[I18N] Update 8.0 translations with latest changes from Launchpad

54 files changed, 11729 insertions, 29514 deletions

diff --git a/addons/base_setup/i18n/ar.po b/addons/base_setup/i18n/ar.po
index 3d41eea4ec9..ba5053fca6f 100644
--- a/addons/base_setup/i18n/ar.po
+++ b/addons/base_setup/i18n/ar.po
@@ -1,837 +1,374 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Arabic translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-14 11:20+0000\n"
-"Last-Translator: kifcaliph <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:28+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "زائر"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "جهات الاتصال"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "السماح بمشاركة المستندات"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr ""
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "السماح للمستخدمين باستيراد معلومات من ملفات بصيغة CSV"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "عضو"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "تطبيق"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "عروض سعر وطلبات الشراء"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "الإعدادات العامة"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "إلغاء"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "متبرع"
+msgid "Client"
+msgstr "العميل"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "زبون"
-
-#. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "السماح للمستخدمين باستيراد معلومات من ملفات بصيغة CSV"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "اعداد معلومات الشركة"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "ادارة عدة شركات"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "جهات الاتصال"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "عميل"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "متبرع"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "الإعدادات العامة"
+
+#. module: base_setup
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
-"يمكنك استخدام صندوق الحوار لتغيير المصطلحات للعملاء في التطبيق بالكامل."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "مستأجر"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "عميل"
+msgid "Guest"
+msgstr "زائر"
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr "كيف يمكنك استدعاء عميل"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
-msgstr "كيف يمكنك استدعاء عميل"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "ادارة عدة شركات"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "العميل"
+msgid "Member"
+msgstr "عضو"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
+msgstr "خيارات"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
 msgstr "الشريك"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "استخدام كلمة أخرى لقول \"العميل\""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "زبون"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "عروض سعر وطلبات الشراء"
+
+#. module: base_setup
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
-msgstr "خيارات"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "السماح بمشاركة المستندات"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr ""
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
+msgstr "حدد المصطلحات الخاصة بك"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "مستأجر"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "إلغاء"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "استخدام كلمة أخرى لقول \"العميل\""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "تطبيق"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
-msgstr "حدد المصطلحات الخاصة بك"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "أو"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "اعداد معلومات الشركة"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "الحسابات و المالية"
-
-#~ msgid "Invoicing"
-#~ msgstr "الفواتير"
-
-#~ msgid "Bank Account No"
-#~ msgstr "رقم الحساب المصرفي"
-
-#~ msgid "Extra Tools"
-#~ msgstr "أدوات إضافية"
-
-#~ msgid "Point of Sales"
-#~ msgstr "نقاط البيع"
-
-#~ msgid "Your database is now created."
-#~ msgstr "تم إنشاء قاعدة البيانات"
-
-#~ msgid "Sales Management"
-#~ msgstr "إدارة المبيعات"
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "تقارير متقدمة"
-
-#~ msgid "Purchase Management"
-#~ msgstr "إدارة المشتريات"
-
-#~ msgid "Company Configuration"
-#~ msgstr "إعدادات الشركة"
-
-#~ msgid "Project Management"
-#~ msgstr "إدارة المشاريع"
-
-#~ msgid "Installed Users"
-#~ msgstr "المستخدمون المعرّفون"
-
-#~ msgid "Food Industry"
-#~ msgstr "الصناعات الغذائية"
-
-#~ msgid "Information about your new database"
-#~ msgstr "معلومات عن قاعدة البيانات الجديدة"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "إدارة علاقات العملاء"
-
-#~ msgid "Company Website"
-#~ msgstr "الموقع الإلكتروني للشركة"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "مثال: http://openerp.com"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "الشعار - استخدم صورة بحجم 150x450 نقطة"
-
-#~ msgid "Base Setup"
-#~ msgstr "الإعدادات الأساسية"
-
-#~ msgid "Start Configuration"
-#~ msgstr "بدء الإعداد"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "تمت إضافة المستخدمين التالين: \n"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "إدارة المخازن و المستودعات"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "إعداد البيانات الخاصة بشركتكم"
-
-#~ msgid "E-mail"
-#~ msgstr "البريد الإلكتروني"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "تذييل تقرير 1"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr "يساعدك على إدارة عمليات التصنيع وإصدار تقارير عن هذه العمليات."
-
-#~ msgid "Human Resources"
-#~ msgstr "الموارد البشرية"
-
-#~ msgid "City"
-#~ msgstr "المدينة"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "تذييل تقرير 2"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "يساعدك على متابعة وإدارة علاقات العملاء مثل الفرص والطلبات والشكاوى. يوفر "
-#~ "إمكانيات تلقائية لإرسال رسائل تذكير، وتصعيد طلبات، وابتداء إجراءات مخصصة "
-#~ "بناء على أحداث قياسية."
-
-#~ msgid "Configuration Progress"
-#~ msgstr "تقدم الإعدادات"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "يساعدك على التعامل مع احتياجاتك المحاسبية. إذا لم تكن محاسباً، نقترح تثبيت "
-#~ "\"الفواتير\" فقط "
-
-#~ msgid "Currency"
-#~ msgstr "العملة"
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "يساعدك على إدارة حملاتك التسويقية خطوة بخطوة."
-
-#~ msgid "Phone"
-#~ msgstr "هاتف"
-
-#~ msgid "Company"
-#~ msgstr "الشركة"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr "يمكنك الشروع في إعداد النظام أو استخدام النظام مباشرة كمدير."
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Marketing"
-#~ msgstr "التسويق"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"يمكنك استخدام صندوق الحوار لتغيير المصطلحات للعملاء في التطبيق بالكامل."
 
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "سيتمّ استخدام معلومات شركتك لتخصيص المستندات التي يصدرها OpenERP مثل "
-#~ "الفواتير وأوامر المبيعات وغير ذلك الكثير."
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid "title"
-#~ msgstr "العنوان"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "يمكّنك من تثبيت عدد من الأدوات المفيدة ولكن غير الضرورية، مثل الاستبانات "
-#~ "والوجبات وصندوق الأفكار."
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "تجاوز معالجات الإعدادات"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "يساعدك على إدارة العمليات المتعلقة بالشراء مثل طلبات التسعير وفواتير "
-#~ "الموردين وما إلى ذلك."
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "يساعدك على إدارة مواردك البشرية عن طريق فهم هيكل الموظفين وإصدار أوراق العمل "
-#~ "ومتابعة الحضور وغير ذلك."
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "يساعدك على إدارة مشاريعك ومهامك عن طريق متابعتهم وإصدار الخطط وما إلى ذلك."
-
-#~ msgid "Knowledge Management"
-#~ msgstr "إدارة المعارف"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "يقوم بتثبيت مجموعة من تطبيقات OpenERP مختارة مسبقاً تساعدك على إدارة نوع "
-#~ "الصناعة الخاص بك."
-
-#~ msgid "Company Name"
-#~ msgstr "اسم الشركة"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr "يمكّنك من تثبيت إضافات غرضها نشر ومشاركة المعارف بين موظفيك."
-
-#~ msgid "Zip Code"
-#~ msgstr "الرمز البريدي"
-
-#~ msgid "Setup"
-#~ msgstr "إعداد"
-
-#~ msgid "Country"
-#~ msgstr "الدولة"
-
-#~ msgid "Logo"
-#~ msgstr "الشعار"
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "اختر التطبيقات الي تريد أن يتضمنها النظام. إذا لم تكن متأكداً من احتياجاتك "
-#~ "بدقة في هذه المرحلة، يمكنك تثبيت أي من التطبيقات بسهولة لاحقاً."
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "يساعدك على التعامل مع التسعيرات وأوامر المبيعات والفواتير."
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "يساعدك على تشغيل نقاط البيع بكفاءة عن طريق تسجيل عمليات البيع بسرعة وتوفير "
-#~ "وضع مبسط للدفع وإصدار تلقائي لقوائم الالتقاط وغير ذلك."
-
-#~ msgid "Manufacturing"
-#~ msgstr "التصنيع"
-
-#~ msgid "Report Header"
-#~ msgstr "رأس التقرير"
-
-#~ msgid "Image"
-#~ msgstr "صورة"
-
-#~ msgid "New Database"
-#~ msgstr "قاعدة بيانات جديدة"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "يقوم بتثبيت مجموعة من تطبيقات OpenERP مختارة مسبقاً لتساعدك على إدارة "
-#~ "المزادات والعمليات المتعلقة بها."
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr "يمكّنك من تثبيت عدة أدوات تسهل وتحسن إنشاء التقارير."
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "ثبّت تطبيقات صناعات معينة"
-
-#~ msgid "Install Applications"
-#~ msgstr "تثبيت تطبيقات"
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "يساعدك على إدارة العمليات المتعلقة بكميات المخزون مثل أوامر التسليم "
-#~ "والاستلام وما إلى ذلك."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "يقوم بتثبيت مجموعة من تطبيقات OpenERP مختارة مسبقاً لتساعدك على إدارة جمعيتك "
-#~ "بكفاءة أعلى."
-
-#~ msgid "Fed. State"
-#~ msgstr "المحافظة / الولاية"
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "يمكّنك من إصدار الفواتير و متابعة المدفوعات.  يعدّ نسخة مبسطة من "
-#~ "\"المحاسبة\" مناسبة للمدراء غير المحاسِبين."
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid "Associations"
-#~ msgstr "الجمعيات"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "ستظهر هذه الجملة أسفل التقارير.\n"
-#~ "نقترح عليك وضع معلوماتك المصرفية هنا:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "ستظهر هذه الجملة في الزاوية اليمنى في رأس كل تقرير.\n"
-#~ "نقترح عليك وضع شعار هنا:\n"
-#~ "\"حلول أعمال مفتوحة المصدر\"."
-
-#~ msgid "Street"
-#~ msgstr "العنوان"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "ستظهر هذه الجملة في أسفل التقارير.\n"
-#~ "نقترح عليك كتابة معلومات قانونية هنا:\n"
-#~ "موقع: http://openerp.com - فاكس: +32.81.73.35.01 - بنك فوتيس: 126-2013269-07"
-
-#~ msgid "Street 2"
-#~ msgstr "العنوان 2"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    هذا البرنامج يشمل إعدادات النظام ليساعد المستخدم\n"
-#~ "    لإعداد النظام أثناء إنشاءه قاعدة بيانات جديدة.\n"
-#~ "\n"
-#~ "    سيسمح لك بإختيار من قائمة معرفة لتنصيب:\n"
-#~ "    * الحد الأدني للنظام\n"
-#~ "    * برامج المحاسبة فقط\n"
-#~ "    * برامج القطاع الخدمي\n"
-#~ "    * برامج القطاع التصنيعي\n"
-#~ "\n"
-#~ "    بالإضافة إلي مساعدتك علي تحديد نوع شركتك، اسمها\n"
-#~ "    و تعريف نوع الدليل المحاسبي و اللغة.\n"
-#~ "    "
-
-#~ msgid "Install"
-#~ msgstr "ابدأ التثبيت"
-
-#~ msgid "Auction Houses"
-#~ msgstr "مزاد البيع للمنازل"
-
-#~ msgid "Create"
-#~ msgstr "إنشاء"
-
-#~ msgid "Import"
-#~ msgstr "إستيراد"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "إذا كنت تستخدم أوبيرب لأول مرة، ننصحك بشدة أن تختار الواجهة المبسطة، والتي "
-#~ "تنقصها بعض المزايا ولكنها أسهل استخداماً. يمكنك تغيير هذا الاختيار في أي وقت "
-#~ "من تفضيلات المستخدم."
-
-#~ msgid "Extended"
-#~ msgstr "مفصّلة"
-
-#~ msgid "Customers"
-#~ msgstr "العملاء"
-
-#~ msgid "Interface"
-#~ msgstr "الواجهة"
-
-#~ msgid "Language"
-#~ msgstr "اللغة"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr "اختر لعرض نصائح لإجراءات القائمة"
-
-#~ msgid "Timezone"
-#~ msgstr "المنطقة الزمنية"
-
-#~ msgid "Simplified"
-#~ msgstr "مبسّط"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "تعريف تفضيلات المستخدمين"
-
-#~ msgid "Display Tips"
-#~ msgstr "عرضالإرشادات"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "تعريف تفضيلات المستخدمين الإفتراضية"
-
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "تعيين العنوان الرئيسي و ذيل الصفحة"
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "ضبط التوقيت الافتراضي للمستخدم الجديد، حيث يستخدم لتنفيذ التحويلات الزمنية "
-#~ "بين الخادم و العميل."
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "مزامنة حسابات جوجل"
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
-
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
-
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "إنشاء أو استيراد العملاء واتصالاتهم يدويا من هذا النموذج أو يمكنك استيراد "
-#~ "الشركاء الموجودين من قبل جدول CSV من صندوق حوار\"استيراد البيانات\""
-
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "حدد اللغة الافتراضية لواجهة المستخدم كل شيء، عندما تتوفر ترجمات UI. إذا كنت "
-#~ "ترغب في إضافة لغة جديدة، يمكنك إضافته من صندوق حوار 'تحميل ترجمة رسمية \"من "
-#~ "القائمة' إدارة '."
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "ملء بيانات الشركة الخاصة بك (عنوان، والشعار، والحسابات المصرفية) التي سوف "
-#~ "تطبع على تقاريرك. يمكنك النقر على زر \"معاينة رأس الصفحة\"  لفحص رأس / تذييل "
-#~ "الصفحة من وثائق PDF"
-
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "هذا سوف يحدد المراجع الافتراضية للمستخدمين الجدد وتحديث كافة البرامج "
-#~ "القائمة. بعد ذلك، للمستخدمين الحرية في تغيير تلك القيم على شكل المستخدم "
-#~ "الخاصة بهم التفضيل."
-
-#~ msgid "Create Additional Users"
-#~ msgstr "إنشاء مزيد من المستخدمين"
-
-#~ msgid "Import or create customers"
-#~ msgstr "إنشاء أو استيراد عملاء"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "إنشاء أو استيراد العملاء"
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "لمزامنة الاتصال بجوجل"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/bg.po b/addons/base_setup/i18n/bg.po
index 9c2f7608778..d3534e336b4 100644
--- a/addons/base_setup/i18n/bg.po
+++ b/addons/base_setup/i18n/bg.po
@@ -1,781 +1,373 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Bulgarian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-07 12:47+0000\n"
-"Last-Translator: lem0na <nickyk@gmx.net>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian <bg@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: 2014-04-22 06:28+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Authentication"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Откажи"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Partner"
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Откажи"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
-#~ msgid "City"
-#~ msgstr "Град"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Може да започнете настройката на системата или се свържете базата "
-#~ "използвайки настроките по подразбиране."
-
-#~ msgid "Zip code"
-#~ msgstr "Пощенски код"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Избери профил"
-
-#~ msgid "Report header"
-#~ msgstr "Горен колонтитул на справка"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Ще може да инсталирате повече модули по-късно през меню Аминистрация "
-#~ "(Administration)."
-
-#~ msgid "Next"
-#~ msgstr "Напред"
-
-#~ msgid "State"
-#~ msgstr "Област"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Новата Ви база е напълно инсталирана."
-
-#~ msgid "Profile"
-#~ msgstr "Профил"
-
-#~ msgid "Street2"
-#~ msgstr "Улица2"
-
-#~ msgid "Phone"
-#~ msgstr "Телефон"
-
-#~ msgid "Company Name"
-#~ msgstr "Име на фирма"
-
-#~ msgid "Country"
-#~ msgstr "Държава"
-
-#~ msgid "Summary"
-#~ msgstr "Резюме"
-
-#~ msgid "Install"
-#~ msgstr "Инсталиране"
-
-#~ msgid "Installation Done"
-#~ msgstr "Инсталацията завършена."
-
-#~ msgid "Currency"
-#~ msgstr "Валута"
-
-#~ msgid "Street"
-#~ msgstr "Улица"
-
-#~ msgid "Previous"
-#~ msgstr "Предишен"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Долен колонтитул на справка 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Долен колонтитул на справка 2"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Вашето лого - използвайте размер 450x150 пиксела."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Изречението ще се появи в долната част на вашите справки,\n"
-#~ "Предлагаме ви тук да включите финансова информация:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Изречението ще се появи в долната част на вашите справки,\n"
-#~ "Предлагаме ви тук да включите девиз:\n"
-#~ "\"Open Source Business Solutions\"."
-
-#~ msgid "Logo"
-#~ msgstr "Лого"
-
-#~ msgid "E-mail"
-#~ msgstr "Имейл"
-
-#~ msgid "Human Resources"
-#~ msgstr "Човешки ресурси"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Помага за управлението на вашите производствени процеси и генерира справки "
-#~ "по тези процеси."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Помага за управление на маркетингови компании стъпка по стъпка."
-
-#~ msgid "Invoicing"
-#~ msgstr "Фактуриране"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Номер на банкова сметка"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Допълнителни инструменти"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Прогрес на настройките"
-
-#~ msgid "Marketing"
-#~ msgstr "Маркетинг"
-
-#~ msgid "Fed. State"
-#~ msgstr "Област"
-
-#~ msgid "Point of Sales"
-#~ msgstr "POS продажби"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Базата данни е създадена"
-
-#~ msgid "Associations"
-#~ msgstr "Асоциации"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Следните потребители са инсталирани: \n"
-
-#~ msgid "Sales Management"
-#~ msgstr "Управление на продажби"
-
-#~ msgid "Company"
-#~ msgstr "Фирма"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Може да започнете настройване на системата или да се свържете директно към "
-#~ "базата като администратор."
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "Информацията за вашата фирма ще бъде използвана за персонализиране на "
-#~ "документи издадени през OpenERP като фактури, нареждания за продажби и много "
-#~ "други."
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Управление на Знания"
-
-#~ msgid "title"
-#~ msgstr "заглавие"
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Разширени отчети"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Прескачане на Помощници за настройки"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Помага управлението на процеси свързани със закупуване като запитвания за "
-#~ "оферти, фактури към доставчици и  др."
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Помага за  управлението на  човешките ресурси чрез кодиране структурата на "
-#~ "служителите,  генериране на графици за заетост, проследяване на присъствията "
-#~ "и др."
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Позволява създаването на фактури и проследяване на плащанията. Това е по-"
-#~ "лесна версия на счетоводния модул за мениджъри, които не са счетоводители."
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Помага ви да управлявате своите проекти и задачи, като ги проследяване, "
-#~ "генерирайки планиране и др .."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Инсталира предварително избран комплект от приложения на Open ERP, което да "
-#~ "помогне за управлението на бизнеса."
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
 
-#~ msgid "Zip Code"
-#~ msgstr "Пощенски код"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid "Auction Houses"
-#~ msgstr "Аукционни къщи"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Счетоводство и финанси"
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Изберете приложенията, с които желаете вашата система да работи. Ако не сте "
-#~ "сигурни какви са точно нуждите ви на този етап, то лесно можете да добавяте "
-#~ "по-късно."
-
-#~ msgid "Start Configuration"
-#~ msgstr "Започни настройване"
-
-#~ msgid "Setup"
-#~ msgstr "Инсталация"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Складово стопанство"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Управление на поръчки"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Настройка на фирма"
-
-#~ msgid "New Database"
-#~ msgstr "Нова база данни"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Управление на връзки с клиенти"
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "Помога за управление на вашите запитвания, продажби и фактури."
-
-#~ msgid "Project Management"
-#~ msgstr "Управление на проекти"
-
-#~ msgid "Installed Users"
-#~ msgstr "Инсталирани потребители"
-
-#~ msgid "Food Industry"
-#~ msgstr "Хрантелна промишленост"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Производство"
-
-#~ msgid "Report Header"
-#~ msgstr "Горен колонтитул на отчет"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Изречението ще се появи в долната част на вашите справки.\n"
-#~ "Предлагаме ви тук да включите юридическа информация:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Информация за новата база данни"
-
-#~ msgid "Image"
-#~ msgstr "Изображение"
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Позволява инсталиране на различни инструменти за улеснение на работа ви и "
-#~ "разширяване изготвянето на отчети."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Инсталира предварително избран комплект от Open ERP приложения за управление "
-#~ "на търгове, както и бизнес процесите свързани с тях."
-
-#~ msgid "Base Setup"
-#~ msgstr "Настройки на базата"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Настройване на информацията за вашата фирма"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Инсталира специфични за всеки бизнес приложения"
-
-#~ msgid "Company Website"
-#~ msgstr "Фирмен уебсайт"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Пример: http://openerp.com"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Помага за следене и управление на връзки с клиенти като жалби, молби и "
-#~ "проблеми"
-
-#~ msgid "Install Applications"
-#~ msgstr "Инсталиране на приложения"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Инсталира предварително избран комплект Open ERP приложения за управление на "
-#~ "асоциации по-ефективно."
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Помага за управление на наличности и основни стокови операции: delivery "
-#~ "orders, receptions, etc."
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Помага да се справите с вашите счетоводни нужди, ако не сте счетоводител ви "
-#~ "препоръчваме да инсталирате само фактуриране "
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Позволява инсталацията на различни интересни, но не задължителни инструменти "
-#~ "като анкета, обяд и идеи."
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Този модул предлага конфигурационна система, която помага на "
-#~ "потребителя\n"
-#~ "    да настрои системата при инсталация на нова база данни.\n"
-#~ "\n"
-#~ "    можете да изберете профил за инсталация:\n"
-#~ "    минимален профил\n"
-#~ "    само счетоводство\n"
-#~ "    фирми в сферата на услугите\n"
-#~ "    производствени предприятия\n"
-#~ "\n"
-#~ "    Също така предоставя стъпки за лесно настройване на фирмата, горен и "
-#~ "долен \n"
-#~ "    колонтитул за документите, сметкоплан и език.\n"
-#~ "    "
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "Street 2"
-#~ msgstr "Улица 2"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Позволява инсталирането на добавки помагащи споделянето на знания с вашите "
-#~ "служители."
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Помага да получите максимума от вашите точки за продажба с помоща на бързо "
-#~ "отчитане на продажбите, улеснено регистриране на плащания, автоматични "
-#~ "списъци за вдигане и др."
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/bs.po b/addons/base_setup/i18n/bs.po
index dcd2c9edff3..ca74f96d3e5 100644
--- a/addons/base_setup/i18n/bs.po
+++ b/addons/base_setup/i18n/bs.po
@@ -1,544 +1,390 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Bosnian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-09-29 09:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@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: 2014-04-22 06:28+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Integracija email-a"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Gost"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Kontakti"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr ""
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Aktiviraj portal za partnere"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
-"Koristi vanjske davatelje usluga autentikacije, prijava s računom google, "
-"facebook, ..."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Dozvoli dijeljenje dokumenata"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
-"OpenERP dozvoljava da se automatski kreiraju potencijali (ili drugi "
-"dokumenti)\n"
-"                            iz dolazećih email-ova. Možete automatski "
-"sinhronizovati email sa OpenERP\n"
-"                            koristeći regularne POP/IMAP račune, direktno "
-"koristeći email integracijske skripte\n"
-"                            za Vaš email server, ili ručno gurajući email-"
-"ove u OpenERP koristeći specifične\n"
-"                            dodatke za vašu preferiranu email aplikaciju."
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "PRODAJA"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Dozvoli uvoz podataka iz CSV datoteka"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Član"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Primijeni"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Pristup portalu"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Autentifikacija"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Ponude i prodajne narudžbe"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
+msgstr "CRM"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Opšta podešavanja"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Otkaži"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Donator"
+msgid "Client"
+msgstr "Klijent"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "E-Mail"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Postavke prodaje"
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
-msgstr "CRM"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Podesi odlazne email servere"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Pacijent"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Upišite podatke o Vašoj kompaniji"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Dozvoli uvoz podataka iz CSV datoteka"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Kontakti"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Upravljajte sa više kompanija"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=VASA_BAZA"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Kupac"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Automatski učitaj kontakte iz LinkedIn-a"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
+msgstr "Značajke kupca"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Omogući Thunderbird plug-in"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Donator"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "E-Mail"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
-msgstr "Značajke kupca"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Integracija email-a"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Uvoz / Izvoz"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Opšta podešavanja"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Značajke prodaje"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Omogući Outlook plug-in"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Automatski učitaj kontakte iz LinkedIn-a"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Možete koristiti ovaj čarobnjak da izmjenite terminologiju kupaca u cijeloj "
-"aplikaciji."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Dozvolite svojim partnerima pristup njihovim dokumentima."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Dijeli ili uklopi bilo koji ekran OpenERP-a."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
+msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Kupac"
+msgid "Guest"
+msgstr "Gost"
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Kada otvarate novi kontakt (kupac ili kompanija), dobivate mogućnost "
-"učitavanja svih podataka o njemu sa LinkedIna (slike, adrese i sl.)."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr "Koji temin želite koristiti za kupce"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
-"Rad u okolini sa više kompanija, sa prikladnim osiguranjem pristupa između "
-"organizacija.\n"
-"                                                             ovo instalira "
-"modul multi_company."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
-msgstr ""
-"Javni portal je dostupan jedino ako ste u načinu rada sa samo jednom bazom,  "
-"možete\n"
-"                                                                             "
-"   pokrenuti OpenERP sa opcijom"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Uvoz / Izvoz"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
-"Naći će te više opcija u detaljima vaše kompanije: adresu za zaglavlje i "
-"podnožje, prekoračenja plaćanja poreza, itd."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
-msgstr "Koji temin želite koristiti za kupce"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
-"Kad pošaljete mailom dokument partneru\n"
-"                                                                             "
-" (predračun, računa), vaš partner će se moći\n"
-"                                                                             "
-" prijaviti i preuzeti sve svoje dokumente,\n"
-"                                                                             "
-" pročitati novosti vaše organizacije, provjeriti svoje projekte\n"
-"                                                                             "
-" isl."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr ""
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Upravljajte sa više kompanija"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Klijent"
+msgid "Member"
+msgstr "Član"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr "Dozvoli javni dio OpenERP-a. Vaš OpenERP postaje javna web stranica."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
+msgstr "Opcije"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Druga riječ da kažete \"Kupac\""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Pacijent"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Postavke prodaje"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Pristup portalu"
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Ponude i prodajne narudžbe"
+
+#. module: base_setup
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
-msgstr "Opcije"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "PRODAJA"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Aktiviraj portal za partnere"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Značajke prodaje"
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Dozvoli dijeljenje dokumenata"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Dijeli ili uklopi bilo koji ekran OpenERP-a."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(novosti organizacije, poslovi, kontakt obrasci itd.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Integracija društvenih mreža"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Aktiviraj javni portal"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
+msgstr "Specifirajte vašu terminologiju"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Podesi odlazne email servere"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Integracija društvenih mreža"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Dozvolite svojim partnerima pristup njihovim dokumentima."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Otkaži"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Druga riječ da kažete \"Kupac\""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Primijeni"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
+"Koristi vanjske davatelje usluga autentikacije, prijava s računom google, "
+"facebook, ..."
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
-msgstr "Specifirajte vašu terminologiju"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Kada otvarate novi kontakt (kupac ili kompanija), dobivate mogućnost "
+"učitavanja svih podataka o njemu sa LinkedIna (slike, adrese i sl.)."
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "ili"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Kad pošaljete mailom dokument partneru\n"
+"                                                                             "
+" (predračun, računa), vaš partner će se moći\n"
+"                                                                             "
+" prijaviti i preuzeti sve svoje dokumente,\n"
+"                                                                             "
+" pročitati novosti vaše organizacije, provjeriti svoje projekte\n"
+"                                                                             "
+" isl."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Upišite podatke o Vašoj kompaniji"
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Profil određuje pred-izbor modula za specifične potrebe. Ti su profili "
-#~ "podešeni kako biste lakše otkrivali različite aspekte Open ERP-a. Ovo je tek "
-#~ "osvrt, postoji 300+ raspoloživih modula."
-
-#~ msgid "Next"
-#~ msgstr "Dalje"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid "Report header"
-#~ msgstr "Zaglavlje Izvještaja"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Odaberite Profil"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Možete početi s konfiguracijom sustava ili se izravno spojiti na bazu "
-#~ "podataka koristeći predefinirane postavke."
-
-#~ msgid "City"
-#~ msgstr "Grad"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Moći ćete instalirati više modula kasnije kroz izbornik Admininstracija"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Započnite konfiguriranje"
-
-#~ msgid "Zip code"
-#~ msgstr "Poštanski broj"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Vaša nova baza podataka sada je instalirana u potpunosti."
-
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Podnožje izvještaja 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Podnožje izvještaja 2"
-
-#~ msgid "State"
-#~ msgstr "Kanton/Regija"
-
-#~ msgid "Street2"
-#~ msgstr "Ulica2"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Report Information"
-#~ msgstr "Informacija o izvještaju"
-
-#~ msgid "General Information"
-#~ msgstr "Opće informacije"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Odredite glavno poduzeće"
-
-#~ msgid "Report Header"
-#~ msgstr "Zaglavlje izvještaja"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Ova će se rečenica pojavljivati u podnožju vaših izvještaja.\n"
-#~ "Savjetujemo vam da ovdje upišete osnovne podatke:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Installation Done"
-#~ msgstr "Instalacija završena"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Ova će se rečenica pojavljivati u gornjem desno kutu vaših izvještaja.\n"
-#~ "Savjetujemo vam da ovdje upišete slogan tvrtke:\n"
-#~ "\"Open Source Business Solutions\""
-
-#~ msgid "Country"
-#~ msgstr "Država"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Ova će se rečenica pojavljivati u podnožju vaših izvještaja.\n"
-#~ "Savjetujemo vam da ovdje upišete bankovne podatke:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - PDV: BE0477.472.701"
-
-#~ msgid "Install"
-#~ msgstr "Instaliraj"
-
-#~ msgid "Summary"
-#~ msgstr "Sažetak"
-
-#~ msgid "Setup"
-#~ msgstr "Podešavanje"
-
-#~ msgid "Company Name"
-#~ msgstr "Naziv poduzeća"
-
-#~ msgid "Base Setup"
-#~ msgstr "Osnovno podešavanje"
-
-#~ msgid "Use Directly"
-#~ msgstr "Koristiti izravno"
-
-#~ msgid "Previous"
-#~ msgstr "Prethodno"
-
-#~ msgid "Street"
-#~ msgstr "Ulica"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Currency"
-#~ msgstr "Valuta"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Možete koristiti ovaj čarobnjak da izmjenite terminologiju kupaca u cijeloj "
+"aplikaciji."
 
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Vaš Logo: Koristite veličinu slike od cca. 450x150 pixela."
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Naći će te više opcija u detaljima vaše kompanije: adresu za zaglavlje i "
+"podnožje, prekoračenja plaćanja poreza, itd."
 
-#~ msgid "Logo"
-#~ msgstr "Logotip"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/ca.po b/addons/base_setup/i18n/ca.po
index 71c3b0e6c55..55d68575343 100644
--- a/addons/base_setup/i18n/ca.po
+++ b/addons/base_setup/i18n/ca.po
@@ -1,807 +1,373 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Catalan translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-07 12:56+0000\n"
-"Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
-"<resteve@zikzakmedia.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2014-04-22 06:28+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Authentication"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Cancel·la"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_continguts"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Partner"
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Cancel·la"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
-#~ msgid "Select a Profile"
-#~ msgstr "Seleccioneu un perfil"
-
-#~ msgid "City"
-#~ msgstr "Ciutat"
-
-#~ msgid "Zip code"
-#~ msgstr "Codi postal"
-
-#~ msgid "Report header"
-#~ msgstr "Capçalera dels informes"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Inicia configuració"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Posteriorment podreu instal·lar més mòduls des del menú Administració."
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Un perfil instal·la una preselecció de mòduls per a una necessitat "
-#~ "específica. Aquests perfils s'han creat per ajudar-vos a descobrir els "
-#~ "diferents aspectes d'OpenERP. Això només és un punt de partida, OpenERP "
-#~ "disposa de 300+ mòduls."
-
-#~ msgid "Next"
-#~ msgstr "Següent"
-
-#~ msgid "E-mail"
-#~ msgstr "Correu electrònic"
-
-#~ msgid "State"
-#~ msgstr "Estat"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "La vostra nova base de dades s'ha instal·lat completament."
-
-#~ msgid "Profile"
-#~ msgstr "Perfil"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Peu de pàgina 1 dels informes"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Peu de pàgina 2 dels informes"
-
-#~ msgid "General Information"
-#~ msgstr "Informació general"
-
-#~ msgid "Street2"
-#~ msgstr "Carrer 2"
-
-#~ msgid "Report Information"
-#~ msgstr "Informació dels informes"
-
-#~ msgid "Phone"
-#~ msgstr "Telèfon"
-
-#~ msgid "Company Name"
-#~ msgstr "Nom de la companyia"
-
-#~ msgid "Country"
-#~ msgstr "País"
-
-#~ msgid "Setup"
-#~ msgstr "Instal·lació"
-
-#~ msgid "Summary"
-#~ msgstr "Resum"
-
-#~ msgid "Install"
-#~ msgstr "Instal·la"
-
-#~ msgid "Installation Done"
-#~ msgstr "Instalació realitzada"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Aquesta frase apareixerà a la part superior dreta dels vostres informes.\n"
-#~ "Us suggerim que poseu un eslògan, per exemple:\n"
-#~ "\"Solucions d'empresa de codi obert\"."
-
-#~ msgid "Report Header"
-#~ msgstr "Capçalera dels informes"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "El vostre logo – Utilitzeu una mida de 450x150 píxels aprox."
-
-#~ msgid "Currency"
-#~ msgstr "Moneda"
-
-#~ msgid "Street"
-#~ msgstr "Carrer"
-
-#~ msgid "Use Directly"
-#~ msgstr "Utilitza directament"
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid "Previous"
-#~ msgstr "Anterior"
-
-#~ msgid "Base Setup"
-#~ msgstr "Configuració bàsica"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Definiu la companyia principal"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Podeu iniciar la configuració del sistema o connectar-vos directament a la "
-#~ "base de dades utilitzant la instal·lació per defecte."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Aquesta frase apareixerà a la part inferior dels vostres informes.\n"
-#~ "Us suggerim posar la vostra informació bancària, per exemple:\n"
-#~ "IBAN: ES1234 1234 00 0123456789 - SWIFT: CPDF BE71 - CIF: ES12345678A"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Aquesta frase apareixerà a la part inferior dels vostres informes.\n"
-#~ "Us suggerim que aquí hi poseu frases legals del tipus:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Compte bancari: 126-2013269-"
-#~ "07"
-
-#~ msgid "Human Resources"
-#~ msgstr "Recursos humans"
-
-#~ msgid "Your database is now created."
-#~ msgstr "La seva base de dades ja està creada."
-
-#~ msgid "Associations"
-#~ msgstr "Associacions"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Terminal punt de venda"
-
-#~ msgid "Invoicing"
-#~ msgstr "Facturació"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Núm. compte bancari"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Eines extres"
-
-#~ msgid "Sales Management"
-#~ msgstr "Gestió de vendes"
-
-#~ msgid "Company"
-#~ msgstr "Companyia"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progrés de la configuració"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Podeu començar configurant el sistema o connectant directament a la base de "
-#~ "dades com un administrador."
-
-#~ msgid "Marketing"
-#~ msgstr "Màrqueting"
-
-#~ msgid "Fed. State"
-#~ msgstr "Província"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Els següents usuaris han estat instal·lats : \n"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Permet instal·lar diverses eines interessants però no essencials com a "
-#~ "Informes, menjars i caixa d'Idees."
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Informes avançats"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Omet assistents de configuració"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.companyia"
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Gestió del coneixement"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Instal·la un conjunt preseleccionat d'aplicacions d'OpenERP que poden ajudar-"
-#~ "vos a gestionar la seva indústria."
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
 
-#~ msgid "title"
-#~ msgstr "títol"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Configuració de la compañía"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.instal·lador"
-
-#~ msgid "Street 2"
-#~ msgstr "Carrer 2"
-
-#~ msgid "Zip Code"
-#~ msgstr "Codi postal"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Cases de subhastes"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Comptabilitat i finances"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Gestió de magatzems"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Gestió de compres"
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Li permet instal·lar diverses eines per simplificar i millorar la creació "
-#~ "d'informes en OpenERP."
-
-#~ msgid "New Database"
-#~ msgstr "Nova base de dades"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Gestió de les relacions amb el client (CRM)"
-
-#~ msgid "Project Management"
-#~ msgstr "Gestió de projectes"
-
-#~ msgid "Installed Users"
-#~ msgstr "Usuaris instal·lats"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Producció"
-
-#~ msgid "Food Industry"
-#~ msgstr "Indústria alimentària"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Instal·la aplicacions específiques per a la indústria"
-
-#~ msgid "Company Website"
-#~ msgstr "Pàgina web de la companyia"
-
-#~ msgid "Install Applications"
-#~ msgstr "Instal·la aplicacions"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Exemple: http://openerp.com"
-
-#~ msgid "Image"
-#~ msgstr "Imatge"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "L'ajuda a gestionar els seus processos de fabricació i generar informes "
-#~ "sobre aquests processos."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "L'ajuda a gestionar les seves campanyes de màrqueting pas a pas."
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "L'ajuda a controlar i administrar les relacions amb els clients, tals com "
-#~ "les iniciatives, peticions o qüestions. Podeu enviar automàticament "
-#~ "recordatoris, escalar les peticions o activar accions específiques del "
-#~ "negoci basat en esdeveniments estàndard."
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "L'ajuda a gestionar les seves necessitats comptables. Si no és comptable, li "
-#~ "suggerim instal·lar només la facturació. "
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Li ajuda a gestionar els seus projectes i tasques realitzant un seguiment "
-#~ "dels mateixos, generant planificacions, ..."
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Aquest mòdul implementa un sistema de configuració que ajuda a l'usuari\n"
-#~ "    a configurar el sistema durant la instal·lació d'una nova base de "
-#~ "dades.\n"
-#~ "\n"
-#~ "    Li permet seleccionar entre una llista de perfils a instal·lar:\n"
-#~ "    * Perfil mínim\n"
-#~ "    * Només comptabilitat\n"
-#~ "    * Companyies de serveis\n"
-#~ "    * Companyies de fabricació\n"
-#~ "\n"
-#~ "    També proporciona pantalles per ajudar-vos a configurar fàcilment la "
-#~ "seva companyia, la capçalera i \n"
-#~ "    el peu de pàgina, el pla comptable a instal·lar i l'idioma.\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Li ajuda a gestionar els seus recursos humans mitjançant la codificació de "
-#~ "l'estructura de treballadors, la generació de fulls de treball, seguiment de "
-#~ "l'assistència, ..."
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Li permet crear les seves factures i controlar els pagaments. És una versió "
-#~ "més fàcil del mòdul de comptabilitat per a gestors que no siguin comptables."
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "La informació de la seva companyia s'utilitzarà per personalitzar els "
-#~ "documents expedits amb OpenERP, com les factures, comandes i molt més."
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Li permet instal·lar addons orientats a compartir el coneixement amb i entre "
-#~ "els seus treballadors."
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Li ajuda a gestionar els seus processos relacionats amb les compres com "
-#~ "peticions de pressupostos, factures de proveïdor, ..."
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Escolliu les aplicacions que desitgeu cobrir amb el seus sistema. Si no "
-#~ "esteu segurs sobre les seves necessitats exactes en aquest punt, podeu "
-#~ "instal·lar-les fàcilment més tard."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Instal·la un conjunt preseleccionat d'aplicacions d'OpenERP per ajudar-vos a "
-#~ "gestionar les seves subhastes com també els processos de negoci al voltant "
-#~ "d'elles."
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr ""
-#~ "Li ajuda a gestionar els seus pressupostos, comandes de venda i facturació."
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Li ajuda a treure profit dels seus terminals punt de venda amb la "
-#~ "codificació ràpida de les vendes, codificació de maneres de pagament "
-#~ "simplificada, generació automàtica d'albarans, ..."
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Configura la informació de la seva companyia"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Informació sobre la seva nova base de dades"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Instal·la un conjunt preseleccionat d'aplicacions en OpenERP que li ajudarà "
-#~ "a administrar la seva associació de manera més eficient."
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Li ajuda a gestionar el seu inventari i les operacions principals d'estoc: "
-#~ "les ordres de lliurament, recepcions, ..."
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_continguts"
diff --git a/addons/base_setup/i18n/cs.po b/addons/base_setup/i18n/cs.po
index ded3f49384a..25743b1d957 100644
--- a/addons/base_setup/i18n/cs.po
+++ b/addons/base_setup/i18n/cs.po
@@ -1,241 +1,175 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * base_setup
+# Czech translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-07 12:52+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:28+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-"X-Poedit-Language: Czech\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Integrace e-mailů"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Host"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Kontakty"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Aktivovat zákaznický portál"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr "Použít externí poskytovatele přihlášení (Google, Facebook...)"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Povolit sdílení dokumentů"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
-"OpenERP umožňuje automaticky vytvářet leady (nebo jiné dokumenty) z "
-"příchozích e-mailů.\n"
-"E-maily můžete s OpenERP synchronizovat automaticky z běžných POP3/IMAP "
-"účtů, pomocí skriptu pro přímou integraci s e-mailovým serverem, nebo "
-"manuálně s použitím plug-inu pro vašeho e-mailového klienta."
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "PRODEJ"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Umožnit uživatelům import z CSV"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Člen"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Použít"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Přístup k portálu"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Autentizace"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Nabídky a přijaté objednávky"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Obecná nastavení"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Dárce"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "E-mail"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Storno"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Pacient"
+msgid "Client"
+msgstr "Klient"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Umožnit uživatelům import z CSV"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Konfigurovat prodej"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Spravovat více firem"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Konfigurovat odchozí e-mailové servery"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "V e-mailovém klientovi"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Nastavte data své společnosti"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=VAŠE_DATABÁZE"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Kontakty"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Získat kontakty automaticky z LinkedIn"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Povolit Thunderbird plug-in"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Zákazník"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Zákaznické funkce"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Import / Export"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Prodejní funkce"
-
-#. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Povolit Outlook plug-in"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Dárce"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Tohoto průvodce můžete použít pro úpravu terminologie na míru zákazníka v "
-"celé aplikaci."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "E-mail"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Instance/zákazník (\"tenant\")"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Integrace e-mailů"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Sdílet nebo vložit kteroukoli obrazovku OpenERP"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Obecná nastavení"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Zákazník"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Budete moci k novým kontaktům (osobám nebo firmám) automaticky doplnit "
-"kontaktní informace (fotografie, adresy atd.) z LinkedIn."
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Získat kontakty automaticky z LinkedIn"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
-"Pracujte v prostředí více firem, s příslušným řízením přístupu k jednotlivým "
-"firmám.\n"
-"Bude nainstalován modul multi_company."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Dejte svým zákazníkům přístup k jejich dokumentům."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
-"Veřejný portál je přístupný, pokud pracujete s jedinou databází.\n"
-"                                     Můžete spustit OpenERP server s "
-"parametrem"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
-"Více nastavení najdete v detailech společnosti: adresa do záhlaví a zápatí, "
-"texty upomínek atd."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Host"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -243,528 +177,206 @@ msgid "How do you call a Customer"
 msgstr "Jak nazýváte zákazníka"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
-"Když pošlete dokument zákazníkovi (nabídku, fakturu), bude se moci "
-"zaregistrovat a získat přístup ke všem svým dokumentům, čtení firemních "
-"novinek, kontrole svých projektů atd."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Import / Export"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Klient"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr "Povolit veřejný web OpenERP."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
-"Plug-in umožňuje připojit e-maily a jejich přílohy k objektům v OpenERP "
-"(partnerům nebo leadům).\n"
-"Z vybraných e-mailů můžete vytvářet nové partnery a leady.\n"
-"Bude nainstalován modul plugin_thunderbird."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Partner"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Spravovat více firem"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Použijte jiný výraz pro \"zákazník\""
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Člen"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Konfigurovat prodej"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"Plug-in umožňuje připojit e-maily a jejich přílohy k objektům v OpenERP "
-"(partnerům nebo leadům).\n"
-"Z vybraných e-mailů můžete vytvářet nové partnery a leady.\n"
-"Bude nainstalován modul plugin_outlook."
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Možnosti"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Aktivovat zákaznický portál"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Partner"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
-"Pokud toto aktivujete, přihlašovací stránka OpenERP bude nahrazena veřejným "
-"webem."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Pacient"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Povolit sdílení dokumentů"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Přístup k portálu"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(firemní novinky, pracovní příležitosti, kontaktní formulář atd.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Nabídky a přijaté objednávky"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Aktivovat veřejný portál"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Konfigurovat odchozí e-mailové servery"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "PRODEJ"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Integrace sociální sítě"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Prodejní funkce"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Dejte svým zákazníkům přístup k jejich dokumentům."
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Storno"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Sdílet nebo vložit kteroukoli obrazovku OpenERP"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Použít"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Integrace sociální sítě"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Určete svou terminologii"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "nebo"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Instance/zákazník (\"tenant\")"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Nastavte data své společnosti"
-
-#~ msgid "City"
-#~ msgstr "Město"
-
-#~ msgid "Zip code"
-#~ msgstr "PSČ"
-
-#~ msgid "Report header"
-#~ msgstr "Hlavička výpisu"
-
-#~ msgid "Next"
-#~ msgstr "Další"
-
-#~ msgid "State"
-#~ msgstr "Stav"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Vaše nová databáze je nyní plně nainstalována."
-
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Street2"
-#~ msgstr "Ulice2"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Company Name"
-#~ msgstr "Název společnosti"
-
-#~ msgid "Country"
-#~ msgstr "Země"
-
-#~ msgid "Setup"
-#~ msgstr "Nastavení"
-
-#~ msgid "Summary"
-#~ msgstr "Souhrn"
-
-#~ msgid "Install"
-#~ msgstr "Instalovat"
-
-#~ msgid "Currency"
-#~ msgstr "Měna"
-
-#~ msgid "Street"
-#~ msgstr "Ulice"
-
-#~ msgid "Previous"
-#~ msgstr "Předchozí"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid "General Information"
-#~ msgstr "Všeobecné informace"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Vyberte profil"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Start nastavení"
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid "Installation Done"
-#~ msgstr "Instalace dokončena"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Byli instalováni následující uživatelů : \n"
-
-#~ msgid "Invoicing"
-#~ msgstr "Fakturace"
-
-#~ msgid "Human Resources"
-#~ msgstr "Lidské zdroje"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Číslo bankovního účtu"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Další nástroje"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid "Report Footer 1"
-#~ msgstr "Zápatí výpisu 1"
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Pomůže vám spravovat vaše výrobní procesy a generovat výkazy nad těmito "
-#~ "procesy."
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Použijte jiný výraz pro \"zákazník\""
 
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Pomáhá vámkrok za krokem spravovat vaše marketingové kampaně."
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr "Použít externí poskytovatele přihlášení (Google, Facebook...)"
 
-#~ msgid "Your database is now created."
-#~ msgstr "Vaše databáze je nyní vytvořena."
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Budete moci k novým kontaktům (osobám nebo firmám) automaticky doplnit "
+"kontaktní informace (fotografie, adresy atd.) z LinkedIn."
 
-#~ msgid "Point of Sales"
-#~ msgstr "Prodejní místo"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Když pošlete dokument zákazníkovi (nabídku, fakturu), bude se moci "
+"zaregistrovat a získat přístup ke všem svým dokumentům, čtení firemních "
+"novinek, kontrole svých projektů atd."
 
-#~ msgid "Associations"
-#~ msgstr "Přidružení"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Pomůže vám zvládnout vaše účetní potřeby. Pokud nejste účetní, doporučujeme "
-#~ "vám instalovat pouze Fakturaci. "
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Tohoto průvodce můžete použít pro úpravu terminologie na míru zákazníka v "
+"celé aplikaci."
 
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Pomůže vám sledovat a spravovat vztahy se zákazníky jako vedení, požadavky "
-#~ "nebo problémy. Může automaticky zasílat upozornění, stupňování požadavků "
-#~ "nebo vyvolat obchodně vztažené akce založené na standardních událostech."
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Průběh nastavení"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Zápatí výpisu 2"
-
-#~ msgid "Fed. State"
-#~ msgstr "Fed. stát"
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
-
-#~ msgid "Company"
-#~ msgstr "Společnost"
-
-#~ msgid "Sales Management"
-#~ msgstr "Řízení prodeje"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Umožní vám instalovat různé zajímavé, ale ne nutně potřebné nástroje jako "
-#~ "Průzkumy, Obědy a Krabice nápadů."
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Můžete začít s nastavením systému nebo se přímo připojit k databázi jako "
-#~ "správce."
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Pokročilé vykazování"
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "Vaše informace o společnosti budou použity pro přizpůsobení dokumentů "
-#~ "vytvářených OpenERP jako faktury, prodejní objednávky a mnoho dalších."
-
-#~ msgid "title"
-#~ msgstr "název"
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Správa znalostí"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Instalovat předvybranou sadu aplikací OpenERP, která vám pomůže spravovat "
-#~ "vaše odvětví."
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Pomůže vám spravovat projekty a úkoly jejich sledováním, generováním plánů, "
-#~ "aj."
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Přeskočit průvodce nastavení"
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Pomůže vám spravovat vaše lidské zdroje pomocí nakódování struktury "
-#~ "zaměstnanců, generování pracovních listů, sledování docházky a další."
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Umožní vám vytvořit faktury a sledovat platby. Jedná se o jednodušší "
-#~ "variantu účetního modulu pro vedoucí, kteří nejsou účetními."
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Pomůže vám spravovat vaše nákupní procesy jako požadavky na ocenění, faktury "
-#~ "dodavatelů, aj."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Tato věta se objeví dole ve vašich výkazech.\n"
-#~ "Doporučujeme vám dát zde bankovní informace:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid "Street 2"
-#~ msgstr "Ulice 2"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Účetnictví & peněžnictví"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Aukční domy"
-
-#~ msgid "Zip Code"
-#~ msgstr "PSČ"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Umožní vám instalovat doplňky zaměřené na sdílení znalostí s a mezi vašimi "
-#~ "zaměstnanci."
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Vyberte aplikace, které chcete, aby zahrnoval váš systém. Můžete je "
-#~ "instalovat snadno později, pokud si nejste v této fázi jisti svými přesnými "
-#~ "požadavky."
-
-#~ msgid "Company Configuration"
-#~ msgstr "Nastavení společnosti"
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Pomůže vám s většinou vašich prodejních míst díky rychlému kódování prodeje, "
-#~ "zjednodušenému kódování režimu plateb, automatickému generování naváděcích "
-#~ "seznamu a další."
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Řízení nákupu"
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr ""
-#~ "Pomáhá vám spravovat vaše cenové nabídky, prodejní příkazy a fakturaci."
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Správa skladů"
-
-#~ msgid "Project Management"
-#~ msgstr "Projektové řízení"
-
-#~ msgid "Installed Users"
-#~ msgstr "Instalováni uživatelé"
-
-#~ msgid "New Database"
-#~ msgstr "Nová databáze"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Řízení vztahů se zákazníky"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Instaluje předvybranou sadu aplikací OpenERP, která je vybraná, aby vám "
-#~ "pomohla spravovat vaše aukce stejně tak jako obchodní procesy kolem."
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Tato věta se objeví v pravém horním roku vašich výkazů.\n"
-#~ "Doporučujeme vám umístit zde slogan:\n"
-#~ "\"Otevřené obchodní řešení\"."
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Umožní vám instalovat rozličné nástroje ke zjednodušení a vylepšení "
-#~ "vytváření výkazů OpenERP."
-
-#~ msgid "Report Header"
-#~ msgstr "Záhlaví výpisu"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Informace o vaší nové databázi"
-
-#~ msgid "Image"
-#~ msgstr "Obrázek"
-
-#~ msgid "Food Industry"
-#~ msgstr "Potravinářský průmysl"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Výroba"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Vaše logo - Použijte velikost okolo 450x150 obrazových bodů."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Tato věta se objeví na spodu vašich výkazů.\n"
-#~ "Navrhujeme vám napsat zde právní věty:\n"
-#~ "Web: http://openerp.com - Fax: +420 123456789 - Bankovní účet: 123456789/1234"
-
-#~ msgid "Company Website"
-#~ msgstr "Stránky společnosti"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Instalovat určité průmyslové aplikace"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Nastavit informace vaší společnosti"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Příklad: http://openerp.com"
-
-#~ msgid "Install Applications"
-#~ msgstr "Instalovat aplikace"
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Pomůže vám spravovat váš inventář a hlavní skladové operace: doručovací "
-#~ "příkazy, příjmy, aj."
-
-#~ msgid "Base Setup"
-#~ msgstr "Základní nastavení"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Více nastavení najdete v detailech společnosti: adresa do záhlaví a zápatí, "
+"texty upomínek atd."
 
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Instalovat předvybranou sadu aplikací OpenERP, které vám pomůžou spravovat "
-#~ "efektivněji vaše asociace."
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/da.po b/addons/base_setup/i18n/da.po
index d0677f164b8..05ce36c2f9e 100644
--- a/addons/base_setup/i18n/da.po
+++ b/addons/base_setup/i18n/da.po
@@ -1,242 +1,175 @@
 # Danish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-08 10:30+0000\n"
-"Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@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: 2014-04-22 06:28+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Email integration"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Gæst"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Adressebog"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr ""
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Aktiver kunde portal"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr "Brug ekstern login godkendelse, login med google, facebook,..."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Tillad deling af dokumenter"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
-"OpenERP tillader automatisk oprettelse af emner(eller andre poster)\n"
-"                            fra indkomne emails. Du kan automatisk "
-"synkronisere email med OpenERP\n"
-"                            ved hjælp af almindelig POP3/IMAP konti, ved "
-"brug af email integrations script til din\n"
-"                            email server, eller manuelt at overføre emails "
-"til OpenERP ved hjælp af dedikeret\n"
-"                            plugins til dit foretrukne email program."
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "SALG"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Tillad brugere at importere data fra CSV filer"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Medlem"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Anvend"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Portal adgang"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Godkendelse"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Tilbud og Salgs Ordre"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Generelle indstillinger"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Donor"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "E-mail"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Fortryd"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Tålmodig"
+msgid "Client"
+msgstr "Klient"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Tillad brugere at importere data fra CSV filer"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Tilpas Ordre"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Administrere firmaer"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Opsætning udgående email server"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "Mail klient"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Opsæt firma oplysninger"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=DIN_DATABASE"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Adressebog"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Hent automatisk kontakter fra LinkedIn"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Aktiver Thunderbird plug-in"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Kunde"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Kunde funktioner"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Import / Eksport"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Salgs funktioner"
-
-#. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Aktiver Outlook plug-in"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Donor"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Du kan bruge denne wizard til at ændre terminologier for kunder i hele "
-"programmet."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "E-mail"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Lejer"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Email integration"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Del eller indlejre enhvert skærmbilled af openerp"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Generelle indstillinger"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Kunde"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Når du opretter en ny kontakt(person eller firma), kan du hente alle data "
-"fra LinkedIn (billeder, adresse, m.m.)."
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Hent automatisk kontakter fra LinkedIn"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
-"Arbejd i et multi firma miljø, med styrede rettigheder mellem firmaer.\n"
-"                Dette installerer mudulet multi_firma."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Giv dine kunder adgang til deres dokumenter"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
-"Den offentlige portal er kun tilgængelig i enkelt database mode. Du kan\n"
-"                                    starte openerp server med denne option"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
-"Du vil finde flere optioner i detaljerne for firmaet: adresse til sidehoved "
-"og sidefod, rykker tekster, m.m."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Gæst"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -244,529 +177,210 @@ msgid "How do you call a Customer"
 msgstr "Hvordan kontakter du en kunde"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
-"Når du sender et dokument til en kunde\n"
-"                                    (tilbud, faktura), vil din kunde kunne\n"
-"                                    tilmelde sig for at tilgå alle hans "
-"dokumenter,\n"
-"                                    læse firma nyheder, kontrollere sine "
-"projekter,\n"
-"                                    m.m."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Import / Eksport"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Klient"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"Aktiver den offentlige del af openerp, openerp bliver en offentlig "
-"hjemmeside."
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
-"Denne plugin tillader at du arkiverer email og vedhæftede filer til det "
-"valgte\n"
-"                OpenERP objekt. Du kan vælge en kunde eller et emne og\n"
-"                vedhæfte den valgte mail som en .eml fil i\n"
-"                dokumentstyringen til den valgte post. Du kan oprette poster "
-"for CRM emner,\n"
-"                Partnere fra de valgte emails.\n"
-"                Dette installerer modulet plugin_thunderbird."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Kontakt"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Administrere firmaer"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Brug alternativt ord for \"Kunde\""
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Medlem"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Tilpas Ordre"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"Outlook plugin giver mulighed for at vælge et objekt du vil knytte til din "
-"email\n"
-"                med vedhæftninger fra MS Outlook. Du kan vælge en partner,\n"
-"                eller et emne object og arkivere den valgte email\n"
-"                til en OpenERP mail meddelse med vedhæftninger.\n"
-"                Dette installerer modulet plugin_outlook."
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Muligheder"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Aktiver kunde portal"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Kontakt"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
-"at gøre sådan.\n"
-"                                    Når aktiveret, vil login side blive "
-"erstattet af den offentlige hjemmeside."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Tålmodig"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Tillad deling af dokumenter"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Portal adgang"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(firma nyheder, job, kontakt form, osv.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Tilbud og Salgs Ordre"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Aktiver offentlig portal"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Opsætning udgående email server"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "SALG"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Social Network integration"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Salgs funktioner"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Giv dine kunder adgang til deres dokumenter"
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Fortryd"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Del eller indlejre enhvert skærmbilled af openerp"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Anvend"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Social Network integration"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Angiv din Terminologi"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "eller"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Lejer"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Opsæt firma oplysninger"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid "City"
-#~ msgstr "By"
-
-#~ msgid "Install"
-#~ msgstr "Installer"
-
-#~ msgid "Invoicing"
-#~ msgstr "Fakturering"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Ekstra værktøjer"
-
-#~ msgid "Marketing"
-#~ msgstr "Markedsføring"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Point of sales"
-
-#~ msgid "Currency"
-#~ msgstr "Valuta"
-
-#~ msgid "title"
-#~ msgstr "titel"
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Avanceret rapportering"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid "Company Name"
-#~ msgstr "Firmanavn"
-
-#~ msgid "Zip Code"
-#~ msgstr "Postnr"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "Street 2"
-#~ msgstr "Adresse 2"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Auktionshuse"
-
-#~ msgid "Country"
-#~ msgstr "Land"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid "Logo"
-#~ msgstr "Logo"
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid "Manufacturing"
-#~ msgstr "Produktion"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Brug alternativt ord for \"Kunde\""
 
-#~ msgid "New Database"
-#~ msgstr "Ny database"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr "Brug ekstern login godkendelse, login med google, facebook,..."
 
-#~ msgid "Street"
-#~ msgstr "Gade"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Når du opretter en ny kontakt(person eller firma), kan du hente alle data "
+"fra LinkedIn (billeder, adresse, m.m.)."
 
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Hjælper dig med din maketingskampagne skridt for skridt"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Når du sender et dokument til en kunde\n"
+"                                    (tilbud, faktura), vil din kunde kunne\n"
+"                                    tilmelde sig for at tilgå alle hans "
+"dokumenter,\n"
+"                                    læse firma nyheder, kontrollere sine "
+"projekter,\n"
+"                                    m.m."
 
-#~ msgid "Human Resources"
-#~ msgstr "Personale (HR)"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Bank Account No"
-#~ msgstr "Bankkonto nr."
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Du kan bruge denne wizard til at ændre terminologier for kunder i hele "
+"programmet."
 
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Hjælper med at styre produktionsprocesser og lave rapporter over disse."
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Du vil finde flere optioner i detaljerne for firmaet: adresse til sidehoved "
+"og sidefod, rykker tekster, m.m."
 
-#~ msgid "Report Footer 2"
-#~ msgstr "Rapport sidefod 2"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Konfigurationsfremgang"
-
-#~ msgid "Fed. State"
-#~ msgstr "Delstat"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Din database er nu oprettet"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Hjælper dig med at håndtere dine regnskabsmæssige behov. Hvis du ikke er "
-#~ "revisor, foreslår vi dig kun at installere faktureringsmodulet "
-
-#~ msgid "Associations"
-#~ msgstr "Organisationer"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Rapport sidefod 1"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Følgende brugere er installeret: \n"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Sales Management"
-#~ msgstr "Salgsstyring"
-
-#~ msgid "Company"
-#~ msgstr "Firma"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Du kan starte med at konfigurere systemet eller tilslutte dig direkte til "
-#~ "databasen som administrator."
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "Dine virksomhedsoplysninger vil blive brugt til at individualisere "
-#~ "dokumenter fra OpenERP som fakturaer, salgsordrer m.m."
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Videnstyring"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Du kan installere forskellige interessante, men ikke afgørende værktøjer som "
-#~ "meningsmåling, frokost og idéer."
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Spring konfigurationsguide over"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Hjælper dig med at styre dine indkøbsrelaterede processer som anmodninger om "
-#~ "tilbud, leverandørfakturaer, osv. .."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Denne sætning vises nederst i dine rapporter.\n"
-#~ "Vi forslår at vise bankoplysninger her:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - Moms: BE0477.472.701"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Dette modul implementerer et konfigurationssystem, der hjælper brugeren\n"
-#~ "    med at konfigurere systemet ved installation af en ny database.\n"
-#~ "\n"
-#~ "    Det giver dig mulighed for at installere forskellige profiler:\n"
-#~ "    * Minimal profil\n"
-#~ "    * Kun regnskab\n"
-#~ "    * Servicevirksomhed\n"
-#~ "    * Produktionsvirksomhed\n"
-#~ "\n"
-#~ "    Modulet hjælper dig også med at oprette dit firma, sidehoved,\n"
-#~ "    sidefod, kontoplan og sprog.\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Hjælper dig med at styre dit personale ved at indkode dine medarbejderes "
-#~ "struktur, opret arbejdsplaner, checke fremmøde og m.m."
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Lader dig oprette fakturaer og spore betalinger. Det er en lettere udgave af "
-#~ "regnskabsmodulet for ledere, der ikke er regnskabskyndige.."
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Hjælper dig med at styre dine projekter og opgaver ved at spore dem, lave "
-#~ "planlægning, osv. .."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Installerer en sæt OpenERP moduler, der vil hjælpe dig med at administrere "
-#~ "din branche."
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Lader dig installere tillægsmodul beregnet til at dele viden med og mellem "
-#~ "dine medarbejdere."
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Regnskab & finans"
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Vælg de moduler, som dit system skal indeholde. Hvis du ikke er sikker dine "
-#~ "præcise behov på nuværende tidspunkt, kan du nemt installere dem senere."
-
-#~ msgid "Start Configuration"
-#~ msgstr "Startkonfiguration"
-
-#~ msgid "Setup"
-#~ msgstr "Opsætning"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Lagerstyrning"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Indkøbsstyring"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Firmaopsætning"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Kundestyring (CRM)"
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "Hjælper dig med dina tilbud, salgsordre och fakturer."
-
-#~ msgid "Project Management"
-#~ msgstr "Projektstyring"
-
-#~ msgid "Installed Users"
-#~ msgstr "Installerede brugere"
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Hjælper dig med at få det bedste ud af dit detailhandelssystem med hurtigt "
-#~ "salg, enkel betaling, automatisk plukliste m.m."
-
-#~ msgid "Food Industry"
-#~ msgstr "Fødevareindustri"
-
-#~ msgid "Report Header"
-#~ msgstr "Rapporthoved"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Dit Logo - Brug en størrelse på ca. 450x150 pixels."
-
-#~ msgid "Information about your new database"
-#~ msgstr "Information om din nye database"
-
-#~ msgid "Image"
-#~ msgstr "Billede"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Installerer et sæt OpenERP moduler, som hjælper med at styre auktioner og "
-#~ "tilhørende forretningsprocesserne."
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Lader dig installere diverse værktøjer til forenkle og forbedre udvikling af "
-#~ "rapporter i OpenERP."
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Denne sætning vises i øverste højre hjørne af dine rapporter.\n"
-#~ "Vi foreslår at indsætte et slogan her:\n"
-#~ "\"Open Source fimaløsninger\"."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Denne sætning vises nederst i dine rapporter.\n"
-#~ "Vi forslår at vise kontaktoplysninger her:\n"
-#~ "Web: http://openerp.com - Fax: +32 81 733 501 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Base Setup"
-#~ msgstr "Basal opsætning"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Opsætter dit firmaoplysninger"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Installerer specifikke branchemoduler"
-
-#~ msgid "Company Website"
-#~ msgstr "Firmaets hjemmeside"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Eksempel: http://openerp.com"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Hjælper med at spore og styre kunderelationer, som potentielle kunder, "
-#~ "forespørgsler eller emner. Kan automatisk sende rykkere, fremme tilbud eller "
-#~ "udløse forretningsspecifikke handlinger baseret på standard begivenheder."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Installerer OpwnERP moduler, som hjælper med styring af forbindelser mere "
-#~ "effektivt."
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr "Hjælper med lageroperationer: Levering, modtagelse osv."
-
-#~ msgid "Install Applications"
-#~ msgstr "Installer moduler"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po
index e68997e9929..84b4bea8771 100644
--- a/addons/base_setup/i18n/de.po
+++ b/addons/base_setup/i18n/de.po
@@ -1,248 +1,175 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# German translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-19 22:09+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:28+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "E-Mail-Integration"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Gast"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Kontakte"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Aktivieren Sie das Kundenportal"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr "Externe Benutzer-Authentifizierung,  z.B. mit Google-Konto"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Ermögliche Dokumentenfreigabe"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
-"OpenERP ermöglicht die automatische Erstellung von Interessenten (und "
-"anderen Belegen)\n"
-"                                    aus eingehenden EMails. Sie können Ihren "
-"E-Mail-Posteingang regelmässig synchronisieren, indem\n"
-"                                    Sie hierzu Ihre POP/IMAP Konten anbinden "
-"und dann ein Script zur direkten E-Mail-Integration \n"
-"                                    regelmässig anwenden oder indem Sie "
-"selektiv mit Hilfe eines Plugins für Ihre persönliche Arbeitsplatz \n"
-"                                    Mailanwendung bestimmte E-Mails nach "
-"OpenERP transferieren."
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "VERKAUF"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Erlaubt Benutzern Import von .csv Dateien"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Mitglied"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Anwenden"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Portalzugang"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Authentifizierung"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Angebote und Aufträge"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Allgemeine Einstellungen"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Spender"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "E-Mail"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Patient"
+msgid "Client"
+msgstr "Klient"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Erlaubt Benutzern Import von .csv Dateien"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Konfiguriere Verkauf"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Multi-Unternehmen Verwaltung"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Konfiguriere die Postausgangsserver"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "Anbindung E-Mail-Anwendung"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Konfigurieren Sie Ihre Unternehmensdaten"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=YOUR_DATABAE"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Kontakte"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Kontakte aus linkedin importieren"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Aktiviere Thunderbird Plug-In"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Kunde"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Kundenanwendungen"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Import / Export"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Verkaufsfunktionen"
-
-#. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Aktiviere Outlook Plugin"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Spender"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Sie können mit diesem Assistenten die Terminologie des gesamten Systems im "
-"Sinne der Kunden verändern."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "E-Mail"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Mieter"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "E-Mail-Integration"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Teilen oder einbetten von Bildschirmansichten"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Allgemeine Einstellungen"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Kunde"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Wenn Sie einen neuen Kontakt erstellen (Person oder Firma), können Sie "
-"sämtliche in LinkedIn vorhandenen Kontaktdaten importieren (Photo, Adresse, "
-"etc.)"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Kontakte aus linkedin importieren"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
-"Arbeiten Sie in einer Multi-Unternehmen Organisation, und wenden Sie die "
-"entsprechenden Berechtigungen für den wechselseitigen Unternehmenszugriff "
-"einfach an."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Erteilen Sie den Kunden Zugriff auf Ihre eigenen Dokumente."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
-"Der öffentliche Portalzugang ist nur im einfachen Modus der Datenbank "
-"möglich. Sie können\n"
-"                              Ihren OpenERP Server mit folgender Option "
-"starten"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
-"Sie finden weitere Optionen unter Ihren Unternehmenseinstellungen: Adresse "
-"für Kopf- und Fußzeile, Mahntexte, u.s.w."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Gast"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -250,742 +177,207 @@ msgid "How do you call a Customer"
 msgstr "Wie bezeichnen Sie einen Kunden"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
-"Wenn Sie ein Dokument zu einem Kunden senden wollen\n"
-"                                        (Angebot, Rechnung) können sich die "
-"Kunden auch zu allen anderen Dokumenten anmelden."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Import / Export"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Klient"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"Aktivieren Sie den Zugriff auf veröffentliche Bereiche und Dokumente , "
-"OpenERP wird dadurch auch öffentlich verfügbar."
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
-"Die Erweiterung erlaubt es, E-Mails inklusive Anhänge bei ausgewählten\n"
-"                 OpenERP Objekten zu archivieren. Sie können bei der Auswahl "
-"entscheiden, ob Sie den Anhang \n"
-"                 als .eml Dateianhang beim Kunden oder bei einem "
-"Interessenten zuordnen. Sie können auch neue \n"
-"                 Dokumente anlegen, z.B. für einen neuen Interessenten, "
-"indem Sie die Auswahl\n"
-"                \"Neues Dokument\" anklicken. Durch die Auswahl wird das "
-"Modul plugin_thunderbird installiert."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Partner"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Multi-Unternehmen Verwaltung"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Verwenden Sie ein anderes Wort für \"Kunde\""
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Mitglied"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Konfiguriere Verkauf"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"Das Outlook Plugin erlaubt es, E-Mails inklusive Anhänge bei ausgewählten\n"
-"                 OpenERP Objekten zu archivieren. Sie können bei der Auswahl "
-"entscheiden, ob Sie den Anhang \n"
-"                 als .eml Dateianhang beim Kunden oder einem Interessenten  "
-"zuordnen. Sie können auch neue \n"
-"                 Dokumente anlegen, z.B. für einen Interessenten, indem Sie "
-"die Auswahl\n"
-"                \"Neues Dokument\" anklicken. Durch Ihre Auswahl wird das "
-"Modul plugin_outlook installiert."
-
-#. module: base_setup
-#: view:base.config.settings:0
+
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Einstellungen"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Aktivieren Sie das Kundenportal"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Partner"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
-"es so zu machen.\n"
-"                              Durch Aktivierung wird die Loginseite durch "
-"Ihre öffentliche Webpage ersetzt."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Patient"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Ermögliche Dokumentenfreigabe"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Portalzugang"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(Unternehmens-News, Stellenangebote, Fragebögen etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Angebote und Aufträge"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Aktivierung des öffentlichen Portals"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Konfiguriere die Postausgangsserver"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "VERKAUF"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Integration Sozialer Netzwerke"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Verkaufsfunktionen"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Erteilen Sie den Kunden Zugriff auf Ihre eigenen Dokumente."
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Abbrechen"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Teilen oder einbetten von Bildschirmansichten"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Anwenden"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Integration Sozialer Netzwerke"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Spezifizieren Sie Ihre Terminologie"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "oder"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Mieter"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Konfigurieren Sie Ihre Unternehmensdaten"
-
-#~ msgid "City"
-#~ msgstr "Stadt"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Sie können Ihre System nun konfigurieren oder sich sofort verbinden und die "
-#~ "Standardeinstellungen verwenden"
-
-#~ msgid "Report header"
-#~ msgstr "Bericht Kopfzeile"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Beginne Konfiguration"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Sie können später im Administrationsmenü weitere Module installieren."
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Ein Profil installiert eine vordefinierte Anzahl von Modulen für spezielle "
-#~ "Anforderungen. Diese Profile sollen Ihnen helfen, die verschiedenen "
-#~ "Möglichkeiten von OpenERP zu erkunden. Dies ist nur ein Überblick. Es gibt "
-#~ "mehr als 300 Module."
-
-#~ msgid "Next"
-#~ msgstr "Nächste"
-
-#~ msgid "State"
-#~ msgstr "Staat"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Ihre Datenbank ist jetzt vollständig installiert"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Bericht Fusszeile 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Bericht Fusszeile 2"
-
-#~ msgid "Street2"
-#~ msgstr "Strasse2"
-
-#~ msgid "Report Information"
-#~ msgstr "Report Information"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Haupt Gesellschaft Defnieren"
-
-#~ msgid "Company Name"
-#~ msgstr "Unternehmensname"
-
-#~ msgid "Country"
-#~ msgstr "Land"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Dieser Satz wird am unteren Ende Ihrer Berichte erscheinen. Wir empfehlen "
-#~ "hier die gestzlich vorgesehen Angaben zu machen zB: Web: http://openerp.com -"
-#~ " Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Summary"
-#~ msgstr "Zusammenfassung"
-
-#~ msgid "Report Header"
-#~ msgstr "Bericht Kopfzeile"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Ihr Logo – sollte ca 450x150 Pixel groß sein"
-
-#~ msgid "Currency"
-#~ msgstr "Währung"
-
-#~ msgid "Street"
-#~ msgstr "Strasse"
-
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "E-mail"
-#~ msgstr "E-Mail"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "General Information"
-#~ msgstr "Allgemeine Informationen"
-
-#~ msgid "Installation Done"
-#~ msgstr "Installation durchgeführt"
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Wähle ein Profil"
-
-#~ msgid "Install"
-#~ msgstr "Installiere"
-
-#~ msgid "Zip code"
-#~ msgstr "Postleitzahl"
-
-#~ msgid "Base Setup"
-#~ msgstr "Basis Setup"
-
-#~ msgid "Previous"
-#~ msgstr "Vorherig"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Bankkonto"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Ihre Datenbank ist jetzt vollständig installiert"
-
-#~ msgid "Company"
-#~ msgstr "Unternehmen"
-
-#~ msgid "title"
-#~ msgstr "Bezeichnung"
-
-#~ msgid "Zip Code"
-#~ msgstr "Postleitzahl"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Konfiguration Unternehmen"
-
-#~ msgid "Image"
-#~ msgstr "Bild"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Extra Werkzeuge"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr "Management Ihrer Fertigungsprozesse und Erstellung von Auswertungen"
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr ""
-#~ "Management von Marketingkampagnen zur Automatisierung von Vertriebsaktionen"
-
-#~ msgid "Point of Sales"
-#~ msgstr "POS & Kasse"
-
-#~ msgid "Associations"
-#~ msgstr "Vereine & Verbände"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Sie können Ihr System jetzt entweder über den Assistenten vorkonfigurieren "
-#~ "oder sofort mit der Arbeit auf dieser Datenbank beginnen."
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Konfiguration Abfolge"
-
-#~ msgid "Fed. State"
-#~ msgstr "Bundesland"
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing & Kampagnen"
-
-#~ msgid "Sales Management"
-#~ msgstr "Angebote & Rechnungen"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Optionale Erweiterung interessanter, aber nicht zwingend zu installierender "
-#~ "Applikationen, wie z.B. Umfragen, Vorschlagswesen etc."
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Reports & Auswertungen"
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Knowledge & Dokumente"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Management, Planung und Überwachnung von Projekten, Aufgaben, Zeiten und "
-#~ "Kosten ..."
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid "Human Resources"
-#~ msgstr "Personal & Zeiterfassung"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Verwenden Sie ein anderes Wort für \"Kunde\""
 
-#~ msgid "Accounting & Finance"
-#~ msgstr "Finanzen & Controlling"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr "Externe Benutzer-Authentifizierung,  z.B. mit Google-Konto"
 
-#~ msgid "Auction Houses"
-#~ msgstr "Auktionen & Versteigerungen"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Wenn Sie einen neuen Kontakt erstellen (Person oder Firma), können Sie "
+"sämtliche in LinkedIn vorhandenen Kontaktdaten importieren (Photo, Adresse, "
+"etc.)"
 
-#~ msgid "Purchase Management"
-#~ msgstr "Disposition & Einkauf"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Wenn Sie ein Dokument zu einem Kunden senden wollen\n"
+"                                        (Angebot, Rechnung) können sich die "
+"Kunden auch zu allen anderen Dokumenten anmelden."
 
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "Erstellen Sie Angebote, Aufträge und Rechnungen."
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Warehouse Management"
-#~ msgstr "Lager & Logistik"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Sie können mit diesem Assistenten die Terminologie des gesamten Systems im "
+"Sinne der Kunden verändern."
 
-#~ msgid "Project Management"
-#~ msgstr "Projekte & Aufgaben"
-
-#~ msgid "Installed Users"
-#~ msgstr "Existierende Benutzer"
-
-#~ msgid "New Database"
-#~ msgstr "Neue Datenbank"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "CRM & SRM"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Installiert ein vordefiniertes Set an Anwendungen für das Management von "
-#~ "Auktionshäusern und deren Prozesse."
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Installation der Werkzeuge für die Erstellung und Verwaltung von Reports."
-
-#~ msgid "Information about your new database"
-#~ msgstr "Information zur Datenbank"
-
-#~ msgid "Food Industry"
-#~ msgstr "Nahrung & Genuss"
-
-#~ msgid "Company Website"
-#~ msgstr "Webpage"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Installation Branchenanwendungen"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Beispiel: http://openerp.com"
-
-#~ msgid "Install Applications"
-#~ msgstr "Installiere Module"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Folgende Benutzer wurden installiert : \n"
-
-#~ msgid "Invoicing"
-#~ msgstr "Offene Posten Buchhaltung"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Management Ihrer Finanzen. Falls Sie keine vollständige Finanzbuchhaltung "
-#~ "benötigen, empfehlen wir nur die Installation der Anwendung Offene Posten "
-#~ "Buchhaltung. "
-
-#~ msgid "Use Directly"
-#~ msgstr "Sofort beginnen"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Installiert eine Vorauswahl von OpenERP Modulen zur Anwendung in Ihrem "
-#~ "Betrieb."
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Applikation für Ihren Point of Sales mit Schnellerfassung von Verkäufen, "
-#~ "vereinfachter Zahlungserfassung, automatische Lieferscheinerstellung u.a. "
-#~ "Anwendungen."
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Personalwesen zur Verwaltung von Mitarbeitern, Arbeitszeiten,  Zeiterfassung "
-#~ "von Mitarbeitern, Urlaubsverwaltung, Spesenabrechnung usw."
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Applikation zur Erstellung von Rechnungen mit offener Posten Buchhaltung zur "
-#~ "Zahlungsüberwachung. Diese vereinfachte Version kann auch durch Mitarbeiter "
-#~ "genutzt werden, die keine ausgewiesenen Buchhaltungsexperten sind."
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Unterstützung aller Beschaffungsvorgänge, wie z.B. Bedarfsmeldung, "
-#~ "Angebotsanfrage, Bestellung und Rechnungskontrolle."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Dieser Satz wird am unteren Ende Ihrer Berichte erscheinen. Wir empfehlen "
-#~ "hier die gesetzlich vorgesehen Angaben zu machen zB: IBAN: BE74 1262 0121 "
-#~ "6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid "Street 2"
-#~ msgstr "Strasse 2"
-
-#~ msgid "Setup"
-#~ msgstr "Installation"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Installiert die Anwendungen zur Verwaltung von Wissen und Daten und "
-#~ "ermöglicht einen effizienten Austausch und die gemeinsame Bearbeitung von "
-#~ "Dokumenten."
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Dieser Satz wird im oberen rechten Eck der Berichte erscheinen.\n"
-#~ " Wir empfehlen Ihnen einen Slogan zu verwenden:\n"
-#~ " z.b. 'Open Source Unternehmens Lösungen'."
-
-#~ msgid "Manufacturing"
-#~ msgstr "Stücklisten & Fertigungsaufträge"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Die Anwendung CRM (Kundenbeziehungen) steuert die Abläufe im Vertrieb, SRM "
-#~ "(Lieferantenbeziehungen) kann in ähnlicher Weise im Einkauf verwendet "
-#~ "werden. Terminieren Sie wichtige Vertriebsaktionen, verfolgen Sie die "
-#~ "Kundenhistorie und kommunizieren Sie mit Kunden und Lieferanten."
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Management von Lagerorten und Verwaltung von Beständen, z.B. durch  Erfassen "
-#~ "von Lieferungen, Durchführung von Inventuren, etc."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Installation von definierten Sets an Anwendungen für das Management von "
-#~ "Vereinen oder Verbänden."
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Überspringe Konfigurationsassistent"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Konfigurieren Sie Ihre Unternehmensdaten"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Durch dieses Modul wird den Benutzern ein Assistent zur ersten "
-#~ "Konfiguration \n"
-#~ "    der Datenbank zur Verfügung gestellt.\n"
-#~ "\n"
-#~ "    Es besteht die Möglichkeit aus Installationsprofilen auszuwählen:\n"
-#~ "    * Minimal Profil\n"
-#~ "    * Finanzen\n"
-#~ "    * Dienstleistungsbetriebe\n"
-#~ "    * Fertigungsbetriebe\n"
-#~ "\n"
-#~ "    In weiteren Konfigurationsschritten werden dann schrittweise die Daten "
-#~ "des\n"
-#~ "    Unternehmens konfiguriert, z.B. die Anschrift zur Ausgabe im Kopf- und "
-#~ "Fussbereich\n"
-#~ "    von Belegen, der Kontenplan, die Sprache etc.\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "Ihre Unternehmensinformationen werden benötigt, damit diese Daten auf "
-#~ "Rechnungen, Verkaufsaufträgen und anderen Dokumenten erscheinen."
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Wählen Sie die Anwendungen aus, die Ihr System beinhalten soll. Wenn Sie "
-#~ "jetzt noch nicht sicher sind, installieren Sie diese einfach zu einem "
-#~ "späteren Zeitpunkt."
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid "Display Tips"
-#~ msgstr "Zeige Tipps"
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "Synchronisiere Google Kontakte"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Benutzereinstellungen festlegen"
-
-#~ msgid "Create"
-#~ msgstr "Erstellen"
-
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Setze Unternehmens Kopf- und Fusszeilen"
-
-#~ msgid "Import"
-#~ msgstr "Importieren"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "Wenn sie OpenERP erstmals verwenden, empfehlen wir Ihnen das vereinfachte "
-#~ "Benutzerinterface zu benutzen. Es bietet zwar weniger Funktionen, ist "
-#~ "dadurch aber auch leichter zu bedienen und verstehen. Sie können jederzeit "
-#~ "in Ihren Benutzereinstellungen auf das erweiterte Benutzerinterface wechseln."
-
-#~ msgid "For Quickbooks Ippids"
-#~ msgstr "Für Quickbooks Import"
-
-#~ msgid "Extended"
-#~ msgstr "Erweitert"
-
-#~ msgid "Customers"
-#~ msgstr "Kunden"
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
-
-#~ msgid "Interface"
-#~ msgstr "Benutzeroberfläche"
-
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Bestimmt die Standard Sprache für alle Formulare. Mit \"Lade neue offizielle "
-#~ "Sprache\" können Sie weitere Sprachen hinzufügen"
-
-#~ msgid "Language"
-#~ msgstr "Sprache"
-
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "Dies setzt die Standardeinstellungen für alle bestehenden und neue Benutzer. "
-#~ "Danach kann jeder Benutzer seine eigenen Standardeinstellungen setzen."
-
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
-
-#~ msgid "Timezone"
-#~ msgstr "Zeitzone"
-
-#~ msgid "Simplified"
-#~ msgstr "Vereinfacht"
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "Synchronisation von Google Kontakten"
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "Setze den Standardwert für die Zeitzone neuer Benutzer. Damit wird die "
-#~ "Zeitzone des Servers zur Zeitzone des Benutzers konvertiert"
-
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "Erfassen Sie Kunden und deren Kontakte in diesem Formular manuell oder lesen "
-#~ "Sie vorhandene Daten mit dem Importassistenten aus CSV-Dateien ein"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Sie finden weitere Optionen unter Ihren Unternehmenseinstellungen: Adresse "
+"für Kopf- und Fußzeile, Mahntexte, u.s.w."
 
-#~ msgid "For Import Saleforce"
-#~ msgstr "Zum Import von Verkaufskräften"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Standardeeinstellungen für (neue) Benutzer festlegen"
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Erfassen Sie die Unternehmensdaten (Adresse, Logo, Bankkonten) die auf den "
-#~ "Reports gedruckt werden sollen.\r\n"
-#~ "Mit \"Vorschau\" können Sie eine PDF-Vorschau ansehen und die Darstellung "
-#~ "überprüfen."
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Weitere Benutzer anlegen"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Dieses Kästchen unmarkiert lassen um alle Tips für alle Menüpunkte zu "
-#~ "erhalten"
-
-#~ msgid "Import Saleforce"
-#~ msgstr "Verkaufsmitarbeiter importieren"
-
-#~ msgid "Quickbooks Ippids"
-#~ msgstr "Quickbooks Import"
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "Um aus Sugarcrm zu importieren"
-
-#~ msgid "Import or create customers"
-#~ msgstr "Kunden importieren oder anlegen"
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "Aus Sugarcrm importieren"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Kunden anlegen oder importieren"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po
index 4f4d9a46b97..5f0a34ec27f 100644
--- a/addons/base_setup/i18n/el.po
+++ b/addons/base_setup/i18n/el.po
@@ -1,270 +1,245 @@
 # Greek translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-07 12:51+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Greek <el@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: 2014-04-22 06:28+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Επισκέπτης"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Μέλος"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Άκυρο"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr ""
+msgid "Client"
+msgstr "Πελάτης"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Ασθενής"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Πελάτης"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
-"Μπορείς να χρησιμοποιήσεις αυτόν τον οδηγό για να αλλάξεις τις ορολογίες για "
-"τους πελάτες σε όλη την εφαρμογή"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Πελάτης"
+msgid "Guest"
+msgstr "Επισκέπτης"
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr "Πώς καλείς έναν Πελάτη"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
-msgstr "Πώς καλείς έναν Πελάτη"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Πελάτης"
+msgid "Member"
+msgstr "Μέλος"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
@@ -273,589 +248,128 @@ msgid "Partner"
 msgstr "Συνεργάτης"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Χρησιμοποίησε μια άλλη λέξη για να πεις \"Πελάτης\""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Ασθενής"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr ""
+
+#. module: base_setup
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Άκυρο"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Χρησιμοποίησε μια άλλη λέξη για να πεις \"Πελάτης\""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Ένα προφίλ θέτει σε εφαρμογή μιά συγκεκριμένη επιλογή ενοτήτων για ειδικές "
-#~ "ανάγκες. Αυτά τα προφίλ έχουν ρυθμιστεί για να σας βοηθήσουν να ανακαλύψετε "
-#~ "τις διαφορετικές οπτικές του OpenERP. Αυτό είναι απλά μιά περίληψη, έχουμε "
-#~ "πάνω απο 300 ενότητες διαθέσιμες."
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid "Report header"
-#~ msgstr "Κεφαλίδα αναφοράς"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Επιλέξτε Προφίλ"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Μπορείτε να ξεκινήσετε την παραμετροποίηση του συστήματος ή να συνδεθείτε "
-#~ "απευθείας στην βάση δεδομένων χρησιμοποιώντας την προκαθορισμένη εγκατάσταση."
-
-#~ msgid "City"
-#~ msgstr "Πόλη"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Θα είστε σε θέση να εγκαταστήσετε περισσότερες ενότητες αργότερα μέσω του "
-#~ "μενού Διαχείρισης."
-
-#~ msgid "Start Configuration"
-#~ msgstr "Έναρξη Παραμετροποίησης"
-
-#~ msgid "Zip code"
-#~ msgstr "Ταχυδρομικος Κώδικας"
-
-#~ msgid "Next"
-#~ msgstr "Επόμενο"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Η νέα σας βάση δεδομένων έχει εγκατασταθεί πλήρως."
-
-#~ msgid "Profile"
-#~ msgstr "Προφίλ"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Υποσέλιδο Αναφοράς 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Υποσέλιδο Αναφοράς 2"
-
-#~ msgid "State"
-#~ msgstr "Νομός"
-
-#~ msgid "Street2"
-#~ msgstr "Διεύθυνση2"
-
-#~ msgid "Phone"
-#~ msgstr "Τηλέφωνο"
-
-#~ msgid "Report Information"
-#~ msgstr "Πληροφορίες Αναφοράς"
-
-#~ msgid "General Information"
-#~ msgstr "Γενικές Πληροφορίες"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Καθορίστε Κύρια Εταιρία"
-
-#~ msgid "Report Header"
-#~ msgstr "Κεφαλίδα Αναφοράς"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Αυτή η πρόταση θα εμφανίζεται στο κάτω μέρος των αναφορών σας.\n"
-#~ "Σας προτείνουμε να γράψετε προτάσεις όπως:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Installation Done"
-#~ msgstr "Ολοκλήρωση Εγκατάστασης"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Αυτή η εγκατάσταση θα εμφανίζεται στην πάνω δεξιά γωνία των αναφορών σας.\n"
-#~ "Σας προτείνουμε να βάλετε το slogan σας εδώ:\n"
-#~ "\"Open Source Business Solutions\"."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Αυτή η πρόταση θα εμφανίζεται στο κάτω μέρος των αναφορών σας.\n"
-#~ "Σας προτείνουμε να εισάγετε πληροφορίες τράπεζας εδω:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid "Install"
-#~ msgstr "Εγκατάσταση"
-
-#~ msgid "Summary"
-#~ msgstr "Περίληψη"
-
-#~ msgid "Setup"
-#~ msgstr "Εγκατάσταση"
-
-#~ msgid "Country"
-#~ msgstr "Χώρα"
-
-#~ msgid "Company Name"
-#~ msgstr "Επωνυμία Επιχείρησης"
-
-#~ msgid "Base Setup"
-#~ msgstr "Βασική Εγκατάσταση"
-
-#~ msgid "Use Directly"
-#~ msgstr "Χρήση Απευθείας"
-
-#~ msgid "Previous"
-#~ msgstr "Προηγούμενο"
-
-#~ msgid "Street"
-#~ msgstr "Οδός"
-
-#~ msgid "Currency"
-#~ msgstr "Νόμισμα"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Η βάση σου έχει δημιουργηθεί"
-
-#~ msgid "Invoicing"
-#~ msgstr "Τιμολόγηση"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Αρ. Λογαριασμού Τραπέζης"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Επιπλέον Εργαλεία"
-
-#~ msgid "Company"
-#~ msgstr "Εταιρία"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Πρόοδος Ρυθμίσεων"
-
-#~ msgid "Marketing"
-#~ msgstr "Μάρκετινγκ"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Μπορείς να χρησιμοποιήσεις αυτόν τον οδηγό για να αλλάξεις τις ορολογίες για "
+"τους πελάτες σε όλη την εφαρμογή"
 
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Σε βοηθά να διαχειριστείς τις λογιστικές σου ανάγκες, εάν δεν είσαι "
-#~ "λογιστής, σας προτείνουμε να εγκαταστήσετε μόνο την Τιμολόγηση "
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid "Advanced Reporting"
-#~ msgstr "Προχωρημένες Αναφορές"
-
-#~ msgid "title"
-#~ msgstr "τίτλος"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Ρύθμιση Εταιρίας"
-
-#~ msgid "Street 2"
-#~ msgstr "Οδός 2"
-
-#~ msgid "Zip Code"
-#~ msgstr "Ταχυδρομικός Κώδικας"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Παραγωγή"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Πληροφορίες σχετικά με την νέα βάση δεδομένων"
-
-#~ msgid "Image"
-#~ msgstr "Εικόνα"
-
-#~ msgid "New Database"
-#~ msgstr "Νέα Βάση Δεδομένων"
-
-#~ msgid "Installed Users"
-#~ msgstr "Εγκατεστημένοι χρήστες"
-
-#~ msgid "Company Website"
-#~ msgstr "Ιστοσελίδα Εταιρίας"
-
-#~ msgid "Food Industry"
-#~ msgstr "Βιομηχανία Τροφίμων"
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Γίνεται εγκατάσταση εργαλείων για την απλοποίηση και την ενίσχυση των "
-#~ "αναφορών του OpenERP"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Βοηθά στην διαχείρηση των διαδικασιών παραγωγής και παράγει αναφορές γι' "
-#~ "αυτές"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Εγκαθίστανται μια σειρά από προεγκατεστημένες εφαρμογές του OpenERP που θα "
-#~ "σε βοηθήσουν να διαχειριστείς την εταιρία σου"
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Σε βοηθά να διαχειριστείς τους ανθρώπινους πόρους καταγράφοντας τη δομή των "
-#~ "υπαλήλων,δημιουργώντας φύλλα εργασιών, καταγραφή παρουσίας"
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Επιτρέπει να δημιουργήσεις τιμολόγια και να παρακολουθήσεις τις πληρωμές. "
-#~ "Είναι μια πρώιμη έκδοση του πρόσθετου της Λογιστικής για διαχειριστές που "
-#~ "δεν είναι λογιστές."
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Εγκαθιστά Συγκεκριμένες Επιχειρησιακές Εφαρμογές"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Σε βοηθά να καταγράψεις και και να διαχειριστείς τις σχέσεις με τους "
-#~ "υποψήφιους πελάτες, αιτήσεις και θέματα. Μπορεί να στείλει υπενθυμίσεις "
-#~ "αυτόματα, να κλημακώσει απαιτήσεις ή να ενεργήσει βάσει κάποιον γεγονότων."
-
-#~ msgid "Associations"
-#~ msgstr "Αντιστοιχήσεις"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Παράβλεψη των οδηγών διαμόρφωσης"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Σας βοηθάει να διαχειριστείτε τις σχετικές με τις προμήθειες διαδικασίες σας "
-#~ "όπως αιτήματα προσφορών, τιμολόγια προμηθευτών κλπ"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Σας επιτρέπει να εγκαταστήσετε πρόσθετα σχεδιασμένα να προωθούν τη διάχυση "
-#~ "της γνώσης μεταξύ εσάς και των υπαλλήλων σας."
-
-#~ msgid "Auction Houses"
-#~ msgstr "Οίκοι δημοπρασιών"
-
-#~ msgid "Fed. State"
-#~ msgstr "Πολιτεία"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Οι ακόλουθοι χρήστες έχουν εγκατασταθεί: \n"
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Σας βοηθά να αξιοποιήσετε στο μέγιστο τα σημεία σας πωλήσεων με γρήγορη "
-#~ "κωδικοποίηση πωλήσεων, απλοποιημένη κωδικοποίηση τρόπου πληρωμής, αυτόματα "
-#~ "δημιουργία λιστών περισυλλογής και άλλα."
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Σας επιτρέπει να εγκαταστήσετε διάφορα ενδιαφέροντα αλλά όχι απαραίτητα "
-#~ "εργαλεία όπως την Έρευνα (Survey), το Γεύμα και το Κουτί ιδεών."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Εγκαθιστά ένα προεπιλεγμένο σύνολο εφαρμογών του OpenERP επιλεγμένων για να "
-#~ "σας βοηθήσουν να διαχειριστείτε τις δημοπρασίες σας καθώς και τις "
-#~ "επιχειρησιακές διαδικασίες γύρω από αυτές."
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Εγκαθιστά ένα προεπιλεγμένο σύνολο εφαρμογών του OpenERP που θα σας "
-#~ "βοηθήσουν να διαχειριστείτε την εταιρεία σας πιο αποτελεσματικά."
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Σας βοηθάει να διαχειριστείτε την αποθήκη σας και τις κύριες λειτουργίες "
-#~ "αποθέματος: παράδοση παραγγελιών, παραλαβές κλπ"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Σημείο πώλησης"
-
-#~ msgid "Sales Management"
-#~ msgstr "Διαχείριση Πωλήσεων"
-
-#~ msgid "Human Resources"
-#~ msgstr "Ανθρώπινο Δυναμικό"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Διαχείριση Αγορών"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Λογιστικά & Χρηματοοικονομικά"
-
-#~ msgid "Logo"
-#~ msgstr "Λογότυπο"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Διαχείριση Πελατειακών Σχέσεων (CRM)"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Διαχείριση Αποθήκης"
-
-#~ msgid "Project Management"
-#~ msgstr "Διαχείριση Έργων"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Παράδειγμα: http://openerp.com"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Λογότυπο - Χρησιμοποιείστε μέγεθος 450x150 pixels."
-
-#~ msgid "Install Applications"
-#~ msgstr "Εγκατάσταση Εφαρμογών"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Μπορείς να ξεκινήσεις την παραμετροποίηση του συστήματος ή να συνδεθείς "
-#~ "απευθείας στην βάση ως διαχειριστής."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Βοηθά στην διαχείριση των εκστρατειών μάρκετινγκ βήμα προς βήμα."
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Βοηθά στην παρακολούθηση των έργων και εργασιών παράγοντας σχέδια , κλπ..."
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Διαχείριση Γνώσης"
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr ""
-#~ "Σας βοηθά να διαχειριστείτε τις προσφορές, παραγγελίες πωλήσεων και την "
-#~ "τιμολόγηση"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Ρυθμίστε τις Πληροφορίες της Εταιρίας Σας"
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Επιλέξτε τις εφαρμογές που θέλετε να καλύπτει το σύστημά σας. Εάν δεν είστε "
-#~ "σίγουροι για τις ακριβής ανάγκες σε αυτην την φάση, μπορείτε να τις "
-#~ "εγκαταστήσετε εύκολα αργότερα."
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "Οι πληροφορίες της εταιρίας που θα χρησιμοποιηθούν για την εξατομίκευση των "
-#~ "εγγράφων του OpenERP  όπως τιμολόγια, παραγγελίες πώλησης και πολλά άλλα."
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Αυτό το άρθρωμα υλοποιεί μια παραμετροποίηση του συστήματος που βοηθά "
-#~ "τον χρήστη\n"
-#~ "    να παραμετροποιήσει το σύστημα κατά την εγκατάσταση μιας νέας βάσης.\n"
-#~ "\n"
-#~ "    Επιτρέπει να επιλέξετε μεταξύ μιας λίστας προφίλ προς εγκατάσταση:\n"
-#~ "    *Ελάχιστο προφίλ\n"
-#~ "    *Μόνο Λογιστική\n"
-#~ "    *Εταιρίες Παροχής Υπηρεσιών\n"
-#~ "    *Κατασκευαστικές εταιρίες\n"
-#~ "\n"
-#~ "    Επίσης μέσω οθονών σας βοηθά να παραμετροποιήσετε την εταιρία, την "
-#~ "κεφαλίδα και\n"
-#~ "    το υποσέλιδο, το λογιστικό σχέδιο που θα εγκατασταθεί και την γλώσσα.\n"
-#~ "    "
-
-#~ msgid "Create"
-#~ msgstr "Δημιουργία"
-
-#~ msgid "Import"
-#~ msgstr "Εισαγωγή"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr ""
-#~ "Βάλε τα στοιχεία της Εταιρίας που θα εμφανίζονται στην Κεφαλίδα και στο "
-#~ "Υποσέλιδο"
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "Συγχρονισμός Επαφής Google"
-
-#~ msgid "Extended"
-#~ msgstr "Εκτεταμένο"
-
-#~ msgid "Customers"
-#~ msgstr "Πελάτες"
-
-#~ msgid "Interface"
-#~ msgstr "Διεπαφή χρήστη"
-
-#~ msgid "Language"
-#~ msgstr "Γλώσσα"
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Δημιουργία επιπλέον Χρηστών"
-
-#~ msgid "Timezone"
-#~ msgstr "Ζώνη ώρας"
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "Για εισαγωγή από Sugarcrm"
-
-#~ msgid "Simplified"
-#~ msgstr "Απλοποιημένη"
-
-#~ msgid "Import or create customers"
-#~ msgstr "Εισαγωγή ή δημιουργία πελατών"
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "Εισαγωγή από Sugarcrm"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Δημιουργία ή Εισαγωγή Πελατών"
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "Για συγχρονισμό με επαφή Google"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Καθόρισε τις προτιμήσεις του Χρήστη"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/en_GB.po b/addons/base_setup/i18n/en_GB.po
index 3d4bd810198..0bf6e5febe6 100644
--- a/addons/base_setup/i18n/en_GB.po
+++ b/addons/base_setup/i18n/en_GB.po
@@ -1,270 +1,245 @@
 # English (United Kingdom) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-01-23 15:44+0000\n"
-"Last-Translator: mrx5682 <Unknown>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (United Kingdom) <en_GB@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Guest"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Member"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Donor"
+msgid "Client"
+msgstr "Client"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Patient"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Customer"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Donor"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Customer"
+msgid "Guest"
+msgstr "Guest"
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr "How do you call a Customer"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
-msgstr "How do you call a Customer"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Client"
+msgid "Member"
+msgstr "Member"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
@@ -273,235 +248,128 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Use another word to say \"Customer\""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Patient"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr ""
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
+msgstr "Specify Your Terminology"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr ""
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Use another word to say \"Customer\""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
-msgstr "Specify Your Terminology"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
-#~ msgid "Display Tips"
-#~ msgstr "Display Tips"
-
-#~ msgid "Create"
-#~ msgstr "Create"
-
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Set Company Header and Footer"
-
-#~ msgid "Import"
-#~ msgstr "Import"
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "Sync Google Contact"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Define Users's Preferences"
-
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-
-#~ msgid "For Import Saleforce"
-#~ msgstr "For Import Saleforce"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Define default users preferences"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-
-#~ msgid "Extended"
-#~ msgstr "Extended"
-
-#~ msgid "For Quickbooks Ippids"
-#~ msgstr "For Quickbooks Ippids"
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-
-#~ msgid "Customers"
-#~ msgstr "Customers"
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
-
-#~ msgid "Interface"
-#~ msgstr "Interface"
-
-#~ msgid "Language"
-#~ msgstr "Language"
-
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Timezone"
-#~ msgstr "Timezone"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 
-#~ msgid "Create Additional Users"
-#~ msgstr "Create Additional Users"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Check out this box if you want to always display tips on each menu action"
-
-#~ msgid "Image"
-#~ msgstr "Image"
-
-#~ msgid "Import Saleforce"
-#~ msgstr "Import Saleforce"
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "For Sync Google Contact"
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "For Import Sugarcrm"
-
-#~ msgid "Simplified"
-#~ msgstr "Simplified"
-
-#~ msgid "Import or create customers"
-#~ msgstr "Import or create customers"
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "Import Sugarcrm"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Create or Import Customers"
-
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po
index da5b2a77fdc..238b6acc005 100644
--- a/addons/base_setup/i18n/es.po
+++ b/addons/base_setup/i18n/es.po
@@ -1,238 +1,177 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Spanish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-24 10:16+0000\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-15 10:09+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
-"Language-Team: \n"
+"Language-Team: Spanish <es@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-16 06:55+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Integración con emails"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Invitado"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Contactos"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr "(recargar tipos de letra)"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "Parámetros de configuración base"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Activar el portal de cliente"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr "Usar autenticación externa, firmar con google, facebook,  ...."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Permitir compartir documentos"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
-"OpenERP permite crear automáticamente ofertas (u otros documentos) desde "
-"correos entrantes. Puede sincronizar correos con OpenERP usando cuentas "
-"POP/IMAP, con scripts desde su servidor de correo, o manualmente usando los "
-"plugins específicos para su gestor de correo preferido."
+"Permite a los usuarios sincronizar su calendario con el calendario de Google"
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "VENTAS"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Permitir a los usuarios importar datos desde archivos CSV"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Miembro"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Aplicar"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Acceso portal"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr "Adjuntar documentos de Google a cualquier registro"
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Autenticación"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Presupuestos y pedidos de venta"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Configuraciones Generales"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Donante"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "Email"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Paciente"
+msgid "Client"
+msgstr "Cliente"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Permitir a los usuarios importar datos desde archivos CSV"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Configurar Ventas"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Gestionar varias compañías"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Configurar servidores de correo saliente"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "En cliente email"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Configurar datos de su compañía"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=SU_BASE_DE_DATOS"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Contactos"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Traer contactos automáticamente desde linkedin"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr "Creado por"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Activar plug-in Thunderbird"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr "Creado en"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Cliente"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Características del cliente"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Importar/Exportar"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Características de venta"
-
-#. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Activar plug-in Outlook"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Donante"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Puede usar el siguiente asistente para cambiar los términos para los cliente "
-"en toda la aplicación."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "Email"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Tenedor"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Integración con emails"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Compartir o embeber cualquier pantalla de openerp."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Configuraciones Generales"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Cliente"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
+"Obtener acceso a estadísticas con sus envíos masivos. Administrar campañas."
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Cuando crea un nuevo contacto(persona o compañía), podrá importar todos sus "
-"datos desde LinkedIn (fotos, direcciones, etc)."
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Traer contactos automáticamente desde linkedin"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
-"Trabajar en entornos multiempresa, con los permisos adecuados entre "
-"compañias.\n"
-"Se instalará el módulo multi_company."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Dar a sus clientes acceso a sus documentos."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
-msgstr ""
-"El portal público es accesible sólo si está en modo de base de datos único. "
-"Puede ejecutar el servidor OpenERP con la opción"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
+msgstr "Calendario de Google"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
-msgstr ""
-"Encontrará más opciones en los detalles de su compañía: dirección para la "
-"cabecera y pie, textos de recordatorio de pagos, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
+msgstr "Google Drive"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "Configuración de las ventas"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Invitado"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -240,739 +179,221 @@ msgid "How do you call a Customer"
 msgstr "Como llama  a un cliente"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
-msgstr ""
-"Cuando envía un documento a un cliente (presupuesto, factura), el cliente "
-"podrá ingresar para obtener todos sus documentos, leer las noticias de la "
-"compañía, comprobar sus proyectos, etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Importar/Exportar"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Cliente"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr "Última actualización de"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr ""
-"Activar la parte pública de openerp, openerp se convierte en un website "
-"público."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
+msgstr "Última actualización en"
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
-msgstr ""
-"El conector de Thunderbird le permite archivar un correo y sus adjuntos al "
-"objeto OpenERP seleccionado. Puede seleccionar una empresa, o una iniciativa "
-"y adjuntar el correo seleccionado como un archivo .eml en los adjuntos del "
-"registro seleccionado. Puede crear documentos para una iniciativa del CRM o "
-"para una empresa desde los correos seleccionados.\n"
-"Se instalará el módulo 'plugin_thunderbird'."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
+msgstr "Gestionar campañas de envío masivo"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Empresa"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Gestionar varias compañías"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Use otra palabra para referirse a \"cliente\""
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Miembro"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Configurar Ventas"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
+"Odoo permite crear iniciativas automáticamente (u otros documentos) desde\n"
+"los correos entrantes. Puede sincronizar automáticamente los correos "
+"electrónicos\n"
+"con Odoo usando cuentas POP/IMAP normales, usando un script de integración "
+"directa\n"
+"del correo electrónico para su servidor de correo, o manualmente traspasando "
+"correos\n"
+"a Odoo usando complementos específicos para su aplicación de correo favorita."
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"El conector Outlook permite seleccionar un objeto y añadirlo a su correo "
-"electrónico desde MS Outlook. Puede seleccionar una empresa, o una oferta y "
-"archivar un correo como adjunto en OpenERP.\n"
-"Se instalará el módulo plugin_outlook."
+"Una vez instalado, puede configurar sus credenciales de la API para el "
+"calendario de Google"
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Opciones"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Activar el portal de cliente"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Empresa"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
-"para hacerlo.\n"
-"Una vez activado, la página de inicio de sesión será reemplazada con el "
-"sitio web público."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Paciente"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Permitir compartir documentos"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Acceso portal"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr ""
-"(noticias de la compañía, puestos de trabajo, formulario de contacto, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Presupuestos y pedidos de venta"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Activar portal público"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr "Tipo de letra de informe"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Configurar servidores de correo saliente"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "VENTAS"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Integración red social"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Características de venta"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Dar a sus clientes acceso a sus documentos."
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
+"Establezca el tipo de letra en la cabecera del informe, y se usará como el "
+"tipo predefinido en los informes RML de la compañía del usuario."
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Cancelar"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Compartir o embeber cualquier pantalla de openerp."
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Aplicar"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Integración red social"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Especifique su terminología"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "o"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Tenedor"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Configurar datos de su compañía"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Seleccione un perfil"
-
-#~ msgid "City"
-#~ msgstr "Ciudad"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Puede empezar configurando el sistema o conectarse directamente a la base de "
-#~ "datos usando la configuración por defecto."
-
-#~ msgid "Zip code"
-#~ msgstr "Código postal"
-
-#~ msgid "Report header"
-#~ msgstr "Cabecera de los informes"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Empezar configuración"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Posteriormente podrá instalar más módulos desde el menú Administración."
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Un perfil instala una preselección de módulos para una necesidad específica. "
-#~ "Estos perfiles han sido creados para ayudarle a descubrir los diferentes "
-#~ "aspectos de OpenERP. Esto es sólo un punto de partida, OpenERP dispone de "
-#~ "300+ módulos."
-
-#~ msgid "Next"
-#~ msgstr "Siguiente"
-
-#~ msgid "E-mail"
-#~ msgstr "Correo electrónico"
-
-#~ msgid "State"
-#~ msgstr "Estado"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr "Esto instala el módulo google_calendar."
 
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Su nueva base de datos ha sido instalada completamente."
-
-#~ msgid "Profile"
-#~ msgstr "Perfil"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Pie de página 1 de los informes"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Pie de página 2 de los informes"
-
-#~ msgid "General Information"
-#~ msgstr "Información general"
-
-#~ msgid "Street2"
-#~ msgstr "Calle 2"
-
-#~ msgid "Report Information"
-#~ msgstr "Información de los informes"
-
-#~ msgid "Phone"
-#~ msgstr "Teléfono"
-
-#~ msgid "Company Name"
-#~ msgstr "Nombre de la compañía"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Esta frase aparecerá en la parte inferior de sus informes.\n"
-#~ "Le sugerimos poner información bancaria, por ejemplo:\n"
-#~ "IBAN: ES1234 1234 00 0123456789 - SWIFT: CPDF BE71 - CIF: ES12345678A"
-
-#~ msgid "Country"
-#~ msgstr "País"
-
-#~ msgid "Setup"
-#~ msgstr "Instalación"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Esta frase aparecerá en la parte inferior de sus informes.\n"
-#~ "Le sugerimos que aquí escriba frases legales del tipo:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Cuenta bancaria: 126-"
-#~ "2013269-07"
-
-#~ msgid "Summary"
-#~ msgstr "Resumen"
-
-#~ msgid "Install"
-#~ msgstr "Instalar"
-
-#~ msgid "Installation Done"
-#~ msgstr "Instalación realizada"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Esta frase aparecerá en la esquina superior derecha de sus informes.\n"
-#~ "Le sugerimos poner un eslogan, por ejemplo:\n"
-#~ "\"Soluciones de empresa de código abierto\"."
-
-#~ msgid "Report Header"
-#~ msgstr "Cabecera de los informes"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Su logo – Utilice un tamaño de 450x150 píxeles aprox."
-
-#~ msgid "Currency"
-#~ msgstr "Moneda"
-
-#~ msgid "Street"
-#~ msgstr "Calle"
-
-#~ msgid "Use Directly"
-#~ msgstr "Usar directamente"
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid "Previous"
-#~ msgstr "Anterior"
-
-#~ msgid "Base Setup"
-#~ msgstr "Configuración básica"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Defina la compañia principal"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Terminal punto de venta"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Su base de datos ya está creada."
-
-#~ msgid "Associations"
-#~ msgstr "Asociaciones"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus procesos de fabricación y generar informes sobre "
-#~ "estos procesos."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Le ayuda a gestionar sus campañas de marketing paso a paso."
-
-#~ msgid "Extra Tools"
-#~ msgstr "Herramientas extras"
-
-#~ msgid "Invoicing"
-#~ msgstr "Facturación"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Nº cuenta bancaria"
-
-#~ msgid "Sales Management"
-#~ msgstr "Gestión ventas"
-
-#~ msgid "Company"
-#~ msgstr "Compañía"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progreso configuración"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Puede empezar configurando el sistema o conectando directamente a la base de "
-#~ "datos como un administrador."
-
-#~ msgid "Fed. State"
-#~ msgstr "Provincia"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus necesidades contables. Si no es un contable, le "
-#~ "sugerimos instalar sólo la facturación. "
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Permite instalar varias herramientas interesantes pero no esenciales como "
-#~ "Informes, Comidas y caja de Ideas."
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr "Esto instala el módulo google_docs"
 
-#~ msgid "Advanced Reporting"
-#~ msgstr "Informes avanzados"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Use otra palabra para referirse a \"cliente\""
 
-#~ msgid "Human Resources"
-#~ msgstr "Recursos humanos"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr "Usar autenticación externa, firmar con google, facebook,  ...."
 
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus procesos relacionados con las compras como "
-#~ "peticiones de presupuestos, facturas de proveedor, ..."
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Cuando crea un nuevo contacto(persona o compañía), podrá importar todos sus "
+"datos desde LinkedIn (fotos, direcciones, etc)."
 
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Le permite crear sus facturas y controlar los pagos. Es una versión más "
-#~ "fácil del módulo de contabilidad para gestores que no sean contables."
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Cuando envía un documento a un cliente (presupuesto, factura), el cliente "
+"podrá ingresar para obtener todos sus documentos, leer las noticias de la "
+"compañía, comprobar sus proyectos, etc."
 
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus proyectos y tareas mediante el seguimiento de "
-#~ "ellas, generando planificaciones, ..."
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
+"Trabajar en entorno multi-compañía, con las reglas de seguridad apropiadas "
+"entre compañías.\n"
+"- Esto instala el módulo multi_company."
 
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Le ayuda sacar provecho de sus terminales punto de venta con la codificación "
-#~ "rápida de las ventas, codificación de modos de pago simplificada, generación "
-#~ "automática de albaranes, ..."
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Puede usar el siguiente asistente para cambiar los términos para los cliente "
+"en toda la aplicación."
 
-#~ msgid "Knowledge Management"
-#~ msgstr "Gestión conocimiento"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Encontrará más opciones en los detalles de su compañía: dirección para la "
+"cabecera y pie, textos de recordatorio de pagos, etc."
 
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Instala un conjunto preseleccionado de aplicaciones OpenERP que pueden "
-#~ "ayudarle a gestionar su industria."
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Gestión de almacenes"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Gestión de compras"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Configuración compañía"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.instalador"
-
-#~ msgid "Street 2"
-#~ msgstr "Calle 2"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Le permite instalar addons orientados a compartir el conocimiento con y "
-#~ "entre sus empleados."
-
-#~ msgid "Zip Code"
-#~ msgstr "Código postal"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Casas de subastas"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Contabilidad y finanzas"
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus presupuestos, pedidos de venta y facturación."
-
-#~ msgid "Manufacturing"
-#~ msgstr "Fabricación"
-
-#~ msgid "Food Industry"
-#~ msgstr "Industria alimentaria"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Información sobre su nueva base de datos"
-
-#~ msgid "Image"
-#~ msgstr "Imagen"
-
-#~ msgid "New Database"
-#~ msgstr "Nueva base de datos"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Gestión relaciones con el cliente (CRM)"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Instala un conjunto preseleccionado de aplicaciones OpenERP para ayudarle a "
-#~ "gestionar sus subastas como también los procesos de negocio alrededor de "
-#~ "ellas."
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Le permite instalar varias herramientas para simplificar y mejorar la "
-#~ "creación de informes OpenERP."
-
-#~ msgid "Project Management"
-#~ msgstr "Gestión de proyectos"
-
-#~ msgid "Installed Users"
-#~ msgstr "Usuarios instalados"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Instala aplicaciones específicas para la industria"
-
-#~ msgid "Company Website"
-#~ msgstr "Sitio web compañía"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Ejemplo: http://openerp.com"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.compañía"
-
-#~ msgid "Install Applications"
-#~ msgstr "Instala aplicaciones"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Le ayuda a controlar y administrar las relaciones con los clientes, tales "
-#~ "como las iniciativas, peticiones o cuestiones. Puede enviar automáticamente "
-#~ "recordatorios, escalar las peticiones o activar acciones específicas del "
-#~ "negocio basado en eventos estándar."
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus recursos humanos mediante la codificación de la "
-#~ "estructura de los empleados, la generación de hojas de trabajo, seguimiento "
-#~ "de la asistencia, ..."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Instala un conjunto preseleccionado de aplicaciones OpenERP que le ayudará a "
-#~ "administrar su asociación de manera más eficiente."
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Le ayuda a gestionar su inventario y las operaciones principales de stock: "
-#~ "las órdenes de entrega, recepciones, ..."
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Los siguientes usuarios han sido instalados : \n"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Omitir asistentes configuración"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Configurar la información de su compañía"
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "La información de su compañía se usará para personalizar los documentos "
-#~ "emitidos con OpenERP, como las facturas, pedidos y mucho más."
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Escoja las aplicaciones que desea cubrir con su sistema. Si no está seguro "
-#~ "acerca de sus necesidades exactas en este punto, puede instalarlas "
-#~ "fácilmente más tarde."
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Este módulo implementa un sistema de configuración que ayuda al usuario\n"
-#~ "    a configurar el sistema durante la instalación de una nueva base de "
-#~ "datos.\n"
-#~ "\n"
-#~ "    Le permite seleccionar entre una lista de perfiles a instalar:\n"
-#~ "    * Perfil mínimo\n"
-#~ "    * Sólo contabilidad\n"
-#~ "    * Compañías de servicios\n"
-#~ "    * Compañías de fabricación\n"
-#~ "\n"
-#~ "    También proporciona pantallas para ayudarle a configurar fácilmente su "
-#~ "compañía, la cabecera y el pie de página, el plan contable a instalar y el "
-#~ "idioma.\n"
-#~ "    "
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "Sicronizar Contactos del Google"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Defina el encabezado y pie de la compañia"
-
-#~ msgid "Create"
-#~ msgstr "Crear"
-
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "Defina la zona horaria por defecto para los nuevos usuarios. Se usa para la "
-#~ "conversión de zona horaria entre cliente y servidor"
-
-#~ msgid "Import"
-#~ msgstr "Importar"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Defina las preferencias de los usuarios"
-
-#~ msgid "For Quickbooks Ippids"
-#~ msgstr "Para Quickbooks Ippids"
-
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "Cree o importe clientes y sus contactos de forma manual a través de este "
-#~ "formulario o puede imoprtar empresas existentes a través de un fichero CSV "
-#~ "desde el asistente \"Importar datos\""
-
-#~ msgid "For Import Saleforce"
-#~ msgstr "Para importar Saleforce"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Defina las preferencias por defecto para los usuarios"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "Si utiliza OpenERP por primera vez, le recomendamos que seleccione la "
-#~ "interfaz simplificada, que tiene menos funciones, pero es más fácil. Siempre "
-#~ "puede cambiarla más tarde en las preferencias del usuario."
-
-#~ msgid "Extended"
-#~ msgstr "Extendido"
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Rellene los datos de su compañía (dirección, logotipo, cuentas bancarias) "
-#~ "así se imprimirá en sus informes. Puede hacer clic en el botón \"Vista "
-#~ "previa del encabezado\" de esa forma podrá ver el encabezado y pie de pagina "
-#~ "de los documentos PDF."
-
-#~ msgid "Customers"
-#~ msgstr "Clientes"
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
-
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Defina el idioma por defecto para toda la interfáz de usuario, cuando las "
-#~ "traducciones de UI estén disponibles. Si quiere añadir un nuevo idioma, "
-#~ "puede hacerlos desde el asistente 'Cargar una traducción oficial' de menú "
-#~ "administración."
-
-#~ msgid "Language"
-#~ msgstr "Idioma"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Seleccione esta opción si desea mostrar las sugerencias en cada acción del "
-#~ "menú."
-
-#~ msgid "Timezone"
-#~ msgstr "Zona horaria"
-
-#~ msgid "Quickbooks Ippids"
-#~ msgstr "Quickbooks Ippids"
-
-#~ msgid "Import Saleforce"
-#~ msgstr "Importar Saleforce"
-
-#~ msgid "Display Tips"
-#~ msgstr "Mostrar sugerencias"
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "Para importar sugarcrm"
-
-#~ msgid "Simplified"
-#~ msgstr "Simplificada"
-
-#~ msgid "Import or create customers"
-#~ msgstr "Importar o crear clientes"
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "Importar Sugarcrm"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Crear o importar clientes"
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "Para sincronizar contactos de Google"
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Crear usuarios adicionales"
-
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
-
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "Esto definirá las preferencias por defecto para los nuevos usuarios y "
-#~ "actualizará las existentes. Después los usuarios podrán modifcarlas "
-#~ "libremente desde su propio formulario de preferencias."
-
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/es_AR.po b/addons/base_setup/i18n/es_AR.po
index fbb3f695a02..98c70871093 100644
--- a/addons/base_setup/i18n/es_AR.po
+++ b/addons/base_setup/i18n/es_AR.po
@@ -1,512 +1,389 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Spanish (Argentina) translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2009-09-15 15:41+0000\n"
-"Last-Translator: Silvana Herrera <sherrera@thymbra.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Argentina) <es_AR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr ""
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr ""
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Activar el portal de cliente"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Permitir compartir documentos"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr ""
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Permitir a los usuarios importar datos desde archivos CSV"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Aplicar"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
-msgstr ""
+msgstr "Autenticación"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr ""
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
+msgstr "CRM"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Cancelar"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr ""
+msgid "Client"
+msgstr "Cliente"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr ""
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Configurar Ventas"
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Configurar servidores de correo saliente"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Configurar datos de su compañía"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Contactos"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Cliente"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
+msgstr "Características del Cliente"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Donante"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "Email"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Integración con Emails"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Ajustes Generales"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr ""
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Traer contactos automáticamente desde linkedin"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Dé a sus clientes acceso a sus documentos"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr ""
+msgid "Guest"
+msgstr "Invitado"
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr "Como llama  a un Cliente"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Importar / Exportar"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr ""
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Administrar múltiples compañías"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr ""
+msgid "Member"
+msgstr "Miembro"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
+msgstr "Opciones"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Paciente"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Acceso portal"
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Presupuestos y Pedidos de Venta"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr ""
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "VENTA"
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Características de Venta"
+
+#. module: base_setup
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr ""
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Compartir o embeber cualquier pantalla de openerp."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Integración de Redes Sociales"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr ""
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
+msgstr "Especifique Su Terminología"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Inquilino"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Cancelar"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Use otra palabra para decir \"Cliente\""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
+"Usar proveedores de autenticación externos, registrarse con google, "
+"facebook, ..."
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
+"Cuando crea un nuevo contacto (persona o compañía), podrá importar todos sus "
+"datos desde LinkedIn (fotos, direcciones, etc)."
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
+"Cuando envía un documento a un cliente\n"
+"                                    (presupuesto, factura), el cliente "
+"podrá\n"
+"                                    ingresar para obtener todos sus "
+"documentos,\n"
+"                                    leer las noticias de la compañía, "
+"comprobar sus proyectos,\n"
+"                                    etc."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Esta frase aparecerá en la parte inferior de sus informes.\n"
-#~ "Le sugerimos que aquí escriba frases legales del tipo:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Cuenta bancaria: 126-"
-#~ "2013269-07"
-
-#~ msgid "Company Name"
-#~ msgstr "Nombre de la compañía"
-
-#~ msgid "Use Directly"
-#~ msgstr "Usar directamente"
-
-#~ msgid "Summary"
-#~ msgstr "Resumen"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Esta frase aparecerá en la esquina superior derecha de sus informes.\n"
-#~ "Le sugerimos poner un eslogan, por ejemplo:\n"
-#~ "\"Soluciones de empresa de código abierto\"."
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Puede empezar configurando el sistema o conectarse directamente a la base de "
-#~ "datos usando la configuración predeterminada"
-
-#~ msgid "Previous"
-#~ msgstr "Anterior"
-
-#~ msgid "Next"
-#~ msgstr "Siguiente"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Seleccione un perfil"
-
-#~ msgid "Zip code"
-#~ msgstr "Código postal"
-
-#~ msgid "Report Information"
-#~ msgstr "Información de los informes"
-
-#~ msgid "Install"
-#~ msgstr "Instalar"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Posteriormente podrá instalar más módulos desde el menú de Administración."
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid "Phone"
-#~ msgstr "Teléfono"
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Un perfil instala una preselección de módulos para una necesidad específica. "
-#~ "Estos perfiles han sido creados para ayudarle a descubrir los diferentes "
-#~ "aspectos de OpenERP. Esto es sólo un punto de partida, OpenERP dispone de "
-#~ "300+ módulos."
-
-#~ msgid "City"
-#~ msgstr "Ciudad"
-
-#~ msgid "Profile"
-#~ msgstr "Perfil"
-
-#~ msgid "Installation Done"
-#~ msgstr "Instalación Finalizada"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Su logo – Utilice un tamaño de 450x150 píxeles aprox."
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Su nueva base de datos está completamente instalada"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Pie de página 1 de los informes"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Pie de página 2 de los informes"
-
-#~ msgid "Street2"
-#~ msgstr "Calle 2"
-
-#~ msgid "General Information"
-#~ msgstr "Información general"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Empezar la configuración"
-
-#~ msgid "Country"
-#~ msgstr "País"
-
-#~ msgid "Street"
-#~ msgstr "Calle"
-
-#~ msgid "Currency"
-#~ msgstr "Moneda"
-
-#~ msgid "State"
-#~ msgstr "Provincia"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Definir la compañia principal"
-
-#~ msgid "Report Header"
-#~ msgstr "Encabezado del Reporte"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Esta frase aparecerá en la parte inferior de sus informes.\n"
-#~ "Le sugerimos poner información bancaria aquí, por ejemplo:\n"
-#~ "IBAN: ES1234 1234 00 0123456789 - SWIFT: CPDF BE71 - CIF: ES12345678A"
-
-#~ msgid "Setup"
-#~ msgstr "Configuración"
-
-#~ msgid "Base Setup"
-#~ msgstr "Configuración básica"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Puede usar el siguiente asistente para cambiar los términos para los cliente "
+"en toda la aplicación."
 
-#~ msgid "Report header"
-#~ msgstr "Encabezado del Reporte"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Encontrará más opciones en los detalles de su compañía: dirección para la "
+"cabecera y pie, textos de pagos atrasados, etc."
 
-#~ msgid "E-mail"
-#~ msgstr "Correo electrónico"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/es_CL.po b/addons/base_setup/i18n/es_CL.po
index 564ce4d69c1..6d91bb3dfb8 100644
--- a/addons/base_setup/i18n/es_CL.po
+++ b/addons/base_setup/i18n/es_CL.po
@@ -1,807 +1,373 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Spanish (Chile) translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-01-14 04:34+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Chile) <es_CL@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Authentication"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Cancelar"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contenidos"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Partner"
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Cancelar"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
-#~ msgid "City"
-#~ msgstr "Ciudad"
-
-#~ msgid "Install"
-#~ msgstr "Instalar"
-
-#~ msgid "Invoicing"
-#~ msgstr "Facturación"
-
-#~ msgid "Human Resources"
-#~ msgstr "Recursos humanos"
-
-#~ msgid "E-mail"
-#~ msgstr "Correo electrónico"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Nº cuenta bancaria"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Herramientas extras"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Pie de página 1 de los informes"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus procesos de fabricación y generar informes sobre "
-#~ "estos procesos."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Le ayuda a gestionar sus campañas de marketing paso a paso."
-
-#~ msgid "Your database is now created."
-#~ msgstr "Su base de datos ya está creada."
-
-#~ msgid "Point of Sales"
-#~ msgstr "Terminal punto de venta"
-
-#~ msgid "Associations"
-#~ msgstr "Asociaciones"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus necesidades contables. Si no es un contable, le "
-#~ "sugerimos instalar sólo la facturación. "
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Los siguientes usuarios han sido instalados : \n"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progreso configuración"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Pie de página 2 de los informes"
-
-#~ msgid "Currency"
-#~ msgstr "Moneda"
-
-#~ msgid "Fed. State"
-#~ msgstr "Provincia"
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
-
-#~ msgid "Company"
-#~ msgstr "Compañía"
-
-#~ msgid "Sales Management"
-#~ msgstr "Gestión ventas"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Permite instalar varias herramientas interesantes pero no esenciales como "
-#~ "Informes, Comidas y caja de Ideas."
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Puede empezar configurando el sistema o conectando directamente a la base de "
-#~ "datos como un administrador."
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Informes avanzados"
-
-#~ msgid "Phone"
-#~ msgstr "Teléfono"
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "La información de su compañía se usará para personalizar los documentos "
-#~ "emitidos con OpenERP, como las facturas, pedidos y mucho más."
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Gestión conocimiento"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Este módulo implementa un sistema de configuración que ayuda al usuario\n"
-#~ "    a configurar el sistema durante la instalación de una nueva base de "
-#~ "datos.\n"
-#~ "\n"
-#~ "    Le permite seleccionar entre una lista de perfiles a instalar:\n"
-#~ "    * Perfil mínimo\n"
-#~ "    * Sólo contabilidad\n"
-#~ "    * Compañías de servicios\n"
-#~ "    * Compañías de fabricación\n"
-#~ "\n"
-#~ "    También proporciona pantallas para ayudarle a configurar fácilmente su "
-#~ "compañía, la cabecera y el pie de página, el plan contable a instalar y el "
-#~ "idioma.\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Instala un conjunto preseleccionado de aplicaciones OpenERP que pueden "
-#~ "ayudarle a gestionar su industria."
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus proyectos y tareas mediante el seguimiento de "
-#~ "ellas, generando planificaciones, ..."
-
-#~ msgid "Company Name"
-#~ msgstr "Nombre de la compañía"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Omitir asistentes configuración"
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus recursos humanos mediante la codificación de la "
-#~ "estructura de los empleados, la generación de hojas de trabajo, seguimiento "
-#~ "de la asistencia, ..."
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Le permite crear sus facturas y controlar los pagos. Es una versión más "
-#~ "fácil del módulo de contabilidad para gestores que no sean contables."
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.compañía"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus procesos relacionados con las compras como "
-#~ "peticiones de presupuestos, facturas de proveedor, ..."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Esta frase aparecerá en la parte inferior de sus informes.\n"
-#~ "Le sugerimos poner información bancaria, por ejemplo:\n"
-#~ "IBAN: ES1234 1234 00 0123456789 - SWIFT: CPDF BE71 - CIF: ES12345678A"
-
-#~ msgid "Street 2"
-#~ msgstr "Calle 2"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.instalador"
-
-#~ msgid "Country"
-#~ msgstr "País"
-
-#~ msgid "Setup"
-#~ msgstr "Instalación"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Contabilidad y finanzas"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Casas de subastas"
-
-#~ msgid "Zip Code"
-#~ msgstr "Código postal"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Empezar configuración"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Le permite instalar addons orientados a compartir el conocimiento con y "
-#~ "entre sus empleados."
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Escoja las aplicaciones que desea cubrir con su sistema. Si no está seguro "
-#~ "acerca de sus necesidades exactas en este punto, puede instalarlas "
-#~ "fácilmente más tarde."
-
-#~ msgid "Company Configuration"
-#~ msgstr "Configuración compañía"
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Le ayuda sacar provecho de sus terminales punto de venta con la codificación "
-#~ "rápida de las ventas, codificación de modos de pago simplificada, generación "
-#~ "automática de albaranes, ..."
-
-#~ msgid "Purchase Management"
-#~ msgstr "Gestión de compras"
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus presupuestos, pedidos de venta y facturación."
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Gestión de almacenes"
-
-#~ msgid "Project Management"
-#~ msgstr "Gestión de proyectos"
-
-#~ msgid "Installed Users"
-#~ msgstr "Usuarios instalados"
-
-#~ msgid "New Database"
-#~ msgstr "Nueva base de datos"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Gestión relaciones con el cliente (CRM)"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Instala un conjunto preseleccionado de aplicaciones OpenERP para ayudarle a "
-#~ "gestionar sus subastas como también los procesos de negocio alrededor de "
-#~ "ellas."
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Esta frase aparecerá en la esquina superior derecha de sus informes.\n"
-#~ "Le sugerimos poner un eslogan, por ejemplo:\n"
-#~ "\"Soluciones de empresa de código abierto\"."
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Le permite instalar varias herramientas para simplificar y mejorar la "
-#~ "creación de informes OpenERP."
-
-#~ msgid "Report Header"
-#~ msgstr "Cabecera de los informes"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Información sobre su nueva base de datos"
-
-#~ msgid "Image"
-#~ msgstr "Imagen"
-
-#~ msgid "Food Industry"
-#~ msgstr "Industria alimentaria"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Fabricación"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Su logo – Utilice un tamaño de 450x150 píxeles aprox."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Esta frase aparecerá en la parte inferior de sus informes.\n"
-#~ "Le sugerimos que aquí escriba frases legales del tipo:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Cuenta bancaria: 126-"
-#~ "2013269-07"
-
-#~ msgid "Company Website"
-#~ msgstr "Sitio web compañía"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Instala aplicaciones específicas para la industria"
-
-#~ msgid "Street"
-#~ msgstr "Calle"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Configurar la información de su compañía"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Ejemplo: http://openerp.com"
-
-#~ msgid "Install Applications"
-#~ msgstr "Instala aplicaciones"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Le ayuda a controlar y administrar las relaciones con los clientes, tales "
-#~ "como las iniciativas, peticiones o cuestiones. Puede enviar automáticamente "
-#~ "recordatorios, escalar las peticiones o activar acciones específicas del "
-#~ "negocio basado en eventos estándar."
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Le ayuda a gestionar su inventario y las operaciones principales de stock: "
-#~ "las órdenes de entrega, recepciones, ..."
-
-#~ msgid "Base Setup"
-#~ msgstr "Configuración básica"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Instala un conjunto preseleccionado de aplicaciones OpenERP que le ayudará a "
-#~ "administrar su asociación de manera más eficiente."
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Seleccione un perfil"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Puede empezar configurando el sistema o conectarse directamente a la base de "
-#~ "datos usando la configuración por defecto."
-
-#~ msgid "Zip code"
-#~ msgstr "Código postal"
-
-#~ msgid "Report header"
-#~ msgstr "Cabecera de los informes"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Posteriormente podrá instalar más módulos desde el menú Administración."
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Un perfil instala una preselección de módulos para una necesidad específica. "
-#~ "Estos perfiles han sido creados para ayudarle a descubrir los diferentes "
-#~ "aspectos de OpenERP. Esto es sólo un punto de partida, OpenERP dispone de "
-#~ "300+ módulos."
-
-#~ msgid "Next"
-#~ msgstr "Siguiente"
-
-#~ msgid "State"
-#~ msgstr "Estado"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Su nueva base de datos ha sido instalada completamente."
-
-#~ msgid "Profile"
-#~ msgstr "Perfil"
-
-#~ msgid "General Information"
-#~ msgstr "Información general"
-
-#~ msgid "Street2"
-#~ msgstr "Calle 2"
-
-#~ msgid "Report Information"
-#~ msgstr "Información de los informes"
-
-#~ msgid "Summary"
-#~ msgstr "Resumen"
-
-#~ msgid "Installation Done"
-#~ msgstr "Instalación realizada"
-
-#~ msgid "Use Directly"
-#~ msgstr "Usar directamente"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
 
-#~ msgid "Previous"
-#~ msgstr "Anterior"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid "Define Main Company"
-#~ msgstr "Defina la compañia principal"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
diff --git a/addons/base_setup/i18n/es_CR.po b/addons/base_setup/i18n/es_CR.po
index fed31deb8ed..b40ffddddee 100644
--- a/addons/base_setup/i18n/es_CR.po
+++ b/addons/base_setup/i18n/es_CR.po
@@ -1,270 +1,245 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* base_setup
+# Spanish (Costa Rica) translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-02-15 17:34+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Costa Rica) <es_CR@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-"Language: \n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Invitado"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Miembro"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Cancelar"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Donante"
+msgid "Client"
+msgstr "Cliente"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Paciente"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Cliente"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Donante"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contenidos"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
-"Puede utilizar este asistente para cambiar la terminología para los clientes "
-"en toda la aplicación."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Tenant"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Cliente"
+msgid "Guest"
+msgstr "Invitado"
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr "¿Cómo usted llama a un cliente?"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
-msgstr "¿Cómo usted llama a un cliente?"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Cliente"
+msgid "Member"
+msgstr "Miembro"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
@@ -273,676 +248,128 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Use otra palabra para decir \"Cliente\""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Paciente"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr ""
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
+msgstr "Especifique su terminología"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Tenant"
+
+#. module: base_setup
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Cancelar"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Use otra palabra para decir \"Cliente\""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
-msgstr "Especifique su terminología"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
-#~ msgid "Image"
-#~ msgstr "Imagen"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Seleccione un perfil"
-
-#~ msgid "City"
-#~ msgstr "Ciudad"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Puede empezar configurando el sistema o conectarse directamente a la base de "
-#~ "datos usando la configuración por defecto."
-
-#~ msgid "Zip code"
-#~ msgstr "Código postal"
-
-#~ msgid "Report header"
-#~ msgstr "Cabecera de los informes"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Empezar configuración"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Posteriormente podrá instalar más módulos desde el menú Administración."
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Un perfil instala una preselección de módulos para una necesidad específica. "
-#~ "Estos perfiles han sido creados para ayudarle a descubrir los diferentes "
-#~ "aspectos de OpenERP. Esto es sólo un punto de partida, OpenERP dispone de "
-#~ "300+ módulos."
-
-#~ msgid "Next"
-#~ msgstr "Siguiente"
-
-#~ msgid "E-mail"
-#~ msgstr "Correo electrónico"
-
-#~ msgid "State"
-#~ msgstr "Estado"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Su nueva base de datos ha sido instalada completamente."
-
-#~ msgid "Profile"
-#~ msgstr "Perfil"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Pie de página 1 de los informes"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Pie de página 2 de los informes"
-
-#~ msgid "General Information"
-#~ msgstr "Información general"
-
-#~ msgid "Street2"
-#~ msgstr "Calle 2"
-
-#~ msgid "Report Information"
-#~ msgstr "Información de los informes"
-
-#~ msgid "Phone"
-#~ msgstr "Teléfono"
-
-#~ msgid "Company Name"
-#~ msgstr "Nombre de la compañía"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Esta frase aparecerá en la parte inferior de sus informes.\n"
-#~ "Le sugerimos poner información bancaria, por ejemplo:\n"
-#~ "IBAN: ES1234 1234 00 0123456789 - SWIFT: CPDF BE71 - CIF: ES12345678A"
-
-#~ msgid "Country"
-#~ msgstr "País"
-
-#~ msgid "Setup"
-#~ msgstr "Instalación"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Esta frase aparecerá en la parte inferior de sus informes.\n"
-#~ "Le sugerimos que aquí escriba frases legales del tipo:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Cuenta bancaria: 126-"
-#~ "2013269-07"
-
-#~ msgid "Summary"
-#~ msgstr "Resumen"
-
-#~ msgid "Install"
-#~ msgstr "Instalar"
-
-#~ msgid "Installation Done"
-#~ msgstr "Instalación realizada"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Esta frase aparecerá en la esquina superior derecha de sus informes.\n"
-#~ "Le sugerimos poner un eslogan, por ejemplo:\n"
-#~ "\"Soluciones de empresa de código abierto\"."
-
-#~ msgid "Report Header"
-#~ msgstr "Cabecera de los informes"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Su logo – Utilice un tamaño de 450x150 píxeles aprox."
-
-#~ msgid "Currency"
-#~ msgstr "Moneda"
-
-#~ msgid "Street"
-#~ msgstr "Calle"
-
-#~ msgid "Use Directly"
-#~ msgstr "Usar directamente"
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid "Previous"
-#~ msgstr "Anterior"
-
-#~ msgid "Base Setup"
-#~ msgstr "Configuración básica"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Defina la compañia principal"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Terminal punto de venta"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Su base de datos ya está creada."
-
-#~ msgid "Associations"
-#~ msgstr "Asociaciones"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus procesos de fabricación y generar informes sobre "
-#~ "estos procesos."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Le ayuda a gestionar sus campañas de marketing paso a paso."
-
-#~ msgid "Extra Tools"
-#~ msgstr "Herramientas extras"
-
-#~ msgid "Invoicing"
-#~ msgstr "Facturación"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Nº cuenta bancaria"
-
-#~ msgid "Sales Management"
-#~ msgstr "Gestión ventas"
-
-#~ msgid "Company"
-#~ msgstr "Compañía"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progreso configuración"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Puede empezar configurando el sistema o conectando directamente a la base de "
-#~ "datos como un administrador."
-
-#~ msgid "Fed. State"
-#~ msgstr "Provincia"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus necesidades contables. Si no es un contable, le "
-#~ "sugerimos instalar sólo la facturación. "
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Permite instalar varias herramientas interesantes pero no esenciales como "
-#~ "Informes, Comidas y caja de Ideas."
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Informes avanzados"
-
-#~ msgid "Human Resources"
-#~ msgstr "Recursos humanos"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus procesos relacionados con las compras como "
-#~ "peticiones de presupuestos, facturas de proveedor, ..."
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Le permite crear sus facturas y controlar los pagos. Es una versión más "
-#~ "fácil del módulo de contabilidad para gestores que no sean contables."
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus proyectos y tareas mediante el seguimiento de "
-#~ "ellas, generando planificaciones, ..."
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Le ayuda sacar provecho de sus terminales punto de venta con la codificación "
-#~ "rápida de las ventas, codificación de modos de pago simplificada, generación "
-#~ "automática de albaranes, ..."
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Puede utilizar este asistente para cambiar la terminología para los clientes "
+"en toda la aplicación."
 
-#~ msgid "Knowledge Management"
-#~ msgstr "Gestión conocimiento"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Instala un conjunto preseleccionado de aplicaciones OpenERP que pueden "
-#~ "ayudarle a gestionar su industria."
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Gestión de almacenes"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Gestión de compras"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Configuración compañía"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.instalador"
-
-#~ msgid "Street 2"
-#~ msgstr "Calle 2"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Le permite instalar addons orientados a compartir el conocimiento con y "
-#~ "entre sus empleados."
-
-#~ msgid "Zip Code"
-#~ msgstr "Código postal"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Casas de subastas"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Contabilidad y finanzas"
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus presupuestos, pedidos de venta y facturación."
-
-#~ msgid "Manufacturing"
-#~ msgstr "Fabricación"
-
-#~ msgid "Food Industry"
-#~ msgstr "Industria alimentaria"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Información sobre su nueva base de datos"
-
-#~ msgid "New Database"
-#~ msgstr "Nueva base de datos"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Gestión relaciones con el cliente (CRM)"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Instala un conjunto preseleccionado de aplicaciones OpenERP para ayudarle a "
-#~ "gestionar sus subastas como también los procesos de negocio alrededor de "
-#~ "ellas."
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Le permite instalar varias herramientas para simplificar y mejorar la "
-#~ "creación de informes OpenERP."
-
-#~ msgid "Project Management"
-#~ msgstr "Gestión de proyectos"
-
-#~ msgid "Installed Users"
-#~ msgstr "Usuarios instalados"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Instala aplicaciones específicas para la industria"
-
-#~ msgid "Company Website"
-#~ msgstr "Sitio web compañía"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Ejemplo: http://openerp.com"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.compañía"
-
-#~ msgid "Install Applications"
-#~ msgstr "Instala aplicaciones"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Le ayuda a controlar y administrar las relaciones con los clientes, tales "
-#~ "como las iniciativas, peticiones o cuestiones. Puede enviar automáticamente "
-#~ "recordatorios, escalar las peticiones o activar acciones específicas del "
-#~ "negocio basado en eventos estándar."
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus recursos humanos mediante la codificación de la "
-#~ "estructura de los empleados, la generación de hojas de trabajo, seguimiento "
-#~ "de la asistencia, ..."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Instala un conjunto preseleccionado de aplicaciones OpenERP que le ayudará a "
-#~ "administrar su asociación de manera más eficiente."
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Le ayuda a gestionar su inventario y las operaciones principales de stock: "
-#~ "las órdenes de entrega, recepciones, ..."
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Los siguientes usuarios han sido instalados : \n"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Omitir asistentes configuración"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Configurar la información de su compañía"
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "La información de su compañía se usará para personalizar los documentos "
-#~ "emitidos con OpenERP, como las facturas, pedidos y mucho más."
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Escoja las aplicaciones que desea cubrir con su sistema. Si no está seguro "
-#~ "acerca de sus necesidades exactas en este punto, puede instalarlas "
-#~ "fácilmente más tarde."
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Este módulo implementa un sistema de configuración que ayuda al usuario\n"
-#~ "    a configurar el sistema durante la instalación de una nueva base de "
-#~ "datos.\n"
-#~ "\n"
-#~ "    Le permite seleccionar entre una lista de perfiles a instalar:\n"
-#~ "    * Perfil mínimo\n"
-#~ "    * Sólo contabilidad\n"
-#~ "    * Compañías de servicios\n"
-#~ "    * Compañías de fabricación\n"
-#~ "\n"
-#~ "    También proporciona pantallas para ayudarle a configurar fácilmente su "
-#~ "compañía, la cabecera y el pie de página, el plan contable a instalar y el "
-#~ "idioma.\n"
-#~ "    "
-
-#~ msgid "Display Tips"
-#~ msgstr "Mostrar Sugerencias"
-
-#~ msgid "Create"
-#~ msgstr "Crear"
-
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Configurar Encabezado y pie de página de la empresa"
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "Ajuste por defecto para la zona horaria del nuevo usuario, que se utiliza "
-#~ "para realizar las conversiones de zona horaria entre el servidor y el "
-#~ "cliente."
-
-#~ msgid "Import"
-#~ msgstr "Importar"
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "Sincronización de Contactos de Google"
-
-#~ msgid "For Import Saleforce"
-#~ msgstr "Importar la fuerza de venta"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Definir preferencias de los usuarios"
-
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "Crear o importar los clientes y sus contactos manualmente de esta forma o lo "
-#~ "que pueda importar la hoja de cálculo CSV por los socios existentes de "
-#~ "\"Importar datos\" asistente"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Definir preferencias de los usuarios"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "Si utiliza OpenERP por primera vez, le recomendamos que seleccione la "
-#~ "interfaz simplificada, que tiene menos funciones, pero es más fácil. Siempre "
-#~ "puede cambiarla más tarde en las preferencias del usuario."
-
-#~ msgid "For Quickbooks Ippids"
-#~ msgstr "Quickbooks para Ippids"
-
-#~ msgid "Extended"
-#~ msgstr "Extendida"
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Rellene los datos de su empresa (dirección, logotipo, cuentas bancarias), "
-#~ "para que sea impreso en sus informes. Puede hacer clic en \"Vista previa de "
-#~ "cabecera\" en el botón con el fin de comprobar el encabezado / pie de los "
-#~ "documentos PDF."
-
-#~ msgid "Customers"
-#~ msgstr "Clientes"
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
-
-#~ msgid "Interface"
-#~ msgstr "Interfaz"
-
-#~ msgid "Language"
-#~ msgstr "Idioma"
-
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Establece el idioma predeterminado para todas las traducciones de interfaz "
-#~ "de usuario están disponibles cuando IU. Si desea agregar un nuevo lenguaje, "
-#~ "que-puede añadir desde 'Cargar una traducción oficial \"del asistente de "
-#~ "la\" Administración \"del menú."
-
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "Este establece las preferencias por defecto para los nuevos usuarios y "
-#~ "actualizar todas las existentes. Posteriormente, los usuarios son libres de "
-#~ "intercambiar las ganancias por su propia cuenta Aquellos forma las "
-#~ "preferencias del usuario."
-
-#~ msgid "Quickbooks Ippids"
-#~ msgstr "Quickbooks Ippids"
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Crear usuarios adicionales"
-
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "Importación de Sugar CRM"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Crear o importar clientes"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Seleccione esta opción si desea mostrar los consejos en cada acción del menú."
-
-#~ msgid "Timezone"
-#~ msgstr "Zona horaria"
-
-#~ msgid "Import Saleforce"
-#~ msgstr "Importar fuerza de ventas"
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "Para importación Sugar CRM"
-
-#~ msgid "Simplified"
-#~ msgstr "Simplificada"
-
-#~ msgid "Import or create customers"
-#~ msgstr "Importar o crear clientes"
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "Para sincronización de contactos de Google"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
diff --git a/addons/base_setup/i18n/es_EC.po b/addons/base_setup/i18n/es_EC.po
index e401362e7f6..63c5111b57f 100644
--- a/addons/base_setup/i18n/es_EC.po
+++ b/addons/base_setup/i18n/es_EC.po
@@ -1,270 +1,245 @@
 # Spanish (Ecuador) translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-12-27 16:41+0000\n"
-"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Invitado"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Miembro"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Cancelar"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Donante"
+msgid "Client"
+msgstr "Cliente"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Paciente"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Cliente"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Donante"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
-"Puede usar este asistente para cambiar la terminología de clientes en la "
-"aplicación"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Arrendatario"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Cliente"
+msgid "Guest"
+msgstr "Invitado"
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr "Como llamar a un cliente"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
-msgstr "Como llamar a un cliente"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Cliente"
+msgid "Member"
+msgstr "Miembro"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
@@ -273,671 +248,128 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Usar otra palabra para decir 'Cliente'"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Paciente"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr ""
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
+msgstr "Especificar su terminología"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Arrendatario"
+
+#. module: base_setup
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Cancelar"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Usar otra palabra para decir 'Cliente'"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
-msgstr "Especificar su terminología"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Un perfil instala una preselección de módulos para una necesidad específica. "
-#~ "Estos perfiles han sido creados para ayudarle a descubrir los diferentes "
-#~ "aspectos de OpenERP. Esto es sólo un punto de partida, OpenERP dispone de "
-#~ "300+ módulos."
-
-#~ msgid "Next"
-#~ msgstr "Siguiente"
-
-#~ msgid "E-mail"
-#~ msgstr "Correo electrónico"
-
-#~ msgid "Report header"
-#~ msgstr "Cabecera de los informes"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Seleccionar un perfil"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Puede empezar configurando el sistema o conectarse directamente a la base de "
-#~ "datos usando la configuración por defecto."
-
-#~ msgid "City"
-#~ msgstr "Ciudad"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Posteriormente podrá instalar más módulos desde el menú Administración."
-
-#~ msgid "Start Configuration"
-#~ msgstr "Empezar configuración"
-
-#~ msgid "Zip code"
-#~ msgstr "Código postal"
-
-#~ msgid "Profile"
-#~ msgstr "Perfil"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Pie de página 1 de los informes"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Pie de página 2 de los informes"
-
-#~ msgid "State"
-#~ msgstr "Estado/Provincia"
-
-#~ msgid "Street2"
-#~ msgstr "Calle 2"
-
-#~ msgid "Phone"
-#~ msgstr "Teléfono"
-
-#~ msgid "Report Information"
-#~ msgstr "Información de los informes"
-
-#~ msgid "General Information"
-#~ msgstr "Información general"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Definir compañia principal"
-
-#~ msgid "Report Header"
-#~ msgstr "Cabecera del informe"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Esta frase aparecerá en la parte inferior de sus informes.\n"
-#~ "Le sugerimos que aquí escriba frases legales del tipo:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Cuenta bancaria: 126-"
-#~ "2013269-07"
-
-#~ msgid "Installation Done"
-#~ msgstr "Instalación realizada"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Esta frase aparecerá en la esquina superior derecha de sus informes.\n"
-#~ "Le sugerimos poner un eslogan, por ejemplo:\n"
-#~ "\"Soluciones de empresa de código abierto\"."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Esta frase aparecerá en la parte inferior de sus informes.\n"
-#~ "Le sugerimos poner información bancaria, por ejemplo:\n"
-#~ "IBAN: ES1234 1234 00 0123456789 - SWIFT: CPDF BE71 - CIF: ES12345678A"
-
-#~ msgid "Install"
-#~ msgstr "Instalar"
-
-#~ msgid "Summary"
-#~ msgstr "Resumen"
-
-#~ msgid "Setup"
-#~ msgstr "Instalación"
-
-#~ msgid "Country"
-#~ msgstr "País"
-
-#~ msgid "Company Name"
-#~ msgstr "Nombre de la compañía"
-
-#~ msgid "Base Setup"
-#~ msgstr "Configuración básica"
-
-#~ msgid "Previous"
-#~ msgstr "Anterior"
-
-#~ msgid "Street"
-#~ msgstr "Calle"
-
-#~ msgid "Currency"
-#~ msgstr "Moneda"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Su logo – Utilice un tamaño de 450x150 píxeles aprox."
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid "Use Directly"
-#~ msgstr "Usar directamente"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Su nueva base de datos ha sido instalada completamente."
-
-#~ msgid "Human Resources"
-#~ msgstr "Recursos Humanos"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Su base de datos ya está creada."
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus necesidades contables. Si no es un contable, le "
-#~ "sugerimos instalar sólo la facturación. "
-
-#~ msgid "Associations"
-#~ msgstr "Asociaciones"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Terminal punto de venta"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus procesos de fabricación y generar informes sobre "
-#~ "estos procesos."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Le ayuda a gestionar sus campañas de marketing paso a paso."
-
-#~ msgid "Invoicing"
-#~ msgstr "Facturación"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Cuenta Bancaria No."
-
-#~ msgid "Extra Tools"
-#~ msgstr "Herramientas extras"
-
-#~ msgid "Sales Management"
-#~ msgstr "Ventas"
-
-#~ msgid "Company"
-#~ msgstr "Compañía"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progreso de Configuración"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Puede empezar configurando el sistema o conectando directamente a la base de "
-#~ "datos como un administrador."
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
-
-#~ msgid "Fed. State"
-#~ msgstr "Provincia"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Los siguientes usuarios han sido instalados : \n"
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Informes avanzados"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Permite instalar varias herramientas interesantes pero no esenciales como "
-#~ "Informes, Comidas y caja de Ideas."
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Omitir asistentes configuración"
-
-#~ msgid "base.setup.company"
-#~ msgstr "Configuración Base de la Compañia"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus procesos relacionados con las compras como "
-#~ "peticiones de presupuestos, facturas de proveedor, ..."
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus recursos humanos mediante la codificación de la "
-#~ "estructura de los empleados, la generación de hojas de trabajo, seguimiento "
-#~ "de la asistencia, ..."
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Le permite crear sus facturas y controlar los pagos. Es una versión más "
-#~ "fácil del módulo de contabilidad para gestores que no sean contables."
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus proyectos y tareas mediante el seguimiento de "
-#~ "ellas, generando planificaciones, ..."
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Gestión conocimiento"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Instala un conjunto preseleccionado de aplicaciones OpenERP que pueden "
-#~ "ayudarle a gestionar su industria."
-
-#~ msgid "title"
-#~ msgstr "Título"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Gestión de compras"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Configuración compañía"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "Instalador"
-
-#~ msgid "Street 2"
-#~ msgstr "Calle 2"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Le permite instalar addons orientados a compartir el conocimiento con y "
-#~ "entre sus empleados."
-
-#~ msgid "Zip Code"
-#~ msgstr "Código postal"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Casas de subastas"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Contabilidad y finanzas"
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Le ayuda sacar provecho de sus terminales punto de venta con la codificación "
-#~ "rápida de las ventas, codificación de modos de pago simplificada, generación "
-#~ "automática de albaranes, ..."
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Gestión de inventario"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Información sobre su nueva base de datos"
-
-#~ msgid "Image"
-#~ msgstr "Imágen"
-
-#~ msgid "New Database"
-#~ msgstr "Nueva base de datos"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Gestión relaciones con el cliente (CRM)"
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Le permite instalar varias herramientas para simplificar y mejorar la "
-#~ "creación de informes OpenERP."
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus presupuestos, pedidos de venta y facturación."
-
-#~ msgid "Project Management"
-#~ msgstr "Gestión de proyectos"
-
-#~ msgid "Installed Users"
-#~ msgstr "Usuarios instalados"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Instala un conjunto preseleccionado de aplicaciones OpenERP para ayudarle a "
-#~ "gestionar sus subastas como también los procesos de negocio alrededor de "
-#~ "ellas."
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Configura información de tu Compañia"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Producción"
-
-#~ msgid "Food Industry"
-#~ msgstr "Industria alimentaria"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Instala aplicaciones específicas para la industria"
-
-#~ msgid "Company Website"
-#~ msgstr "Sitio web compañía"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Ejemplo: http://openerp.com"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Le ayuda a controlar y administrar las relaciones con los clientes, tales "
-#~ "como las iniciativas, peticiones o cuestiones. Puede enviar automáticamente "
-#~ "recordatorios, escalar las peticiones o activar acciones específicas del "
-#~ "negocio basado en eventos estándar."
-
-#~ msgid "Install Applications"
-#~ msgstr "Instala aplicaciones"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Instala un conjunto preseleccionado de aplicaciones OpenERP que le ayudará a "
-#~ "administrar su asociación de manera más eficiente."
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Le ayuda a gestionar su inventario y las operaciones principales de stock: "
-#~ "las órdenes de entrega, recepciones, ..."
-
-#~ msgid "base.setup.config"
-#~ msgstr "Configuración"
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Escoja las aplicaciones que desea cubrir con su sistema. Si no está seguro "
-#~ "acerca de sus necesidades exactas en este punto, puede instalarlas "
-#~ "fácilmente más tarde."
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "La información de su compañía se usará para personalizar los documentos "
-#~ "emitidos con OpenERP, como las facturas, pedidos y mucho más."
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Este módulo implementa un sistema de configuración que ayuda al usuario\n"
-#~ "    a configurar el sistema durante la instalación de una nueva base de "
-#~ "datos.\n"
-#~ "\n"
-#~ "    Le permite seleccionar entre una lista de perfiles a instalar:\n"
-#~ "    * Perfil mínimo\n"
-#~ "    * Sólo contabilidad\n"
-#~ "    * Compañías de servicios\n"
-#~ "    * Compañías de fabricación\n"
-#~ "\n"
-#~ "    También proporciona pantallas para ayudarle a configurar fácilmente su "
-#~ "compañía, la cabecera y el pie de página, el plan contable a instalar y el "
-#~ "idioma.\n"
-#~ "    "
-
-#~ msgid "Display Tips"
-#~ msgstr "Mostrar Sugerencias"
-
-#~ msgid "Create"
-#~ msgstr "Crear"
-
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Configurar Encabezado y Pie"
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "Configurar zona horaria para usuario, usado para cambios de zonas horarias "
-#~ "entre el servidor y cliente."
-
-#~ msgid "Import"
-#~ msgstr "Importar"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Definir Preferencias de Usuario"
-
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "Crear o importar Clientes y sus contactos manualmente desde este formulario "
-#~ "o puede importar los existentes desde una hoja de cálculo con el asistente "
-#~ "de \"Importar Datos\""
-
-#~ msgid "For Import Saleforce"
-#~ msgstr "Para importar en Saleforce"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Definir preferencias por defecto"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "Si utiliza OpenERP por primera vez, le recomendamos que seleccione la "
-#~ "interfaz simplificada, que tiene menos funciones, pero es más fácil. Siempre "
-#~ "puede cambiarla más tarde en las preferencias del usuario."
-
-#~ msgid "For Quickbooks Ippids"
-#~ msgstr "For Quickbooks Ippids"
-
-#~ msgid "Extended"
-#~ msgstr "Extendido"
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Llenar datos de la empresa, que se imprimirán en los reportes. Puedes dar "
-#~ "clic en el boton de vista previa para revisar el PDF."
-
-#~ msgid "Customers"
-#~ msgstr "Clientes"
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
-
-#~ msgid "Interface"
-#~ msgstr "Interface"
-
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Por defecto el lenguaje para la interfaz de usuario, cuando la traducción "
-#~ "está diponible. Si desea agregar un nuevo lenguaje, puedes agregarlo desde "
-#~ "'Cargar una traducción Oficial' desde el menú de administración."
-
-#~ msgid "Language"
-#~ msgstr "Lenguaje"
-
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-
-#~ msgid "Quickbooks Ippids"
-#~ msgstr "Quickbooks Ippids"
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Crear usuario adicional"
-
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Seleccione esta opción si desea mostrar los consejos en cada acción del menú."
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "Importar SugarCRM"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Crear o importar Clientes"
-
-#~ msgid "Timezone"
-#~ msgstr "Zona horaria"
-
-#~ msgid "Import Saleforce"
-#~ msgstr "Importar Saleforce"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Puede usar este asistente para cambiar la terminología de clientes en la "
+"aplicación"
 
-#~ msgid "For Sync Google Contact"
-#~ msgstr "Para Sync contactos de Google"
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "Para importar SugarCRM"
-
-#~ msgid "Simplified"
-#~ msgstr "Simplificado"
-
-#~ msgid "Import or create customers"
-#~ msgstr "Importar o crear clientes"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid "Sync Google Contact"
-#~ msgstr "Sync con Contactos de Google"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/es_MX.po b/addons/base_setup/i18n/es_MX.po
index 13868b33b79..4fec178d028 100644
--- a/addons/base_setup/i18n/es_MX.po
+++ b/addons/base_setup/i18n/es_MX.po
@@ -1,370 +1,373 @@
 # Spanish (Mexico) translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-11 17:55+0000\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Mexico) <es_MX@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Acceso al portal"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Authentication"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Acceso al portal"
+
+#. module: base_setup
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: help:base.config.settings,font:0
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
 msgstr ""
diff --git a/addons/base_setup/i18n/es_PY.po b/addons/base_setup/i18n/es_PY.po
index 53c4c3cb09d..b8ac186582e 100644
--- a/addons/base_setup/i18n/es_PY.po
+++ b/addons/base_setup/i18n/es_PY.po
@@ -1,740 +1,373 @@
 # Spanish (Paraguay) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-03-18 12:16+0000\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Authentication"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contenidos"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Partner"
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
-#~ msgid "E-mail"
-#~ msgstr "Correo electrónico"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Pie de página 1 del informe"
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Le ayuda a gestionar sus campañas de marketing paso a paso."
-
-#~ msgid "Human Resources"
-#~ msgstr "Recursos humanos"
-
-#~ msgid "Install"
-#~ msgstr "Instalar"
-
-#~ msgid "City"
-#~ msgstr "Ciudad"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus procesos de fabricación y generar informes sobre "
-#~ "estos procesos."
-
-#~ msgid "Extra Tools"
-#~ msgstr "Herramientas extras"
-
-#~ msgid "Invoicing"
-#~ msgstr "Facturación"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Nº cuenta bancaria"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Pie de página 2 de los informes"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
 
-#~ msgid "Currency"
-#~ msgstr "Moneda"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid "Configuration Progress"
-#~ msgstr "Progreso de la configuración"
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
-
-#~ msgid "Fed. State"
-#~ msgstr "Provincia"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Terminal punto de venta"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Su base de datos ya está creada."
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus necesidades contables. Si no es un contable, le "
-#~ "sugerimos instalar sólo la facturación. "
-
-#~ msgid "Associations"
-#~ msgstr "Asociaciones"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Los siguientes usuarios han sido instalados : \n"
-
-#~ msgid "Phone"
-#~ msgstr "Teléfono"
-
-#~ msgid "Sales Management"
-#~ msgstr "Gestión ventas"
-
-#~ msgid "Company"
-#~ msgstr "Compañía"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Puede empezar configurando el sistema o conectando directamente a la base de "
-#~ "datos como un administrador."
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "La información de su compañía se usará para personalizar los documentos "
-#~ "emitidos con OpenERP, como las facturas, pedidos y mucho más."
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Gestión conocimiento"
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Permite instalar varias herramientas interesantes pero no esenciales como "
-#~ "Informes, Comidas y caja de Ideas."
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Informes avanzados"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Omitir asistentes configuración"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus procesos relacionados con las compras como "
-#~ "peticiones de presupuestos, facturas de proveedor, ..."
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.compañía"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Esta frase aparecerá en la parte inferior de sus informes.\n"
-#~ "Le sugerimos poner información bancaria, por ejemplo:\n"
-#~ "IBAN: ES1234 1234 00 0123456789 - SWIFT: CPDF BE71 - CIF: ES12345678A"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Este módulo implementa un sistema de configuración que ayuda al usuario\n"
-#~ "    a configurar el sistema durante la instalación de una nueva base de "
-#~ "datos.\n"
-#~ "\n"
-#~ "    Le permite seleccionar entre una lista de perfiles a instalar:\n"
-#~ "    * Perfil mínimo\n"
-#~ "    * Sólo contabilidad\n"
-#~ "    * Compañías de servicios\n"
-#~ "    * Compañías de fabricación\n"
-#~ "\n"
-#~ "    También proporciona pantallas para ayudarle a configurar fácilmente su "
-#~ "compañía, la cabecera y el pie de página, el plan contable a instalar y el "
-#~ "idioma.\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus recursos humanos mediante la codificación de la "
-#~ "estructura de los empleados, la generación de hojas de trabajo, seguimiento "
-#~ "de la asistencia, ..."
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Le permite crear sus facturas y controlar los pagos. Es una versión más "
-#~ "fácil del módulo de contabilidad para gestores que no sean contables."
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus proyectos y tareas realizando un seguimiento de los "
-#~ "mismos, generando planificaciones, ..."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Instala un conjunto preseleccionado de aplicaciones OpenERP que pueden "
-#~ "ayudarle a gestionar su industria."
-
-#~ msgid "Company Name"
-#~ msgstr "Nombre de la compañía"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.instalador"
-
-#~ msgid "Street 2"
-#~ msgstr "Calle 2"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Le permite instalar addons orientados a compartir el conocimiento con y "
-#~ "entre sus empleados."
-
-#~ msgid "Zip Code"
-#~ msgstr "Código postal"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Casas de subastas"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Contabilidad y finanzas"
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Escoja las aplicaciones que desea cubrir con su sistema. Si no está seguro "
-#~ "acerca de sus necesidades exactas en este punto, puede instalarlas "
-#~ "fácilmente más tarde."
-
-#~ msgid "Start Configuration"
-#~ msgstr "Empezar configuración"
-
-#~ msgid "Setup"
-#~ msgstr "Instalación"
-
-#~ msgid "Country"
-#~ msgstr "País"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Gestión de compras"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Configuración compañía"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Gestión de almacenes"
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Le ayuda sacar provecho de sus terminales punto de venta con la codificación "
-#~ "rápida de las ventas, codificación de modos de pago simplificada, generación "
-#~ "automática de albaranes, ..."
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Gestión relaciones con el cliente (CRM)"
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr ""
-#~ "Le ayuda a gestionar sus presupuestos, pedidos de venta y facturación."
-
-#~ msgid "Project Management"
-#~ msgstr "Gestión de proyectos"
-
-#~ msgid "Installed Users"
-#~ msgstr "Usuarios instalados"
-
-#~ msgid "New Database"
-#~ msgstr "Nueva base de datos"
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Fabricación"
-
-#~ msgid "Food Industry"
-#~ msgstr "Industria alimentaria"
-
-#~ msgid "Report Header"
-#~ msgstr "Cabecera de los informes"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Su logo – Utilice un tamaño de 450x150 píxeles aprox."
-
-#~ msgid "Information about your new database"
-#~ msgstr "Información sobre su nueva base de datos"
-
-#~ msgid "Image"
-#~ msgstr "Imagen"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Instala un conjunto preseleccionado de aplicaciones OpenERP para ayudarle a "
-#~ "gestionar sus subastas como también los procesos de negocio alrededor de "
-#~ "ellas."
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Le permite instalar varias herramientas para simplificar y mejorar la "
-#~ "creación de informes OpenERP."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Esta frase aparecerá en la parte inferior de sus informes.\n"
-#~ "Le sugerimos que aquí escriba frases legales del tipo:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Cuenta bancaria: 126-"
-#~ "2013269-07"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Esta frase aparecerá en la esquina superior derecha de sus informes.\n"
-#~ "Le sugerimos poner un eslogan, por ejemplo:\n"
-#~ "\"Soluciones de empresa de código abierto\"."
-
-#~ msgid "Base Setup"
-#~ msgstr "Configuración básica"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Configurar la información de su compañía"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Instala aplicaciones específicas para la industria"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Ejemplo: http://openerp.com"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Le ayuda a controlar y administrar las relaciones con los clientes, tales "
-#~ "como las iniciativas, peticiones o cuestiones. Puede enviar automáticamente "
-#~ "recordatorios, escalar las peticiones o activar acciones específicas del "
-#~ "negocio basado en eventos estándar."
-
-#~ msgid "Install Applications"
-#~ msgstr "Instala aplicaciones"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Instala un conjunto preseleccionado de aplicaciones OpenERP que le ayudará a "
-#~ "administrar su asociación de manera más eficiente."
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Le ayuda a gestionar su inventario y las operaciones principales de stock: "
-#~ "las órdenes de entrega, recepciones, ..."
-
-#~ msgid "Street"
-#~ msgstr "Calle"
-
-#~ msgid "Company Website"
-#~ msgstr "Sitio web compañía"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
diff --git a/addons/base_setup/i18n/et.po b/addons/base_setup/i18n/et.po
index 9e435e38e78..5a097c1a063 100644
--- a/addons/base_setup/i18n/et.po
+++ b/addons/base_setup/i18n/et.po
@@ -1,267 +1,245 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Estonian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-10-10 19:33+0000\n"
-"Last-Translator: Aare Vesi <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Estonian <et@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: 2014-04-22 06:28+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr ""
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Liige"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Loobu"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr ""
+msgid "Client"
+msgstr "Klient"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Klient"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Klient"
-
-#. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Klient"
+msgid "Member"
+msgstr "Liige"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
@@ -270,322 +248,126 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Loobu"
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
-#~ msgid "City"
-#~ msgstr "Linn"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Te võite asuda süsteemi seadistama või üenduda otse andmebaasi kasutades "
-#~ "vaikehäälestust."
-
-#~ msgid "Zip code"
-#~ msgstr "Postiindeks"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Vali profiil"
-
-#~ msgid "Report header"
-#~ msgstr "Aruande päis"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Alusta Seadistamist"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr "Te saate paigaldada veel mooduleid läbi administreerimine menüü."
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Profiil sätestab eelvalitud moodulid erivajadusteks. Need profiilid on "
-#~ "häälestatud, et aidata sul avastada OpenERP-i erinevaid aspekte. See on "
-#~ "kõigest ülevaade, meil on 300+ moodulit saadaval."
-
-#~ msgid "Next"
-#~ msgstr "Edasi"
-
-#~ msgid "E-mail"
-#~ msgstr "E-post"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Teie uus andmebaas on edukalt paigaldatud."
-
-#~ msgid "Profile"
-#~ msgstr "Profiil"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Aruande jalus 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Aruande jalus 2"
-
-#~ msgid "General Information"
-#~ msgstr "Üldine info"
-
-#~ msgid "Street2"
-#~ msgstr "Tänav2"
-
-#~ msgid "Report Information"
-#~ msgstr "Aruande informatsioon"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Määra Emaettevõte"
-
-#~ msgid "Company Name"
-#~ msgstr "Ettevõtte nimi"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "See lause ilmub sinu aruannetes allosas.\n"
-#~ "Me soovitame sul panna panga informatsioon siia:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid "Country"
-#~ msgstr "Riik"
-
-#~ msgid "Setup"
-#~ msgstr "Häälestus"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "See lause ilmub sinu aruannete allosas.\n"
-#~ "Me soovitame sul kirjutada juriidilise lause siia:\n"
-#~ "Veeb: http://openerp.com - Faks: +32.81.73.35.01 - Fortis Pank: 126-2013269-"
-#~ "07"
-
-#~ msgid "Summary"
-#~ msgstr "Kokkuvõte"
-
-#~ msgid "Install"
-#~ msgstr "Paigalda"
-
-#~ msgid "Installation Done"
-#~ msgstr "Paigaldamine teostatud"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "See lause ilmub sinu aruannetes paremal üleval nurgas.\n"
-#~ "Me soovitame sul panna loosung siia:\n"
-#~ "\"Avatud Lähtekoodiga Äritarkvara\"."
-
-#~ msgid "Report Header"
-#~ msgstr "Aruande päis"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Teie logo - Kasutage suurust umbes 450x150 pikselit."
-
-#~ msgid "Currency"
-#~ msgstr "Valuuta"
-
-#~ msgid "Street"
-#~ msgstr "Tänav"
-
-#~ msgid "Use Directly"
-#~ msgstr "Kasuta otse"
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid "Previous"
-#~ msgstr "Eelmine"
-
-#~ msgid "State"
-#~ msgstr "Maakond"
-
-#~ msgid "Base Setup"
-#~ msgstr "Baashäälestus"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Pangakonto number"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Seadistamise edenemine"
-
-#~ msgid "Fed. State"
-#~ msgstr "Maakond"
-
-#~ msgid "Zip Code"
-#~ msgstr "Postiindeks"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Ostuhaldus"
-
-#~ msgid "New Database"
-#~ msgstr "Uus andmebaas"
-
-#~ msgid "Project Management"
-#~ msgstr "Projektihaldus"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Kliendisuhete haldus"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Tootmine"
-
-#~ msgid "Human Resources"
-#~ msgstr "Inimressursid"
-
-#~ msgid "Invoicing"
-#~ msgstr "Arveldamine"
-
-#~ msgid "Sales Management"
-#~ msgstr "Müügihaldus"
-
-#~ msgid "Marketing"
-#~ msgstr "Turundus"
-
-#~ msgid "title"
-#~ msgstr "pealkiri"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Laohaldus"
-
-#~ msgid "Food Industry"
-#~ msgstr "Toidutööstus"
-
-#~ msgid "Image"
-#~ msgstr "Pilt"
-
-#~ msgid "Create"
-#~ msgstr "Loo"
-
-#~ msgid "Import"
-#~ msgstr "Import"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Kasutaja eelistused"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Kasutaja vaikimisi eelistused"
-
-#~ msgid "Extended"
-#~ msgstr "Laiendatud"
-
-#~ msgid "Customers"
-#~ msgstr "Kliendid"
-
-#~ msgid "Interface"
-#~ msgstr "Liides"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Language"
-#~ msgstr "Keel"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
 
-#~ msgid "Create Additional Users"
-#~ msgstr "Loo uus kasutaja"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid "Simplified"
-#~ msgstr "Lihtsustatud"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr ""
diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po
index 002c5d8719f..aeef6851c48 100644
--- a/addons/base_setup/i18n/fa.po
+++ b/addons/base_setup/i18n/fa.po
@@ -1,513 +1,373 @@
 # Persian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-08-03 03:47+0000\n"
-"Last-Translator: avion <nat@sethack.com>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "امکان بارگذاری فایل CSV توسط کاربران"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "اعمال"
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Authentication"
+msgstr "احراز هویت"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr ""
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
+msgstr "CRM"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Authentication"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "لغو"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr ""
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "تنظیمات فروش"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "تنظیم اطلاعات شرکت"
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "تماس ها"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "مشتری"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "ایمیل"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "تنظیمات عمومی"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr ""
+msgid "Guest"
+msgstr "مهمان"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Import / Export"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "مدیریت چند شرکت"
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "عضو"
+
+#. module: base_setup
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr ""
+msgid "Partner"
+msgstr "همکار"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "دسترسی پورتال"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr ""
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "فروش"
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "لغو"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
 msgstr ""
 
-#~ msgid "City"
-#~ msgstr "شهر"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "شما می‌توانید با بکارگیری از سوارسازی پیش‌فرض آغاز به پیکربندی سامانه کنید و "
-#~ "یا یک‌راست به دادگان متصل شوید."
-
-#~ msgid "Zip code"
-#~ msgstr "کد پستی"
-
-#~ msgid "Select a Profile"
-#~ msgstr "یک پروفایل را برگزینید"
-
-#~ msgid "Report header"
-#~ msgstr "سرنویس گزارش"
-
-#~ msgid "Start Configuration"
-#~ msgstr "آغاز پیکربندی"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "شما می‌توانید از طریق منوی راهبری پیمانه‌های بیشتری را در آینده برپاسازی "
-#~ "نمایید."
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "یک پروفایل دارای پیمانه‌های از پیش گزینش شده برای نیازهای خاص است. این "
-#~ "پروفایل‌ها برای این سوار می‌شوند تا به شما برای شناخت بیشتر جنبه‌های متفاوت "
-#~ "اپن ای‌آر‌پی کمک نماید. این تنها یک پیش‌نمایش است، ما بیش از ۳۰۰ پیمانه "
-#~ "آماده داریم."
-
-#~ msgid "Next"
-#~ msgstr "پس"
-
-#~ msgid "E-mail"
-#~ msgstr "ایمیل"
-
-#~ msgid "State"
-#~ msgstr "استان"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "دادگان نو شما بطور کامل برپاسازی گردید."
-
-#~ msgid "Profile"
-#~ msgstr "پروفایل"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "پانویس گزارش ۱"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "پانویس گزارش ۲"
-
-#~ msgid "General Information"
-#~ msgstr "آگهگان عمومی"
-
-#~ msgid "Street2"
-#~ msgstr "خیابان۲"
-
-#~ msgid "Report Information"
-#~ msgstr "آگهگان گزارش"
-
-#~ msgid "Phone"
-#~ msgstr "تلفن"
-
-#~ msgid "Define Main Company"
-#~ msgstr "تعریف شرکت اصلی"
-
-#~ msgid "Company Name"
-#~ msgstr "نام شرکت"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "این جمله در پایین گزارش‌های شما ظاهر خواهد شد.\n"
-#~ "پیشنهاد می‌کنیم آگهگان بانکی را اینجا وارد نمایید:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid "Country"
-#~ msgstr "کشور"
-
-#~ msgid "Setup"
-#~ msgstr "سوارکردن"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "این جمله در پایین گزارش‌های شما ظاهر خواهد شد.\n"
-#~ "پیشنهاد می‌کنیم تا از عبارات قانونی در اینجا بکار ببرید:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Summary"
-#~ msgstr "چکیده"
-
-#~ msgid "Install"
-#~ msgstr "برپایی"
-
-#~ msgid "Installation Done"
-#~ msgstr "برپایی انجام شد"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "این جمله در گوشه بالا سمت راست گزارش‌های شما ظاهر خواهد شد.\n"
-#~ "پیشنهاد می‌کنیم شعار خود را اینجا قرار دهید:\n"
-#~ "\"راهکارهای بازمتن برای تجارت\"."
-
-#~ msgid "Report Header"
-#~ msgstr "سرنویس گزارش"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "نشان شما - اندازه تصویری ۱۵۰×۴۵۰ پیکسل را بکار برید."
-
-#~ msgid "Currency"
-#~ msgstr "ارز"
-
-#~ msgid "Street"
-#~ msgstr "خیابان"
-
-#~ msgid "Use Directly"
-#~ msgstr "بکارگیری آنی"
-
-#~ msgid "Logo"
-#~ msgstr "نشان"
-
-#~ msgid "Base Setup"
-#~ msgstr "سوارکردن پایه"
-
-#~ msgid "Previous"
-#~ msgstr "پیش"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/fi.po b/addons/base_setup/i18n/fi.po
index edf71c708bc..87f91ac6d17 100644
--- a/addons/base_setup/i18n/fi.po
+++ b/addons/base_setup/i18n/fi.po
@@ -1,245 +1,175 @@
 # Finnish translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-07 12:49+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@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: 2014-04-22 06:28+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Sähköpostien integrointi"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Vieras"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Yhteystiedot"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Aktivoi asiakasportaali"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr "Käytä ulkoista todentamista kuten: google, facebook,..."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Salli dokumenttien jako"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
-"OpenERP sallii automaattisesti liidien ja muiden dokumenttien luonnin "
-"saapuvista sähköposteista.\n"
-"                            Voit automaattisesti synkronoida sähköpostit "
-"OpenERP:in kanssa käyttäen normaaleita\n"
-"                            POP/IMAP -tunnuksia, käyttäen suoria "
-"sähköpostiskriptejä sähköpostipalvelimelle tai \n"
-"                            manuaalisesti käynnistäen sähköpostien siirron "
-"OpenERP:iin käyttäen erityistä sinun\n"
-"                            sähköpostiisi tarkoitettua liitännäistä."
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "MYYNTI"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Sallii käyttäjien tuoda tietoa CSV-tiedostoista"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Jäsen"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Tallenna"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Portaaliin pääsy"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Todennus"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Tarjoukset ja myyntitilaukset"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Yleiset asetukset"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Lahjoittaja"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "Sähköposti"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "Asiakkuudenhallinta"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Peruuta"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Kärsivällinen"
+msgid "Client"
+msgstr "Asiakas"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Sallii käyttäjien tuoda tietoa CSV-tiedostoista"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Konfiguroi myynti"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Hallitse useita yrityksiä"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Konfiguroi lähtevien sähköpostien palvelimet"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "Linkki sähköpostiohjelmaan"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Konfiguroi yrityksesi tiedot"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=TIETOKANTASI_NIMI"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Yhteystiedot"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Tuo yhteystiedot automaattisesti LinkedIn:stä"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Salli Thunderbird-liitännäinen"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Asiakas"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Asiakkaan ominaisuudet"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Tuo/Vie"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Myyntiominaisuudet"
-
-#. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Salli Outlook- liitännäinen"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Lahjoittaja"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Voit käyttää tätä ohjattua toimintoa vaihtaaksesi asiakastermejä koko "
-"ohjelmistossa"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "Sähköposti"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Vuokralainen"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Sähköpostien integrointi"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Jaa tai upota mikä tahansa OpenERP:n näyttö."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Yleiset asetukset"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Asiakas"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Kun luot uuden yhteystiedon (henkilö tai yritys), voit tuoda kaikki tiedot "
-"LinkedIn:istä (kuvat, osoitteet, jne.)."
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Tuo yhteystiedot automaattisesti LinkedIn:stä"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
-"Tee työtä moniyritysympäristössä, jossa on asianmukainen tietoturvallinen "
-"pääsynhallinta yritysten välillä.\n"
-"                Tämä asentaa multi_company-moduulin."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Anna asiakkaillesi pääsy heidän dokumentteihinsa."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
-"Julkinen portaali on käytettävissä yhden tietokannan tilassa. Voit \n"
-"                                    käynnistää OpenERP-palvelimen tällä "
-"optiolla"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
-"Löydät lisää valintoja yrityksesi tiedoista: osoitteen ylä- ja "
-"alatunnisteeseen, maksuehdot, jne."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Vieras"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -247,671 +177,210 @@ msgid "How do you call a Customer"
 msgstr "Kuinka soitat asiakkaalle"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
-"Kun lähetät dokumentin asiakkaalle\n"
-"                                    (tarjous, lasku), asiakkaasi) voi "
-"tunnistautua käyttäjäksi\n"
-"                                    saadakseen kaikki hänen dokumenttinsa, "
-"lukeakseen\n"
-"                                    yrityksesi outset, tarkistaakseen hänen "
-"projektinsa jne."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Tuo/Vie"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Asiakas"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"Salli OpenERP:in julkinen osa, jolloin OpenERP:istä tulee julkinen web-"
-"portaali."
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
-"Liitännäinen sallii sinun arkistoida sähköpostit ja niiden liitteet "
-"valittuihin \n"
-"                OpenERP objekteihin. Voit valuta kumppanin tai liidin ja "
-"liittää\n"
-"                kook valitun sähköpostin .eml-tiedostona liitteeksi "
-"valittuun\n"
-"                tietueeseen. Voit luoda dokumentteja liideiksi ja "
-"kumppaneiksi\n"
-"                halutuista sähköposteista. \n"
-"                Tämä asentaa plugin_thunderbird-moduulin."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Kumppani"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Hallitse useita yrityksiä"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Käytä toista sanaa sanoaksesi \"asiakas\""
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Jäsen"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Konfiguroi myynti"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"Outlook-liitännäinen sallii sinun valita objektin MS Outllokista ja voit "
-"lisätä sen sähköpostiisi ja\n"
-"                sähköpostin liitteiksi. Voit valuta kumppanin tai liidiin "
-"liittyvän objektin ja arkistoida \n"
-"                valitut sähköpostit OpenERP:ion liitteineen. \n"
-"                Tämä asentaa plugin_outlook -moduulin."
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Vaihtoehdot"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Aktivoi asiakasportaali"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Kumppani"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
-"tehdään niin.\n"
-"                                    Kun portaali on aktivoitu, niin "
-"kirjaantumissivu vaihtuu julkiseksi web-portaaliksi."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Kärsivällinen"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Salli dokumenttien jako"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Portaaliin pääsy"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(yritysuutiset, työpaikat, yhteystiedot, jne.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Tarjoukset ja myyntitilaukset"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Aktivoi julkinen portaali"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Konfiguroi lähtevien sähköpostien palvelimet"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "MYYNTI"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Integrointi someen"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Myyntiominaisuudet"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Anna asiakkaillesi pääsy heidän dokumentteihinsa."
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Peruuta"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Jaa tai upota mikä tahansa OpenERP:n näyttö."
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Tallenna"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Integrointi someen"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Määrittele terminologiasi"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "tai"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Vuokralainen"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Konfiguroi yrityksesi tiedot"
-
-#~ msgid "Next"
-#~ msgstr "Seuraava"
-
-#~ msgid "E-mail"
-#~ msgstr "Sähköposti"
-
-#~ msgid "Report header"
-#~ msgstr "Raportin ylätunniste"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Valitse profiili"
-
-#~ msgid "City"
-#~ msgstr "Kaupunki"
-
-#~ msgid "Zip code"
-#~ msgstr "Postinumero"
-
-#~ msgid "Profile"
-#~ msgstr "Profiili"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Raportin alatunniste 1"
-
-#~ msgid "Phone"
-#~ msgstr "Puhelin"
-
-#~ msgid "Report Information"
-#~ msgstr "Raportin tiedot"
-
-#~ msgid "General Information"
-#~ msgstr "Yleistiedot"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Raportin alatunniste 2"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Määritä pääyritys"
-
-#~ msgid "Report Header"
-#~ msgstr "Raportin ylätunniste"
-
-#~ msgid "Install"
-#~ msgstr "Asenna"
-
-#~ msgid "Summary"
-#~ msgstr "Yhteenveto"
-
-#~ msgid "Country"
-#~ msgstr "Maa"
-
-#~ msgid "Company Name"
-#~ msgstr "Yrityksen nimi"
-
-#~ msgid "Previous"
-#~ msgstr "Edellinen"
-
-#~ msgid "Currency"
-#~ msgstr "Valuutta"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Logo - Käytä kokoa noin 450x150 pikseliä."
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Profiili sisältää tiettyyn tarpeeseen ennalta määritellyn valikoiman "
-#~ "moduuleja. Näiden profiilien on tarkoitus helpottaa sinua tutustumaan "
-#~ "OpenERP:in eri puoliin. Tässä on kuitenkin vain yleiskatsaus - saatavilla on "
-#~ "yli 300 moduulia."
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Voit aloittaa järjestelmän konfiguroinnin tai ottaa yhteyden tietokantaan "
-#~ "suoraan käyttäen oletusasetuksia."
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr "Voit asentaa myöhemmin lisää moduuleja Hallinto-valikon kautta."
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid "Start Configuration"
-#~ msgstr "Aloita konfigurointi"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Käytä toista sanaa sanoaksesi \"asiakas\""
 
-#~ msgid "State"
-#~ msgstr "Osavaltio"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr "Käytä ulkoista todentamista kuten: google, facebook,..."
 
-#~ msgid "Street2"
-#~ msgstr "Katuosoite2"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Kun luot uuden yhteystiedon (henkilö tai yritys), voit tuoda kaikki tiedot "
+"LinkedIn:istä (kuvat, osoitteet, jne.)."
 
-#~ msgid "Installation Done"
-#~ msgstr "Asennus valmis"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Kun lähetät dokumentin asiakkaalle\n"
+"                                    (tarjous, lasku), asiakkaasi) voi "
+"tunnistautua käyttäjäksi\n"
+"                                    saadakseen kaikki hänen dokumenttinsa, "
+"lukeakseen\n"
+"                                    yrityksesi outset, tarkistaakseen hänen "
+"projektinsa jne."
 
-#~ msgid "Use Directly"
-#~ msgstr "Käytä suoraan"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Street"
-#~ msgstr "Katuosoite"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Voit käyttää tätä ohjattua toimintoa vaihtaaksesi asiakastermejä koko "
+"ohjelmistossa"
 
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Tämä lause tulee raporttien oikeaan ylänurkkaan.\n"
-#~ "Suosittelemme laittamaan iskulauseesi tähän:\n"
-#~ "\"Avoimen lähdekoodin yritysratkaisuja\"."
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Löydät lisää valintoja yrityksesi tiedoista: osoitteen ylä- ja "
+"alatunnisteeseen, maksuehdot, jne."
 
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Tämä lause tulee raporttien loppuun.\n"
-#~ "Suosittelemme laittamaan pankki- ja tilitiedot tähän:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Uusi tietokanta on nyt kokonaan asennettu."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Tämä lauseke tulee näkymään raporttiesi lopussa.\n"
-#~ "Suosittelemme laittamaan tähän esim. seuraavia tietoja:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Setup"
-#~ msgstr "Asetukset"
-
-#~ msgid "Base Setup"
-#~ msgstr "Perusasetukset"
-
-#~ msgid "Human Resources"
-#~ msgstr "Henkilöstön hallinta"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Myyntipiste"
-
-#~ msgid "Associations"
-#~ msgstr "Assosiaatiot"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Tietokantasi on nyt luotu."
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Auttaa sinua hallitsemaan valmistusprosessia ja luomaan raportteja näistä "
-#~ "prosesseista."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Auttaa sinua hallitsemaan markkinointikampanjoita vaihe vaiheelta."
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Seuraavat käyttäjät on asennettu: \n"
-
-#~ msgid "Invoicing"
-#~ msgstr "Laskutus"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Pankkitilin numero"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Lisätyökalut"
-
-#~ msgid "Sales Management"
-#~ msgstr "Myynninhallinta"
-
-#~ msgid "Company"
-#~ msgstr "Yritys"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Hauttaa sinua seuraamaan ja hallitsemaan asiakaskontakteja kuten tarpeita, "
-#~ "pyyntöjä ja tapauksia. Voi lähettää automaattisesti muistututksia, "
-#~ "eskalointipyyntöjä tai käynnistää yrityskohtaisia toimintoja "
-#~ "vakiotapahtumien pohjalta."
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Konfiguraation eteneminen"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Voit aloittaa järjestelmän konfiguroinnin suoraan tietokantaan pääkäyttäjänä."
-
-#~ msgid "Marketing"
-#~ msgstr "Markkinointi"
-
-#~ msgid "Fed. State"
-#~ msgstr "Osavaltio"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Auttaa sinua hoitamaan kirjanpidolliset tarpeet, jos et ole kirjanpitäjä, "
-#~ "suosittelemme että asennat vain laskutuksen "
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Kehittynyt raportointi"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Antaa sinun asentaa monia kiinnostavia mutta ei välttämättömiä työkaluja "
-#~ "kuten kysely, lounas, idealaatikko."
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Ohita asetusvelhot"
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Mahdollistaa laskujen laadinnan ja maksujen seurannan. On helpompi versio "
-#~ "kirjanpitomoduulista päälliköille jotka eivät ole kirjanpitäjiä."
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Auttaa sinua hallitsemaan henkilöstöresurssejasi määrittelemällä "
-#~ "henkilöstörakenteen, luomalla työlistat, seuraamalla läsnäoloa jne."
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Auttaa sinua hallitsemaan projektejasi ja tehtäviäsi seuraamalla niitä, "
-#~ "luomalla suunnitelmia yms."
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "Yritystietojasi käytetään personoimaan OpenERP dokumenttejä kuten laskuja, "
-#~ "myyntitilauksia yms."
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Osaamisenhallinta"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Asentaa esivalitun sarjan OpenERP ohjelmia, joka auttaa sinua hallitsemaan "
-#~ "teollisuudenalaasi."
-
-#~ msgid "title"
-#~ msgstr "otsikko"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Yrityksen konfigurointi"
-
-#~ msgid "Street 2"
-#~ msgstr "Katuosoite 2"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Auttaa sinua hallitsemaan ostoon liittyviä prosesseja kuten esim. "
-#~ "tarjouspyyntöjä, toimittajien laskuja yms."
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Mahdollistaa lisäosien asentamisen, näiden tarkoituksena on tiedonjako "
-#~ "henkilöstön kanssa ja henkilöstön kesken."
-
-#~ msgid "Zip Code"
-#~ msgstr "Postinumero"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Huutokauppatalot"
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Valitse ohjelmat jotka haluat kuuluvan järjestelmääsi. Jos et ole varma "
-#~ "tarpeistasi vielä, voit lisätä niitä helposti myöhemminkin."
-
-#~ msgid "Purchase Management"
-#~ msgstr "Ostojen hallinta"
-
-#~ msgid "New Database"
-#~ msgstr "Uusi tietokanta"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Asiakkuuden hallinta"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Varastonhallinta"
-
-#~ msgid "Project Management"
-#~ msgstr "Projektinhallinta"
-
-#~ msgid "Installed Users"
-#~ msgstr "Asennetut käyttäjät"
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Auttaa sinua saamaan mahdollisimman paljon tulosta myyntipisteestäsi "
-#~ "käyttäen nopeaa myynnin kirjausta, yksinkertaistettua maksunkoodausta, "
-#~ "automaattista keräilylistan luontia jne."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Asentaa esivalitun ryhmän OpenERP ohjelmia auttaakseen hallitsemaan "
-#~ "huutokauppojasi ja niihin liittyviä bisnes prosesseja."
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Määrittele yrityksesi tiedot"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Valmistava"
-
-#~ msgid "Food Industry"
-#~ msgstr "Ruokateollisuus"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Asenna tietyn toimialan ohjelmistot"
-
-#~ msgid "Company Website"
-#~ msgstr "Yrityksen nettisivut"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "esim. http://openerp.com"
-
-#~ msgid "Install Applications"
-#~ msgstr "Asenna ohjelmat"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Tietoja uudesta tietokannastasi"
-
-#~ msgid "Image"
-#~ msgstr "Kuva"
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Mahdollistaa lisätyökalujen asentamiksen OpenERP raporttien luomisen "
-#~ "helpottamiseksi."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Asentaa perussarjan OpenERP ohjelmia jotka auttavat sinua hallitsemaan "
-#~ "yhdistystäsi tehokkaammin."
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Auttaa sinua hallitsemaan varastoa ja varaston päätoimenpiteitä, "
-#~ "toimitusmääräyksiä, vastaanottoja yms."
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "Auttaa sinua hallitsemaan tarjouksia, myyntitilauksia ja laskuja"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Kirjanpito ja talous"
-
-#~ msgid "Display Tips"
-#~ msgstr "Näytä vihjeet"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Aseta yrityksen ylä ja alatunniste"
-
-#~ msgid "Create"
-#~ msgstr "Luo"
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "Aseta uuden käyttäjän oletusaikavyöhyke, jota käytetään "
-#~ "aikavyöhykemuunnoksiin palvelimen ja työaseman välissä"
-
-#~ msgid "Import"
-#~ msgstr "Tuo"
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "Synkronoi Google kontaktit"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Määrittele käyttäjän asetukset"
-
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "Luo tai tuo asiakkaita ja heiden kontaktejaan tältä lomakkeelta tai voit "
-#~ "tuoda olemassaolevat kumppanit CSV tiedostona \"tuo tiedot\" velhon avulla"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Määrittele käyttäjien oletusasetukset"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "Jos käytät OpenERP järjestelmää ensimmäsen kerran, suosittelemme että "
-#~ "valitset yksinkertaisen käyttöliittymän, jossa on vähemmän ominaisuuksia "
-#~ "mutta se on helppokäyttöisempi. Voit vaihtaa liittymää myöhemmin "
-#~ "asetuksistasi."
-
-#~ msgid "Extended"
-#~ msgstr "Laajennettu"
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Syötä yrityksesi tiedot (osoite, logi, tilitiedot) jotka tulostetaan "
-#~ "raportteihin. Voit klikata nappia 'esikatesele tunnisteet' tarkastaaksesi "
-#~ "ylä/alatunnisteen pdf dokumentissa."
-
-#~ msgid "Customers"
-#~ msgstr "Asiakkaat"
-
-#~ msgid "Interface"
-#~ msgstr "Liittymä"
-
-#~ msgid "Language"
-#~ msgstr "Kieli"
-
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Asettaa oletuskielen käyttöliittymälle, kun käyttöliittymän käännökset ovat "
-#~ "saatavilla. Jos haluat lisätä uuden kielen, voit tehdä sen 'Lataa virallinen "
-#~ "käännös' vleholla 'Asetukset' valikosta."
-
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "Tämä asettaa oletusasetukset uusille käyttäjille ja päivittää "
-#~ "olemassaolevat. Käyttäjät voivat myöhemmin vaihtaa näitä arvoja haluamikseen "
-#~ "käyttäjänasetukset lomakkeella."
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Luo tai tuo asiakkaita"
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Luo lisää käyttäjiä"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Valitse tämä laatikko, jos haluat aina näyttää vihjeet kaikille "
-#~ "valikkotoiminnoille"
-
-#~ msgid "Timezone"
-#~ msgstr "Aikavyöhyke"
-
-#~ msgid "Simplified"
-#~ msgstr "Yksinkertaistettu"
-
-#~ msgid "Import or create customers"
-#~ msgstr "Tuo tai luo asiakkaita"
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "Synkronoi Google kontaktit"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index 83954661200..fd88a11e9b5 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/i18n/fr.po
@@ -1,244 +1,175 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# French translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-03 13:52+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@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: 2014-04-22 06:28+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Intégration des courriels"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Invité"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Contacts"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Activer le portail client"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
-"Utiliser une identification fournie par un tiers (connexion avec Google, "
-"Facebook, etc.)."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Autoriser le partage de documents"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
-"OpenERP peut créer automatiquement des pistes (ou d'autres documents) depuis "
-"les courriels entrants.\n"
-"Vous pouvez synchroniser vos courriels avec OpenERP via vos comptes POP/IMAP "
-"habituels, via un script d'intégration directe des courriels depuis votre "
-"serveur, ou bien en ajoutant manuellement les courriels dans OpenERP depuis "
-"un greffon dans votre application de courriel."
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "VENTE"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Autoriser l'import de fichiers CSV par les utilisateurs"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Membre"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Appliquer"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Accès au portail"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Authentification"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Devis et bons de commande"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Paramètres généraux"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Donateur"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "Courriel"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Annuler"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Patient"
+msgid "Client"
+msgstr "Client"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Autoriser l'import de fichiers CSV par les utilisateurs"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Paramétrer les ventes"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Gérer plusieurs sociétés"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Paramétrer les serveurs de courriels sortants"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "Sur le client de messagerie"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Configurer les données de la société"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=VOTRE_BASE_DE_DONNEES"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Contacts"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Récupérer les contacts automatiquement de LinkedIn"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Activer le greffon Thunderbird"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Client"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Fonctions client"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Import / Export"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Fonctions de vente"
-
-#. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Activer le greffon Outlook"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Donateur"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Vous pouvez lancer cet assistant pour modifier dans toute l'application  la "
-"terminologie que vous souhaitez utiliser pour les clients."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "Courriel"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Résident"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Intégration des courriels"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Partagez ou embarquez n'importe quel écran d'OpenERP."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Paramètres généraux"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Client"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Quand vous créerez un nouveau contact (personne ou société), vous pourrez "
-"importer ses données depuis LinkedIn (photos, adresse, etc.)."
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Récupérer les contacts automatiquement de LinkedIn"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
-"Travail en environnement multi-sociétés, avec les restrictions de sécurité "
-"appropriées entre les sociétés.\n"
-"Ceci installe le module multi_company."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Donner à vos clients l'accès à leur documents"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
-"Le portail public n'est accessible qu'en mode base de données unique. Vous "
-"pouvez\n"
-"                                    lancer le serveur OpenERP avec l'option"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
-"D'autres options sont disponibles dans les détails de votre société : "
-"adresse pour les en-têtes et pieds de page, textes de relances de paiements, "
-"etc."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Invité"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -246,743 +177,213 @@ msgid "How do you call a Customer"
 msgstr "Comment appelez-vous un client"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
-"Lorsque vous envoyez un document à un client\n"
-"                                    (devis, facture), votre client pourra\n"
-"                                     s'inscrire pour obtenir tous ses "
-"documents, \n"
-"                                     lire les nouvelles de la société, "
-"consulter ses projets, \n"
-"                                    etc."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Import / Export"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Client"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"Activer la partie publique d'OpenERP : OpenERP devient un site web public."
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
-"Le greffon vous permet d'archiver les courriels et les pièces-jointes avec "
-"les objets OpenERP correspondants. Sélectionnez un partenaire ou une piste "
-"CRM, et attachez le fichier .eml avec le courriel qui correspond. Vous "
-"pouvez créer des documents pour les pistes CRM ou les partenaires depuis les "
-"courriels sélectionnés.\n"
-"Ceci installe le module plugin_thunderbird."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Partenaire"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Gérer plusieurs sociétés"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Utiliser un autre mot pour dire \"client\""
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Membre"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Paramétrer les ventes"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"Le greffon Outlook vous permet de sélectionner un objet OpenERP pour lui "
-"attacher un courriel et ses pièces-jointes directement depuis MS Outlook. "
-"Vous pouvez sélectionner un partenaire ou une piste CRM, et archiver le "
-"courriel sélectionné dans OpenERP.\n"
-"Ceci installe le module plugin_outlook."
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Options"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Activer le portail client"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Partenaire"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
-"pour cela.\n"
-"                                    Une fois activée, la page "
-"d'authentification sera remplacée par la page Web publique."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Patient"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Autoriser le partage de documents"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Accès au portail"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(actualités de la société, emplois, formulaire de contact, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Devis et bons de commande"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Activer le portail public"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Paramétrer les serveurs de courriels sortants"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "VENTE"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Intégration aux réseaux sociaux"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Fonctions de vente"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Donner à vos clients l'accès à leur documents"
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Annuler"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Partagez ou embarquez n'importe quel écran d'OpenERP."
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Appliquer"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Intégration aux réseaux sociaux"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Précisez votre terminologie"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "ou"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Résident"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Configurer les données de la société"
-
-#~ msgid "City"
-#~ msgstr "Ville"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Vous pouvez commencer à configurer le système ou vous connecter directement "
-#~ "à la base de données en utilisant la configuration par défaut."
-
-#~ msgid "Zip code"
-#~ msgstr "Code postal"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Sélectionnez un profile"
-
-#~ msgid "Report header"
-#~ msgstr "En-tête de rapport"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Commencer la configuration"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Vous pourrez installer d'autres modules plus tard via le menu "
-#~ "d'Administration."
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Un profile définit une présélection de modules pour des besoins spécifiques. "
-#~ "Ces profiles ont été configurés pour vous aider à découvrir les différents "
-#~ "aspects d'OpenERP. C'est juste un aperçu, nous avons plus de 300 modules "
-#~ "disponibles."
-
-#~ msgid "Next"
-#~ msgstr "Suivant"
-
-#~ msgid "State"
-#~ msgstr "Etat"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Votre nouvelle base de données est maintenant totalement installée"
-
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Pied de page 1 de rapport"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Pied de page 2 de rapport"
-
-#~ msgid "General Information"
-#~ msgstr "Information générale"
-
-#~ msgid "Street2"
-#~ msgstr "Rue (suite)"
-
-#~ msgid "Report Information"
-#~ msgstr "Rapport d'information"
-
-#~ msgid "Phone"
-#~ msgstr "Téléphone"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Définir la société principale"
-
-#~ msgid "Company Name"
-#~ msgstr "Nom de la société"
-
-#~ msgid "Country"
-#~ msgstr "Pays"
-
-#~ msgid "Setup"
-#~ msgstr "Installation"
-
-#~ msgid "Summary"
-#~ msgstr "Résumé"
-
-#~ msgid "Install"
-#~ msgstr "Installer"
-
-#~ msgid "Installation Done"
-#~ msgstr "Installation terminée"
-
-#~ msgid "Report Header"
-#~ msgstr "En-tête de rapport"
-
-#~ msgid "Currency"
-#~ msgstr "Devise"
-
-#~ msgid "Street"
-#~ msgstr "Rue"
-
-#~ msgid "Use Directly"
-#~ msgstr "Utiliser directement"
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid "Previous"
-#~ msgstr "Précédent"
-
-#~ msgid "Base Setup"
-#~ msgstr "Module pour la configuration de base"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Vous aide à gérer vos processus de fabrication et à générer des rapports sur "
-#~ "ces processus."
-
-#~ msgid "Bank Account No"
-#~ msgstr "N° de compte bancaire"
-
-#~ msgid "Invoicing"
-#~ msgstr "Facturation"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Outils supplémentaires"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Avancement de la configuration"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Vous pouvez commencer à configurer le système, ou vous connecter directement "
-#~ "à la base de données en tant qu'administrateur."
-
-#~ msgid "Point of Sales"
-#~ msgstr "Point de vente"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Votre base de données est maintenant créée."
-
-#~ msgid "Associations"
-#~ msgstr "Associations"
-
-#~ msgid "Sales Management"
-#~ msgstr "Gestion des ventes"
-
-#~ msgid "Company"
-#~ msgstr "Société"
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Gestion des connaissances"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Vous aide à installer de nombreux outils intéressants, mais non "
-#~ "indispensables, comme par exemple les sondages, les déjeuners ou les boîtes "
-#~ "à idées."
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Vous aide à gérer vos ressources humaines en saisissant la structure de "
-#~ "votre organisation, en générant des fiches de travail, en suivant les "
-#~ "présences, et bien d'autres choses."
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Vous aide à gérer vos projets et tâches, en assurant leur suivi, en générant "
-#~ "des plannings, etc..."
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Utiliser un autre mot pour dire \"client\""
 
-#~ msgid "Company Configuration"
-#~ msgstr "Configuration de la société"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
+"Utiliser une identification fournie par un tiers (connexion avec Google, "
+"Facebook, etc.)."
 
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Quand vous créerez un nouveau contact (personne ou société), vous pourrez "
+"importer ses données depuis LinkedIn (photos, adresse, etc.)."
 
-#~ msgid "Zip Code"
-#~ msgstr "Code postal"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Lorsque vous envoyez un document à un client\n"
+"                                    (devis, facture), votre client pourra\n"
+"                                     s'inscrire pour obtenir tous ses "
+"documents, \n"
+"                                     lire les nouvelles de la société, "
+"consulter ses projets, \n"
+"                                    etc."
 
-#~ msgid "Purchase Management"
-#~ msgstr "Gestion des achats"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "New Database"
-#~ msgstr "Nouvelle base de données"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Vous pouvez lancer cet assistant pour modifier dans toute l'application  la "
+"terminologie que vous souhaitez utiliser pour les clients."
 
-#~ msgid "Installed Users"
-#~ msgstr "Utilisateurs installés"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Cette phrase apparaîtra en pied de vos rapports.\n"
-#~ "Nous vous suggérons d'écrire vos informations légales ici.\n"
-#~ "Site: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Image"
-#~ msgstr "Image"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Vous aide à tirer le maximum de vos points de ventes grâce à une saisie "
-#~ "rapide des ventes, un mode de paiement simplifié, une génération automatique "
-#~ "des bons de préparation, et bien d'autres choses."
-
-#~ msgid "Fed. State"
-#~ msgstr "État fédéral"
-
-#~ msgid "Human Resources"
-#~ msgstr "Ressources humaines"
-
-#~ msgid "title"
-#~ msgstr "titre"
-
-#~ msgid "Street 2"
-#~ msgstr "Rue 2"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Comptabilité & finance"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Informations sur la nouvelle base de données"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Gestion de la relation client (CRM)"
-
-#~ msgid "Project Management"
-#~ msgstr "Gestion de projets"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Gestion de production"
-
-#~ msgid "Food Industry"
-#~ msgstr "Industrie agroalimentaire"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Exemple : http://openerp.com"
-
-#~ msgid "Company Website"
-#~ msgstr "Site web de la société"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Vous aide à gérer vos besoins comptables. Si vous n'êtes pas comptable, nous "
-#~ "vous suggérons d'installer uniquement la facturation. "
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Installe un ensemble d'applications d'OpenERP pré-sélectionnées qui vont "
-#~ "vous aider à gérer votre industrie."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Vous aide à gérer vos campagnes marketing pas à pas"
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Vous permet de créer les factures et de suivre les règlements. C'est une "
-#~ "version simplifiée du module comptable à destination des responsables qui ne "
-#~ "sont pas des comptables."
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Vous aide à gérer vos processus d'achats, tels que les appels d'offres, les "
-#~ "factures fournisseurs, etc..."
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Vous permet d'installer des extensions visant le partage des connaissances "
-#~ "entre les employés."
-
-#~ msgid "Auction Houses"
-#~ msgstr "Maisons de ventes aux enchères"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Cette phrase apparaîtra en pied du rapport.\n"
-#~ "Nous vous suggérons de mettre vos informations bancaires ici : \n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - TVA: BE0477.472.701"
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Vous permet d'installer différents outils destinés à simplifier et à "
-#~ "améliorer la création de rapports dans OpenERP."
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "Vous aide à gérer vos devis, commandes et factures"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Cette phrase apparaîtra en haut à droite de vos rapports.\n"
-#~ "Nous vous suggérons d'y apposer votre slogan :\n"
-#~ "\"Open Source Business Solutions\"."
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Vous aide à gérer et à suivre vos relations avec vos clients, comme les "
-#~ "pistes, les demandes ou les incidents. Permet d'envoyer automatiquement des "
-#~ "rappels, d'escalader des demandes ou de déclencher des actions spécifiques "
-#~ "en fonction d'évènements standard."
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Passer l'étape des assistants de configuration"
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Choisir les applications que vous voulez mettre en oeuvre dans le système. "
-#~ "Si vous n'êtes pas sûr de vos besoins précis à ce stade, vous pourrez "
-#~ "facilement les installer plus tard."
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Ce module implémente un système de configuration qui aide l'utilisateur\n"
-#~ "    à configurer le système à l'installation d'une nouvelle base de donnée.\n"
-#~ "\n"
-#~ "    Il vous permet de sélectionner parmi une liste de profils à installer :\n"
-#~ "    * Profil minimal\n"
-#~ "    * Comptabilité uniquement\n"
-#~ "    * Sociétés de services\n"
-#~ "    * Sociétés manufacturières\n"
-#~ "\n"
-#~ "    Il vous aide à configurer votre société, l'entête et le pied de page, la "
-#~ "charte \n"
-#~ "    comptable à installer et la langue.\n"
-#~ "    "
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Les utilisateurs suivants ont été installés : \n"
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "La description de votre société personnalisera les documents générés par "
-#~ "OpenERP (factures, bons de commande, etc.)"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Gestion d'entrepôts"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Votre logo - Utilisez une taille approximative de 450x150 pixels."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Installe un ensemble d'applications OpenERP présélectionnées pour vous aider "
-#~ "à gérer efficacement votre association."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Installe un ensemble d'applications d'OpenERP présélectionnées pour la "
-#~ "gestion des ventes aux enchères, ainsi que les processus qui s'y rattachent."
-
-#~ msgid "E-mail"
-#~ msgstr "Courriel"
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Vous aide à gérer votre inventaire et les principales opérations de stocks : "
-#~ "bon de livraison, réceptions, etc..."
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Rapports avancés"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Installez des applications spécifiques"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Configurez les informations de la société"
-
-#~ msgid "Install Applications"
-#~ msgstr "Installez les applications"
-
-#~ msgid "Display Tips"
-#~ msgstr "Afficher les astuces"
-
-#~ msgid "Create"
-#~ msgstr "Créer"
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "Définir le fuseau horaire par défaut pour un nouvel utilisateur, utilisé "
-#~ "pour effectuer des conversions de fuseau horaire entre le serveur et le "
-#~ "client."
-
-#~ msgid "Import"
-#~ msgstr "Importer"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "Si vous utilisez OpenERP pour la première fois, nous vous encourageons à "
-#~ "utiliser l'interface simplifiée, qui a moins de fonctionnalités mais qui est "
-#~ "plus facile. Vous pourrez basculer plus tard via les préférences de "
-#~ "l'utilisateur."
-
-#~ msgid "Customers"
-#~ msgstr "Clients"
-
-#~ msgid "Language"
-#~ msgstr "Langue"
-
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "Créez ou importez manuellement les clients et leurs contacts à partir de ce "
-#~ "formulaire. Vous pouvez aussi les importer avec des fichiers au format CSV "
-#~ "avec le bouton \"Importer des données\""
-
-#~ msgid "For Import Saleforce"
-#~ msgstr "Pour importer à partir de Saleforce"
-
-#~ msgid "For Quickbooks Ippids"
-#~ msgstr "Pour Quickbooks Ippids"
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Complétez avec les informations de votre société (adresse, logo, comptes "
-#~ "bancaires) pour qu'elles figurent sur vos états. Vous pouvez cliquer sur le "
-#~ "bouton 'Prévisualiser l'entête' pour vérifier les entêtes et pieds de pages "
-#~ "de vos documents PDF."
-
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "Cela va régler les préférences par défaut pour les nouveaux utilisateurs et "
-#~ "mettre à jour toutes celles déjà existantes. Ensuite, les utilisateurs "
-#~ "pourront changer ces valeurs à partir de leurs propres préférences."
-
-#~ msgid "Quickbooks Ippids"
-#~ msgstr "Quickbooks Ippids"
-
-#~ msgid "Import or create customers"
-#~ msgstr "Créer ou importer des clients"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Créer ou importer des clients"
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "Pour synchroniser des contacts Google"
-
-#~ msgid "Extended"
-#~ msgstr "Étendue"
-
-#~ msgid "Interface"
-#~ msgstr "Interface"
-
-#~ msgid "Timezone"
-#~ msgstr "Fuseau horaire"
-
-#~ msgid "Simplified"
-#~ msgstr "Simplifiée"
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "Synchroniser les contacts Google"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Définissez les préférences des utilisateurs"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Définir les préférences par défaut des utilisateurs"
-
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Paramétrez la langue par défaut de toute l'interface utilisateurs si les "
-#~ "traductions sont disponibles. Si vous souhaitez ajouter une nouvelle langue, "
-#~ "vous pouvez le faire à partir du menu configuration puis \"Charger une "
-#~ "traduction officielle\"."
-
-#~ msgid "Import Saleforce"
-#~ msgstr "Importer de Saleforce"
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Ajouter de nouveaux utilisateurs"
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "Importer de Sugarcrm"
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "Pour importer de Sugarcrm"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Définir l'en-tête et le pied de page de la société"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"D'autres options sont disponibles dans les détails de votre société : "
+"adresse pour les en-têtes et pieds de page, textes de relances de paiements, "
+"etc."
 
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
-
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
-
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Décochez cette case si vous ne souhaitez plus afficher les astuces sur "
-#~ "chaque action du menu"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/gl.po b/addons/base_setup/i18n/gl.po
index 1a192f81535..12e7eff2686 100644
--- a/addons/base_setup/i18n/gl.po
+++ b/addons/base_setup/i18n/gl.po
@@ -1,513 +1,373 @@
 # Galician translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2009-09-08 15:27+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@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: 2014-04-22 06:28+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Authentication"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Cancelar"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Partner"
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Cancelar"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
-#~ msgid "Next"
-#~ msgstr "Seguinte"
-
-#~ msgid "E-mail"
-#~ msgstr "Correo-e"
-
-#~ msgid "Report header"
-#~ msgstr "Título do informe"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Seleccione un perfil"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Pode comezar configurando o sistema ou conectándose directamente á base de "
-#~ "datos usando a configuración predefinida."
-
-#~ msgid "City"
-#~ msgstr "Cidade"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Poderá instalar máis módulos posteriormente a través do menú de "
-#~ "administración"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Comezar configuración"
-
-#~ msgid "Zip code"
-#~ msgstr "CP"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "A súa nova base de datos está completamente instalada."
-
-#~ msgid "Profile"
-#~ msgstr "Perfil"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Pé de páxina 1 do informe"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Pé de páxina 2 do informe"
-
-#~ msgid "State"
-#~ msgstr "Estado"
-
-#~ msgid "Phone"
-#~ msgstr "Teléfono"
-
-#~ msgid "Street2"
-#~ msgstr "Rúa2"
-
-#~ msgid "Report Information"
-#~ msgstr "Información do informe"
-
-#~ msgid "General Information"
-#~ msgstr "Información xeral"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Defina a compañía principal"
-
-#~ msgid "Report Header"
-#~ msgstr "Título do informe"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Esta frase aparecerá ao final dos seus informes.\n"
-#~ "Suxerímoslle que escriba as frases de contidos legais aquí:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Banco Fortis: 126-2013269-07"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Esta frase aparecerá na esquina superior dereita dos seus informes.\n"
-#~ "Suxerímoslle que escriba un slogan aquí:\n"
-#~ "\"Solucións empresariais en software libre\"."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Esta frase aparecerá ao final dos seus informes.\n"
-#~ "Suxerímoslle que poña a súa información bancaria aquí:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid "Company Name"
-#~ msgstr "Nome da compañía"
-
-#~ msgid "Install"
-#~ msgstr "Instalar"
-
-#~ msgid "Summary"
-#~ msgstr "Resumo"
-
-#~ msgid "Setup"
-#~ msgstr "Configuración"
-
-#~ msgid "Country"
-#~ msgstr "País"
-
-#~ msgid "Base Setup"
-#~ msgstr "Instalación base"
-
-#~ msgid "Use Directly"
-#~ msgstr "Usar directamente"
-
-#~ msgid "Previous"
-#~ msgstr "Anterior"
-
-#~ msgid "Currency"
-#~ msgstr "Moeda"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "O seu logotipo - Use unha imaxe que teña sobre 450x150 píxels."
-
-#~ msgid "Logo"
-#~ msgstr "Logotipo"
-
-#~ msgid "Street"
-#~ msgstr "Rúa"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
 
-#~ msgid "Installation Done"
-#~ msgstr "Instalación concluída"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Un perfil estabelece unha preselección de módulos para unhas necesidades "
-#~ "específicas. Estes perfís foron creados para axudalo a descubrir os "
-#~ "diferentes aspectos de OpenERP. Isto só é un punto de partida, temos máis de "
-#~ "300 módulos dispoñíbeis."
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr ""
diff --git a/addons/base_setup/i18n/gu.po b/addons/base_setup/i18n/gu.po
index 7b65c253275..15cef40ea67 100644
--- a/addons/base_setup/i18n/gu.po
+++ b/addons/base_setup/i18n/gu.po
@@ -1,268 +1,245 @@
 # Gujarati translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-05-31 11:08+0000\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gujarati <gu@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: 2014-04-22 06:28+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "અતિથિ"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "સભ્ય"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Donor"
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr ""
+msgid "Guest"
+msgstr "અતિથિ"
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "સભ્ય"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
@@ -271,127 +248,126 @@ msgid "Partner"
 msgstr "ભાગીદાર"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
-#~ msgid "Create"
-#~ msgstr "બનાવો"
-
-#~ msgid "Import"
-#~ msgstr "આયાત કરો"
-
-#~ msgid "Customers"
-#~ msgstr "ગ્રાહકો"
-
-#~ msgid "Extended"
-#~ msgstr "વિસ્તૃત"
-
-#~ msgid "Interface"
-#~ msgstr "ઇન્ટરફેસ"
-
-#~ msgid "Language"
-#~ msgstr "ભાષા"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Image"
-#~ msgstr "ચિત્ર"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
 
-#~ msgid "Timezone"
-#~ msgstr "ટાઈમઝોન"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid "Simplified"
-#~ msgstr "સરળ"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr ""
diff --git a/addons/base_setup/i18n/he.po b/addons/base_setup/i18n/he.po
index 5b7a4b7259b..3d1faadc5d9 100644
--- a/addons/base_setup/i18n/he.po
+++ b/addons/base_setup/i18n/he.po
@@ -1,370 +1,373 @@
 # Hebrew translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-12-30 18:38+0000\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hebrew <he@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: 2014-04-22 06:28+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "אורח"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "הפעל פורטל לקוחות"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "אנשי קשר"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "התר שיתוף מסמכים"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "התר למשתמשים לייבא נתונים מקובץ CSV"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "החל"
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "חבר"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "גישה לפורטל"
-
-#. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "אימות"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "הצעות מחיר והזמנות רכש"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "הגדרות כלליות"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "תורם"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "דוא״ל"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "בטל"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr ""
+msgid "Client"
+msgstr "לקוח"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "התר למשתמשים לייבא נתונים מקובץ CSV"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "הגדרות מכירות"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "נהל חברות מרובות"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "בשרת הדואר"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "הגדירו מידע על החברה שלכם"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "אנשי קשר"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "לקוח"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "פיצ'רים ללקוחות"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "יבוא /יצוא"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "תורם"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "פיצ'רים של מכירות"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "דוא״ל"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "הגדרות כלליות"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "לקוח"
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "אפשר ללקוחות שלך גישה למסמכים שלהם."
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "אורח"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
-msgstr ""
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr "כיצד אתם מכנים לקוח"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
-msgstr "כיצד אתם מכנים לקוח"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "יבוא /יצוא"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "נהל חברות מרובות"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "לקוח"
+msgid "Member"
+msgstr "חבר"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
+msgstr "אפשרויות"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
 msgstr "שותף"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "השתמשו במילה אחרת עבור \"לקוח\""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "הגדרות מכירות"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "גישה לפורטל"
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "הצעות מחיר והזמנות רכש"
+
+#. module: base_setup
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
-msgstr "אפשרויות"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "הפעל פורטל לקוחות"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "פיצ'רים של מכירות"
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "התר שיתוף מסמכים"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "הפעל פורטל ציבורי"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
+msgstr "הגדירו מונחים שלכם"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "אפשר ללקוחות שלך גישה למסמכים שלהם."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "בטל"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "השתמשו במילה אחרת עבור \"לקוח\""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "החל"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
-msgstr "הגדירו מונחים שלכם"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "או"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "הגדירו מידע על החברה שלכם"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr ""
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index 0c056231412..87479f00c76 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.po
@@ -1,236 +1,175 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * base_setup
-# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
+# Croatian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-17 20:31+0000\n"
-"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
-"Language-Team: Vinteh\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Croatian <hr@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
-"Language: hr\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Integracija email-a"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Gost"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Kontakti"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr ""
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Aktiviraj portal za partnere"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
-"Koristi vanjske davatelje usluga autentikacije, prijava s računom google, "
-"facebook, ..."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Dozvoli dijeljenje dokumenata"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "Prodaja"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Dozvoli uvoz podataka iz CSV datoteka"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Član"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Primjeni"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Pristup portalu"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Autentifikacija"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Ponude i prodajni nalozi"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Opće postavke"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Donator"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "E-mail"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Pacijent"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Odustani"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Dozvoli uvoz podataka iz CSV datoteka"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr "Klijent"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Više organizacija (tvrtki)"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Postavke prodaje"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "Na e-mail klijentu"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Podesi odlazne email servere"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=VASA_BAZA"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Upišite podatke o Vašoj organizaciji (tvrtci)"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Automatski učitaj kontakte sa LinkedIn-a"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Kontakti"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Omogući Thunderbird plug-in"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Kupac"
+
+#. module: base_setup
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Značajke kupca"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Uvoz / Izvoz"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Donator"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Značajke prodaje"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "E-mail"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Omogući Outlook plug-in"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Integracija email-a"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Opće postavke"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Dijeli ili uklopi bilokoji ekran openerpa"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Kupac"
-
-#. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Kada otvarate novi kontakt (kupac ili tvrtka), dobivate mogućnost učitavanja "
-"svih podataka o njemu sa LinkedIna (slike, adrese isl.)."
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Automatski učitaj kontakte sa LinkedIn-a"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
-"Rad u okolini sa više organzacija, pa prikladnim osiguranjem pristupa između "
-"organizacija.\n"
-"                                                             ovo instalira "
-"modul multi_company."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Dozvolite svojim partnerima pristup njihovim dokumentima."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
-"Javni portal je dostupan jedino ako ste u načinu rada sa samo jednom bazom,  "
-"možete\n"
-"                                                                             "
-"   pokrenuti OpenERP sa opcijom"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Gost"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -238,341 +177,210 @@ msgid "How do you call a Customer"
 msgstr "Koji temin želite koristiti za kupce"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
-"Kad pošaljete mailom dokument partneru\n"
-"                                                                             "
-" (ponudu, računa), vaš partner će se moći\n"
-"                                                                             "
-" prijaviti i preuzeti sve svoje dokumente,\n"
-"                                                                             "
-" pročitati novosti vaše organizacije, provjeriti svoje projekte\n"
-"                                                                             "
-" isl."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Uvoz / Izvoz"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Klijent"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr "Dozvoli javni dio OpenERP-a. Vaš OpenERP postaje javna web stranica."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Partner"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Više organizacija (tvrtki)"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Termin \"Kupac\""
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Član"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Postavke prodaje"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Opcije"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Aktiviraj portal za partnere"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Partner"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Pacijent"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Dozvoli dijeljenje dokumenata"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Pristup portalu"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(novosti organizacije, poslovi, kontakt obrasci itd.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Ponude i prodajni nalozi"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Aktiviraj javni portal"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Podesi odlazne email servere"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "Prodaja"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Integracija društvenih mreža"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Značajke prodaje"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Dozvolite svojim partnerima pristup njihovim dokumentima."
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Odustani"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Dijeli ili uklopi bilokoji ekran openerpa"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Primjeni"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Integracija društvenih mreža"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Termin"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "ili"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Upišite podatke o Vašoj organizaciji (tvrtci)"
-
-#~ msgid "Currency"
-#~ msgstr "Valuta"
-
-#~ msgid "Install"
-#~ msgstr "Instaliraj"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "City"
-#~ msgstr "Grad"
-
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Street2"
-#~ msgstr "Ulica2"
-
-#~ msgid "Country"
-#~ msgstr "Država"
-
-#~ msgid "Street"
-#~ msgstr "Ulica"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Možete početi s konfiguracijom sustava ili se izravno spojiti na bazu "
-#~ "podataka koristeći predefinirane postavke."
-
-#~ msgid "Zip code"
-#~ msgstr "Pošt. broj"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Odaberite Profil"
-
-#~ msgid "Report header"
-#~ msgstr "Zaglavlje Izvještaja"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Započnite Konfiguriranje"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Moći ćete instalirati više Modula kasnije kroz izbornik Admininstracija"
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Profil određuje pred-izbor modula za specifične potrebe. Ti su profili "
-#~ "podešeni kako biste lakše otkrivali različite aspekte Open ERP-a. Ovo je tek "
-#~ "osvrt, postoji 300+ raspoloživih modula."
-
-#~ msgid "Next"
-#~ msgstr "Dalje"
-
-#~ msgid "E-mail"
-#~ msgstr "E-Mail"
-
-#~ msgid "State"
-#~ msgstr "Stanje"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Vaša nova baza podataka sada je instalirana u potpunosti."
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Podnožje Izvještaja 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Podnožje Izvještaja 2"
-
-#~ msgid "General Information"
-#~ msgstr "Opće Informacije"
-
-#~ msgid "Report Information"
-#~ msgstr "Informacija o Izvještaju"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Odredite glavnu Tvrtku"
-
-#~ msgid "Company Name"
-#~ msgstr "Ime Tvrtke"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Ova će se rečenica pojavljivati u podnožju vaših izvještaja.\n"
-#~ "Savjetujemo vam da ovdje upišete bankovne podatke:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - PDV: BE0477.472.701"
-
-#~ msgid "Setup"
-#~ msgstr "Postava"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Ova će se rečenica pojavljivati u podnožju vaših izvještaja.\n"
-#~ "Savjetujemo vam da ovdje upišete osnovne podatke:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Summary"
-#~ msgstr "Sižetak"
-
-#~ msgid "Installation Done"
-#~ msgstr "Instalacija Završena"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Ova će se rečenica pojavljivati u gornjem desno kutu vaših izvještaja.\n"
-#~ "Savjetujemo vam da ovdje upišete slogan tvrtke:\n"
-#~ "\"Open Source Business Solutions\""
-
-#~ msgid "Report Header"
-#~ msgstr "Zaglavlje Izvještaja"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Vaš Logo: Koristite veličinu slike od cca. 450x150 pixela."
-
-#~ msgid "Use Directly"
-#~ msgstr "Koristi Izravno"
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid "Base Setup"
-#~ msgstr "Osnovni Postav"
-
-#~ msgid "Previous"
-#~ msgstr "Prethodno"
-
-#~ msgid "Create"
-#~ msgstr "Kreiraj"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Postavi zaglavlje i podnožje memoranduma organizacije"
-
-#~ msgid "Import"
-#~ msgstr "Uvoz"
-
-#~ msgid "Extended"
-#~ msgstr "Prošireno"
-
-#~ msgid "Customers"
-#~ msgstr "Kupci"
-
-#~ msgid "Interface"
-#~ msgstr "Sučelje"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid "Language"
-#~ msgstr "Jezik"
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid "Create Additional Users"
-#~ msgstr "Kreiraj  korisnike programa"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Termin \"Kupac\""
 
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr "Prikazivanje savjeta na svakoj akciji/prozoru"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
+"Koristi vanjske davatelje usluga autentikacije, prijava s računom google, "
+"facebook, ..."
 
-#~ msgid "Image"
-#~ msgstr "Slika"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Kada otvarate novi kontakt (kupac ili tvrtka), dobivate mogućnost učitavanja "
+"svih podataka o njemu sa LinkedIna (slike, adrese isl.)."
 
-#~ msgid "Timezone"
-#~ msgstr "Vremenska zona"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Kad pošaljete mailom dokument partneru\n"
+"                                                                             "
+" (ponudu, računa), vaš partner će se moći\n"
+"                                                                             "
+" prijaviti i preuzeti sve svoje dokumente,\n"
+"                                                                             "
+" pročitati novosti vaše organizacije, provjeriti svoje projekte\n"
+"                                                                             "
+" isl."
 
-#~ msgid "Simplified"
-#~ msgstr "Pojednostavljeno"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Create or Import Customers"
-#~ msgstr "Kreirajte ili uvezite podatke o kupcima"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
 
-#~ msgid "Import or create customers"
-#~ msgstr "Kreirajte ili uvezite podatke o kupcima"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid "For Sync Google Contact"
-#~ msgstr "Sinkronizacija Google kontakata"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr ""
diff --git a/addons/base_setup/i18n/hu.po b/addons/base_setup/i18n/hu.po
index 49d4c224980..ac121be9ac1 100644
--- a/addons/base_setup/i18n/hu.po
+++ b/addons/base_setup/i18n/hu.po
@@ -1,247 +1,175 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * base_setup
+# Hungarian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-07 12:54+0000\n"
-"Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:28+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "e-amil integrálás"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Vendég"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Kapcsolattartók"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "A közösségi portál aktiválása"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
-"Használjon külső azonosító tartalomkezelőt, lépjen be mint google, facebook, "
-"... felhasználó"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Dokumentumok megoszásának engedélyezése"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
-"OpenERP lehetővé teszi az automatikus érdeklődések (vagy egyéb dokumentumok) "
-"létrehozását \n"
-"                            a beérkező levelekből. Autokmatikusan tud e-"
-"mailt szinkronizálni az OpenERP\n"
-"                            alapértelmezett POP/IMAP fiókok használatával, "
-"közvetlen az e-mail szerver címéhez tartozó \n"
-"                            e-mail beillesztő skript használatával, vagy "
-"kézzel saját betöltő plugin használatával az OpenERP\n"
-"                            kiegészítőivel, az előnyben létesített levelező "
-"használatához."
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "ÉRTÉKESÍTÉS"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Lehetővé teszi a felhasználók adatainak betöltését CSV fájlokból"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Tag"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Alkalmaz"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Portál hozzáférés"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Azonosítás"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Árajánlatok és vevői megrendelések"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Általános beállítások"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Donor"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "E-mail"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM ügyfélkapcsolat-kezelő rendszer"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Visszavonás"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Páciens"
+msgid "Client"
+msgstr "Ügyfél"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Lehetővé teszi a felhasználók adatainak betöltését CSV fájlokból"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Eladás beállítása"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Többes válallkozás kezelése"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Kimenő e-mail szerverek beállítása"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "Az e-mail ügyfelen"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "A vállalata részleteinek beállítása"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=YOUR_DATABAE"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Kapcsolattartók"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Kapcsolatok automatikus behozatala a LinkeIn-ből"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Thunderbird plug-in bekapcsolása"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Vevő"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Vavő tulajdonságai"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Import / Export"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "eladás tulajdonságai"
-
-#. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Outlook plug-in bekapcsolása"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Donor"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Használhatja ezt a varázslót a vevők nyelvezetének megváltoztatásához a "
-"teljes alkalmazásra vonatkozólag."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "E-mail"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Haszonélvező"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "e-amil integrálás"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Bármely OpenERP képernyő megosztása vagy eltüntetése."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Általános beállítások"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Vevő"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Ha új kapcsolatot hoz létre (személy vagy vállalkozás), akkor lehetősége "
-"lesz a LinkedIn adatok betöltésére (fotók, címek, stb.)."
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Kapcsolatok automatikus behozatala a LinkeIn-ből"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
-"Többes vállalkozású környezetben dolgozni, a helyesen meghatározott "
-"vállalatok közötti hozzáférési jogosultságokkal.\n"
-"                Ez a multi_company modult telepíti."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Adjon hozzáférést a vevőknek a dokumentumaikhoz."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
-"A közösségi portál csak akkor hozzáférhetző ha egyszeres, önálló adatbázis "
-"módot használ. Elindíthatja\n"
-"                                    az OpenERP Szervert ezzel a lehetőséggel"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
-"Több lehetőséget fog találni a vállalata részleteinél: a fejléc és "
-"lábjegyzet címek, határidő túllépés szöveges üzenete, stb."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Vendég"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -249,563 +177,212 @@ msgid "How do you call a Customer"
 msgstr "Hogy hívhat meg egy Vevőt"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
-"Ha egy dokumentumot küld egy Vevőhöz\n"
-"                                    (árajánlat, számla), a Vevő "
-"feliratkozhat\n"
-"                                    a dokumentumainak eléréséhez,\n"
-"                                    a vállalati új hírek elolvasásához, "
-"projektek ellenőrzéséhez,\n"
-"                                    stb."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Import / Export"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Ügyfél"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"Az OpenERP közösségi részének bekapcsolása, OpenERP elérhetővé válik egy "
-"közösségi weboldalként."
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
-"A közösség lehetővé teszi a kiválasztott OpenERP\n"
-"                objektumhoz tartozó e-mailek és mellékletei\n"
-"                archiválását. Kiválaszthat egy partnert, vagy érdeklődést és "
-"\n"
-"                mellékelheti a kiválasztott levelet mint .eml fájl\n"
-"                a kiválasztott rekord mellékleteként. A CRM érdeklődésekből "
-"dokumentumokat\n"
-"                hozhat létre, Partnert a kiválasztott e-mailekből.\n"
-"                Ez a plugin_thunderbird modult telepíti.."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Partner"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Többes válallkozás kezelése"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Használjon másik szót amivel kifejezi \"Vevő\""
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Tag"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Eladás beállítása"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"Az Outlook plugin lehetővé teszi egy objektum kiválasztását amit\n"
-"                az Outlookból az e-mailhez és mellékletéhez szeretne "
-"csatolni. \n"
-"                Kiválaszthat egy partnert vagy érdeklődés objektumot\n"
-"                és eltárolhatja a kiválasztott e-mailt az OpenERP "
-"üzenetekhez\n"
-"                mellékletekkel együtt.\n"
-"                Ez a plugin_outlook modult telepíti."
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Lehetőségek"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "A közösségi portál aktiválása"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Partner"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
-"így tenni.\n"
-"                                    Ha egyszer aktiválva van, a "
-"bejelentkezési oldal ki lesz váltva a közösségi weboldallal."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Páciens"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Dokumentumok megoszásának engedélyezése"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Portál hozzáférés"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(vállalati hírek, munkahelyek, kapcsolatu űrlapok, stb.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Árajánlatok és vevői megrendelések"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Közösségi portál aktiválása"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Kimenő e-mail szerverek beállítása"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "ÉRTÉKESÍTÉS"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Közösségi hálózat integráció"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "eladás tulajdonságai"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Adjon hozzáférést a vevőknek a dokumentumaikhoz."
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Visszavonás"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Bármely OpenERP képernyő megosztása vagy eltüntetése."
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Alkalmaz"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Közösségi hálózat integráció"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Terminológia meghatározása"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "vagy"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Haszonélvező"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "A vállalata részleteinek beállítása"
-
-#~ msgid "City"
-#~ msgstr "Város"
-
-#~ msgid "Invoicing"
-#~ msgstr "Számlázás"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Bankszámlaszám"
-
-#~ msgid "Currency"
-#~ msgstr "Pénznem"
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Haladó jelentés"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "Country"
-#~ msgstr "Ország"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Aukciós házak"
-
-#~ msgid "Zip Code"
-#~ msgstr "Irányítószám"
-
-#~ msgid "New Database"
-#~ msgstr "Új adatbázis"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Információk az Ön új adatbázisáról"
-
-#~ msgid "Image"
-#~ msgstr "Kép"
-
-#~ msgid "Food Industry"
-#~ msgstr "Élelmiszeripar"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Gyártás"
-
-#~ msgid "Street"
-#~ msgstr "Utca"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Például: http://openerp.com"
-
-#~ msgid "Install Applications"
-#~ msgstr "Alkalmazások telepítése"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid "Install"
-#~ msgstr "Telepítés"
-
-#~ msgid "Human Resources"
-#~ msgstr "Humán Erőforrás"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Jelentés lábléc 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Jelentés lábléc 2"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid "Fed. State"
-#~ msgstr "Szövetségi állam"
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid "Company"
-#~ msgstr "Vállalat"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Használjon másik szót amivel kifejezi \"Vevő\""
 
-#~ msgid "title"
-#~ msgstr "Pozíció"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
+"Használjon külső azonosító tartalomkezelőt, lépjen be mint google, facebook, "
+"... felhasználó"
 
-#~ msgid "Company Name"
-#~ msgstr "Vállalat neve"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Ha új kapcsolatot hoz létre (személy vagy vállalkozás), akkor lehetősége "
+"lesz a LinkedIn adatok betöltésére (fotók, címek, stb.)."
 
-#~ msgid "Street 2"
-#~ msgstr "Utca 2"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Ha egy dokumentumot küld egy Vevőhöz\n"
+"                                    (árajánlat, számla), a Vevő "
+"feliratkozhat\n"
+"                                    a dokumentumainak eléréséhez,\n"
+"                                    a vállalati új hírek elolvasásához, "
+"projektek ellenőrzéséhez,\n"
+"                                    stb."
 
-#~ msgid "Setup"
-#~ msgstr "Beállítás"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Accounting & Finance"
-#~ msgstr "Könyvelés és pénzügy"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Használhatja ezt a varázslót a vevők nyelvezetének megváltoztatásához a "
+"teljes alkalmazásra vonatkozólag."
 
-#~ msgid "Start Configuration"
-#~ msgstr "Konfigurálás indítása"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Több lehetőséget fog találni a vállalata részleteinél: a fejléc és "
+"lábjegyzet címek, határidő túllépés szöveges üzenete, stb."
 
-#~ msgid "Installed Users"
-#~ msgstr "Telepített felhasználók"
-
-#~ msgid "Report Header"
-#~ msgstr "Jelentés fejléc"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Az Ön logója - használható méret kb. 450x150 pixel"
-
-#~ msgid "Company Website"
-#~ msgstr "Vállalat weboldala"
-
-#~ msgid "Base Setup"
-#~ msgstr "Alapbeállítás"
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Segít Önnek a marketing kampányok kezelésében lépésről lépésre."
-
-#~ msgid "Your database is now created."
-#~ msgstr "Az Ön adatbázisa létrejött."
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Segít Önnek a könyvelésben, de ha Ön nem könyvelő, azt javasoljuk, hogy csak "
-#~ "a Számlázást telepítse. "
-
-#~ msgid "Associations"
-#~ msgstr "Egyesületek"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "A következő felhasználók lettek létrehozva : \n"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Elkezdheti a rendszer konfigurálását vagy közvetlenül kapcsolódhat az "
-#~ "adatbázishoz rendszergazdaként."
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "A cég adatai arra lesznek felhasználva, hogy személyre legyenek szabva a "
-#~ "generált dokumentumok, úgymint számlák, vevő rendelések, stb."
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Tudáskezelés"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Lehetővé teszi, hogy telepítsen különböző érdekes, de nem alapvető "
-#~ "eszközöket, mint Felmérés, Ebédrendelés és Ötlet doboz."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Ez a mondat a jelentések alján fog megjelenni.\n"
-#~ "Azt javasoljuk, hogy itt adja meg a bank információkat:\n"
-#~ "IBAN: HU24 1171 4007 8060 1443 - SWIFT: OTPV-HU-HB - VAT: HU12345678"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Ez a modul biztosít egy beállítási felületet, hogy segítsen\n"
-#~ "    a felhasználóknak egy új rendszer beállításában.\n"
-#~ "\n"
-#~ "    Lehetőséget ad alapvető profilok közül választani:\n"
-#~ "    * Minimális profil\n"
-#~ "    * Könyvelő profil\n"
-#~ "    * Szolgáltató cégeknek\n"
-#~ "    * Gyáraknak\n"
-#~ "\n"
-#~ "    Továbbá alapvető kérdésekkel segít a cégre testre szabni a felületet,\n"
-#~ "    a fejlécet és a láblécet, beállítani a könyvelési számlákat és a "
-#~ "nyelvet.\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Segít Önnek a projektjei és feladatai kezelésében, azok nyomon követésével, "
-#~ "automata tervezés könnyítéssel, stb..."
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Kiválaszthatja a felhasználni kívánt programokat. Ha jelenleg nem tudja "
-#~ "pontosan mit is szeretne, később is telepítheti őket."
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Olyan addon-okat telepíthet, amik segítségével a tudás alapú információt "
-#~ "használhatják és oszthatják meg a dolgozók egymás között."
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Raktár kezelés"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Cég testreszabás"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Ügyfélkapcsolat kezelés"
-
-#~ msgid "Project Management"
-#~ msgstr "Projekt kezelés"
-
-#~ msgid "Logo"
-#~ msgstr "Embléma"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Pénztárgép működés"
-
-#~ msgid "Sales Management"
-#~ msgstr "Értékesítés kezelés"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Beállítási lépések kihagyása"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Segít Önnek a gyártási folyamatok kezelésében és az azokhoz tartozó "
-#~ "jelentések létrehozásában."
-
-#~ msgid "Purchase Management"
-#~ msgstr "Beszerzés kezelés"
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Segít Önnek, hogy a legtöbbet hozza ki a számlázásnál egyszerűsített adat "
-#~ "bevitellel, egyszerűsített fizetési információ bevitellel, automatikus "
-#~ "szállítólevél generálással, stb..."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Ez a mondat meg fog jelenni az Ön jelentéseinek alján.\n"
-#~ "Azt javasoljuk, hogy írjon ide hivatalos mondatokat:\n"
-#~ "Web: http://openerp.com - Fax: +36 (1) 1234-56-78 - OTP Bank: 11714007-"
-#~ "80601443"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "A kiválasztott OpenERP alkalmazások egy előre kiválasztott beállítását "
-#~ "telepíti, hogy segítsen Önnek az aukciói valamint az azokhoz tartozó üzleti "
-#~ "folyamatok kezelésében."
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Több különböző eszközt telepíthet, hogy egyszerűsítse és fejlessze az "
-#~ "OpenERP rendszerével generálható riportokat."
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Ez a mondat meg fog jelenni a jelentések jobb felső sarkában.\n"
-#~ "Azt javasoljuk, hogy itt adja meg a szlogenjét:\n"
-#~ "\"Nyílt Forráskódú Üzleti Megoldások\"."
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Adja meg a cégének az adatait"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Különböző profilú cégekhez kialakított modulok telepítése"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "A kiválasztott OpenERP alkalmazások egy előre kiválasztott beállítását "
-#~ "telepíti, hogy segítsen Önnek az egyesületének kezelésében."
-
-#~ msgid "Extra Tools"
-#~ msgstr "További eszközök"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Beállítás előrehaladása"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Segít Önnek a beszerzéshez kapcsolódó folyamatainak kezelésében, mint "
-#~ "például ajánlatkérések, szállítói számlák, stb..."
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Segít Önnek a humán erőforrások kezelésében az alkalmazotti struktúra "
-#~ "berögzítésével, munkaidő-kimutatások előállításával, jelenlét nyomon "
-#~ "követésével, stb."
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Lehetővé teszi számlák készítését és a kifizetések nyomon követését. Ez a "
-#~ "könyvelési modul egyszerűbb változata nem könyvelők számára."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Telepíti az előre kiválasztott OpenERP modulok kombinációit, amelyek "
-#~ "segítenek vállalkozása jobb kézben tartásában."
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr ""
-#~ "Segít Önnek az árajánlatok, a vevői megrendelések és a számlázás kezelésében."
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Segít Önnek az ügyfelekkel való kapcsolatok nyomon követésében és "
-#~ "kezelésében, mint például találkozók, igények vagy problémák. Automatikusan "
-#~ "küldhet emlékeztetőket, kiterjesztheti a kéréseket vagy indíthat üzlet-"
-#~ "specifikus műveleteket az események alapján."
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Segít Önnek a készletek és a fő készletműveletek kezelésében: "
-#~ "szállítólevelek, áruátvételek, stb."
-
-#~ msgid "Create"
-#~ msgstr "Létrehozás"
-
-#~ msgid "Import"
-#~ msgstr "Importálás"
-
-#~ msgid "Customers"
-#~ msgstr "Vásárlók"
-
-#~ msgid "Language"
-#~ msgstr "Nyelv"
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Új felhasználók létrehozása"
-
-#~ msgid "Timezone"
-#~ msgstr "Időzóna"
-
-#~ msgid "Simplified"
-#~ msgstr "Egyszerűsített"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po
index 6298543e9f4..cf089ddee5d 100644
--- a/addons/base_setup/i18n/id.po
+++ b/addons/base_setup/i18n/id.po
@@ -1,269 +1,245 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Indonesian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-05-28 02:39+0000\n"
-"Last-Translator: Abdul Munif Hanafi <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian <id@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Tamu"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Anggota"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Batal"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Donor"
+msgid "Client"
+msgstr "Klien"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Telaten"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Pelanggan"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Donor"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
-"Anda dapat menggunakan wizard ini untuk mengubah terminologi bagi pelanggan "
-"di seluruh aplikasi."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Penyewa"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Pelanggan"
+msgid "Guest"
+msgstr "Tamu"
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr "Bagaimana anda menghubungi Pelanggan"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
-msgstr "Bagaimana anda menghubungi Pelanggan"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "pengaturan.terminologi.dasar"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Klien"
+msgid "Member"
+msgstr "Anggota"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
@@ -272,313 +248,128 @@ msgid "Partner"
 msgstr "Rekanan"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Gunakan kata lain untuk \"Pelanggan\""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Telaten"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr ""
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
+msgstr "Spesifikasikan Terminologi Anda"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Penyewa"
+
+#. module: base_setup
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Batal"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Gunakan kata lain untuk \"Pelanggan\""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
-msgstr "Spesifikasikan Terminologi Anda"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
-#~ msgid "Next"
-#~ msgstr "Berikutnya"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Pilih sebuah profil"
-
-#~ msgid "City"
-#~ msgstr "Kota"
-
-#~ msgid "Zip code"
-#~ msgstr "Kode pos"
-
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Phone"
-#~ msgstr "Telepon"
-
-#~ msgid "General Information"
-#~ msgstr "Informasi Umum"
-
-#~ msgid "Installation Done"
-#~ msgstr "Pemasangan Selesai"
-
-#~ msgid "Setup"
-#~ msgstr "Atur"
-
-#~ msgid "Country"
-#~ msgstr "Negara"
-
-#~ msgid "Company Name"
-#~ msgstr "Nama Perusahaan"
-
-#~ msgid "Previous"
-#~ msgstr "Sebelumnya"
-
-#~ msgid "Street"
-#~ msgstr "Jalan"
-
-#~ msgid "Logo"
-#~ msgstr "Lambang"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Judul Bawah 1"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Membantu Anda dalam mengelola proses produksi sekaligus menghasilkan "
-#~ "berbagai laporan atas berbagai proses tersebut."
-
-#~ msgid "Human Resources"
-#~ msgstr "Sumber Daya Manusia"
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Untuk memandu Anda langkah demi langkah dalam kampanye pemasaran."
-
-#~ msgid "Install"
-#~ msgstr "Instal"
-
-#~ msgid "Invoicing"
-#~ msgstr "Penagihan"
-
-#~ msgid "Bank Account No"
-#~ msgstr "No Rekening Bank"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Tools Extra"
-
-#~ msgid "Display Tips"
-#~ msgstr "Tampilan Bantuan"
-
-#~ msgid "Create"
-#~ msgstr "Membuat"
-
-#~ msgid "product.installer"
-#~ msgstr "Pemasangan Produk"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Buat Kop dan Kaki Surat Perusahaan"
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "Set zona waktu standar bagi pengguna baru, digunakan untuk melakukan "
-#~ "konversi zona waktu antara server dan klien."
-
-#~ msgid "Import"
-#~ msgstr "Impor"
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "Sinkronisasikan Kontak Google"
-
-#~ msgid "For Import Saleforce"
-#~ msgstr "Untuk Import Salesforce"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Tetapkan Pengaturan User Standar"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Tetapkan Pengaturan User"
-
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "Buat atau Impor Pelanggan dan kontak mereka secara manual dari form ini atau "
-#~ "Anda dapat mengimpor mitra yang ada dengan spreadsheet CSV dari wizard "
-#~ "\"Impor Data\""
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "Jika Anda menggunakan OpenERP untuk pertama kalinya kami sangat menyarankan "
-#~ "Anda untuk memilih interface yang sederhana, yang memiliki fitur lebih "
-#~ "sedikit tetapi lebih mudah. Anda selalu dapat beralih kemudian dari "
-#~ "pengaturan pengguna."
-
-#~ msgid "For Quickbooks Ippids"
-#~ msgstr "Untuk Quickbooks lppids"
-
-#~ msgid "Extended"
-#~ msgstr "Penambahan"
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Isi data-data perusahaan Anda (alamat, logo, rekening bank) sehingga itu "
-#~ "dicetak pada laporan Anda. Anda dapat klik pada 'header Preview' tombol "
-#~ "untuk memeriksa header / footer dari dokumen PDF."
-
-#~ msgid "Customers"
-#~ msgstr "Pelanggan"
-
-#~ msgid "Language"
-#~ msgstr "Bahasa"
-
-#~ msgid "Interface"
-#~ msgstr "Antarmuka"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Anda dapat menggunakan wizard ini untuk mengubah terminologi bagi pelanggan "
+"di seluruh aplikasi."
 
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Mengatur bahasa standar untuk semua antarmuka pengguna, ketika terjemahan UI "
-#~ "yang tersedia. Jika Anda ingin Menambahkan Bahasa baru, Anda dapat "
-#~ "menambahkannya dari 'Mengisikan Terjemahan Resmi' wizard dari menu "
-#~ "'Administrasi'."
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "Ini akan mengatur pengaturan standar untuk pengguna baru dan memperbarui "
-#~ "semua yang sudah ada. Setelah itu, pengguna bebas untuk mengubah nilai-nilai "
-#~ "pada formulir pengaturan pengguna sendiri."
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Membuat Pengguna Tambahan"
-
-#~ msgid "user.preferences.config"
-#~ msgstr "konfig.pengaturan.user"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Centang kotak ini jika anda selalu ingin menampilkan tips di setiap menu"
-
-#~ msgid "Image"
-#~ msgstr "Gambar"
-
-#~ msgid "Timezone"
-#~ msgstr "Zona waktu"
-
-#~ msgid "Quickbooks Ippids"
-#~ msgstr "Quickbooks lppids"
-
-#~ msgid "Import Saleforce"
-#~ msgstr "Impor Salesforce"
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "Untuk impor sugarcrm"
-
-#~ msgid "Simplified"
-#~ msgstr "Sederhana"
-
-#~ msgid "Import or create customers"
-#~ msgstr "Impor atau buat data pelanggan"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Buat atau Impor Data Pelanggan"
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "Untuk Sinkronisasi Kontak Google"
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "Impor Sugarcrm"
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.pemasangan.modul.aplikasi"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/it.po b/addons/base_setup/i18n/it.po
index ed8e4edbe3a..5e7e752e766 100644
--- a/addons/base_setup/i18n/it.po
+++ b/addons/base_setup/i18n/it.po
@@ -1,241 +1,175 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Italian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-15 11:58+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian <it@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Integrazione Email"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Ospite"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Contatti"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
-"Usa provider per l'autenticazione esterna, login con google, facebook, ..."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Abilita la condivisione documenti"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
-"OpenERP permette di creare automaticamente leads (o altri documenti)\n"
-"per le mail in entrata. Potrete sincronizzare automaticamente email con "
-"OpenERP\n"
-"utilizzando il vostro account POP / IMAP, usando uno script di  integrazione "
-"diretta dalla email\n"
-"al mail server, o manualmente caricando email a OpenERP utilizzando "
-"specifici\n"
-"plugin for il vostro client di posta preferito."
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr ""
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Permetti agli utenti di importare dati da file CSV"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Membro"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Applica"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Accesso portale"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Autenticazione"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Preventivi ed Ordini di Vendita"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Impostazioni Generali"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Donatore"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "Email"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Annulla"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Paziente"
+msgid "Client"
+msgstr "Cliente"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Permetti agli utenti di importare dati da file CSV"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Configura Vendite"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Gestione multi aziendale"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Configura email server in uscita"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "Su client email"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Configura i dati aziendali"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Contatti"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Ricevi contatti automaticamente da LinkedIn"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Abilita il plug in di Thunderbird"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "Copy text   \t res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Cliente"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Caratteristiche cliente"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Importa / Esporta"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Caratteristiche di vendita"
-
-#. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Abilita plug in di outlook"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Donatore"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Potrete utilizzare questo wizard per cambiare le terminologie per i clienti "
-"nell'intera appllicazione"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "Email"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Gestore"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Integrazione Email"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Condividi e integra ogni schermata di OpenERP"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Impostazioni Generali"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Cliente"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Quando create un nuovo contatto (persona o azienda), sarete in grado di "
-"caricare tutti i dati da LinkedIn (foto, indirizzi, ecc.)."
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Ricevi contatti automaticamente da LinkedIn"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
-"Funzionale in un ambiente multi-compani, con impostazioni di sicurezza "
-"appropriate tra le aziende.\n"
-"Installa il modulo multi_company."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
-"Troverai maggiori opzioni tra i dettagli della tua azienda: indirizzo per "
-"header e footer, messaggio pagamenti scaduti, etc."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Ospite"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -243,607 +177,209 @@ msgid "How do you call a Customer"
 msgstr "Come chiamate un cliente"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
-"Quando viene spedito un documento ad un cliente\n"
-"                                    (offerta, fattura), il cliente potrà\n"
-"                                    registrarsi per ottenere tutti i suoi\n"
-"                                    documenti, leggere le novità aziendali,\n"
-"                                    controllare i suoi progetti, ecc."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Importa / Esporta"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Cliente"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"Abilità l'accesso pubblico ad openerp, openerp diventa un sito web pubblico."
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
-"Il plugin permette di archiviare email e i loro allegati all'oggetto\n"
-"selezionato in OpenERP. Potrete selezionare un partner, una lead e\n"
-"collegare la mail selezionata come un file .EML nell'allegato\n"
-"del record selezionato. Potrete creare documenti per Lead CRM,\n"
-"Partner fa email selezionate.\n"
-"Questo installando il modulo plugin_thunderbird"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Partner"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Gestione multi aziendale"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Utilizza un altra parola per dire \"Cliente\""
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Membro"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Configura Vendite"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"Il plug in di Outlook permette di selezionare un oggetto a cui vorreste "
-"aggiungere\n"
-"la vostra email e il suo allegato partendo da MS Outlook. Potreste "
-"selezionare un partner,\n"
-"o un oggetto lead ed archiviare la mail selezionata \n"
-"in OpenERP creando un messaggio email con allegati.\n"
-"Questo installa il modulo plugin_outlook."
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Opzioni"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Partner"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Paziente"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Abilita la condivisione documenti"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Accesso portale"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Preventivi ed Ordini di Vendita"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Attiva il portale pubblico"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Configura email server in uscita"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Integrazione social network"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Caratteristiche di vendita"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Annulla"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Condividi e integra ogni schermata di OpenERP"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Applica"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Integrazione social network"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Specificare la propria terminologia"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "o"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Gestore"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Configura i dati aziendali"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Questa frase apparirà al fondo dei report.\n"
-#~ "Si possono inserire le coordinate bancarie qui:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid "City"
-#~ msgstr "Città"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Puoi iniziare a configurare il sistema oppure puoi connetterti direttamente "
-#~ "al database utilizzando la configurazione predefinita"
-
-#~ msgid "Zip code"
-#~ msgstr "CAP"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Seleziona un Profilo"
-
-#~ msgid "Report header"
-#~ msgstr "Intestazione Report"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Inizia Configurazione"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Potrai installare ulteriori moduli anche in seguito tramite il Menu di "
-#~ "Amministrazione"
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Un 'Profilo' determina una preselezione di moduli specifici. Questi profili "
-#~ "sono stati appositamente creati per favorire l'esplorazione dei divresi "
-#~ "aspetti e funzionalità di OpenERP. Ovviamente questa è solo un'anteprima: "
-#~ "abbiamo più di 300 moduli disponibili."
-
-#~ msgid "Next"
-#~ msgstr "Avanti"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid "State"
-#~ msgstr "Stato"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Il tuo nuova database è stato pienamente installato"
-
-#~ msgid "Profile"
-#~ msgstr "Profilo"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Report - Piè di Pagina 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Report - Piè di Pagina 2"
-
-#~ msgid "General Information"
-#~ msgstr "Informazioni Generali"
-
-#~ msgid "Street2"
-#~ msgstr "Indirizzo 2"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid "Report Information"
-#~ msgstr "Informazion Report"
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid "Phone"
-#~ msgstr "Telefono"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Definisci Azienda Principale"
-
-#~ msgid "Company Name"
-#~ msgstr "Nome Azienda"
-
-#~ msgid "Country"
-#~ msgstr "Nazione"
-
-#~ msgid "Setup"
-#~ msgstr "Configurazione"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Questa affermazione apparirà in fondo ai reports.\n"
-#~ "Ti consigliamo di scrivere qui i riferimenti legali:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Summary"
-#~ msgstr "Riepilogo"
-
-#~ msgid "Install"
-#~ msgstr "Installa"
-
-#~ msgid "Installation Done"
-#~ msgstr "Installazione Completata"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Questa frase comparirà nell'angolo in alto a destra dei tuoi reports.\n"
-#~ "Ti suggeriamo di mettere uno slogan qui:\n"
-#~ "\"Open Source Business Solutions\"."
-
-#~ msgid "Report Header"
-#~ msgstr "Report - Intestazione"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Il tuo Logo - Usare una dimensione di circa 450x150 pixel"
-
-#~ msgid "Currency"
-#~ msgstr "Valuta"
-
-#~ msgid "Street"
-#~ msgstr "Indirizzo"
-
-#~ msgid "Use Directly"
-#~ msgstr "Usa Direttamente"
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid "Previous"
-#~ msgstr "Indietro"
-
-#~ msgid "Base Setup"
-#~ msgstr "Configurazione di base"
-
-#~ msgid "Install Applications"
-#~ msgstr "Installa applicazioni"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Aiuta a tracciare e gestire i rapporti con i clienti come le iniziative, le "
-#~ "richieste o le controversie. E' possibile inviare automaticamente "
-#~ "promemoria, intensificare le richieste o avviare azioni specifiche del "
-#~ "business basate su eventi standard."
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Gestione dei rapporti con i clienti"
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Aiuta ad ottenere il massimo dai punti vendita con una veloce codifica delle "
-#~ "vendite, una codifica semplificata dei pagamenti, generazione automatica dei "
-#~ "documenti di trasporto e altro."
-
-#~ msgid "Point of Sales"
-#~ msgstr "Punto vendita"
-
-#~ msgid "Project Management"
-#~ msgstr "Gestione progetti"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Aiuta a gestire i processi legati agli acquisti come le richieste di "
-#~ "preventivo, le fatture fornitore, ecc..."
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Aiuta a gestire l'inventario e le operazioni principali di magazzino: ordini "
-#~ "di consegna, di ricezione, ecc..."
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Aiuta a gestire le necessità contabili, se non si è un contabile, suggeriamo "
-#~ "di installare solo la fatturazione "
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr ""
-#~ "Aiuta a gestire i preventivi, gli ordini di vendita e la fatturazione."
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Aiuta a gestire i processi di produzione ed a generare i report di questi "
-#~ "processi."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Aiuta a gestire passo passo la campagne di marketing."
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Aiuta a gestire le risorse umane codificando la struttura dei dipendenti, "
-#~ "generando fogli di lavoro, tracciando le presenze e altro."
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Aiuta a gestire i progetti e le attività attraverso il loro tracciamento, "
-#~ "pianificazione, ecc..."
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Utilizza un altra parola per dire \"Cliente\""
 
-#~ msgid "Invoicing"
-#~ msgstr "Fatturazione"
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
-
-#~ msgid "Fed. State"
-#~ msgstr "Stato fed."
-
-#~ msgid "Your database is now created."
-#~ msgstr "Il nuovo database è creato."
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "E' possibile iniziare a configurare il sistema oppure connetterti "
-#~ "direttamente al database come amministratore."
-
-#~ msgid "Extra Tools"
-#~ msgstr "Strumenti extra"
-
-#~ msgid "Human Resources"
-#~ msgstr "Risorse Umane"
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Gestione conoscenze"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
+"Usa provider per l'autenticazione esterna, login con google, facebook, ..."
 
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Quando create un nuovo contatto (persona o azienda), sarete in grado di "
+"caricare tutti i dati da LinkedIn (foto, indirizzi, ecc.)."
 
-#~ msgid "Zip Code"
-#~ msgstr "CAP"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Quando viene spedito un documento ad un cliente\n"
+"                                    (offerta, fattura), il cliente potrà\n"
+"                                    registrarsi per ottenere tutti i suoi\n"
+"                                    documenti, leggere le novità aziendali,\n"
+"                                    controllare i suoi progetti, ecc."
 
-#~ msgid "Accounting & Finance"
-#~ msgstr "Contabilità & Finanza"
-
-#~ msgid "Installed Users"
-#~ msgstr "Utenti installati"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Food Industry"
-#~ msgstr "Industria alimentare"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Potrete utilizzare questo wizard per cambiare le terminologie per i clienti "
+"nell'intera appllicazione"
 
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Troverai maggiori opzioni tra i dettagli della tua azienda: indirizzo per "
+"header e footer, messaggio pagamenti scaduti, etc."
 
-#~ msgid "Information about your new database"
-#~ msgstr "Informazioni ralative al nuovo database"
-
-#~ msgid "New Database"
-#~ msgstr "Nuovo Database"
-
-#~ msgid "Street 2"
-#~ msgstr "Via (2)"
-
-#~ msgid "title"
-#~ msgstr "titolo"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Esempio: http://openerp.com"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Installa un gruppo prestabilito di applicazioni OpenERP che permetterà di "
-#~ "gestire l'associazione in maniera più efficiente."
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Gestione Magazzino"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Gestione Acquisti"
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Permette di installare una serie di strumenti per semplificare e potenziare "
-#~ "la creazione dei report in OpenERP"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Installa applicazioni specifiche per l'industria"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "I seguenti utenti sono stati installati: \n"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid "Sales Management"
-#~ msgstr "Gestione Vendite"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Salta Wizard di configurazione"
-
-#~ msgid "Associations"
-#~ msgstr "Associazioni"
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Permette di creare le vostre fatture e tenere traccia dei pagamenti. E' una "
-#~ "versione semplificata del modulo di contabilità per i manager non contabili."
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Avanzamento Configurazione"
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Reporting Avanzato"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Case d'Asta"
-
-#~ msgid "Image"
-#~ msgstr "Immagine"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Configurazione azienda"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Configura le informazioni della vostra azienda"
-
-#~ msgid "Company Website"
-#~ msgstr "Sito internet aziendale"
-
-#~ msgid "Company"
-#~ msgstr "Azienda"
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Seleziona le applicazioni che volete che il sistema copra. Se non siete "
-#~ "sicuri circa le precise necessità a questo stadio, potete tranquillamente "
-#~ "installarle più avanti."
-
-#~ msgid "Manufacturing"
-#~ msgstr "Produzione"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Questo modulo implementa un sistema di configurazioni che aiuta "
-#~ "l'utente\n"
-#~ "    a configurare il sistema alla installazione di un nuovo database.\n"
-#~ "\n"
-#~ "    Esso vi permette di selezionare tra una lista di profili da installare:\n"
-#~ "    * Profilo minimo\n"
-#~ "    * Solo contabilità\n"
-#~ "    * Azienda di servizi\n"
-#~ "    * Azienda di produzione\n"
-#~ "\n"
-#~ "    Esso chiede colamente, mediante videate, un aiuto per configurare la "
-#~ "vostra azienda, l'intestazione e il\n"
-#~ "    piè pagina, il piano dei conti da installare e la lingua.\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Installa un preselezionato set di applicazioni OpenERP che aiuterà nella "
-#~ "gestione della vostra casa d'asta, così come tutti i processi aziendali che "
-#~ "girano attorno."
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "Le informazioni relative alla vostra azienda verranno utilizzate per "
-#~ "personalizzare documenti che riguardano OpenERP, come: fatture, ordini di "
-#~ "vendita e altri ancora."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Installa un preselezionato set di applicazioni OpenERP che aiuterà nella "
-#~ "gestione della vostra industria."
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Vi permette di installare vari, interessanti ma non essenziali, strumenti "
-#~ "per gestire: Sondaggio, Pranzo e cassetto delle idee."
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Consente di installare addons orientati verso la condivisione della "
-#~ "conoscenza con e tra i vostri dipendenti."
-
-#~ msgid "Bank Account No"
-#~ msgstr "Conto Banca n."
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Imposta Intestazione e Piè di pagina aziendali"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Crea o Importa i Clienti"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "Copy text   \t res_config_contents"
diff --git a/addons/base_setup/i18n/ja.po b/addons/base_setup/i18n/ja.po
index bce7f7f6311..75d8923d9f5 100644
--- a/addons/base_setup/i18n/ja.po
+++ b/addons/base_setup/i18n/ja.po
@@ -1,498 +1,373 @@
 # Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-07-28 21:52+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Eメールの統合"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "ゲスト"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "顧客ポータルを活性化"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "連絡先"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr "外部認証プロバイダを使用、GoogleやFacebookでサインイン、…"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "CSVファイルからデータをインポート"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "メンバー"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "ポータルアクセス"
-
-#. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "認証"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "見積りと販売受注"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "一般設定"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "提供者"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "Eメール"
+msgid "Client"
+msgstr "顧客"
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "お待ちください。"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "送信メールサーバを設定"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "CSVファイルからデータをインポート"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "会社のデータを設定"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "複数の会社を管理"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "連絡先"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "LinkedInから自動で連絡先を取得"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "顧客"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
+msgstr "顧客の特徴"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "提供者"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
-msgstr "顧客の特徴"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "Eメール"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "インポート / エクスポート"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Eメールの統合"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "販売の機能"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "一般設定"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr "アプリケーション全体の顧客の用語を変更するには、このウィザードを使用することができます。"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "LinkedInから自動で連絡先を取得"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "テナント"
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "顧客に文書へのアクセスを与えます。"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "顧客"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr "新しい連絡先(個人または会社)を作成すると、LinkedInからすべてのデータ(写真、住所など)を読み込むことができるようになります。"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "ゲスト"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr "企業間の適切なセキュリティアクセスにより複数の企業環境で動作します。"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr "どのように顧客を呼びますか"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
-msgstr "会社の詳細にはヘッダとフッタのアドレス、遅延支払いのテキストなどより多くのオプションがあります。"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "インポート / エクスポート"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
-msgstr "どのように顧客を呼びますか"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "複数の会社を管理"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "顧客"
+msgid "Member"
+msgstr "メンバー"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr "OpenERPの公開部分を有効にすると、OpenERPは公開ウェブサイトになります。"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
+msgstr "オプション"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
 msgstr "パートナ"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "\"顧客\"を言い表す他の言葉を使用してください。"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "お待ちください。"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "ポータルアクセス"
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "見積りと販売受注"
+
+#. module: base_setup
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
-msgstr "オプション"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "顧客ポータルを活性化"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "販売の機能"
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(会社のニュース、求人、連絡先フォームなど)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "ソーシャルネットワークの統合"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "公共ポータルを活性化"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
+msgstr "用語の定義"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "送信メールサーバを設定"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "テナント"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "ソーシャルネットワークの統合"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "顧客に文書へのアクセスを与えます。"
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr ""
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "\"顧客\"を言い表す他の言葉を使用してください。"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr ""
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr "外部認証プロバイダを使用、GoogleやFacebookでサインイン、…"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
-msgstr "用語の定義"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr "新しい連絡先(個人または会社)を作成すると、LinkedInからすべてのデータ(写真、住所など)を読み込むことができるようになります。"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "会社のデータを設定"
-
-#~ msgid "Create"
-#~ msgstr "作成"
-
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
-
-#~ msgid "Extended"
-#~ msgstr "拡張"
-
-#~ msgid "Customers"
-#~ msgstr "顧客"
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
-
-#~ msgid "Language"
-#~ msgstr "言語"
-
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
-
-#~ msgid "Image"
-#~ msgstr "画像"
-
-#~ msgid "Timezone"
-#~ msgstr "タイムゾーン"
-
-#~ msgid "Simplified"
-#~ msgstr "簡易化"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "ユーザのプリファレンスを定義します。"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr "常にそれぞれのメニューアクションのヒントを表示する場合は、このボックスをチェックして下さい。"
-
-#~ msgid "For Import Saleforce"
-#~ msgstr "Salesforceのインポート"
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr "新規ユーザのタイムゾーンのデフォルト設定のために、サーバとクライアント間のタイムゾーンの変換をします。"
-
-#~ msgid "For Quickbooks Ippids"
-#~ msgstr "Quickbooksのlppidsの為に"
-
-#~ msgid "Create Additional Users"
-#~ msgstr "追加ユーザの作成"
-
-#~ msgid "Quickbooks Ippids"
-#~ msgstr "QuickBooksのIPP / IDS"
-
-#~ msgid "Import Saleforce"
-#~ msgstr "Salesforceのインポート"
-
-#~ msgid "Import or create customers"
-#~ msgstr "顧客の作成 / インポート"
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "SugarCRMのインポート"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "顧客の作成 / インポート"
-
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "このフォームから手動で顧客とその連絡先を作成またはインポート或いは "
-#~ "\"データのインポート\"ウィザードからCSVスプレッドシートで、既存のパートナをインポートすることができます。"
-
-#~ msgid "Interface"
-#~ msgstr "インタフェース"
-
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "これは新規ユーザのデフォルトのプリファレンスを設定し、既存のすべてのものを更新します。　その後に、ユーザはユーザ設定フォームで自由に設定変更ができます。"
-
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "UI翻訳が利用可能な時は、既定の言語を全てのユーザインタフェースに設定します。新しい言語を追加する場合は、\"管理\" "
-#~ "メニューのウィザード\"オフィシャル翻訳のロード\"から追加することができます。"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "初めてopenERPを利用する場合は、簡素化されたインタフェースを選択されることをお勧めします。設定後いつでもユーザプリファレンスから切り替えができます。"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "会社ヘッダーとフッターの設定"
-
-#~ msgid "Display Tips"
-#~ msgstr "ヒントの表示"
-
-#~ msgid "Import"
-#~ msgstr "インポート"
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "Googleコンタクトの同期"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "デフォルトのユーザプリファレンスの設定"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "レポートに印刷される会社のデータ（アドレス、ロゴ、銀行口座）を記入して下さい。PDF "
-#~ "ドキュメントのヘッダー/フッターを確認するには、ヘッダープレビューをクリックします。"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr "アプリケーション全体の顧客の用語を変更するには、このウィザードを使用することができます。"
 
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "SugarCRMのインポートのため"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr "会社の詳細にはヘッダとフッタのアドレス、遅延支払いのテキストなどより多くのオプションがあります。"
 
-#~ msgid "For Sync Google Contact"
-#~ msgstr "Googleコンタクトとの同期のため"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/ko.po b/addons/base_setup/i18n/ko.po
index 91a90c2f08f..72630349dd5 100644
--- a/addons/base_setup/i18n/ko.po
+++ b/addons/base_setup/i18n/ko.po
@@ -1,504 +1,373 @@
 # Korean translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2009-09-08 12:19+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-09-03 02:42+0000\n"
+"Last-Translator: Josh Kim <joshkkim@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-09-05 01:12+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr ""
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr ""
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr "(글꼴 불러오기)"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr ""
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "고객 포털 활성화"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "문서 공유 허용"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
-msgstr ""
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
+msgstr "사용자가 구글 캘린더와 달력 동기화 허용"
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr ""
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "사용자가 CSV 파일로부터 데이터 불러오기 허용"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "적용"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr ""
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr "모든 기록에 구글 문서를 첨부"
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
-msgstr ""
+msgstr "인증"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr ""
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
+msgstr "CRM"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "취소"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr ""
+msgid "Client"
+msgstr "클라이언트"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr ""
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "영업 구성"
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "보내는 이메일 서버 구성"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "회사 데이터 구성"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "연락처"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr ""
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr "생성자:"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr ""
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr "생성일:"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "고객"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
+msgstr "고객 특징"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "기증자"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "이메일"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "이메일 통합"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "일반 설정"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr ""
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "LinkedIn으로부터 자동으로 연락처 가져오기"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "고객이 본인 문서에 대한 접근 허용"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
+msgstr "구글 캘린더"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
+msgstr "구글 드라이브"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr ""
-
-#. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
+msgid "Guest"
+msgstr "손님"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr "고객을 어떻게 부르십니까"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
-msgstr ""
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "가져오기 / 내보내기"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr "최근 업데이트한 사람:"
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
-msgstr ""
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
+msgstr "최근 업데이트 날짜:"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
-msgstr ""
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
+msgstr "대량 이메일 발송 캠페인 관리"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr ""
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "다중 회사 관리"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr ""
+msgid "Member"
+msgstr "구성원"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
-msgstr ""
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
+msgstr "설치하면, 구글 캘린더에 대한 API 접속 정보를 구성할 수 있습니다."
+
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
+msgstr "옵션"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "협력업체"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "포털 접근"
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "견적서 및 판매주문서"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
-msgstr ""
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr "보고서 글꼴"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr ""
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "판매"
+
+#. module: base_setup
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "판매 특징"
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "소셜 네트워크 통합"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr ""
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr "이것은 모듈 module google_calendar를 설치합니다."
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr ""
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr "이것은 모듈 module google_docs를 설치합니다."
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "취소"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "\"고객\"을 칭하는 대체어를 사용"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr ""
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr "외부 인증 공급자 사용, 구글, 페이스북 등."
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "프로파일은 특정한 요구에 맞게 미리 구성된 모듈들입니다. 여러 프로파일들을 통해 시스템의 다양한 용도를 확인할 수 있으며, 2009년 "
-#~ "5월 약 400여 종의 모듈들이 제작되어 있습니다."
-
-#~ msgid "Next"
-#~ msgstr "다음"
-
-#~ msgid "E-mail"
-#~ msgstr "이메일"
-
-#~ msgid "Start Configuration"
-#~ msgstr "구성 시작"
-
-#~ msgid "Report header"
-#~ msgstr "리포트 헤더"
-
-#~ msgid "Select a Profile"
-#~ msgstr "프로파일 선택"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr "시스템 구성을 시작하거나, 디폴트 셋업을 이용하여 데이터베이스에 바로 접속할 수 있습니다."
-
-#~ msgid "City"
-#~ msgstr "시/군"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr "나중에 관리 패널을 이용하여 모듈들을 추가할 수 있습니다."
-
-#~ msgid "Zip code"
-#~ msgstr "우편번호"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "새 데이터베이스가 설치되었습니다."
-
-#~ msgid "Profile"
-#~ msgstr "프로파일"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "리포트 푸터 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "리포트 푸터 2"
-
-#~ msgid "State"
-#~ msgstr "상태"
-
-#~ msgid "Street2"
-#~ msgstr "도로명 2"
-
-#~ msgid "Phone"
-#~ msgstr "전화"
-
-#~ msgid "Report Information"
-#~ msgstr "리포트 정보"
-
-#~ msgid "General Information"
-#~ msgstr "일반 정보"
-
-#~ msgid "Define Main Company"
-#~ msgstr "메인 회사를 정의"
-
-#~ msgid "Report Header"
-#~ msgstr "리포트 헤더"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "이 문장은 귀하의 리포트 하단에 표시됩니다. \n"
-#~ "귀하의 법적 문구를 여기에 작성하십시오. \n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Installation Done"
-#~ msgstr "설치 완료"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr "이 문장은 귀하의 리포트 상단에 표시됩니다."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "이 문장은 귀하의 리포트 하단에 표시됩니다.\n"
-#~ "여기에 은행 관련 정보를 기입하십시오:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid "Install"
-#~ msgstr "설치"
-
-#~ msgid "Summary"
-#~ msgstr "요약"
-
-#~ msgid "Setup"
-#~ msgstr "셋업"
-
-#~ msgid "Country"
-#~ msgstr "국가"
-
-#~ msgid "Company Name"
-#~ msgstr "회사 이름"
-
-#~ msgid "Base Setup"
-#~ msgstr "베이스 셋업"
-
-#~ msgid "Use Directly"
-#~ msgstr "직접 이용"
-
-#~ msgid "Previous"
-#~ msgstr "이전"
-
-#~ msgid "Street"
-#~ msgstr "도로명"
-
-#~ msgid "Currency"
-#~ msgstr "통화"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
 
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "귀하의 로고 - 대략 450x150 픽셀 사이즈를 이용하십시오."
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid "Logo"
-#~ msgstr "로고"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/lt.po b/addons/base_setup/i18n/lt.po
index d961a5dd640..b65174c1a8c 100644
--- a/addons/base_setup/i18n/lt.po
+++ b/addons/base_setup/i18n/lt.po
@@ -1,409 +1,373 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2009-12-15 18:45+0000\n"
-"Last-Translator: Donatas Stonys Blue Whale SEO <donatelonow@hotmail.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr ""
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Kontaktai"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Narys"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Taikyti"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Pasiūlymai ir pardavimo užsakymai"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Atšaukti"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Donor"
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "El. paštas"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Kontaktai"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Pirkėjas"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "El. paštas"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Pirkėjas"
-
-#. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr ""
+msgid "Member"
+msgstr "Narys"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
+msgstr "Pasirinkimai"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
 msgstr "Partneris"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Pasiūlymai ir pardavimo užsakymai"
+
+#. module: base_setup
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
-msgstr "Pasirinkimai"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Atšaukti"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Taikyti"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "arba"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Šie profiliai buvo sukurti norint parodyti įvairias Open ERP galimybes. Jie "
-#~ "skirti susidaryti bendrą įspūdį. Yra prieinama daugiau nei 300 modulių."
-
-#~ msgid "Next"
-#~ msgstr "Toliau"
-
-#~ msgid "E-mail"
-#~ msgstr "El. paštas"
-
-#~ msgid "Report header"
-#~ msgstr "Pranešimo antraštė"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Galite pradėti sistemos konfigūravimą arba jungtis prie duombazės tiesiogiai "
-#~ "su numatytaisiais parametrais."
-
-#~ msgid "City"
-#~ msgstr "Miestas"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr "Įdiegti modulius galėsite ir vėliau per administravimo meniu."
-
-#~ msgid "Start Configuration"
-#~ msgstr "Pradėti konfigūravimą"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
 
-#~ msgid "Zip code"
-#~ msgstr "Pašto kodas"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid "Select a Profile"
-#~ msgstr "Pasirinkti profilį"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr ""
diff --git a/addons/base_setup/i18n/lv.po b/addons/base_setup/i18n/lv.po
index 3ee2827169b..b8cb26e8201 100644
--- a/addons/base_setup/i18n/lv.po
+++ b/addons/base_setup/i18n/lv.po
@@ -1,433 +1,373 @@
 # Latvian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-11-30 14:24+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Authentication"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Partner"
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
-#~ msgid "City"
-#~ msgstr "Pilsēta"
-
-#~ msgid "E-mail"
-#~ msgstr "E-pasts"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Bankas konta numurs"
-
-#~ msgid "Company Name"
-#~ msgstr "Uzņēmuma nosaukums"
-
-#~ msgid "Currency"
-#~ msgstr "Valūta"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Konfigurācijas Progress"
-
-#~ msgid "Phone"
-#~ msgstr "Tālrunis"
-
-#~ msgid "Company"
-#~ msgstr "Uzņēmums"
-
-#~ msgid "Human Resources"
-#~ msgstr "Personāla Vadība"
-
-#~ msgid "Zip Code"
-#~ msgstr "Pasta indekss"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Izsoļu nami"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Finanses un Grāmatvedība"
-
-#~ msgid "Country"
-#~ msgstr "Valsts"
-
-#~ msgid "Logo"
-#~ msgstr "Logotips"
-
-#~ msgid "Project Management"
-#~ msgstr "Projektu Vadība"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Ražošana"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Jūsu Logo - Izmēram jābūt apt. 450x150 pikseļi."
-
-#~ msgid "Image"
-#~ msgstr "Attēls"
-
-#~ msgid "Company Website"
-#~ msgstr "Uzņēmuma mājaslapa"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
 
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Piemērs: http://www.openerp.lv"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid "Street"
-#~ msgstr "Iela"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr ""
diff --git a/addons/base_setup/i18n/mk.po b/addons/base_setup/i18n/mk.po
index 9e9d5397895..84a578cda05 100644
--- a/addons/base_setup/i18n/mk.po
+++ b/addons/base_setup/i18n/mk.po
@@ -1,308 +1,246 @@
 # Macedonian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-02-21 13:27+0000\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Macedonian <mk@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Интегрирање на e-mail адреси"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Гостин"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Контакти"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Активирај го порталот на клиентот"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
-"Користење надворешни провајдери за автентикација, најави се преку google, "
-"facebook, ..."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Дозволи споделување на документи"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
-"OpenERP дозволува автоматско креирање на управувачки или други документи\n"
-"                            од дојдовни e-mail пораки. Можна е автоматска "
-"синхронизација на e-mail пораките со OpenERP\n"
-"                            користејки ги стандардните POP/IMAP сметки, "
-"користејки скрипта за директна интеграција\n"
-"                            на e-mail серверот, или рачно префрлање на "
-"пораките во OpenERP користејки одредени \n"
-"                            додатоци за одредени апликации."
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "ПРОДАЖБА"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Дозволи на корисниците да импортираат податоци од CSV фајлови"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Член"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Примени"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Пристап до порталот"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Автентикација"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Понуди и налози за продажба"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
+msgstr "CRM"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Општи подесувања"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Откажи"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Донатор"
+msgid "Client"
+msgstr "Клиент"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "E-mail"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Конфигурација на продажба"
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
-msgstr "CRM"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Конфигурација на излезни e-mail сервери"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Пациент"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Конфигурирај податоци за компанијата"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Дозволи на корисниците да импортираат податоци од CSV фајлови"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Контакти"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Управување со повеќе компании"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=YOUR_DATABAE"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Потрошувач"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Превземи ги контактите директно од linkedIn"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
+msgstr "Функции на клиентот"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Овозможи го Thunderbird додатокот"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Донатор"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "E-mail"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
-msgstr "Функции на клиентот"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Интегрирање на e-mail адреси"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Импортирај / Експортирај"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Општи подесувања"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Функции на продажбата"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Овозможи го Outlook додатокот"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Превземи ги контактите директно од linkedIn"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Може да го користите овој волшебник за промена на терминологијата за "
-"клиентите во целата апликација."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Овозможете им на клиентите пристап до нивните документи."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Потстанар"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Сподели или вметни билокој екран од openerp."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
+msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Потрошувач"
+msgid "Guest"
+msgstr "Гостин"
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"При креирање на нов контакт (лице или компанија), ќе имате можност да ги "
-"превземете сите информации од LinkedIn (слики, адреси, итн.)"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr "Како го нарекувате Потрошувачот"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
-"Работа во околина со повеќе компании, со соодветен безбедносен пристап "
-"помеѓу нив.\n"
-"                Ова го инсталира модулот multi_company."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
-msgstr ""
-"Јавниот портал е достапен само доколу сте во режим на единечна база на "
-"податоци. Може да\n"
-"                                    го покренете OpenERP Серверот со таа "
-"опција"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Импортирај / Експортирај"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
-"Ќе најдете повеќе опции во деталите за вашата компанија: адреса за "
-"заглавјето и долниот дел, заостанати плаќања, итн."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
-
-#. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
-msgstr "Како го нарекувате Потрошувачот"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
-"Кога праќате документ до клиент\n"
-"                                    (понуда, фактура), вашиот клиент ќе\n"
-"                                    може да се најави за да ги превземе "
-"документите,\n"
-"                                    да ги прочита новостите за вашата "
-"компанија, да ги провери неговите проекти,\n"
-"                                    итн."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Управување со повеќе компании"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Клиент"
+msgid "Member"
+msgstr "Член"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
-"Со овозможување на јавниот дел на openerp, тој станува јавен вебсајт."
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"Додатокот ви овозможува да ги архивирате вашите e-mail пораки и "
-"прикачувањата во избраниот\n"
-"                OpenERP објект. Може да изберете партнер или водач и да го "
-"прикачете\n"
-"                одбраниот e-mail како .eml фајл.\n"
-"                Може да креирате документи за управувачот со CRM,\n"
-"                партнерот од избраните e-mail пораки.\n"
-"                Со ова се инсталира модулот plugin_thunderbird."
+
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
+msgstr "Опции"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -310,109 +248,141 @@ msgid "Partner"
 msgstr "Партнер"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Употреби друг збор за да кажеш \"Потрошувач\""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Пациент"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Конфигурација на продажба"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Пристап до порталот"
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Понуди и налози за продажба"
+
+#. module: base_setup
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
-"Outlook додатокот ви овозможува да изберете објект што сакате да го "
-"прикачите\n"
-"                на вашиот e-mail од MS Outlook. Може да изберете партнер\n"
-"                или управувачки објект и да ја архивирате избраната\n"
-"                e-mail порака во ОpenERP порака со прикачувања.\n"
-"                Ова го инсталира модулот plugin_outlook."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
-msgstr "Опции"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "ПРОДАЖБА"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Активирај го порталот на клиентот"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Функции на продажбата"
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
-"да го стори тоа.\n"
-"                                    Кога ќе се активира, страницата за "
-"најавување ќе биде заменета од јавниот вебсајт."
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Дозволи споделување на документи"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Сподели или вметни билокој екран од openerp."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(новости, работа, контакт форми, итн.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Интегрирање на социјални мрежи"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Активирање на јавниот портал"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
+msgstr "Специфицирајте ја вашата терминологија"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Конфигурација на излезни e-mail сервери"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Потстанар"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Интегрирање на социјални мрежи"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Овозможете им на клиентите пристап до нивните документи."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Откажи"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Употреби друг збор за да кажеш \"Потрошувач\""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Примени"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
+"Користење надворешни провајдери за автентикација, најави се преку google, "
+"facebook, ..."
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
-msgstr "Специфицирајте ја вашата терминологија"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"При креирање на нов контакт (лице или компанија), ќе имате можност да ги "
+"превземете сите информации од LinkedIn (слики, адреси, итн.)"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "или"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Кога праќате документ до клиент\n"
+"                                    (понуда, фактура), вашиот клиент ќе\n"
+"                                    може да се најави за да ги превземе "
+"документите,\n"
+"                                    да ги прочита новостите за вашата "
+"компанија, да ги провери неговите проекти,\n"
+"                                    итн."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Конфигурирај податоци за компанијата"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Може да го користите овој волшебник за промена на терминологијата за "
+"клиентите во целата апликација."
+
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Ќе најдете повеќе опции во деталите за вашата компанија: адреса за "
+"заглавјето и долниот дел, заостанати плаќања, итн."
+
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/mn.po b/addons/base_setup/i18n/mn.po
index c44e4ea0fe7..fe75d4a4fcd 100644
--- a/addons/base_setup/i18n/mn.po
+++ b/addons/base_setup/i18n/mn.po
@@ -1,243 +1,175 @@
 # Mongolian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-07 12:43+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Mongolian <mn@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Э-шуудангуудын Уялдаа"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Зочин"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Харилцагч"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Захаиалагчийн порталь идэвхижүүлэх"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr "Гадны нэвтрэлтээр нэвтрэх, facebook, google"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Баримтдуудыг хуваалцахыг зөвшөөрөх"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
-"OpenERP нь ирж байгаа имэйлээс автоматаар сэжим (болон бусад баримтууд)-г \n"
-"                            үүсгэх боломжийг олгодог. OpenERP-тай энгийн "
-"POP/IMAP имэйл эрхийг ашиглан \n"
-"                            имэйлийг шууд имэйл сервертэй холбож болно. "
-"Эсвэл гараараа зарим нэг имэйлийг \n"
-"                            тусгай залгаасын тусламжтайгаар OpenERP-руу "
-"оруулж болно."
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "БОРЛУУЛАЛТ"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Хэрэглэгчдэд CSV файлаас өгөгдөл оруулж ирэхийг зөвшөөрөх"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Гишүүн"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Ашиглах"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Порталь хандалт"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Баталгаажуулалт"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Үнийн санал болон Борлуулалтын Захиалга"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Ерөнхий тохируулга"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Ивээн тэтгэгч"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "Имэйл"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Өвчтөн"
+msgid "Client"
+msgstr "Клиент"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Хэрэглэгчдэд CSV файлаас өгөгдөл оруулж ирэхийг зөвшөөрөх"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Борлуулалт Тохируулах"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Олон компанийг менежмент хийх"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Гарах имэйл серверүүдийг тохируулах"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "Мэйл Клиентэд"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Компанийн өгөгдөл тохируулах"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=Таны_Өгөгдлийн_Бааз"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Харилцагч"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "linkedin-с холбох хаягуудыг автоматаар авах"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Thunderbird-н залгаас програмыг идэвхижүүлэх"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Захиалагч"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Захаиалагчийн боломжууд"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Импорт / Экспорт"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Борлуулалтын боломжууд"
-
-#. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Outlook-н залгаас програмыг идэвхижүүлэх"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Ивээн тэтгэгч"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Энэ харилцах цонхыг ашиглан захиалагчидад бүхэлд нь хэрэглэгдэх нэр "
-"томьёонуудыг сольж болно."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "Имэйл"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Эзэмшигч"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Э-шуудангуудын Уялдаа"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "openerp-н дурын дэлгэцийг хуваалцах юм уу шигтгэх"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Ерөнхий тохируулга"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Захиалагч"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Шинэ харилцагч үүсгэх үед (хувь хүн эсвэл компани) бүх "
-"өгөгдөл/мэдээлэл(зураг, гэрийн хаяг гэх мэт)-ийг нь LinkedIn-с оруулж ирэх "
-"боломжтой болно."
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "linkedin-с холбох хаягуудыг автоматаар авах"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
-"Олон компаний орчинд зохих нууцлалын хяналттайгаар ажиллах.\n"
-"                Энэ нь multi_company модулийг суулгадаг."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Захаиалагчдаа өөрийн баримтруу хандах эрх өгөх."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
-"Нийтийн порталь нь зөвхөн нэг өгөгдлийн баазийн горимд л хандах боломжтой. "
-"OpenERP серверийг\n"
-"                                    энэ горимоор ажиллуулаж боломжтой"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
-"Компаний дэлгэрэнгүй дотор өшөө олон сонголтууд бий: толгой болон хөлд "
-"хэрэглэх хаяг, хугацаа хэтэрсэн төлбөрийн текст, гм."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Зочин"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -245,580 +177,207 @@ msgid "How do you call a Customer"
 msgstr "Захиалагчийг та юу гэж дууддаг вэ?"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
-"Баримтыг захиалагчид илгээхэд захиалагч OpenERP-руу нэвтэрч өөрийн бүх "
-"баримтыг авч болно. Мөн танай компанийн мэдээ зэрэгийг унших боломжтой. Мөн "
-"өөрсдийн төслийг хянах боломжтой."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Импорт / Экспорт"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Клиент"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"OpenERP-н нийтийн хэсгийг зөвшөөрснөөр OpenERP нь нийтийн веб болж хувирна."
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
-"Энэ залгаас нь OpenERP-н сонгосон обьектуудын имэйл болон түүний "
-"хавсралтуудыг OpenERP-д оруулан архивлах \n"
-"                боломжийг олгодог. Харилцагч, сэжимийг сонгож холбогдох "
-"имэйлийг .eml өргөтгөлтэйгээр \n"
-"                хавсаргаж өгөх боломжтой. Сонгосон имэйлүүдээс CRM сэжим "
-"болон харилцагч үүсгэх боломжтой.  \n"
-"                Энэ нь plugin_thunderbird модулийг суулгадаг."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Харилцагч"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Олон компанийг менежмент хийх"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "\"Захиалагч\"-г хэлэх өөр үг сонго"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Гишүүн"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Борлуулалт Тохируулах"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"Outlook залгаас нь өөрийн MS Outlook дотороос OpenERP-н обьектийг сонгон \n"
-"                 имэйлийг түүнд нэмэх боломжийг олгодог. Харилцагч, сэжимийг "
-"сонгож тухайн \n"
-"                 имэйлийг OpenERP-руу оруулан архивлах боломжтой. \n"
-"                 Энэ нь plugin_outlook модулийг суулгадаг."
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Тохируулга"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Захаиалагчийн порталь идэвхижүүлэх"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Харилцагч"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
-"хийх зүйлс.\n"
-"                                    Идэвхжүүлсэн бол нэвтрэх хуудас нь "
-"нийтийн веб хуудсаар солигдоно."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Өвчтөн"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Баримтдуудыг хуваалцахыг зөвшөөрөх"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Порталь хандалт"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(компаний мэдээ,ажилууд,холбогчийн маягт,г.м.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Үнийн санал болон Борлуулалтын Захиалга"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Нийтийн порталь идэвхижүүлэх"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Гарах имэйл серверүүдийг тохируулах"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "БОРЛУУЛАЛТ"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Олон нийтийн харилцааны сүлжээнүүдийн нэгтгэл"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Борлуулалтын боломжууд"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Захаиалагчдаа өөрийн баримтруу хандах эрх өгөх."
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Цуцлах"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "openerp-н дурын дэлгэцийг хуваалцах юм уу шигтгэх"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Ашиглах"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Олон нийтийн харилцааны сүлжээнүүдийн нэгтгэл"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Өөрийн нэр томъёог зааж өгөх"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "эсвэл"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Эзэмшигч"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Компанийн өгөгдөл тохируулах"
-
-#~ msgid "State"
-#~ msgstr "Төлөв"
-
-#~ msgid "Phone"
-#~ msgstr "Утас"
-
-#~ msgid "Country"
-#~ msgstr "Улс"
-
-#~ msgid "Currency"
-#~ msgstr "Валют"
-
-#~ msgid "Logo"
-#~ msgstr "Лого"
-
-#~ msgid "Zip code"
-#~ msgstr "Зип код"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Хувийн мэдээллээ сонгох"
-
-#~ msgid "Report header"
-#~ msgstr "Толгойн мэдээлэл"
-
-#~ msgid "Next"
-#~ msgstr "Дараагийх"
-
-#~ msgid "Profile"
-#~ msgstr "Хувийн мэдээлэл"
-
-#~ msgid "General Information"
-#~ msgstr "Ерөнхий мэдээлэл"
-
-#~ msgid "Street2"
-#~ msgstr "Гудамж 2"
-
-#~ msgid "Report Information"
-#~ msgstr "Мэдээ мэдээлэл"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Үндсэн компани тодорхойлох"
-
-#~ msgid "Summary"
-#~ msgstr "Дүгнэлт"
-
-#~ msgid "Install"
-#~ msgstr "Суулгах"
-
-#~ msgid "Installation Done"
-#~ msgstr "Суулгагдсан"
-
-#~ msgid "Street"
-#~ msgstr "Гудамж"
-
-#~ msgid "Base Setup"
-#~ msgstr "Үндсэн тохируулга"
-
-#~ msgid "Previous"
-#~ msgstr "Өмнөх"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Та цаашид удирдлагын цэсээр дамжин нэмэлт модулууд суулгах боломжтой."
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Та системд тохиргоо хийх юмуу эсвэл өгөгдмөл тохиргоог ашиглан баазруу шууд "
-#~ "холболт хийж болно."
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Таны шинэ бааз бүрэн суусан."
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Энэ өгүүлбэр таны тайлангийн баруун дээд буланд харагдана.\n"
-#~ "Уриагаа энд байрлуулахыг зөвлөж байна:\n"
-#~ "\"Нээлттэй Эхийн Бизнес Шийдэл\"."
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Тодорхой шаардлагаар модулуудыг урьдчилан сонгон хувийн тохиргоонд "
-#~ "байрлуулдаг. Эдгээр хувийн тохиргоонууд нь OpenERP-н ялгаатай байдлуудыг олж "
-#~ "нээхэд тохируулагдсан. Энэ зөвхөн тойм төдий, өшөө 300+ бэлэн модулиуд бий."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Энэ өгүүлбэр таны тайлангийн доод хэсэгт харагдана.\n"
-#~ "Банкны мэдээлэл ээ энд оруулана уу:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Энэ өгүүлбэр таны тайлангийн доод хэсэгт харагдана.\n"
-#~ "Албан ёсны мэдээлэл ээ энд оруулна уу:\n"
-#~ "Вэб: http://openerp.com - Факс: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Борлуулалтын цэг"
-
-#~ msgid "Invoicing"
-#~ msgstr "Нэхэмжлэл"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Нэмэлт багаж"
-
-#~ msgid "Company"
-#~ msgstr "Компани"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Тохиргооны явц"
-
-#~ msgid "Marketing"
-#~ msgstr "Маркетинг"
-
-#~ msgid "Fed. State"
-#~ msgstr "Аймаг/Хот"
-
-#~ msgid "Sales Management"
-#~ msgstr "Борлуулалтын менежмент"
-
-#~ msgid "title"
-#~ msgstr "гарчиг"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Тохиргооны визардыг алгасах"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Санхүү"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "Human Resources"
-#~ msgstr "Хүний нөөц"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Агуулахын менежмент"
-
-#~ msgid "Project Management"
-#~ msgstr "Төслийн менежмент"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Таний шинэ өгөгдлийн сангийн мэдээлэл"
-
-#~ msgid "New Database"
-#~ msgstr "Шинэ өгөгдлийн сан"
-
-#~ msgid "Food Industry"
-#~ msgstr "Хоол үйлдвэрлэл"
-
-#~ msgid "Image"
-#~ msgstr "Зураг"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid "City"
-#~ msgstr "Сум/Дүүрэг"
-
-#~ msgid "E-mail"
-#~ msgstr "Э-мэйл"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Банкны дансны дугаар"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Тайлангийн хөл 1"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Таний өгөгдлийн сан үүсгэгдсэн."
-
-#~ msgid "Associations"
-#~ msgstr "Нийгэмлэг"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Та системд тохиргоо хийх юмуу эсвэл өгөгдмөл тохиргоог ашиглан баазруу шууд "
-#~ "холболт хийж болно."
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Тайлангийн хөл 2"
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Дээд төвшний тайлан"
-
-#~ msgid "Use Directly"
-#~ msgstr "Хэрэглэх заавар"
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Баримтын менежмент"
-
-#~ msgid "Company Name"
-#~ msgstr "Компаний нэр"
-
-#~ msgid "Street 2"
-#~ msgstr "Гудамж 2"
-
-#~ msgid "Setup"
-#~ msgstr "Тохируулах"
-
-#~ msgid "Zip Code"
-#~ msgstr "Зип код"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Тохиргоо эхлэх"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Компаний тохиоргоо"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Худалдан авалтын менежмент"
-
-#~ msgid "Installed Users"
-#~ msgstr "Суулгагдсан хэрэглэгч"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Үйлчлүүлэгчтэй харилцах менежмент"
-
-#~ msgid "Report Header"
-#~ msgstr "Тайлангийн толгой"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Үйлдвэрлэх"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Таний лого - Хэмжээ нь 450x150 пиксел байна."
-
-#~ msgid "Company Website"
-#~ msgstr "Компаний Вэбсайт"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Жишээ нь: http://openerp.com"
-
-#~ msgid "Install Applications"
-#~ msgstr "Хэрэглээний програм суулгах"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Дараагийн хэрэглэгчийн суулгасан байх : \n"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Үйлдвэрлэлийн үйл ажиллагааг удирдах, тэдгээр үйл ажиллагааны тайлан "
-#~ "үүсгэхэд туслана."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Маркетингийн үйл ажиллагааг удирдахад алхам алхамаар туслана."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr "Таны үйлдвэрлэлд тус болох OpenERP цогц аппликэшнүүдийг суулгана."
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Асуулга, Үдийн зоог болон Саналын хайрцаг гэх мэт шаардлагатай бус боловч "
-#~ "олон сонирхолтой хэрэгслүүдийг суулгана."
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid "Auction Houses"
-#~ msgstr "Үнэ хаялцах худалдаа"
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid "Display Tips"
-#~ msgstr "Зөвлөмжийг Харуулах"
-
-#~ msgid "Create"
-#~ msgstr "Үүсгэх"
-
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Компаний Толгой болон Хөлийг Тохируулна уу"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "\"Захиалагч\"-г хэлэх өөр үг сонго"
 
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "Хэрэглэгчийн цагийн бүсийн ахны утгыг тохируулна уу, энэ нь сервер болон "
-#~ "клиентийн цагийн бүсийн зөрүүг хөрвүүлэхэд хэрэглэгддэг."
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr "Гадны нэвтрэлтээр нэвтрэх, facebook, google"
 
-#~ msgid "Import"
-#~ msgstr "Импортлох"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Шинэ харилцагч үүсгэх үед (хувь хүн эсвэл компани) бүх "
+"өгөгдөл/мэдээлэл(зураг, гэрийн хаяг гэх мэт)-ийг нь LinkedIn-с оруулж ирэх "
+"боломжтой болно."
 
-#~ msgid "Sync Google Contact"
-#~ msgstr "Google хаягуудыг ижилтгэх"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Баримтыг захиалагчид илгээхэд захиалагч OpenERP-руу нэвтэрч өөрийн бүх "
+"баримтыг авч болно. Мөн танай компанийн мэдээ зэрэгийг унших боломжтой. Мөн "
+"өөрсдийн төслийг хянах боломжтой."
 
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Хэрэглэгчийн Тохиргоог Тодорхойлно уу"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "Энэ маягтаас захиалагчид болон тэдгээрийн холбогдох хаягуудыг гараараа "
-#~ "оруулж болно эсвэл байгаа хаягуудыг CSV хүснэгтэн файлаар \"Өгөгдөл "
-#~ "Импортлох\" харилцах цонхоор оруулдаг."
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Энэ харилцах цонхыг ашиглан захиалагчидад бүхэлд нь хэрэглэгдэх нэр "
+"томьёонуудыг сольж болно."
 
-#~ msgid "Define default users preferences"
-#~ msgstr "Хэрэглэгчийн тохиргооны анхны утгуудыг тодорхойлно уу"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Компаний дэлгэрэнгүй дотор өшөө олон сонголтууд бий: толгой болон хөлд "
+"хэрэглэх хаяг, хугацаа хэтэрсэн төлбөрийн текст, гм."
 
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "Хэрэв та OpenERP-г анх удаа хэрэглэж байгаа бол хялбаршуулсан харагдацыг "
-#~ "сонгохыг онцгойлон зөвлөе. Энэ горимд бага боломжууд харагдах боловч "
-#~ "хэрэглэхэд илүү хялбар. Дараа нь хэдийд ч хамаагүй өргөтгөсөн хувилбар руу "
-#~ "шилжих боломжтой."
-
-#~ msgid "Extended"
-#~ msgstr "Өргөтгөсөн"
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Компаний өгөгдөл (хаяг, лого, банкны данс)-г бөглөснөөр эдгээр нь тайлангууд "
-#~ "дээр хэвлэгддэг. PDF баримтууд дээрх хөл, толгойг шалгахын тулд 'Толгойг "
-#~ "Урьдчилж Харах' даруулыг дарж шалгаж болно."
-
-#~ msgid "Customers"
-#~ msgstr "Захиалагчид"
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
-
-#~ msgid "Interface"
-#~ msgstr "Интерфейс"
-
-#~ msgid "Language"
-#~ msgstr "Хэл"
-
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Хэрэглэгчийн интерфейсийн орчуулга бэлэн байвал хэрэглэгчийн хэлний анхны "
-#~ "утгыг тааруулна. Хэрэв шинэ хэл нэмэхээр бол 'Удирдлага' менюгээс 'Албан "
-#~ "ёсны орчуулга ачаалах' харилцах цонхоор хийх боломжтой."
-
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "Энэ нь шинэ хэрэглэгчийн тохиргооны анхны утгуудыг тохируулахаас гадна "
-#~ "байгаа хэрэглэгчдийн тохиргоог бүгдийг өөрчилдөг. Дараа нь хэрэглэгчид "
-#~ "өөрсдөө тохиргоогоо чөлөөтэй өөрчлөх боломжтой."
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Нэмэлт Хэрэглэгчдийг Үүсгэх"
-
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Хэрэв та байнга цэсний заавар, тайлбарыг дэлгэцэнд харахыг хүсвэл үүнийг "
-#~ "сонго"
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "Sugarcrm-г импортлох"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Захиалагчдийг Үүсгэх буюу Импортлох"
-
-#~ msgid "Timezone"
-#~ msgstr "Цагийн бүс"
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "Google хаягуудыг ижилтгэх"
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "Sugarcrm импортлох"
-
-#~ msgid "Simplified"
-#~ msgstr "Хялбарчилсан"
-
-#~ msgid "Import or create customers"
-#~ msgstr "Захиалагчдийг импортлох буюу үүсгэх"
-
-#~ msgid "For Import Saleforce"
-#~ msgstr "Saleforce-г импортлох"
-
-#~ msgid "Import Saleforce"
-#~ msgstr "Saleforce-г импортлох"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/nb.po b/addons/base_setup/i18n/nb.po
index b4c853220d2..1018e6eef5f 100644
--- a/addons/base_setup/i18n/nb.po
+++ b/addons/base_setup/i18n/nb.po
@@ -1,232 +1,175 @@
 # Norwegian Bokmal translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-11 14:32+0000\n"
-"Last-Translator: Kaare Pettersen <Unknown>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Epost integrering."
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Gjest"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Kontakter."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "Base.Konfigurasjon.Innstillinger."
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
-"Bruke eksterne verifisering av leverandører, logg deg på med Google, "
-"Facebook, ..."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Tillate å dele dokumenter."
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr ""
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Tillater brukere å importere data fra CSV-filer."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Medlem"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Påfør."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Portal tilgang."
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Autentisering."
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Sitater og salgsordrer."
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Generelle innstillinger."
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Bidragsyter"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "E-post."
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM."
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Avbryt."
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "pasient"
+msgid "Client"
+msgstr "Klient"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Tillater brukere å importere data fra CSV-filer."
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Konfigurasjons salgs"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Administrere flere selskaper."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Konfigurer utgående e-post servere."
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "På Mail klient."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Konfigurer din firma data."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Kontakter."
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Få kontakter automatisk fra LinkedIn."
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Enable Thunderbird plug-in,"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_konfig_innhold"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Kunde"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Kunde funksjoner."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Import / Eksport."
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Salgs funksjoner."
-
-#. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Aktivere Outlook plug-in."
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Bidragsyter"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Du kan bruke denne veiviseren til å endre terminologier for kunder i hele "
-"programmet."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "E-post."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "leietaker"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Epost integrering."
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Dele eller legge alle skjermen på openerp."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Generelle innstillinger."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Kunde"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Når du oppretter en ny kontakt (person eller selskap), vil du være i stand "
-"til å laste alle data fra LinkedIn (bilder, adresse, etc)."
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Få kontakter automatisk fra LinkedIn."
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
-"Du finner flere alternativer i bedriftens detaljer: adresse for topp-og "
-"bunntekst, forsinket betalings tekster, etc."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "Salg.konfigurasjon.innstilling."
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Gjest"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -234,646 +177,205 @@ msgid "How do you call a Customer"
 msgstr "Hvordan ringer du en kunde"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Import / Eksport."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Klient"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"Aktiver den offentlige delen av openerp, openerp blir et offentlig nettsted."
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Partner"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Administrere flere selskaper."
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Bruk et annet for \"kunde\""
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Medlem"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Konfigurasjons salgs"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Alternativer."
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Partner"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "pasient"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Tillate å dele dokumenter."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Portal tilgang."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Sitater og salgsordrer."
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Aktiver den offentlige portalen."
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Konfigurer utgående e-post servere."
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Sosialt nettverk Integrering."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Salgs funksjoner."
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Avbryt."
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Dele eller legge alle skjermen på openerp."
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Påfør."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Sosialt nettverk Integrering."
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Spesifiser ditt Terminologi"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "Eller."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "leietaker"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Konfigurer din firma data."
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Rapport Bunntekst 1"
-
-#~ msgid "E-mail"
-#~ msgstr "E-post"
-
-#~ msgid "Human Resources"
-#~ msgstr "Menneskelige Ressurser"
-
-#~ msgid "City"
-#~ msgstr "By"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Hjelper deg med å administrere dine produksjons prosesser og generere "
-#~ "rapporter på disse prosessene."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr ""
-#~ "Hjelper deg med å administrere dine markedsførings kampanjer trinn for trinn."
-
-#~ msgid "Install"
-#~ msgstr "Installer"
-
-#~ msgid "Invoicing"
-#~ msgstr "Fakturering"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Bankkonto Nr"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Ekstra Verktøy"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Rapport Bunntekst 2"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Konfigurasjons Fremdrift"
-
-#~ msgid "Marketing"
-#~ msgstr "Markedsføring"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Utsalgssted"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Din database er nå opprettet."
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Hjelper deg med å håndtere dine regnskaps behov, dersom du ikke er "
-#~ "regnskapsfører, anbefaler vi at du kun installerer Fakturering "
-
-#~ msgid "Associations"
-#~ msgstr "Assosiasjoner"
-
-#~ msgid "Fed. State"
-#~ msgstr "Fylke"
-
-#~ msgid "Currency"
-#~ msgstr "Valuta"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Følgende brukere er blitt installert: \n"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Sales Management"
-#~ msgstr "Salgs Håndtering"
-
-#~ msgid "Company"
-#~ msgstr "Firma"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Du kan starte konfigurasjon av systemet eller koble direkte til databasen "
-#~ "som en administrator."
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "Din firmainformasjon vil brukes til å tilpasse dokumenter utstedt med "
-#~ "OpenERP som for eksempel fakturaer, salgsordrer og mye mer."
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Kunnskaps håndtering"
-
-#~ msgid "title"
-#~ msgstr "tittel"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Lar deg installere diverse interessante men ikke essensielle verktøy som "
-#~ "Undersøkelse, Lunch og Ide boks."
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Avansert Rapportering"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Hopp over Konfigurasjons Veiviser"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Hjelper deg med å håndtere dine innkjøps-relaterte prosesser slik som "
-#~ "forespørsler på tilbud, leverandørfaktura, osv..."
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.oppsett.firma"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Denne setningen vil komme på bunnen av dine rapporter.\n"
-#~ "Vi anbefaler deg å skrive inn bank informasjon her:\n"
-#~ "IBAN: NO74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: NO047.747.270"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Innstallerer et forhåndsutvalgt sett av OpenERP programmer som hjelper deg å "
-#~ "håndtere din industri."
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Denne modulen implementerer et konfigurasjons system som hjelper "
-#~ "brukere\n"
-#~ "    til å konfigurere systemet ved installasjon av databasen.\n"
-#~ "\n"
-#~ "    Det tillater deg å velge mellom en liste av profiler å innstallere:\n"
-#~ "    * Minimal profil\n"
-#~ "    * Kun regnskap\n"
-#~ "    * Service firmaer\n"
-#~ "    * Produksjons firmaer\n"
-#~ "\n"
-#~ "    Den spør også spørsmål underveis for enkelt å sette opp ditt firma. "
-#~ "topptekst og\n"
-#~ "    Bunntekst, kontoplanen og språket.\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Hjelper deg med å håndtere dine menneskelige ressurser ved å kode din "
-#~ "ansatte struktur, opprette arbeids ark, spore oppmøte og mer."
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Tillater deg å opprette dine fakturaer, og spore betalinger. Det er en "
-#~ "enklere versjon av regnskapsmodulen for ledere som ikke er regnskapsførere."
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Hjelper deg med å håndtere dine prosjekter og oppgaver ved å spore dem, "
-#~ "generere planer, osv..."
-
-#~ msgid "Company Name"
-#~ msgstr "Firmanavn"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.oppsett.installerer"
-
-#~ msgid "Street 2"
-#~ msgstr "Gate 2"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Lar deg installere tillegg rettet mot deling av kunnskap med og mellom dine "
-#~ "ansatte."
-
-#~ msgid "Zip Code"
-#~ msgstr "Postnummer"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Auksjonshus"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Regnskap & Finans"
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Velg programmene du ønsker at systemet skal dekke. Hvis du ikke er sikker på "
-#~ "dine behov, kan du enkelt installere disse senere."
-
-#~ msgid "Start Configuration"
-#~ msgstr "Start Konfigurasjon"
-
-#~ msgid "Setup"
-#~ msgstr "Oppsett"
-
-#~ msgid "Country"
-#~ msgstr "Land"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Lagerstyring"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Innkjøpstyring"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Firma Konfigurasjon"
-
-#~ msgid "New Database"
-#~ msgstr "Ny Database"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Kunde Relasjons Styring"
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "Hjelper deg med å håndtere dine tilbud, salgsordrer og fakturering."
-
-#~ msgid "Project Management"
-#~ msgstr "Prosjektstyring"
-
-#~ msgid "Installed Users"
-#~ msgstr "Installerte Brukere"
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Hjelper den med å få det meste ut av utsalgssteder med rask salgshåndtering, "
-#~ "forenklet betalingsmåte, automatisk plukkliste generering og mer."
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid "Food Industry"
-#~ msgstr "Mat Industri"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Produksjon"
-
-#~ msgid "Report Header"
-#~ msgstr "Rapportens topptekst"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Denne setningen vil vises på bunnen av dine rapporter.\n"
-#~ "Vi anbefaler deg å skrive juridisk informasjon her:\n"
-#~ "Web: http://openerp.com - Faks: +47 81 73 35 01 - Din Bank: 1262 01 32697"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Din Logo - Bruk en størrelse på rundt 450x150 punkter."
-
-#~ msgid "Information about your new database"
-#~ msgstr "Informasjon om din nye database"
-
-#~ msgid "Image"
-#~ msgstr "Bilde"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Installerer et forhåndsdefinert sett med OpenERP programmer valgt til å "
-#~ "hjelp deg med å håndtere auksjoner og forretningsprosessene rundt dem."
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Lar deg installere forskjellige verktøy for å foenkle og forbedre OpenERP's "
-#~ "rapport opprettelse."
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Denne setningen vil vises øverst til høyre på dine rapporter.\n"
-#~ "Vi anbefaler deg å skrive inn et slagord her:\n"
-#~ "\"Open Kildekode Forretningsløsninger\"."
-
-#~ msgid "Base Setup"
-#~ msgstr "Base Oppsett"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Hjelper deg med å håndtere ditt lager og hoved lager operasjoner: "
-#~ "leveringsordrer, mottak, osv."
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Konfigurer Din Firma Informasjon"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Bruk et annet for \"kunde\""
 
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Installer Spesifikke Industri Programmer"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
+"Bruke eksterne verifisering av leverandører, logg deg på med Google, "
+"Facebook, ..."
 
-#~ msgid "Company Website"
-#~ msgstr "Firma Nettside"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Når du oppretter en ny kontakt (person eller selskap), vil du være i stand "
+"til å laste alle data fra LinkedIn (bilder, adresse, etc)."
 
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Eksempel: http://openerp.com"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
 
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Hjelper deg med å spore og håndtere relsjoner med kunder slik som leads, "
-#~ "forespørsler, og spørsmål. Kan automatisk sende påminnelser, eskalere "
-#~ "forespørsler eller utløse forretnings-spesifikke hendelser basert på "
-#~ "standard hendelser."
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Install Applications"
-#~ msgstr "Installer Programmer"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Du kan bruke denne veiviseren til å endre terminologier for kunder i hele "
+"programmet."
 
-#~ msgid "Street"
-#~ msgstr "Gate"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Du finner flere alternativer i bedriftens detaljer: adresse for topp-og "
+"bunntekst, forsinket betalings tekster, etc."
 
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Installerer et forhåndsdefinert sett av OpenERP programmer som vil hjelpe "
-#~ "deg med å håndtere dine relasjoner mer effektivt."
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.oppsett.konfig"
-
-#~ msgid "Create"
-#~ msgstr "Opprett"
-
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
-
-#~ msgid "Import"
-#~ msgstr "Importér"
-
-#~ msgid "Extended"
-#~ msgstr "Utvidet"
-
-#~ msgid "Customers"
-#~ msgstr "Kunder"
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
-
-#~ msgid "Interface"
-#~ msgstr "Grensesnitt"
-
-#~ msgid "Language"
-#~ msgstr "Språk"
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Opprett flere brukere"
-
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
-
-#~ msgid "Timezone"
-#~ msgstr "Tidssone"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Opprett eller importer kunder"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Sett firma topp-og bunntekst"
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "Synk Google kontakt"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Definer brukers preferanser"
-
-#~ msgid "For Import Saleforce"
-#~ msgstr "For import Saleforce"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Definer standard brukerreferanser"
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "For import Sugar CRM"
-
-#~ msgid "Simplified"
-#~ msgstr "Forenklet"
-
-#~ msgid "Import or create customers"
-#~ msgstr "Importer eller opprett kunder"
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "Import Sugar CRM"
-
-#~ msgid "Import Saleforce"
-#~ msgstr "Import Saleforce"
-
-#~ msgid "Display Tips"
-#~ msgstr "Visningstips"
-
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "Opprette eller importere kunder og deres kontakter manuelt fra dette "
-#~ "skjemaet, eller du kan importere eksisterende partnere ved hjelp av CSV-"
-#~ "regneark fra \"Importer data\" veiviser."
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "Hvis du bruker OpenERP for første gang vi sterkt anbefale deg å velge "
-#~ "forenklet grensesnitt, som har mindre funksjoner, men er enklere. Du kan "
-#~ "alltid bytte senere fra brukerens preferanser."
-
-#~ msgid "For Quickbooks Ippids"
-#~ msgstr "For Quickbooks Ippids"
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Fyll ut bedriftens data (adresse, logo, bankkontoer) slik at det er trykt på "
-#~ "rapportene. Du kan klikke på knappen 'Forhåndsvisning Header \"for å sjekke "
-#~ "toppteksten / bunnteksten av PDF-dokumenter."
-
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Setter standard språk for alle brukergrensesnitt, når UI oversettelser. Hvis "
-#~ "du ønsker å legge til nye språk, kan du legge den fra \"Legge en offisiell "
-#~ "oversettelse 'veiviser fra' Administrasjon 'menyen."
-
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "Dette vil sette standard innstillinger for nye brukere og oppdatere alle "
-#~ "eksisterende. Etterpå, kan brukerne fritt til å endre disse verdiene på sine "
-#~ "egne brukerens preferanser form."
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "Sett standard for nye brukerens tidssone, som brukes til å utføre tidssone "
-#~ "konverteringer mellom serveren og klienten."
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "For Synkroniser Google Kontakt"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Sjekk ut denne boksen hvis du ønsker å alltid vise tips om hver meny handling"
-
-#~ msgid "Quickbooks Ippids"
-#~ msgstr "Quickbooks Ippids"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_konfig_innhold"
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index 3a5ec168556..a81e719426f 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -1,244 +1,175 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Dutch translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-09 18:22+0000\n"
-"Last-Translator: Leen Sonneveld <leen.sonneveld@opensol.nl>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-16 13:20+0000\n"
+"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
+"Language-Team: Dutch <nl@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: 2014-04-22 06:28+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-17 06:47+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "E-mail integratie"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr "(herlaad lettertypes)"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Gast"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Contactpersonen"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Activeer het klantenportaal"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Delen van documenten toestaan"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
-"Gebruik externe authenticatie providers. Log in met Google, Facebook, ..."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
+msgstr "Toestaan dat gebruikers hun agenda synchroniseren met Google Agenda"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
-msgstr ""
-"OpenERP maakt het mogelijk om automatisch leads (of anderen documenten)\n"
-"                            van inkomende e-mails aan te maken. U kunt "
-"automatisch e-mails synchroniseren met OpenERP\n"
-"                            met behulp van reguliere POP / IMAP-accounts, "
-"via een direct e-mail integratie script voor uw\n"
-"                            e-mail server, of door handmatig uw e-mails te "
-"sturen naar OpenERP met behulp van specifieke\n"
-"                            plugins voor uw favoriete e-mailprogramma."
-
-#. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "VERKOOP"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Sta toe dat gebruikers gegevens importeren van CSV bestanden."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Lid"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Toepassen"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Portaal toegang"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr "Voeg Google documenten toe aan ieder record"
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Authenticatie"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Offertes en verkooporders"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Algemeen"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Donor"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "E-mail"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "Relatiebeheer"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Annuleren"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Geduld"
+msgid "Client"
+msgstr "Client"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Sta toe dat gebruikers gegevens importeren van CSV bestanden."
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Instellen verkoop"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Beheer meerdere bedrijven"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Uitgaande e-mail servers instellen"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "Op e-mail client"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Uw bedrijfsgegevens instellen"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=UW_DATABASE"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Contactpersonen"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Verkrijg contactpersonen automatisch vanuit LinkedIn"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr "Aangemaakt door"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Inschakelen Thunderbird plug-in"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr "Aangemaakt op"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Klant"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Klant opties"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Importeren"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Verkoop opties"
-
-#. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Inschakelen Outlook plug-in"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Donor"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"U kunt deze wizard gebruiken om de terminologie voor klanten, in de gehele "
-"applicatie, te wijzigen."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "E-mail"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Huurder"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "E-mail integratie"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Deel of embbed iedere scherm van OpenERP"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Algemeen"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Klant"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr "Toegang to statistieken over u bulk mailingen, beheer campagnes."
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Wanneer u een nieuw contact (persoon of bedrijf) maakt, kunt alle gegevens "
-"van LinkedIn (foto's, adres, enz.) laden."
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Verkrijg contactpersonen automatisch vanuit LinkedIn"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
-"Werken in multi-company omgevingen, met de nodige beveiliging toegang tussen "
-"de bedrijven.\n"
-"                Dit installeert de module multi_company."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Geef uw klanten toegang tot hun documenten."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
-msgstr ""
-"Het publiek portal is alleen toegankelijk als u zich in een enkele database-"
-"modus bevind. U kunt\n"
-"                                    de OpenERP Server starten met de optie"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
+msgstr "Google Agenda"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
-msgstr ""
-"U vind meer opties bij de bedrijfsgegevens: adres voor de kop- en voettekst, "
-"teksten voor achterstallige betalingen, enz."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
+msgstr "Google Drive"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Gast"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -246,738 +177,227 @@ msgid "How do you call a Customer"
 msgstr "Hoe belt u een klant"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
-msgstr ""
-"Wanneer u een document naar een klant stuurt,\n"
-"                                    (offerte, factuur), kan uw klant\n"
-"                                    inloggen en inzage krijgen in zijn "
-"documenten,\n"
-"                                    uw bedrijfsnieuws lezen, zijn projecten "
-"checken,\n"
-"                                    enz.."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Importeren"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Client"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr "Laatst bijgewerkt door"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr ""
-"Schakel het publieke deel van OpenERP in, OpenERP wordt hiermee een openbare "
-"website."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
+msgstr "Laatst aangepast op"
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
-msgstr ""
-"Met de plugin kunt u e-mails en bijbehorende bijlagen koppelen aan de "
-"geselecteerde\n"
-"                OpenERP objecten. U kunt kiezen voor een relatie, of een "
-"lead en\n"
-"                de geselecteerde e-mail koppelen als een. eml-bestand als "
-"bijlage\n"
-"                van het geselecteerde record. U kunt documenten aanmaken "
-"voor CRM Lead,\n"
-"                en relaties van de geselecteerde e-mails. Dit installeert de "
-"module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
+msgstr "Beheer bulk mailing campagnes"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Relatie"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Gebruik een ander woord voor \"Klant\""
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Beheer meerdere bedrijven"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Instellen verkoop"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Lid"
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
+"Odoo maakt het mogelijk om automatisch leads aan te maken (of andere "
+"documenten)\n"
+"                            van inkomende e-mails. U kunt u e-mail "
+"automatisch synchroniseren met Odoo\n"
+"                            door gebruik te maken van een gewone POP/IMAP "
+"mail account, en een direct e-mail integratie script\n"
+"                            voor de e-mail server. Of u maakt gebruik van "
+"het versturen van e-mails naar Odoo, door gebruik te maken\n"
+"                            van speciale plugins voor een e-mail programma."
+
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"Met de Outlook-plugin kunt u een object selecteren dat u wilt toevoegen\n"
-"                aan uw e-mail en de bijlagen van MS Outlook. U kunt een "
-"relatie \n"
-"                of een lead kiezen en de geselecteerde e-mail archiveren in "
-"een\n"
-"                OpenERP mailbericht met bijlagen.\n"
-"                Dit installeert de module plugin_outlook."
+"Wanneer geïnstalleerd, kunt u de API instellingen maken voor de Google "
+"Agenda."
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Opties"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Activeer het klantenportaal"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Relatie"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
-"Eenmaal geactiveerd, zal de login pagina worden vervangen door de openbare "
-"website."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Geduld"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Delen van documenten toestaan"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Portaal toegang"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(bedrijfs nieuws, vacatures, contact formulier, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Offertes en verkooporders"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Activeer het publieke portaal"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr "Rapport lettertype"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Uitgaande e-mail servers instellen"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "VERKOOP"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Sociale netwerken intergratie"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Verkoop opties"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Geef uw klanten toegang tot hun documenten."
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
+"Stel het lettertype in voor de rapportage kop. Het wordt gebruikt als "
+"standaard lettertype in de RML rapporten van het bedrijf van de gebruiker."
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Annuleren"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Deel of embbed iedere scherm van OpenERP"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Toepassen"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Sociale netwerken intergratie"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Specificeer uw teminology"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "of"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Huurder"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Uw bedrijfsgegevens instellen"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "U kunt meteen beginnen met het configureren van het systeem of direct "
-#~ "verbinden met de database met de standaard setup."
-
-#~ msgid "Zip code"
-#~ msgstr "Postcode"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Kies een profiel"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr "Dit installeert de module google_calendar."
 
-#~ msgid "Report header"
-#~ msgstr "Koptekst rapport"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Configuratie beginnen"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Later kunnen er meer modules worden geïnstalleerd via het Administratie menu."
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Een profiel bevat een voorselectie van modules voor specifieke behoeften. "
-#~ "Deze profielen zijn een opzet om u te helpen de verschillende aspecten van "
-#~ "OpenERP te ontdekken. Dit is slechts een overzicht, we hebben meer dan 300 "
-#~ "modules beschikbaar"
-
-#~ msgid "Next"
-#~ msgstr "Volgende"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid "State"
-#~ msgstr "Staat/Provincie"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "De database is geïnstalleerd."
-
-#~ msgid "Profile"
-#~ msgstr "Profiel"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Rapport Voettekst 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Rapport Voettekst 2"
-
-#~ msgid "General Information"
-#~ msgstr "Algemene Informatie"
-
-#~ msgid "Street2"
-#~ msgstr "Adres 2"
-
-#~ msgid "Report Information"
-#~ msgstr "Rapportinformatie"
-
-#~ msgid "Phone"
-#~ msgstr "Telefoon"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Defineer moederorganisatie"
-
-#~ msgid "Company Name"
-#~ msgstr "Bedrijfsnaam"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Deze regel verschijnt in de voet van uw rapporten.\n"
-#~ "We adviseren hier uw bankinformatie neer te zetten, bijv:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid "Country"
-#~ msgstr "Land"
-
-#~ msgid "Setup"
-#~ msgstr "Instellingen"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Deze regel verschijnt op de voet van uw rapporten.\n"
-#~ "We raden u aan hier een bedrijfsstatement neer te zetten, bijv:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Summary"
-#~ msgstr "Samenvatting"
-
-#~ msgid "Install"
-#~ msgstr "Installeren"
-
-#~ msgid "Installation Done"
-#~ msgstr "Installatie Gereed"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Deze regel verschijnt aan de rechterkant in de kop van uw rapporten.\n"
-#~ "We adviseren hier een slogan neer te zetten, bijv:\n"
-#~ "\"Open Source Business Solutions\"."
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr "Dit installeert te module google_docs"
 
-#~ msgid "Report Header"
-#~ msgstr "Rapport koptekst"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Gebruik een ander woord voor \"Klant\""
 
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Uw Logo - Gebruik een afmeting van ongeveer 450x150 pixels."
-
-#~ msgid "Currency"
-#~ msgstr "Valuta"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
+"Gebruik externe authenticatie providers. Log in met Google, Facebook, ..."
 
-#~ msgid "Street"
-#~ msgstr "Adres"
-
-#~ msgid "Use Directly"
-#~ msgstr "Direct Gebruiken"
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Wanneer u een nieuw contact (persoon of bedrijf) maakt, kunt alle gegevens "
+"van LinkedIn (foto's, adres, enz.) laden."
 
-#~ msgid "Previous"
-#~ msgstr "Vorige"
-
-#~ msgid "Base Setup"
-#~ msgstr "Basis setup"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Kassa's"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Uw database is nu gemaakt."
-
-#~ msgid "Associations"
-#~ msgstr "Verenigingen"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Helpt uw productieprocessen te beheren en genereert overzichten van die "
-#~ "processen."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Helpt uw marketing campagnes stap voor stap te beheren."
-
-#~ msgid "Invoicing"
-#~ msgstr "Facturatie"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Extra hulpmiddelen"
-
-#~ msgid "Sales Management"
-#~ msgstr "Verkoopbeheer"
-
-#~ msgid "Company"
-#~ msgstr "Bedrijf"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Voortgang configuratie"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "U kunt beginnen met de configuratie van het systeem of direct verbinden met "
-#~ "de database als beheerder."
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
-
-#~ msgid "Fed. State"
-#~ msgstr "Staat/Provincie"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Helpt uw boekhouding te regelen; al u geen boekhouder bent, stellen we voor "
-#~ "om alleen de facturatie te installeren "
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Laat u verschillende interessante maar niet-noodzakelijke hulpmiddelen zoals "
-#~ "enquête, lunch en ideeënbus installeren."
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Wanneer u een document naar een klant stuurt,\n"
+"                                    (offerte, factuur), kan uw klant\n"
+"                                    inloggen en inzage krijgen in zijn "
+"documenten,\n"
+"                                    uw bedrijfsnieuws lezen, zijn projecten "
+"checken,\n"
+"                                    enz.."
 
-#~ msgid "Advanced Reporting"
-#~ msgstr "Geavanceerde overzichten"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
+"Werk in multi-company omgevingen, met de benodigde toegangsrechten bij de "
+"bedrijven.\n"
+"- Dit installeert de module multi_company"
 
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Helpt de inkoop-gerelateerde processen te beheren zoals inkoop "
-#~ "prijsaanvragen, inkoopfacturen, etc..."
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Helpt uw personeel te beheren door uw personeel structuur te coderen, "
-#~ "werkbladen te genereren, aanwezigheid te volgen en meer."
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Laat u facturen maken en de betalingen volgen. Het is een simpeler versie "
-#~ "van de boekhoud module voor managers die geen boekhouders zijn."
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"U kunt deze wizard gebruiken om de terminologie voor klanten, in de gehele "
+"applicatie, te wijzigen."
 
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Helpt uw projecten en taken te beheren door ze te volgen, planningen te "
-#~ "genereren, etc..."
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Helpt u het meeste te halen uit uw kassa's met snelle codering, eenvoudige "
-#~ "betaalmethode codering, automatische piklijst generatie en meer."
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Kennisbeheer"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Installeert een voorgeselecteerde groep OpenERP applicaties die u helpen bij "
-#~ "het beheren van uw bedrijfstak."
-
-#~ msgid "title"
-#~ msgstr "titel"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Inkoopbeheer"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Bedrijf configuratie"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "Street 2"
-#~ msgstr "Straat 2"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Laat u aanvullingen installeren die gericht zijn op het delen van kennis met "
-#~ "en tussen uw medewerkers."
-
-#~ msgid "Zip Code"
-#~ msgstr "Postcode"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Veilinghuizen"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Boekhouding & Financiën"
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "Helpt u offertes, verkooporders en facturen te beheren."
-
-#~ msgid "Food Industry"
-#~ msgstr "Voedingsindustrie"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Productie"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Informatie over uw nieuwe database"
-
-#~ msgid "Image"
-#~ msgstr "Afbeelding"
-
-#~ msgid "New Database"
-#~ msgstr "Nieuwe database"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Klantrelatiebeheer"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Installeert een voorgeselecteerde groep OpenERP applicaties die u helpt bij "
-#~ "het beheren van veilingen evenals de processen eromheen."
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Laat u verschillende hulpmiddelen installeren die OpenERP's overzichten "
-#~ "aanmaak verbeteren en vereenvoudigen."
-
-#~ msgid "Project Management"
-#~ msgstr "Projectbeheer"
-
-#~ msgid "Installed Users"
-#~ msgstr "Geïnstalleerde gebruikers"
-
-#~ msgid "Company Website"
-#~ msgstr "Website bedrijf"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Helpt u bij het volgen en beheren van relaties met klanten zoals leads, "
-#~ "aanvragen en incidenten. Kan automatisch herinneringen sturen, aanvragen "
-#~ "escaleren en bedrijfs-specifieke acties oproepen op basis van standaard "
-#~ "gebeurtenissen."
-
-#~ msgid "Install Applications"
-#~ msgstr "Installeer applicaties"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Installeert een voorgeselecteerde groep applicaties die u helpen om uw "
-#~ "vereniging efficiënter te beheren."
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Voorbeeld: http://openerp.com"
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Helpt uw voorraad te beheren en bij belangrijke voorraad bewerkingen: "
-#~ "leveringen, ontvangsten, etc."
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "De volgende gebruikers zijn geïnstalleerd: \n"
-
-#~ msgid "Human Resources"
-#~ msgstr "Personeel"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Installeer specifieke bedrijfstak applicaties"
-
-#~ msgid "City"
-#~ msgstr "Woonplaats"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Bankrekening Nr"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Configuratie assistenten overslaan"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Uw bedrijfsinformatie configureren"
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "Uw bedrijfsinformatie wordt gebruikt voor het personaliseren van OpenERP "
-#~ "documenten zoals facturen, verkooporders en nog veel meer."
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Selecteer de applicaties waar uw systeem in moet voorzien. Als u nu niet "
-#~ "zeker bent van uw behoeftes, kunt u ze later eenvoudig installeren."
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Deze module implementeert een configuratie systeem dat gebruikers helpt\n"
-#~ "    om het systeem te configureren bij de installatie van een nieuwe "
-#~ "database.\n"
-#~ "\n"
-#~ "    Het laat u selecteren tussen verschillende te installeren profielen:\n"
-#~ "    * Minimaal profiel\n"
-#~ "    * Alleen financieel\n"
-#~ "    * Service bedrijven\n"
-#~ "    * Productie bedrijven\n"
-#~ "\n"
-#~ "    Het vraagt u ook via schermen om uw bedrijf eenvoudig te configureren, "
-#~ "de kop- en voetteksten, \n"
-#~ "    het rekeningschema en de te installeren taal.\n"
-#~ "    "
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Magazijnbeheer"
-
-#~ msgid "Display Tips"
-#~ msgstr "Tips weergeven"
-
-#~ msgid "Create"
-#~ msgstr "Aanmaken"
-
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
-
-#~ msgid "Import"
-#~ msgstr "Import"
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "Sync Google Contacten"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Definieer de standaard gebruikersinstellingen"
-
-#~ msgid "Extended"
-#~ msgstr "Uitgebreid"
-
-#~ msgid "Customers"
-#~ msgstr "Klanten"
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
-
-#~ msgid "Interface"
-#~ msgstr "Uiterlijk"
-
-#~ msgid "Language"
-#~ msgstr "Taal"
-
-#~ msgid "Timezone"
-#~ msgstr "Tijdzone"
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Aanmaken extra gebruikers"
-
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "Importeren van SugerCRM"
-
-#~ msgid "Import Saleforce"
-#~ msgstr "Importeren van Salesforce"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Definieer gebruikersinstellingen"
-
-#~ msgid "For Import Saleforce"
-#~ msgstr "Voor iomporteren van Salesforce"
-
-#~ msgid "For Quickbooks Ippids"
-#~ msgstr "Voor Quickbooks Ippids"
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "Voor importeren van  SugerCRM"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr "Vink dit aan om altijd tips te tonen bij elke menu actie."
-
-#~ msgid "Simplified"
-#~ msgstr "Eenvoudig"
-
-#~ msgid "Import or create customers"
-#~ msgstr "Importeren of aanmaken klanten"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Aanmaken of importeren van klanten"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "Als u OpenERP voor de eerste keer gebruikt adviseren we u dringend het "
-#~ "eenvoudige interface te selecteren die minder functies kent maar eenvoudiger "
-#~ "werkt. U kunt later altijd nog omschakelen via de gebruiker voorkeuren."
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "Voor Sync Google contactpersonen"
-
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "Maak of import klanten en de contactpersonen handmatig vanuit dit scherm of "
-#~ "u kunt uw bestaande partners vanuit een CSV bestand importeren via de "
-#~ "\"Import data\" wizard"
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Vul uw bedrijfsgegevens in (adres, logo, bankrekeningen) zo dat deze kunnen "
-#~ "worden afgedrukt op uw rapporten. U kan op de knop 'Voorbeeld kop' klikken "
-#~ "om de kop en voet van PDF documenten te controleren."
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"U vind meer opties bij de bedrijfsgegevens: adres voor de kop- en voettekst, "
+"teksten voor achterstallige betalingen, enz."
 
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "Stel de standaard tijdzone in voor nieuwe gebruikers. Deze wordt gebruikt om "
-#~ "tijdzone conversies te maken tussen server en client."
-
-#~ msgid "Quickbooks Ippids"
-#~ msgstr "Quickbooks Ippids"
-
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "Dit stelt de standaard voorkeuren voor nieuwe gebruikers in en werkt alle "
-#~ "bestaande gebruikers bij. Naderhand kunnen gebruikers zelfstandig deze "
-#~ "waardes aanpassen in hun voorkeuren scherm."
-
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Dit stelt, wanneer er vertalingen aanwezig zijn, de standaard taal voor de "
-#~ "gebruikers weergave in. Als u een nieuwe taal wilt toevoegen, dan kan dit "
-#~ "via 'Laad een officiële taal' in het 'beheer' menu."
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Configureer uw kop- en voettekst"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/nl_BE.po b/addons/base_setup/i18n/nl_BE.po
index 911ca4269a9..54b24b126b7 100644
--- a/addons/base_setup/i18n/nl_BE.po
+++ b/addons/base_setup/i18n/nl_BE.po
@@ -1,244 +1,175 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-04-26 16:24+0000\n"
-"Last-Translator: Els Van Vossel (Foxy) <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (Belgium) <nl_BE@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "E-mailintegratie"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Gast"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Contactpersonen"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Klantenportaal activeren"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
-"Gebruik externe verificatieproviders. Meld aan met Google, Facebook, ..."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Sta het delen van documenten toe"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
-"OpenERP maakt het mogelijk om automatisch leads (of andere documenten)\n"
-"                             aan te maken op basis van inkomende e-mails. U "
-"kunt automatisch e-mails synchroniseren met OpenERP\n"
-"                            met behulp van reguliere POP / IMAP-accounts, "
-"via een direct e-mailintegratiescript voor uw\n"
-"                            e-mailserver, of door zelf uw e-mails naar "
-"OpenERP te sturen met behulp van specifieke\n"
-"                            plug-ins voor uw favoriete e-mailprogramma."
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "VERKOOP"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Gebruikers mogen gegevens importeren uit csv-bestanden"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Lid"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Toepassen"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Portaaltoegang"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Verificatie"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Offertes en verkooporders"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Algemeen"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Donor"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "E-mail"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "Relatiebeheer"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Afbreken"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Patiënt"
+msgid "Client"
+msgstr "Cliënt"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Gebruikers mogen gegevens importeren uit csv-bestanden"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Verkoop instellen"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Meerdere bedrijven beheren"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Uitgaande e-mailservers instellen"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "Op e-mailclient"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Uw bedrijfsgegevens instellen"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=UW_DATABASE"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Contactpersonen"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Haal contactpersonen op uit LinkedIn"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Activeer de Thunderbirdplug-in"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Klant"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Klantenopties"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Import / Export"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Verkoopopties"
-
-#. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Activeer de Outlookplug-in"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Donor"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Met deze wizard kunt u een andere benaming kiezen voor klanten, die in de "
-"volledige toepassing zal worden gebruikt."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "E-mail"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Huurder"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "E-mailintegratie"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Gelijk welk scherm van OpenERP delen of insluiten"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Algemeen"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Klant"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Als u een nieuwe contactpersoon maakt (persoon of bedrijf), kunt u alle "
-"gegevens van LinkedIn laden (foto, adres, enz.)"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Haal contactpersonen op uit LinkedIn"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
-"Werken in omgevingen met meerdere bedrijven, met de nodige "
-"toegangsbeveiliging tussen de bedrijven.\n"
-"                Hiermee installeert u de module multi_company."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Geef uw klanten toegang tot hun documenten."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
-"Het openbare portaal is alleen toegankelijk als u zich in een enkele "
-"databasemodus bevindt. U kunt\n"
-"                                    de OpenERP-server starten met de optie"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
-"U vindt meer opties bij de bedrijfsgegevens: adres voor de kop- en "
-"voettekst, teksten voor achterstallige betalingen, enz."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Gast"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -246,504 +177,210 @@ msgid "How do you call a Customer"
 msgstr "Hoe wordt een klant bij u genoemd?"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
-"Wanneer u een document naar een klant stuurt,\n"
-"                                    (offerte, factuur), kan uw klant\n"
-"                                    aanmelden en zijn documenten bekijken,\n"
-"                                    uw bedrijfsnieuws lezen, zijn projecten "
-"controleren,\n"
-"                                    enz."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Import / Export"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Cliënt"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"Activeer het openbare deel van OpenERP; OpenERP wordt hiermee een openbare "
-"website."
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
-"Met de plug-in kunt u e-mails met bijlagen koppelen aan de geselecteerde\n"
-"                OpenERP-objecten. U kunt een relatie of een lead kiezen en\n"
-"                de gekozen e-mail koppelen als een .eml-bestand als bijlage\n"
-"                aan het geselecteerde record. U kunt documenten aanmaken "
-"voor CRM-lead\n"
-"                en relaties vanuit de geselecteerde e-mails. Hiermee "
-"installeert u de module plugin_thunderbird."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Relatie"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Meerdere bedrijven beheren"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Gebruik een andere benaming voor Klant"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Lid"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Verkoop instellen"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"Met de Outlookplug-in kunt u een object selecteren dat u wilt toevoegen\n"
-"                aan uw e-mail en de bijlagen van MS Outlook. U kunt een "
-"relatie \n"
-"                of een lead kiezen en de geselecteerde e-mail archiveren in "
-"een\n"
-"                OpenERP-mailbericht met bijlagen.\n"
-"                Hiermee installeert u de module plugin_outlook."
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Opties"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Klantenportaal activeren"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Relatie"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
-"Na activering zal de aanmeldpagina worden vervangen door de openbare website."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Patiënt"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Sta het delen van documenten toe"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Portaaltoegang"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(bedrijfsnieuws, vacatures, contactformulier, enz.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Offertes en verkooporders"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Openbare portaal activeren"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Uitgaande e-mailservers instellen"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "VERKOOP"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Integratie sociale netwerken"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Verkoopopties"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Geef uw klanten toegang tot hun documenten."
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Afbreken"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Gelijk welk scherm van OpenERP delen of insluiten"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Toepassen"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Integratie sociale netwerken"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Kies uw terminologie"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "of"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Huurder"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Uw bedrijfsgegevens instellen"
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid "Installation Done"
-#~ msgstr "Installatie gereed"
-
-#~ msgid "Summary"
-#~ msgstr "Samenvatting"
-
-#~ msgid "Fed. State"
-#~ msgstr "Staat/Provincie"
-
-#~ msgid "Street"
-#~ msgstr "Straat"
-
-#~ msgid "Company Name"
-#~ msgstr "Bedrijfsnaam"
-
-#~ msgid "Company"
-#~ msgstr "Bedrijf"
-
-#~ msgid "City"
-#~ msgstr "Plaats"
-
-#~ msgid "Street2"
-#~ msgstr "Adres 2"
-
-#~ msgid "State"
-#~ msgstr "Status"
-
-#~ msgid "Next"
-#~ msgstr "Volgende"
-
-#~ msgid "Currency"
-#~ msgstr "Valuta"
-
-#~ msgid "Phone"
-#~ msgstr "Telefoon"
-
-#~ msgid "Country"
-#~ msgstr "Land"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Uw Logo - Gebruik een afmeting van ongeveer 450x150 pixels."
-
-#~ msgid "General Information"
-#~ msgstr "Algemene Informatie"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Rapportvoettekst 1"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Bankrekeningnr."
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Helpt u om uw boekhouding te voeren. Als u geen boekhouder bent, raden wij u "
-#~ "aan om enkel Facturatie te installeren. "
-
-#~ msgid "Associations"
-#~ msgstr "Verenigingen"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Rapportvoettekst 2"
-
-#~ msgid "Sales Management"
-#~ msgstr "Verkoopbeheer"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "U kunt beginnen met de configuratie van het systeem of u onmiddellijk als "
-#~ "beheerder aanmelden op de database."
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "Met uw bedrijfsinformatie kunt u OpenERP-documenten zoals facturen, "
-#~ "verkooporders, e.d. personaliseren."
-
-#~ msgid "title"
-#~ msgstr "Titel"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Hiermee kunt u verschillende interessante modules installeren, zoals "
-#~ "Enquêtes, Lunch en Ideeënbus."
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Configuratieassistenten overslaan"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "Street 2"
-#~ msgstr "Straat 2"
-
-#~ msgid "Zip Code"
-#~ msgstr "Postcode"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Veilinghuizen"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Boekhouding & financiën"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Beginnen met de configuratie"
-
-#~ msgid "Setup"
-#~ msgstr "Instellingen"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Magazijnbeheer"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Aankoopbeheer"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Bedrijfsconfiguratie"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Selecteer de applicaties die u wilt gebruiken. U kunt later makkelijk extra "
-#~ "modules installeren, wat ook handig is als u op dit moment nog geen "
-#~ "duidelijk zicht heeft op wat u allemaal nodig heeft."
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "Hiermee kunt u offertes, verkooporders en facturen maken."
-
-#~ msgid "Project Management"
-#~ msgstr "Projectbeheer"
-
-#~ msgid "Installed Users"
-#~ msgstr "Geïnstalleerde gebruikers"
-
-#~ msgid "Food Industry"
-#~ msgstr "Voedingsindustrie"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Productie"
-
-#~ msgid "Report Header"
-#~ msgstr "Rapporthoofding"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Informatie over uw nieuwe database"
-
-#~ msgid "Image"
-#~ msgstr "Afbeelding"
-
-#~ msgid "New Database"
-#~ msgstr "Nieuwe database"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Klantenrelatiebeheer"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Uw bedrijfsinformatie configureren"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Voorbeeld: http://openerp.com"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid "Human Resources"
-#~ msgstr "Personeelszaken"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "De volgende gebruikers zijn geïnstalleerd: \n"
-
-#~ msgid "Install"
-#~ msgstr "Installeren"
-
-#~ msgid "Invoicing"
-#~ msgstr "Facturatie"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Uw database is nu gemaakt."
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Configuratievoortgang"
-
-#~ msgid "Display Tips"
-#~ msgstr "Tips weergeven"
-
-#~ msgid "Create"
-#~ msgstr "Maken"
-
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Stel uw kop- en voettekst in"
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "Stel de standaardtijdzone in voor nieuwe gebruikers. Deze wordt gebruikt om "
-#~ "tijdzoneconversies te doen tussen server en client."
-
-#~ msgid "Import"
-#~ msgstr "Importeren"
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "Google-contacten synchroniseren"
-
-#~ msgid "For Quickbooks Ippids"
-#~ msgstr "Voor Quickboos Ippids"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Stel de gebruikersvoorkeuren in"
-
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "Maak of importeer klanten en contactpersonen manueel vanuit dit scherm. U "
-#~ "kunt ook bestaande klanten importeren vanuit een csv-bestand met de wizard "
-#~ "\"Gegevens importeren\"."
-
-#~ msgid "For Import Saleforce"
-#~ msgstr "Voor Salesforce-import"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Stel de standaard gebruikersvoorkeuren in"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "Als u OpenERP voor de eerste keer gebruikt, raden wij u aan de eenvoudige "
-#~ "weergave te kiezen, met minder functies en een eenvoudige werking. U kunt "
-#~ "deze keuze altijd wijzigen via de gebruikersvoorkeuren."
-
-#~ msgid "Customers"
-#~ msgstr "Klanten"
-
-#~ msgid "Extended"
-#~ msgstr "Uitgebreid"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid "Interface"
-#~ msgstr "Interface"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Gebruik een andere benaming voor Klant"
 
-#~ msgid "Language"
-#~ msgstr "Taal"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
+"Gebruik externe verificatieproviders. Meld aan met Google, Facebook, ..."
 
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Kiest de standaardtaal voor de gebruik, als er vertalingen beschikbaar zijn. "
-#~ "Een Nieuwe taal instellen kan via het menu Beheer, Laad een officiële "
-#~ "vertaling."
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Als u een nieuwe contactpersoon maakt (persoon of bedrijf), kunt u alle "
+"gegevens van LinkedIn laden (foto, adres, enz.)"
 
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "Hiermee wijst u de standaardinstellingen toe aan nieuwe en bestaande "
-#~ "gebruikers. Een gebruiker kan deze waarden altijd wijzigen via zijn "
-#~ "voorkeuren."
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Wanneer u een document naar een klant stuurt,\n"
+"                                    (offerte, factuur), kan uw klant\n"
+"                                    aanmelden en zijn documenten bekijken,\n"
+"                                    uw bedrijfsnieuws lezen, zijn projecten "
+"controleren,\n"
+"                                    enz."
 
-#~ msgid "Create Additional Users"
-#~ msgstr "Extra gebruikers maken"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Met deze wizard kunt u een andere benaming kiezen voor klanten, die in de "
+"volledige toepassing zal worden gebruikt."
 
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr "Schakel dit vakje in als u voor elke menuactie tips wilt weergaven."
-
-#~ msgid "Quickbooks Ippids"
-#~ msgstr "Quickbooks Ippids"
-
-#~ msgid "Timezone"
-#~ msgstr "Tijdzone"
-
-#~ msgid "Import Saleforce"
-#~ msgstr "Salesforce-import"
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "Voor synchronisatie met Google-contacten"
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "Voor SugarCRM-import"
-
-#~ msgid "Simplified"
-#~ msgstr "Eenvoudig"
-
-#~ msgid "Import or create customers"
-#~ msgstr "Klanten maken of importeren"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"U vindt meer opties bij de bedrijfsgegevens: adres voor de kop- en "
+"voettekst, teksten voor achterstallige betalingen, enz."
 
-#~ msgid "Import Sugarcrm"
-#~ msgstr "SugarCRM-import"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Klanten maken of importeren"
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Vul uw bedrijfsgegevens in (adres, logo, bankrekeningen), zodat deze worden "
-#~ "afgedrukt op uw rapporten. U kunt op de knop 'Voorbeeld koptekst' klikken om "
-#~ "de koptekst en voettekst van pdf-documenten te controleren."
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/pl.po b/addons/base_setup/i18n/pl.po
index cb23e19a7ed..ee891a23f4a 100644
--- a/addons/base_setup/i18n/pl.po
+++ b/addons/base_setup/i18n/pl.po
@@ -1,243 +1,175 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Polish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-14 12:01+0000\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-29 15:41+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
-"Language-Team: \n"
+"Language-Team: Polish <pl@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-30 08:37+0000\n"
+"X-Generator: Launchpad (build 17176)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Integracja poczty"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Gość"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Kontakty"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Aktywuje portal klientów"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
-"Stosuje zewnętrzną autentykację, do logowania się kontami google, facebook, "
-"..."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Pozwalaj na współdzielenie dokumentów"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
-msgstr ""
-"OpenERP pozwala automatycznie tworzyć sygnały z wiadomości\n"
-"                            przychodzących. Wiadomości możesz automatycznie "
-"synchronizować\n"
-"                            między OpenERP a kontami POP/IMAP przy "
-"zastosowaniu bezpośrednich\n"
-"                            skryptów pocztowych do serwera email lub ręcznie "
-"możesz przekazywać\n"
-"                            maile z aplikacji do OpenERP przy użyciu wtyczek."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
+msgstr "Pozwala użytkownikom synchronizować kalendarz z Google Calendar"
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "Sprzedaż"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Pozwala importować dane z pliku CSV"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Członek"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Zastosuj"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Dostęp portalowy"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr "Dodawaj dokumenty Google do rekordów"
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Autentykacja"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Oferty i Zamówienia sprzedaży"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Ustawienia ogólne"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Darczyńca"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "Email"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Pacjent"
-
-#. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Pozwala importować dane z pliku CSV"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Anuluj"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Obsługuj kilka firm"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr "Klient"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "W aplikacji mailowej"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Konfiguruj sprzedaż"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=YOUR_DATABAE"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Konfiguruj serwery poczty wychodzącej"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Pobierz kontakty z LinkedIn"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Konfiguruj dane swojej firmy"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Włącz wtyczkę Tunderbird"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Kontakty"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr "Utworzone przez"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
-msgstr "Własne funkcjonalności"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr "Data utworzenia"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Import / Eksport"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Klient"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Funkcjonalność sprzedaży"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
+msgstr "Funkcjonalności klienta"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Włącz wtyczkę Outlook"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Darczyńca"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr "Ten kreator służy do zmiany terminologii w całej aplikacji."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "Email"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Wynajmujący"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Integracja poczty"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Współdziel lub zagnieźdź dowolny ekran openerp"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Ustawienia ogólne"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Klient"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Kiedy utworzysz nowy kontakt (osobą lub firmę), to będziesz mógł pobrać dane "
-"z LinkedIn (zdjęcia, adresy, etc)."
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Pobierz kontakty z LinkedIn"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
-"Pracuje w środowisku wielu firm, z odpowiednim zabezpieczonym dostępem "
-"pomiędzy firmami.\n"
-"                To instaluje moduł multi_company."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Daj swoim klientom dostęp do ich dokumentów."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
-msgstr ""
-"Portal publiczny jest dostępny tylko jeśli jesteś w trybie pojedynczej bazy "
-"danych. Możesz\n"
-"                                    uruchomić OpenERP Serwer tylko z opcją"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
+msgstr "Kalendarz Google"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
-msgstr ""
-"Znajdziesz więcej opcji w szczegółach twojej firmy, adres w nagłowku i "
-"stopce, tekst przeterminowanych płatności, itp."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
+msgstr "Dysk Google"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Gość"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -245,641 +177,211 @@ msgid "How do you call a Customer"
 msgstr "Jak nazywasz klienta"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
-"Kiedy wysyłasz dokument do klienta\n"
-"                                    (ofertę, fakturę), twój klient będzie w "
-"stanie\n"
-"                                    się zarejestrować żeby pobrać wszystkie "
-"jego dokumenty,\n"
-"                                    czytać aktualności firmy, sprawdzać jego "
-"projekty,\n"
-"                                    itp."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Import / Eksport"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Klient"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr "Ostatnio modyfikowane przez"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr "Włącz część publiczną openerp. Openerp stanie się publiczną witryną."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
+msgstr "Data ostatniej modyfikacji"
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
-"Ta wtyczka pozwala tobie archiwizować emaile i ich załączniki do wybranych\n"
-"                obiektów OpenERP. Możesz wybrać kontrahenta lub wątek i\n"
-"                załączyć wybrany email jako plik .eml w załączniku\n"
-"                wybranego rekordu. Możesz utworzyć dokument dla wątku CRM,\n"
-"                kontrahenta z wybranych emaili.\n"
-"                To instaluje moduł plugin_thunderbird."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Kontrahent"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Obsługuj kilka firm"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Podaj inny termin, który stosuejsz zamiast \"Klient\""
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Członek"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Konfiguruj sprzedaż"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"Wtyczka Outlook pozwala na wybranie obiektu, który chciałbyś dodać do\n"
-"                twoich emailów i załączników z MS Outlook. Możesz wybrać "
-"kontrahenta,\n"
-"                lub prowadzony obiekt i archiwizować wybrane emaile do "
-"wiadomości\n"
-"                OpenERP z załącznikami.\n"
-"                To instaluje moduł plugin_outlook."
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Opcje"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Aktywuje portal klientów"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Kontrahent"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
-"tak zrobić.\n"
-"                                    Raz aktywowana, strona logowania "
-"zostanie zastąpiona przez stronę publiczną."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Pacjent"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Pozwalaj na współdzielenie dokumentów"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Dostęp portalowy"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(aktualności firmy, stanowiska pracy, formularze kontaktu, itp.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Oferty i Zamówienia sprzedaży"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Aktywuj portal publiczny"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr "Czcionka raportu"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Konfiguruj serwery poczty wychodzącej"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "Sprzedaż"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Integracja z portalami społecznościowymi"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Funkcjonalności sprzedaży"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Daj swoim klientom dostęp do ich dokumentów."
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Anuluj"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Współdziel lub zagnieźdź dowolny ekran openerp"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Zastosuj"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Integracja z portalami społecznościowymi"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Ustal swoją terminologię"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "lub"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Wynajmujący"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Konfiguruj dane swojej firmy"
-
-#~ msgid "City"
-#~ msgstr "Miasto"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Możesz zacząć konfigurować system lub połączyć się z bazą używając "
-#~ "konfiguracji domyślnej."
-
-#~ msgid "Zip code"
-#~ msgstr "Kod pocztowy"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Wybierz profil"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Rozpocznij konfigurację"
-
-#~ msgid "Next"
-#~ msgstr "Następny"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid "State"
-#~ msgstr "Stan"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Twoja baza została zainstalowana."
-
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Company Name"
-#~ msgstr "Nazwa firmy"
-
-#~ msgid "Setup"
-#~ msgstr "Konfiguracja"
-
-#~ msgid "Summary"
-#~ msgstr "Podsumowanie"
-
-#~ msgid "Installation Done"
-#~ msgstr "Zakończono instalację"
-
-#~ msgid "Currency"
-#~ msgstr "Waluta"
-
-#~ msgid "Street"
-#~ msgstr "Ulica"
-
-#~ msgid "Previous"
-#~ msgstr "Poprzedni"
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Profile jako zestawy modułów do konkretnych zastosowań. Profile zostały "
-#~ "dobrane tak, żeby pomóc rozpoznawać różne zastosowania OpenERP. To tylko "
-#~ "kilka gotowych konfiguracji. Modułów jest ponad 300."
-
-#~ msgid "Report header"
-#~ msgstr "Nagłówek raportu"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Bedziesz mógł zainstalować pozostałe moduły później w menu Administracja"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Stopka raportu 1"
-
-#~ msgid "Report Information"
-#~ msgstr "Informacje raportu"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Definiuj główną firmę"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Stopka raportu 2"
-
-#~ msgid "Report Header"
-#~ msgstr "Nagłówek raportu"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Ten wpis będzie się pojawiał w stopce twoich wydruków.\n"
-#~ "Sugerujemy wpisanie danych firmowych:\n"
-#~ "KRS nr 35648299  Tel. 74 126 20 12 - www.openerp.com"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Ten wpis będzie się pojawiał w prawym górnym narożniku \n"
-#~ "twoich wydruków. Sugerujemy wpisanie sloganu firmy np.:\n"
-#~ "\"Darmowe produkty i rozwiązania\"."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Ten wpis będzie się pojawiał w stopce twoich wydruków.\n"
-#~ "Sugerujemy wpisanie danych do faktur np.:\n"
-#~ "Nr konta 74 1262 0121 0121 6907 4527 3498 - NIP: PL0477472701"
-
-#~ msgid "Base Setup"
-#~ msgstr "Ustawienia podstawowe"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Twoje logo - stosuj obrazek ok 450x150 pikseli"
-
-#~ msgid "Street2"
-#~ msgstr "Ulica2"
-
-#~ msgid "General Information"
-#~ msgstr "Informacje ogólne"
-
-#~ msgid "Install"
-#~ msgstr "Instaluj"
-
-#~ msgid "Country"
-#~ msgstr "Kraj"
-
-#~ msgid "Use Directly"
-#~ msgstr "Użyj bezpośrednio"
-
-#~ msgid "Associations"
-#~ msgstr "Stowarzyszenia"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Pomaga prowadzić księgowość. Jeśli nie jesteś księgowym, to sugerujemy "
-#~ "instalowanie tylko fakturowania. "
-
-#~ msgid "Human Resources"
-#~ msgstr "Kadry"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Punkt sprzedaży"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Baza danych została utworzaona"
-
-#~ msgid "Invoicing"
-#~ msgstr "Fakturowanie"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr "Pomaga w prowadzeniu działalności produkcyjnej."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Pomaga prowadzić kampanie marekringowe"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Nr Konta Bankowego"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Dodatkowe narzędzia"
-
-#~ msgid "Sales Management"
-#~ msgstr "Sprzedaż"
-
-#~ msgid "Company"
-#~ msgstr "Firma"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Postęp konfiguracji"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Możesz rozpocząć konfigurację systemu lub połączyć się z nim od razu jako "
-#~ "administrator."
-
-#~ msgid "Fed. State"
-#~ msgstr "woj."
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Następujący użytkownicy zostali utworzeni : \n"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Pozwala zainstalować ciekawe, ale nie kluczowe narzędzia jak: Ankieta, "
-#~ "Posiłki, Pomysły."
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Zaawansowane raportowanie"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Pomiń kreatory konfiguracji"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Ten moduł konfiguruje system przy tworzeniu bazy danych.\n"
-#~ "\n"
-#~ "    Moduł pozwala wybrać profil do instalacji:\n"
-#~ "    * Profil minimalny\n"
-#~ "    * Tylko księgowość\n"
-#~ "    * Firma usługowa\n"
-#~ "    * Firma produkcyjna\n"
-#~ "\n"
-#~ "    Moduł również pomaga konfigurować dane firmy jak: Nagłówek i stopka "
-#~ "dkumentów,\n"
-#~ "    Plan kont, Język itp.\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "Informacja o firmie będzie stosowana jako dane do drukowania na dokumentach "
-#~ "drukowanych z OpenERP. Dotyczy to faktur, ofert, zamówień zakupu itp."
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Pomaga zarządzać danymi kadrowymi. Definiuje strukturę pracowników, "
-#~ "obsługuje karty czasu pracy, rejestruje nieobecności."
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Pozwala tworzyć faktury i płatności. Jest to prostsza wersja modułu "
-#~ "księgowego."
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr "Pomaga prowadzić projekty i zadania, pomaga w planowaniu itd..."
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Zarządzanie wiedzą"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Instaluje przygotowany zestaw aplikacji OpenERP, które pomogą zarządzać "
-#~ "określonym rodzajem przedsiębiorstwa."
-
-#~ msgid "title"
-#~ msgstr "tytuł"
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Wybierz aplikacje, które mają pokryć potrzebną funkcjonalność. jeśli nie "
-#~ "jesteś pewien, co będzie ci potrzebne, to możesz to doinstalować później."
-
-#~ msgid "Company Configuration"
-#~ msgstr "Konfiguracja firmy"
-
-#~ msgid "Street 2"
-#~ msgstr "Ulica 2"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Pomaga organizować procesy zakupów jak zapytania ofertowe, faktury od "
-#~ "dostawców itp."
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Pozwala instalować moduły do współdzielenia informacji pomiędzy pracownikami."
-
-#~ msgid "Zip Code"
-#~ msgstr "Kod pocztowy"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Aukcje"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Księgowość"
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Pomaga stosować system jako punkt sprzedaży, gdzie funkcje sprzedaży są "
-#~ "przygotowane do szybkich działań."
-
-#~ msgid "Purchase Management"
-#~ msgstr "Zakupy"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Informacje o twojej nowej bazie"
-
-#~ msgid "New Database"
-#~ msgstr "Nowa baza danych"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Relacje z klientami (CRM)"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Instaluje przygotowany zestaw aplikacji OpenERP do prowadzenia aukcji."
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr "Pozwala instalować różne narzędzia do tworzenia raportów w OpenERP."
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Magazyn"
-
-#~ msgid "Project Management"
-#~ msgstr "Projekty"
-
-#~ msgid "Installed Users"
-#~ msgstr "Zainstalowani użytkownicy"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Konfiguruj informacje twojej firmy"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Produkowanie"
-
-#~ msgid "Food Industry"
-#~ msgstr "Produkcja żywności"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Instaluj aplikacje wybranych branż"
-
-#~ msgid "Company Website"
-#~ msgstr "Strona www firmy"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Porządkuje utrzymywanie kontaktów z klientami w postaci sygnałów o "
-#~ "potencjalnych klientach, pytaniach lub reklamacji. Może automatycznie "
-#~ "wysyłać przypomnienia, wysyłać zgłoszenia lub uruchamiać biznesowe działania "
-#~ "na podstawie standardowych zdarzeń."
-
-#~ msgid "Install Applications"
-#~ msgstr "Instaluj aplikacje"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Przykład: http://openerp.com"
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Pomaga zarządzać magazynem i jego operacjami jak: przyjęcia, wydania, "
-#~ "przesunięcia itp."
-
-#~ msgid "Image"
-#~ msgstr "Obraz"
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "Pomaga operować ofertami, zamówieniami sprzedazy i fakturowaniem."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Instaluje przygotowany zestaw aplikacji OpenERP do obsługi stowarzyszenia."
-
-#~ msgid "Display Tips"
-#~ msgstr "Wyświetlaj podpowiedzi"
-
-#~ msgid "Create"
-#~ msgstr "Utwórz"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Ustaw nagłówek i stopkę  dla firmy"
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "Ustaw domyślną strefę czasową dla nowych użytkowników. Stosowane do "
-#~ "konwersji czasu pomiędzy serwerem a klientem."
-
-#~ msgid "Import"
-#~ msgstr "Importuj"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Definiuj przeferancje użytkowników"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Definiuj domyślne preferencje użytkowników"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "Jeśli używasz OpenERP po raz pierwszy, to zalecamy stosowanie interfejsu "
-#~ "uproszczonego. Ma on mniej funkcji, ale jest prostszy. Później możesz "
-#~ "włączyć interfejs rozszerzony w preferencjach użytkownika."
-
-#~ msgid "Extended"
-#~ msgstr "Rozszerzone"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid "Customers"
-#~ msgstr "Klienci"
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid "Interface"
-#~ msgstr "Interfejs"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Podaj inny termin, który stosuejsz zamiast \"Klient\""
 
-#~ msgid "Language"
-#~ msgstr "Język"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
+"Stosuje zewnętrzną autentykację, do logowania się kontami google, facebook, "
+"..."
 
-#~ msgid "Create Additional Users"
-#~ msgstr "Utwórz dodatkowych użytkowników"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Kiedy utworzysz nowy kontakt (osobą lub firmę), to będziesz mógł pobrać dane "
+"z LinkedIn (zdjęcia, adresy, etc)."
 
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr "Zaznacz tę opcję, jeśli chcesz wyświetlać wskazówki do menu"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Kiedy wysyłasz dokument do klienta\n"
+"                                    (ofertę, fakturę), twój klient będzie w "
+"stanie\n"
+"                                    się zarejestrować żeby pobrać wszystkie "
+"jego dokumenty,\n"
+"                                    czytać aktualności firmy, sprawdzać jego "
+"projekty,\n"
+"                                    itp."
 
-#~ msgid "Timezone"
-#~ msgstr "Strefa czasowa"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Simplified"
-#~ msgstr "Uproszczony"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr "Ten kreator służy do zmiany terminologii w całej aplikacji."
 
-#~ msgid "Import or create customers"
-#~ msgstr "Utwórz lub importuj klientów"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Znajdziesz więcej opcji w szczegółach twojej firmy, adres w nagłowku i "
+"stopce, tekst przeterminowanych płatności, itp."
 
-#~ msgid "Create or Import Customers"
-#~ msgstr "Utwórz lub importuj klientów"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr ""
diff --git a/addons/base_setup/i18n/pt.po b/addons/base_setup/i18n/pt.po
index c6c9cec8c87..cfe694503d2 100644
--- a/addons/base_setup/i18n/pt.po
+++ b/addons/base_setup/i18n/pt.po
@@ -1,228 +1,175 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Portuguese translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-17 14:06+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese <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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Integração de e-mails"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Convidado"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Contactos"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Activar o portal do cliente"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
-"Utilizar provedores de autenticação externa, entrar com google, facebook, ..."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Permitir a partilha de documentos"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr ""
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Permitir importação de dados através de ficheiros CSV"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Membro"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Aplicar"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Autenticação"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Orçamentos e ordens de venda"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Configurações Gerais"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Doador"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "E-mail"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Paciente"
-
-#. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Permitir importação de dados através de ficheiros CSV"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Cancelar"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Gerir várias empresas"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr "Cliente"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=YOUR_DATABAE"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Configurar servidores de saída de email"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Conseguir os contactos automaticamente (através do linkedIn)"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Configurar dados da sua empresa"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Activar plug-in do  Thunderbird"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Contactos"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Importar / Exportar"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Cliente"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Activar plug-in do Outlook"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Doador"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Pode usar este assistente para alterar as terminologias dos clientes em toda "
-"a aplicação."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "E-mail"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Inquilino"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Integração de e-mails"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Configurações Gerais"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Cliente"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Quando cria um novo contacto (pessoa ou empresa), tem a possibilidade de "
-"carregar todos os dados a partir do LinkedIn (fotografias, morada, etc) ."
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Conseguir os contactos automaticamente (através do linkedIn)"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Convidado"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -230,715 +177,202 @@ msgid "How do you call a Customer"
 msgstr "Como vai chamar o cliente"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Importar / Exportar"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Cliente"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Parceiro"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Gerir várias empresas"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Use outra palavra para dizer \"Cliente\""
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Membro"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Opções"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Activar o portal do cliente"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Parceiro"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Paciente"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Permitir a partilha de documentos"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(notícias da empresa, vagas, formulário de contacto.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Orçamentos e ordens de venda"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Activar o portal público"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Configurar servidores de saída de email"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Integração com redes sociais"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Cancelar"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Aplicar"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Integração com redes sociais"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Especifique a sua terminologia"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "ou"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Inquilino"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Configurar dados da sua empresa"
-
-#~ msgid "City"
-#~ msgstr "Cidade"
-
-#~ msgid "Zip code"
-#~ msgstr "Caixa postal"
-
-#~ msgid "Next"
-#~ msgstr "Seguinte"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid "State"
-#~ msgstr "Estado"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "A sua nova base de dados esta agora totalmente instalada."
-
-#~ msgid "Profile"
-#~ msgstr "Perfil"
-
-#~ msgid "Phone"
-#~ msgstr "Telefone"
-
-#~ msgid "Country"
-#~ msgstr "País"
-
-#~ msgid "Setup"
-#~ msgstr "Configurar"
-
-#~ msgid "Summary"
-#~ msgstr "Resumo"
-
-#~ msgid "Install"
-#~ msgstr "Instalar"
-
-#~ msgid "Currency"
-#~ msgstr "Moeda"
-
-#~ msgid "Street"
-#~ msgstr "Rua"
-
-#~ msgid "Previous"
-#~ msgstr "Anterior"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Pode começar a configurar o sistema ou conectar-se directamente a base de "
-#~ "dados principal ao utilizar a configuração padrão."
-
-#~ msgid "Select a Profile"
-#~ msgstr "Seleccionar um Perfil"
-
-#~ msgid "Report header"
-#~ msgstr "Cabeçalho do Relatório"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Iniciar Configuração"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Será capaz de instalar mais tarde mais módulos através do menu Administração."
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Um perfil fez uma pré-selecção dos módulos para necessidades específicas. "
-#~ "Estes perfis foram configurados para ajudá-lo a descobrir os diferentes "
-#~ "aspectos do OpenERP. Esta é apenas uma visão geral, temos mais de 300 "
-#~ "módulos. disponíveis."
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Rodapé do Relatório 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Rodapé do Relatório 2"
-
-#~ msgid "General Information"
-#~ msgstr "Informação Geral"
-
-#~ msgid "Street2"
-#~ msgstr "Rua 2"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Definir a Empresa Principal"
-
-#~ msgid "Report Information"
-#~ msgstr "Informação do Relatório"
-
-#~ msgid "Company Name"
-#~ msgstr "Nome da Empresa"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Esta frase irá aparecer no rodapé do seu relatório.\n"
-#~ "Sugerimos que ponta as informações banáarias aqui:"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Esta frase irá aparecer no rodapé dos seus relatórios.\n"
-#~ "Sugerimos que escreva uma frase legal aqui:"
-
-#~ msgid "Installation Done"
-#~ msgstr "Instalação Concluida"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Esta frase aparecerá no canto direito superior de seus relatórios.\n"
-#~ "Nós sugerimos que ponha aqui um slogan:\n"
-#~ "\"Soluções de Negócios em Código Aberto\"."
-
-#~ msgid "Report Header"
-#~ msgstr "Cabeçalho do Relatório"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Seu Logotipo - Use um tamanho de aproximadamente 450x150 pixels."
-
-#~ msgid "Use Directly"
-#~ msgstr "Usar Directamente"
-
-#~ msgid "Logo"
-#~ msgstr "Logotipo"
-
-#~ msgid "Your database is now created."
-#~ msgstr "A sua base de dados foi criada"
-
-#~ msgid "Associations"
-#~ msgstr "Associações"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Número de conta bancária"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Ferramentas extras"
-
-#~ msgid "Sales Management"
-#~ msgstr "Gestão de vendas"
-
-#~ msgid "Company"
-#~ msgstr "Empresa"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progresso da configuração"
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Street 2"
-#~ msgstr "Rua (2)"
-
-#~ msgid "Human Resources"
-#~ msgstr "Recursos Humanos"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Gestão de armazém"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Gestão de compras"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Configuração da empresa"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "Zip Code"
-#~ msgstr "Código Postal"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Leiloeiras"
-
-#~ msgid "Project Management"
-#~ msgstr "Gestão de projetos"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Produção"
-
-#~ msgid "Company Website"
-#~ msgstr "Página web da empresa"
-
-#~ msgid "Image"
-#~ msgstr "Imagem"
-
-#~ msgid "New Database"
-#~ msgstr "Nova base de dados"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Gestão de relacionamentos com clientes"
-
-#~ msgid "Installed Users"
-#~ msgstr "Utilizadores instalados"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Exemplo: http://openerp.com"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid "Install Applications"
-#~ msgstr "Instalar aplicações"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Use outra palavra para dizer \"Cliente\""
 
-#~ msgid "Food Industry"
-#~ msgstr "Indústria alimentar"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
+"Utilizar provedores de autenticação externa, entrar com google, facebook, ..."
 
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Ignorar os assistentes de configuração"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Quando cria um novo contacto (pessoa ou empresa), tem a possibilidade de "
+"carregar todos os dados a partir do LinkedIn (fotografias, morada, etc) ."
 
-#~ msgid "Information about your new database"
-#~ msgstr "Informação sobre a sua nova base de dados"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
 
-#~ msgid "Fed. State"
-#~ msgstr "Distrito"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Ajuda-o a gerir os seus processos de produção e gera relatórios relativos "
-#~ "aos mesmos."
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Pode usar este assistente para alterar as terminologias dos clientes em toda "
+"a aplicação."
 
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Ajuda-o a gerir as suas campanhas de marketing, passo a passo"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Foram instalados os seguintes utilizadores: \n"
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Relatórios avançados"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Contabilidade e Finanças"
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Ajuda-o a gerir os seus projetos e tarefas, registando-os, gerando "
-#~ "planeamentos, etc..."
-
-#~ msgid "Point of Sales"
-#~ msgstr "Ponto de Venda"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Ajuda na gestão da contabilidade. Se não é contabilista, sugerimos que "
-#~ "instale apenas o módulo Facturação "
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Permite a emissão de facturas e a gestão de pagamentos das mesmas. É uma "
-#~ "versão simplificada do módulo de contabilidade. Para gestores que não são "
-#~ "contabilistas."
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Ajuda na gestão dos recursos humanos, permitindo a organização do "
-#~ "organograma, a geração de folhas de trabalho, gerir a assiduidade e muito "
-#~ "mais."
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "As informações da empresa serão utilizadas para personalizar os documentos "
-#~ "gerados pelo OpenERP, como facturas, ordens de veda e muitos outros."
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Gestão de Conhecimento"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Instala um conjunto pré-selecionado de módulos OpenERP que o ajudarão a "
-#~ "gerir o seu negócio."
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Permite a instalação de várias ferramentas interessantes mas não essenciais, "
-#~ "como Inquéritos, Almoços, e Caixa de Ideias."
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Configure a informação da sua empresa"
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Ajuda na gestão do inventário e outras operações de gestão de stock: ordens "
-#~ "de envio, recepções, etc."
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Ajuda na gestão dos processos de aprovisionamento, como pedidos de cotação, "
-#~ "facturas de fornecedores, etc..."
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Instalar aplicações de indústrias específicas."
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Seleccione as aplicações que necessita para o seu sistema. Se não tem "
-#~ "certeza nesta fase de quais as necessidades da sua empresa, pode facilmente "
-#~ "instalá-las mais tarde."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Instala um conjunto pré-selectionado de aplicações do OpenERP, escolhidas "
-#~ "para ajudar a gerir leilões e todos os processos de gestão associados."
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Instala várias ferramentas que simplificam e melhoram a criação de "
-#~ "relatórios no OpenERP."
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "Ajuda na gestão de cotações, ordens de venda e facturação."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Instala um conjunto pré-seleccionado de aplicações OpenERP, escolhidas para "
-#~ "ajudar na gestão de associações."
-
-#~ msgid "Invoicing"
-#~ msgstr "Facturação"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Ajuda a controlar e gerir as relações com os clientes, tais como levar, "
-#~ "pedidos ou questões. Pode enviar automaticamente lembretes, escalar pedidos "
-#~ "ou desencadear acções específicas de negócios baseado em eventos padrão."
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Pode começar a configurar o sistema ou ligar-se directamente à base de "
-#~ "dados, como administrador"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Permite-lhe instalar extras com o objectivo de partilhar informações com e "
-#~ "entre os seus funcionários."
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Ajuda a tirar o máximo proveito dos pontos de vendas com a codificação de "
-#~ "venda rápida, codificação de modo simplificado de pagamento, geração "
-#~ "automática de listas de picking e muito mais."
-
-#~ msgid "Base Setup"
-#~ msgstr "Configuração da Base"
-
-#~ msgid "Create"
-#~ msgstr "Criar"
-
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Defina Cabeçalho e Rodapé da Empresa"
-
-#~ msgid "Import"
-#~ msgstr "Importar"
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "Sincronize ligação ao Google"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Defina preferências do utilizador"
-
-#~ msgid "For Import Saleforce"
-#~ msgstr "Para importar Força de Vendas"
-
-#~ msgid "Extended"
-#~ msgstr "Extendida"
-
-#~ msgid "Customers"
-#~ msgstr "Clientes"
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
-
-#~ msgid "Interface"
-#~ msgstr "Interface"
-
-#~ msgid "Language"
-#~ msgstr "Idioma"
-
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Crie ou Importe Clientes"
-
-#~ msgid "Import Saleforce"
-#~ msgstr "Importar Força de Vendas"
-
-#~ msgid "Import or create customers"
-#~ msgstr "Importe ou crie clientes"
-
-#~ msgid "Simplified"
-#~ msgstr "Simplificado"
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "Para sincronizar ligação com o Google"
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "Importar Sugarcrm"
-
-#~ msgid "Display Tips"
-#~ msgstr "Mostrar Dicas"
-
-#~ msgid "For Quickbooks Ippids"
-#~ msgstr "Para Quickbooks lppids"
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Preencha os dados da empresa (endereço, logotipo, contas bancárias), de modo "
-#~ "a que seja imprimido nos relatórios. Pode clicar em \"Pré-visualizar "
-#~ "Cabeçalho 'o botão a fim de verificar o cabeçalho / rodapé dos documentos em "
-#~ "PDF."
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "Para importar Sugarcrm"
-
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Define o idioma por omissão para a interface do utilizador das contas, "
-#~ "quando as traduções da interface do utilizador estão disponíveis. Se quiser "
-#~ "adicionar um novo idioma, pode adicioná-lo em 'Carregar uma tradução "
-#~ "oficial' no menu do assistente em 'Administração'."
-
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "Isto irá definir as preferências por omissão para novos utilizadores e "
-#~ "atualizar todos os existentes. Posteriormente, os utilizadores são livres "
-#~ "para mudar estes valores nas suas preferências de utilizador."
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "Definir por omissão para o fuso horário do novo utilizador, usado para fazer "
-#~ "conversões do fuso horário entre o servidor e o cliente."
-
-#~ msgid "Quickbooks Ippids"
-#~ msgstr "Quickbooks Ippids"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Este módulo implementa um sistema de configuração que ajuda o "
-#~ "utilizador\n"
-#~ "    para configurar o sistema à instalação de uma nova base de dados.\n"
-#~ "\n"
-#~ "    Ele permite que escolha entre uma lista de perfis para instalar:\n"
-#~ "    * Perfil mínimo\n"
-#~ "    * Apenas Contabilidade\n"
-#~ "    * As empresas de Serviços\n"
-#~ "    * As empresas de manufatura\n"
-#~ "\n"
-#~ "     Ele também pede telas para ajudar a configurar facilmente a sua "
-#~ "empresa, o cabeçalho e\n"
-#~ "     rodapé, o gráfico conta de instalar e da linguagem.\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "Crie ou importe clientes e os seus contatos manualmente para este formulário "
-#~ "ou pode importar parceiros existentes pela  folha de calculo CSV pela "
-#~ "\"Import Data\""
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Defina preferências padrão do utilizador"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "Se estiver a usar OpenERP pela primeira vez, aconselhamos que selecione a "
-#~ "interface simplificada, que tem menos recursos, mas é mais fácil. Sempre "
-#~ "pode mudar depois nas preferências do utilizador."
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Crie Utilizadores Adicionais"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Assinale esta caixa, se quer exibir sempre as dicas em todos os menus de "
-#~ "ação."
-
-#~ msgid "Timezone"
-#~ msgstr "Fuso Horário"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po
index 3ff87bed7e3..03a1945c7f3 100644
--- a/addons/base_setup/i18n/pt_BR.po
+++ b/addons/base_setup/i18n/pt_BR.po
@@ -1,243 +1,178 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-22 01:12+0000\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-09-05 00:49+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@zupy.com.br>\n"
-"Language-Team: \n"
+"Language-Team: Brazilian Portuguese <pt_BR@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-09-05 08:20+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Integração de Emails"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Convidado"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Contatos"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr "(recarregar fontes)"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Ativar o Portal de Cliente"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr "Use provedores de autenticação externos, como google, facebook, ..."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Permite compartilhar documentos"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
-msgstr ""
-"O OpenERP permite criar automaticamente prospectos (ou outros documentos)\n"
-"a partir de e-mails recebidos. Você pode sincronizar automaticamente e-mails "
-"com OpenERP\n"
-"usando o Contas POP/IMAP, usando um script de integração direta para o seu\n"
-"e-mail do servidor, ou manualmente, enviando emails para o OpenERP usando "
-"plugins\n"
-"específicos para o seu aplicativo de e-mail preferido."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
+msgstr "Permite que usuários sincronizem suas agendas com a agenda do Google"
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "VENDA"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Permite a usuários importar dados de arquivos CSV"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Membro"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Aplicar"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Acesso ao Portal"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr "Anexar documentos do Google para qualquer registro"
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Autenticação"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Cotações e Pedidos de Vendas"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Configurações Gerais"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Doador"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "Email"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Paciente"
+msgid "Client"
+msgstr "Cliente"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Permite a usuários importar dados de arquivos CSV"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Configurar Vendas"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Gerenciar múltiplas Empresas"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Configurar servidor de email de saida"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "No Cliente de Email"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Configure os dados de sua empresa"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=SUA_DATABASE"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Contatos"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Associar contatos do Linkedin automaticamente"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr "Criado por"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Habilitar plugin Thunderbird"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr "Criado em"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Cliente"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Recursos do Cliente"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Importar / Exportar"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Características de Venda"
-
-#. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Habilita plug-in Outlook"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Doador"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Você pode usar este assistente para mudar as terminologias para clientes em "
-"toda a aplicação"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "Email"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Locatário"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Integração de Emails"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Compartilhar ou incorporar qualquer tela do OpenERP."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Configurações Gerais"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Cliente"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
+"Acesse as estatísticas de suas campanhas de email em massa e gerencie suas "
+"campanhas."
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Quando você cria um novo contato (pessoa ou empresa), você será capaz de "
-"carregar todos os dados do LinkedIn (fotos, endereço, etc.)"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Associar contatos do Linkedin automaticamente"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
-"Trabalhar em ambientes multi-empresa, com acesso de segurança apropriado "
-"entre as empresas.\n"
-"Isso instala o módulo multi_company."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Dê a seus clientes o acesso a seus documentos."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
-msgstr ""
-"O portal público é acessível apenas se você estiver em um modo único banco "
-"de dados. você pode\n"
-"iniciar o servidor OpenERP com esta opção"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
+msgstr "Agenda do Google"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
-msgstr ""
-"Você vai encontrar mais opções em detalhes da sua empresa: endereço para o "
-"cabeçalho e rodapé, textos atraso de pagamentos, etc"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
+msgstr "Google Drive"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Convidado"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -245,739 +180,216 @@ msgid "How do you call a Customer"
 msgstr "Como você chama um Cliente"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
-msgstr ""
-"Quando você enviar um documento para um cliente\n"
-"                                     (fatura, cotação), seu cliente será\n"
-"                                     capaz de se inscrever para obter todos "
-"os seus documentos,\n"
-"                                     ler as notícias da empresa, verificar "
-"seus projetos,\n"
-"                                     etc"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
+msgstr "ID"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Importar / Exportar"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Cliente"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr "Ultima atualização por"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr ""
-"Habilita a parte pública do OpenERP, OpenERP torna-se um site público."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
+msgstr "Última atualização em"
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
-msgstr ""
-"O plugin permite que você aquive o e-mail e seus anexos ao objeto "
-"selecionado\n"
-"do OpenERP. Você pode selecionar um parceiro, ou um prospecto e\n"
-"anexar o email selecionado como um arquivo. eml como anexo do \n"
-"registro selecionado. Você pode criar documentos para prospectos do CRM,\n"
-"Parceiro para os  e-mails selecionados.\n"
-"Isto instala o módulo plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
+msgstr "Campanhas de email em massa"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Parceiro"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Gerenciar múltiplas Empresas"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Use uma outra palavra para dizer \"Cliente\""
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Membro"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Configurar Vendas"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"O plugin do Outlook permite que você aquive o e-mail e seus anexos ao objeto "
-"selecionado\n"
-"do OpenERP. Você pode selecionar um parceiro, ou um prospecto e\n"
-"anexar o email selecionado como um arquivo. eml como anexo do \n"
-"registro selecionado. Você pode criar documentos para prospectos do CRM,\n"
-"Parceiro para os  e-mails selecionados.\n"
-"Isto instala o módulo plugin_outlook."
+"Instalado, você poderá configurar suas permissões para a Agenda do Google"
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Opções"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Ativar o Portal de Cliente"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Parceiro"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
-"ao fazê-lo.\n"
-"                                     Uma vez ativada, a página de login será "
-"substituído pelo site público."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Paciente"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Permite compartilhar documentos"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Acesso ao Portal"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(notícias da empresa, trabalhos, formulário de contato, etc)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Cotações e Pedidos de Vendas"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Ativar o portal público"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr "Fonte do relatório"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Configurar servidor de email de saida"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "VENDA"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Integração com redes sociais"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Características de Venda"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Dê a seus clientes o acesso a seus documentos."
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
+"Define a fonte dentro do cabeçalho do relatório, será usada como fonte "
+"padrão nos relatórios RML da empresa do usuário"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Cancelar"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Compartilhar ou incorporar qualquer tela do OpenERP."
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Aplicar"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Integração com redes sociais"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Especifique sua Terminologia"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "ou"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Locatário"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Configure os dados de sua empresa"
-
-#~ msgid "City"
-#~ msgstr "Cidade"
-
-#~ msgid "Zip code"
-#~ msgstr "CEP"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr "Isto instala o módulo google_calendar"
 
-#~ msgid "Select a Profile"
-#~ msgstr "Selecione um perfil"
-
-#~ msgid "Report header"
-#~ msgstr "Cabeçalho do relatório"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Iniciar configuração"
-
-#~ msgid "Next"
-#~ msgstr "Próximo"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid "State"
-#~ msgstr "Estado"
-
-#~ msgid "Profile"
-#~ msgstr "Perfil"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Rodapé 1 do relatório"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Rodapé 2 do relatório"
-
-#~ msgid "Street2"
-#~ msgstr "Complemento"
-
-#~ msgid "Report Information"
-#~ msgstr "Relatório de informação"
-
-#~ msgid "Phone"
-#~ msgstr "Telefone"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Definir empresa principal"
-
-#~ msgid "Company Name"
-#~ msgstr "Nome da Empresa"
-
-#~ msgid "Country"
-#~ msgstr "País"
-
-#~ msgid "Install"
-#~ msgstr "Instalar"
-
-#~ msgid "Currency"
-#~ msgstr "Moeda"
-
-#~ msgid "Street"
-#~ msgstr "Rua"
-
-#~ msgid "Use Directly"
-#~ msgstr "Usar diretamente"
-
-#~ msgid "Logo"
-#~ msgstr "Logotipo"
-
-#~ msgid "Previous"
-#~ msgstr "Anterior"
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Um perfil configura uma pré-seleção dos módulos para necessidades "
-#~ "específicas. Estes perfis foram configurados para ajudá-lo a descobrir os "
-#~ "diferentes aspectos do OpenERP. Esta é apenas uma visão geral, nós temos "
-#~ "mais de 300 módulos disponíveis."
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Você pode começar a configurar o sistema ou conectar diretamente a base de "
-#~ "dados usando a configuração padrão."
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Você será capaz de instalar mais módulos posteriormente através do menu "
-#~ "Administração."
-
-#~ msgid "General Information"
-#~ msgstr "Informação geral"
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr "Isto instala o módulo google_docs."
 
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Sua nova base de dados está agora completamente instalada."
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Use uma outra palavra para dizer \"Cliente\""
 
-#~ msgid "Setup"
-#~ msgstr "Configurar"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr "Use provedores de autenticação externos, como google, facebook, ..."
 
-#~ msgid "Installation Done"
-#~ msgstr "Instalação concluída"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Quando você cria um novo contato (pessoa ou empresa), você será capaz de "
+"carregar todos os dados do LinkedIn (fotos, endereço, etc.)"
 
-#~ msgid "Summary"
-#~ msgstr "Resumo"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Quando você enviar um documento para um cliente\n"
+"                                     (fatura, cotação), seu cliente será\n"
+"                                     capaz de se inscrever para obter todos "
+"os seus documentos,\n"
+"                                     ler as notícias da empresa, verificar "
+"seus projetos,\n"
+"                                     etc"
 
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Seu logotipo - Use um tamanho de aproximadamente 450x150 pixels."
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
+"Trabalhar em ambiente multi-empresa, com controle de acesso entre as "
+"empresas.\n"
+"- Isto instala o módulo multi_company"
 
-#~ msgid "Report Header"
-#~ msgstr "Cabeçalho do Relatório"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Você pode usar este assistente para mudar as terminologias para clientes em "
+"toda a aplicação"
 
-#~ msgid "Base Setup"
-#~ msgstr "Configuração Base"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Você vai encontrar mais opções em detalhes da sua empresa: endereço para o "
+"cabeçalho e rodapé, textos atraso de pagamentos, etc"
 
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Esta frase aparecerá no canto superior direito de seus relatórios.\n"
-#~ "Nós sugerimos que coloque um slogan aqui, por exemplo:\n"
-#~ "\"Soluções de negócios em código aberto\"."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Esta frase aparecerá no rodapé de seus relatórios.\n"
-#~ "Sugerimos que coloque informações bancarias aqui:\n"
-#~ "Exemplo: Banco: NOMENÚMERO - Código SWIFT: LLLL XXXX"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Esta frase aparecerá no rodapé de seus relatórios.\n"
-#~ "Sugerimos que escreva uma instrução nesse campo, exemplo:\n"
-#~ "Web: http://openerp.com - Fax: +55.00.0000.0000 - Banco: XYZ"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Ponto de Vendas"
-
-#~ msgid "Your database is now created."
-#~ msgstr "O banco de dados foi criado."
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Auxilia o gerenciamento dos processos de manufatura e geração de relatórios "
-#~ "sobre estes processos."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Auxilia o gerenciamento de campanhas de marketing passo a passo."
-
-#~ msgid "Associations"
-#~ msgstr "Associações"
-
-#~ msgid "Invoicing"
-#~ msgstr "Faturamento"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Conta Bancária"
-
-#~ msgid "Company"
-#~ msgstr "Empresa"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Voce pode iniciar as configurações do sistema ou conectar diretamente no "
-#~ "banco de dados como administrador."
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Auxilia no manuseio das contabilizações. Se você não é contador, sugerimos a "
-#~ "instalação apenas do Faturamento "
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Relatórios Avançados"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Ferramentas Extras"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Configuração em Progresso"
-
-#~ msgid "Fed. State"
-#~ msgstr "Estado(UF)"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Os seguintes usuário foram instalados: \n"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Permite instalar várias ferramentas interessantes mas não essenciais, como "
-#~ "Pesquisas, Lanches e Caixa de Idéias."
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Pular Assistentes de Configuração"
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Ajuda você a gerenciar seus recursos humanos codificando sua estrutura de "
-#~ "funcionários, gerando planilhas de trabalho, controlando frequência e mais."
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Ajuda você a gerenciar seus projetos e tarefas, controlando-os, gerando "
-#~ "planejamentos, etc..."
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Ajuda você a tirar o máximo do seu ponto de vendas com rápida codificação de "
-#~ "vendas, codificação do modo de pagamento simplificado, geração de listas de "
-#~ "separação automáticas e mais."
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Gestão de Conhecimento"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Instala uma pré-seleção de Apliacações do OpenERP que ajudarão você a "
-#~ "gerenciar sua indústria."
-
-#~ msgid "title"
-#~ msgstr "Título"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Contabilidade e Finanças"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "Street 2"
-#~ msgstr "Rua 2"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Ajuda você a gerenciar processos relacionados a compras como solicitações de "
-#~ "cotação, notas fiscais de entrada de fornecedores, etc..."
-
-#~ msgid "Human Resources"
-#~ msgstr "Recursos humanos"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Permite instalar addons orientadas a compartilhar conhecimento com e entre "
-#~ "seus funcionários."
-
-#~ msgid "Zip Code"
-#~ msgstr "Código Postal (CEP)"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Casas de Leilão"
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Permite que você crie suas notas fiscais e acompanhe os pagamentos. Possui "
-#~ "uma versão fácil de módulo de contabilidade para gerentes que não são "
-#~ "contadores."
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Gestão de Estoques"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Gestão de Compras"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Configuração da Empresa"
-
-#~ msgid "New Database"
-#~ msgstr "Nova Base de Dados"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Instala uma pré-seleção de aplicações do OpenERP  selecionados para ajudar "
-#~ "você a gerenciar seus leilões e os processos de negócio envolvidos."
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Permite instalar várias ferramentas que simplificam e incrementam a criação "
-#~ "de relatórios no OpenERP."
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "Ajuda você a lidar com suas cotações, pedidos e faturamento."
-
-#~ msgid "Project Management"
-#~ msgstr "Gestão de Projetos"
-
-#~ msgid "Installed Users"
-#~ msgstr "Usuários Instalados"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Gestão de Relacionamento com o Cliente"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Instalar Aplicações Específicas para Indústria"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Manufatura"
-
-#~ msgid "Food Industry"
-#~ msgstr "Indústria de Alimentos"
-
-#~ msgid "Company Website"
-#~ msgstr "Site da Empresa"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Examplo: http://openerp.com"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Ajuda você a acompanhar e gerenciar relações com clientes como ligações, "
-#~ "solicitações ou problemas. Pode enviar lembretes automaticamente, escalar "
-#~ "solicitações ou disparar ações específicas de negócio baseado em padrões de "
-#~ "evento."
-
-#~ msgid "Install Applications"
-#~ msgstr "Instalar Aplicações"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Informação sobre sua nova base de dados"
-
-#~ msgid "Image"
-#~ msgstr "Imagem"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Instala uma pré-seleção de aplicações do OpenERP que ajudarão você a "
-#~ "gerenciar sua associação mais eficientemente."
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Ajuda você a gerenciar seu inventário e principais operações de estoque: "
-#~ "ordens de entrega, recebimentos, etc."
-
-#~ msgid "Sales Management"
-#~ msgstr "Gestão de Vendas"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Configure as Informações da Sua Empresa"
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Selecione as Aplicações que você quer no sistema. Se você não tem certeza de "
-#~ "quais selecionar neste momento, você pode facilmente instalá-las mais tarde."
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "Informação da sua empresa será usada para personalizar documentos gerados "
-#~ "pelo OpenERP como faturas, ordens de venda e muito mais."
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Este módulo implementa uma configuração que auxilia o usuário  \n"
-#~ "a configurar o sistema na instalação de uma nova base de dados.\n"
-#~ "\n"
-#~ "Permite selecionar entre uma lista de perfis a serem instalados: \n"
-#~ "* Perfil Mínimo\n"
-#~ "* Apenas Contabilidade\n"
-#~ "* Prestação de Serviço\n"
-#~ "* Indústrias\n"
-#~ "\n"
-#~ "Também apresenta telas para configurar facilmente sua empresa, cabeçalho e \n"
-#~ "rodapé de relatórios, plano de contas a instalar e idioma.\n"
-#~ "    "
-
-#~ msgid "Display Tips"
-#~ msgstr "Mostrar DIcas"
-
-#~ msgid "Create"
-#~ msgstr "Criar"
-
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
-
-#~ msgid "Import"
-#~ msgstr "Importar"
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "Sincronizar Contatos Google"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Define as Prefererências dos Usuários"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Define as Preferências Padrão dos Usuários"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "Se você estiver usando o OpenERP pela primeira vez, recomendamos que "
-#~ "selecione a interface simplificada, que tem menos opções mas é mais fácil. "
-#~ "Você poderá sempre mudar isso nas preferências de usuário."
-
-#~ msgid "Customers"
-#~ msgstr "Clientes"
-
-#~ msgid "Interface"
-#~ msgstr "Interface"
-
-#~ msgid "Language"
-#~ msgstr "Idioma"
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Criar Usuários Adicionais"
-
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "Importar do Sugar CRM"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Crie ou Importe os Clientes"
-
-#~ msgid "Timezone"
-#~ msgstr "Fuso Horário"
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "Para Importar do Sugar CRM"
-
-#~ msgid "Import or create customers"
-#~ msgstr "Importe ou crie os clientes"
-
-#~ msgid "Simplified"
-#~ msgstr "Simplificada"
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "Para sincronizar os contatos do Google"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Defina o Cabeçalho e o Rodapé da Empresa"
-
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "Crie ou importe clientes e seus contatos manualmente a partir deste "
-#~ "formulário, ou você pode importar seus parceiros existentes por planilhas "
-#~ "CSV através do assistente \"Importar Dados\""
-
-#~ msgid "For Import Saleforce"
-#~ msgstr "Importar do Saleforce"
-
-#~ msgid "For Quickbooks Ippids"
-#~ msgstr "Para Quickbooks Ippids"
-
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Defina o idioma padrão para toda a interface de usuário, quando traduções de "
-#~ "UI estiverem disponíveis. Se você quiser adicionar um novo idioma, você pode "
-#~ "adicionar pelo assistente \"Carregar uma tradução oficial\" do menu de "
-#~ "administrador"
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Preencha os dados da empresa (Endereço, logo, contas bancárias) para que "
-#~ "seja exibido em seus relatórios. Você pode clicar no botão \"Visualizar "
-#~ "Cabeçalho\" para verificar o cabeçalho/rodapé dos documentos PDF"
-
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "Isto irá definir as preferências padrões para novos usuários e atualizar "
-#~ "todos os existentes. Após isso, os usuários são livres para alterarem esses "
-#~ "valores para suas próprias preferencias"
-
-#~ msgid "Quickbooks Ippids"
-#~ msgstr "Quickbooks Ippids"
-
-#~ msgid "Import Saleforce"
-#~ msgstr "Importar Saleforce"
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "Defina o padrão para o fuso horário de novos usuários, usado para fazer "
-#~ "conversões de fuso horário entre servidor e cliente."
-
-#~ msgid "Extended"
-#~ msgstr "Extendida"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Selecione esta caixa se desejar sempre exibir as dicas sobre cada ação do "
-#~ "menu."
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/ro.po b/addons/base_setup/i18n/ro.po
index 952770f110b..0e43689006b 100644
--- a/addons/base_setup/i18n/ro.po
+++ b/addons/base_setup/i18n/ro.po
@@ -1,246 +1,175 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Romanian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-07 12:48+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <ro@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Integrare Email-uri"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Invitat"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Contacte"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings (setari.config.de_baza)"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Activeaza portalul clientului"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
-"Folositi furnizori de autentificare externa, autentificati-va cu google, "
-"facebook, ..."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Permite impartirea documentelor"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
-"OpenERP permite sa creati automat piste (sau alte documente)\n"
-"                            din email-urile primite. Puteti sincroniza email-"
-"uri automat cu OpenERP\n"
-"                            folosind conturi obisnuite POP/IMAP, folosind un "
-"script de integrare a email-urilor pentru\n"
-"                            serverul de email-uri, sau trimitand email-urile "
-"manual in OpenERP folosind plugin-uri\n"
-"                            specifice pentru aplicatia dumneavoastra "
-"preferata de email."
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "VANZARE"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Permite utilizatorilor sa importe date din fisiere CSV"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Membru"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Aplica"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Acces portal"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Autentificare"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Cotatii si Comenzi de Vanzare"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Configurari Generale"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Sponsor"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "Email"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "MRC (Managementul Relatiei cu Clientii)"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Revocare"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Rabdator"
+msgid "Client"
+msgstr "Client"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Permite utilizatorilor sa importe date din fisiere CSV"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Configureaza Vanzarile"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Gestioneaza companii multiple"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Configureaza serverele de trimitere email-uri"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "Pe Client Email"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Configurati datele companiei dumneavoastra"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filtru=BAZA_DE_DATE"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Contacte"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Ia contactele automat din linkedIn"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Activeaza aplicatia Thunderbird"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_continuturi"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Client"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Caracteristici Clienti"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Import / Export"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Caracteristici Vanzare"
-
-#. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Activeaza aplicatia Outlook"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Sponsor"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Puteti folosi acest wizard pentru a schimba terminologiile din intreaga "
-"aplicatie pentru clienti."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "Email"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Chirias"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Integrare Email-uri"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Imparte sau integreaza orice ecran openerp."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Configurari Generale"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Client"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Atunci cand creati un contact nou (persoana sau companie), veti putea sa "
-"incarcati toate datele din LinkedIn (fotografii, adresa, etc)."
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Ia contactele automat din linkedIn"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
-"Lucreaza in medii multi corporatiste, cu accesul de securitate adecvat intre "
-"companii.\n"
-"                Acesta instaleaza modulul multi_companie."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Permite clientilor dumneavoastra accesul la documentele lor."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
-"Portalul public este accesibil doar daca sunteti in modul baza de date unic. "
-"Puteti\n"
-"                                    lansa Serverul OpenERP cu optiunea"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
-"Veti gasi mai multe optiuni in detaliile companiei dumneavoastra: adresa "
-"pentru antet si subsol, texte in legatura cu platile restante, etc."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "setari.config.vanzare"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Invitat"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -248,744 +177,213 @@ msgid "How do you call a Customer"
 msgstr "Cum sunati un Client"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
-"Atunci cand trimiteti un document unui client\n"
-"                                    (cotatie, factura), clientul "
-"dumneavoastra va putea\n"
-"                                    sa se inregistreze ca sa primeasca toate "
-"documentele,\n"
-"                                    sa citeasca stirile companiei, sa isi "
-"verifice proiectele,\n"
-"                                    etc."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "terminologie.setup.baza"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Import / Export"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Client"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"Activeaza partea publica a lui openerp, openerp devine un site de Internet "
-"public."
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
-"Pluginul va permite sa arhivati email-uri si atasamentele lor in obiectele\n"
-"                OpenERP selectate. Puteti selecta un partener, sau o pista "
-"si\n"
-"                sa atasati emailul selectat ca fisier .eml in\n"
-"                atasamentul inregistrarii selectate. Puteti crea documente "
-"pentru Pista MRC,\n"
-"                Partener din email-urile selectate.\n"
-"                Acesta instaleaza modulul plugin_thunderbird."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Partener"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Gestioneaza companii multiple"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Folositi alt cuvant pentru a spune \"Client\""
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Membru"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Configureaza Vanzarile"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"Pluginul Outlook va permite sa selectati un obiect pe care doriti sa il "
-"aadaugati\n"
-"                email-ului dumneavoastra si atasamentele lui din MS Outlook. "
-"Puteti selecta un partener,\n"
-"                sau un obiect pista si sa arhivati un email\n"
-"                selectat intr-un mesaj de email OpenERP cu atasamente.\n"
-"                Acesta instaleaza modulul plugin_outlook."
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Optiuni"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Activeaza portalul clientului"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Partener"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
-"se face astfel.\n"
-"                                    Odata activat, pagina de autentificare "
-"va fi inlocuita cu pagina de Internet publica."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Rabdator"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Permite impartirea documentelor"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Acces portal"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(stiri despre companie, locuri de munca, formular de contact, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Cotatii si Comenzi de Vanzare"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Activeaza portalul public"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Configureaza serverele de trimitere email-uri"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "VANZARE"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Integrarea Retelei Sociale"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Caracteristici Vanzare"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Permite clientilor dumneavoastra accesul la documentele lor."
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Revocare"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Imparte sau integreaza orice ecran openerp."
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Aplica"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Integrarea Retelei Sociale"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Specificati-va Terminologia"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "sau"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Chirias"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Configurati datele companiei dumneavoastra"
-
-#~ msgid "Street"
-#~ msgstr "Strada"
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid "Report header"
-#~ msgstr "Antet raport"
-
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Subsol raport 1"
-
-#~ msgid "Street2"
-#~ msgstr "Strada2"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "General Information"
-#~ msgstr "Informatii generale"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Subsol raport 2"
-
-#~ msgid "Install"
-#~ msgstr "Instalare"
-
-#~ msgid "Next"
-#~ msgstr "Urmare"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Selectaţi un profil"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Puteţi începe configurarea sistemului sau vă puteţi conecta direct la baza "
-#~ "de date folosind setarea implicită"
-
-#~ msgid "City"
-#~ msgstr "Oraş"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Veţi putea instala mai multe module mai târziu prin intermediul meniului "
-#~ "Administrare"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Start configurare"
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Un profil stabileşte o preselecţie de module potrivite pentru un anumit tip "
-#~ "de activitate. Aceste profile au fost stabilite pentru a va ajuta să "
-#~ "descoperiţi diferitele aspecte ale OpenERP. Aceasta este doar o privire de "
-#~ "ansamblu, existând peste 300 de module disponibile."
-
-#~ msgid "Zip code"
-#~ msgstr "Cod poștal"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Noua bază de date este complet instalată"
-
-#~ msgid "State"
-#~ msgstr "Stat"
-
-#~ msgid "Report Information"
-#~ msgstr "Informaţii raport"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Definire companie mamă"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Aceasta fraza va apărea în partea de jos a rapoartelor.\n"
-#~ "Vă sugerăm să treceţi aici informaţiile juridice despre compania dvs.:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Installation Done"
-#~ msgstr "Instalare completă"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Aceasta frază va apărea în colţul dreapta sus în rapoarte.\n"
-#~ "Vă sugerăm să puneţi aici un slogan:\n"
-#~ "\"Soluţii de business Open source\""
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Aceasta fraza va apărea în partea de jos a rapoartelor.\n"
-#~ "Vă sugerăm să treceţi aici informaţiile bancare:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - TVA: BE0477.472.701"
-
-#~ msgid "Summary"
-#~ msgstr "Rezumat"
-
-#~ msgid "Setup"
-#~ msgstr "Instalare"
-
-#~ msgid "Country"
-#~ msgstr "Ţara"
-
-#~ msgid "Company Name"
-#~ msgstr "Nume companie"
-
-#~ msgid "Base Setup"
-#~ msgstr "Setare de bază"
-
-#~ msgid "Previous"
-#~ msgstr "Anterior"
-
-#~ msgid "Currency"
-#~ msgstr "Valută"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Logo-ul vostru - utilizaţi o dimensiune de aprox. 450x150 pixeli."
-
-#~ msgid "Use Directly"
-#~ msgstr "Folosire directă"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Punct de vînzare"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Baza de date a fost creată."
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Ajută la administrarea proceselor de fabricație și la generarea de rapoarte "
-#~ "pentru acestea."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Ajută la administrarea campaniilor de marketing, pas cu pas."
-
-#~ msgid "Bank Account No"
-#~ msgstr "Cont bancar"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Unelte suplimentare"
-
-#~ msgid "Invoicing"
-#~ msgstr "Facturare"
-
-#~ msgid "Sales Management"
-#~ msgstr "Vînzări"
-
-#~ msgid "Company"
-#~ msgstr "Companie"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progres Configurare"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Puteți începe configurarea sistemului, sau să vă conectați ca administrator."
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
-
-#~ msgid "Fed. State"
-#~ msgstr "Stat federal"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Utilizatorii din lista de mai jos nu au fost instalați : \n"
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Ajută la gestionarea proiectelor și a sarcinilor : monitorizare, "
-#~ "planificări, etc..."
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Ajută la gestionarea resurselor umane : specificarea structurii "
-#~ "organizatorice, generarea de pontaje, urmărirea prezenței și altele."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr "Instalarea uniu set prestabilit de aplicații OpenERP."
-
-#~ msgid "title"
-#~ msgstr "titlu"
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Rapoarte avansate"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Contabilitate și finanțe"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Ajută la gestionarea achizițiilor : cereri de oferte , facturi de la "
-#~ "furnizori , etc ..."
-
-#~ msgid "Human Resources"
-#~ msgstr "Resurse umane"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Permite instalarea de module pentru schimbul de cunoștinte cu și între "
-#~ "angajați."
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid "Zip Code"
-#~ msgstr "Cod poştal"
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Folositi alt cuvant pentru a spune \"Client\""
 
-#~ msgid "Purchase Management"
-#~ msgstr "Aprovizionare"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
+"Folositi furnizori de autentificare externa, autentificati-va cu google, "
+"facebook, ..."
 
-#~ msgid "Company Configuration"
-#~ msgstr "Configurarea companiei"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Atunci cand creati un contact nou (persoana sau companie), veti putea sa "
+"incarcati toate datele din LinkedIn (fotografii, adresa, etc)."
 
-#~ msgid "Warehouse Management"
-#~ msgstr "Gestiunea stocurilor"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Atunci cand trimiteti un document unui client\n"
+"                                    (cotatie, factura), clientul "
+"dumneavoastra va putea\n"
+"                                    sa se inregistreze ca sa primeasca toate "
+"documentele,\n"
+"                                    sa citeasca stirile companiei, sa isi "
+"verifice proiectele,\n"
+"                                    etc."
 
-#~ msgid "New Database"
-#~ msgstr "Bază de date nouă"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Project Management"
-#~ msgstr "Managementul proiectelor"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Puteti folosi acest wizard pentru a schimba terminologiile din intreaga "
+"aplicatie pentru clienti."
 
-#~ msgid "Installed Users"
-#~ msgstr "Utilizatorii instalați"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Veti gasi mai multe optiuni in detaliile companiei dumneavoastra: adresa "
+"pentru antet si subsol, texte in legatura cu platile restante, etc."
 
-#~ msgid "Manufacturing"
-#~ msgstr "Producție"
-
-#~ msgid "Food Industry"
-#~ msgstr "Industria alimentară"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Instalarea de aplicații specifice diverselor industrii"
-
-#~ msgid "Company Website"
-#~ msgstr "Site-ul companiei"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Exemplu http://openerp.com"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid "Install Applications"
-#~ msgstr "Instalarea de aplicații"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Informații despre noua bază de date"
-
-#~ msgid "Image"
-#~ msgstr "Imagine"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Permite emiterea de facturi și monitorizarea încasărilor. Acesta este un "
-#~ "modul simplificat de contabilitate pentru managerii care nu sunt contabili."
-
-#~ msgid "Associations"
-#~ msgstr "Asocieri"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Gestionarea relaţiilor cu clienţii"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Instalarea unui set predefinit de aplicații OpenERP pentru gestionarea "
-#~ "licitațiilor și a proceselor implicate."
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr "Permite instalarea de unelte pentru crearea de rapoarte OpenERP."
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr ""
-#~ "Ajută la gestionarea ofertelor de prețuri, a comenzilor de la furnizori și a "
-#~ "facturilor de intrare."
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Modulul de contabilitate. Dacă nu sunteți contabil, vă sugerăm să instalați "
-#~ "doar modulul de Facturare. "
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Managementul cunoștințelor"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Permite instalarea de module adiționale (neesențiale). De exemplu Survey, "
-#~ "Lunch și Ideas box."
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Ajută la gestionarea inventarului și a stocurilor : ordine de livrare, de "
-#~ "recepție,etc."
-
-#~ msgid "Street 2"
-#~ msgstr "Strada 2"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Case de licitații"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Instalarea unui set preselectat de aplicații OpenERP pentru gestionarea "
-#~ "facilă a asociației dvs."
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Ajută la gestionarea relațiilor cu clienții. Pot fi automat trimite mesaje "
-#~ "de tip reminder, pot fi gestionate solicitările și pot fi inițiate acțiuni "
-#~ "specifice afacerii în momentul în care au loc anumite evenimente."
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Salt peste wizard-urile de configurare"
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Modul pentru punctele de vînzare.  Codificarea rapidă a vînzărilor, "
-#~ "codificarea simplificată a modalităților de plată, generarea automată a "
-#~ "listelor de produse și altele."
-
-#~ msgid "Report Header"
-#~ msgstr "Antetul raportului"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Configurati Informatiile companiei dumneavoastra"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Acest modul implementeaza un sistem de configurare care ajuta "
-#~ "utilizatorul \n"
-#~ "sa configureze sistemul la instalarea unei baze de date noi. \n"
-#~ "\n"
-#~ "Va permite sa selectati intre o lista de profile de instalat: \n"
-#~ "          * Profilul minim \n"
-#~ "          * Doar contabilitate \n"
-#~ "          * Companii de servicii\n"
-#~ "          * Companii de productie\n"
-#~ "\n"
-#~ "De asemenea, le cere ecranelor sa ajute la configurarea cu usurinta a "
-#~ "companiei dumneavoastra, \n"
-#~ "a antetului si a subsolului, planul de conturi care trebuie instalat si "
-#~ "limba.\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "Informatiile despre compania dumneavoastra vor di folosite pentru a "
-#~ "personaliza documentele emise cu OpenERP, precum facturi, ordine de vanzare "
-#~ "si multe altele."
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Selectati Aplicatiile care doriti sa fie acoperite de sistemul "
-#~ "dumneavoastra. Daca nu sunteti sigur(a) despre nevoile dumenavoastra in "
-#~ "aceasta etapa, le puteti instala cu usurinta mai tarziu."
-
-#~ msgid "Display Tips"
-#~ msgstr "Afiseaza Sfaturi"
-
-#~ msgid "Create"
-#~ msgstr "Creeaza"
-
-#~ msgid "product.installer"
-#~ msgstr "program_de_instalare.produs"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Seteaza Antetul si Subsolul paginii Companiei"
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "Seteaza implicit pentru fusul orar al noului utilizator, folosit pentru a "
-#~ "realiza conversiile de fus orar dintre server si client."
-
-#~ msgid "Import"
-#~ msgstr "Importa"
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "Sinc Contact Google"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Defineste Preferintele Utilizatorilor"
-
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "Creeati sau Importati Clienti si contactele lor manual din acest formular "
-#~ "sau puteti importa partenerii existenti prin tabelul CSV din wizardul "
-#~ "\"Importa Date\""
-
-#~ msgid "For Import Saleforce"
-#~ msgstr "Pentru Importa Saleforce"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Defineste preferintele implicite ale utilizatorilor"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "Daca folositi OpenERP pentru prima data, va sfatuim sa selectati interfata "
-#~ "simplificata, care are mai putine caracteristici, dar care e mai usoara. "
-#~ "Puteti oricand sa schimbati interfata din preferintele utilizatorului mai "
-#~ "tarziu."
-
-#~ msgid "For Quickbooks Ippids"
-#~ msgstr "Pentru Quickbooks Ippids"
-
-#~ msgid "Extended"
-#~ msgstr "Extins(a)"
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Completati datele companiei dumneavoastra (adresa, logo, conturi bancare) "
-#~ "astfel incat sa fie imprimate in rapoartele dumneavoastra. Puteti sa faceti "
-#~ "click pe butonul 'Previzualizare Antet' pentru a verifica antetul/subsolul "
-#~ "documentelor PDF."
-
-#~ msgid "Customers"
-#~ msgstr "Clienti"
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "program_instalare.module.aplicatie.migrade"
-
-#~ msgid "Interface"
-#~ msgstr "Interfata"
-
-#~ msgid "Language"
-#~ msgstr "Limba"
-
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Seteaza limba implicita pentru toata interfata utilizatorului, atunci cand "
-#~ "sunt disponibile traduceri IU (Interfata utilizator). Daca doriti sa "
-#~ "Adaugati o limba noua, o puteti adauga din wizardul 'Incarca o Traducere "
-#~ "Oficiala' din meniul 'Administrare'."
-
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "Acesta va seta preferintele implicite pentru noii utilizatori si le va "
-#~ "actualiza pe toate cele existente.Dupa aceea, utilizatorii pot schimba acele "
-#~ "valori in propriul lor formular de preferinte utilizatori."
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Creati Utilizatori Suplimentari"
-
-#~ msgid "user.preferences.config"
-#~ msgstr "config.preferinte.utilizator"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Bifati aceasta casuta daca doriti sa se afiseza sfaturi la fiecare actiune "
-#~ "in meniu"
-
-#~ msgid "Timezone"
-#~ msgstr "Fus orar"
-
-#~ msgid "Quickbooks Ippids"
-#~ msgstr "Quickbooks Ippids"
-
-#~ msgid "Import Saleforce"
-#~ msgstr "Importa Saleforce"
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "Pentru Importul Sugarcrm"
-
-#~ msgid "Simplified"
-#~ msgstr "Simplificat(a)"
-
-#~ msgid "Import or create customers"
-#~ msgstr "Importa sau creeaza clienti"
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "Importa Sugarcrm"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Creeaza sau Importa Clienti"
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "Pentru Sinc Contact Google"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_continuturi"
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index d993fb9433b..fe646bed915 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.po
@@ -1,238 +1,175 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Russian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-06-17 10:30+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <ru@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Интеграция эл. почты"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Гость"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Контакты"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Включить клиентский портал"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
-"Использовать внешние сервисы аутентификации, например, вход через google, "
-"facebook, ..."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Разрешить совместный доступ к документам"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "ПРОДАЖА"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Позволяет пользователям импортировать данные из файлов CSV"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Участник"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Применить"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Доступ к порталу"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Авторизация"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Предложения и заказы продаж"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Общие настройки"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Спонсор"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "Эл. почта"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Отмена"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Пациент"
+msgid "Client"
+msgstr "Клиент"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Позволяет пользователям импортировать данные из файлов CSV"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Настройки продаж"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Управление несколькими компаниями"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Настроить сервер(а) исходящей почты"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "На почтовом клиенте"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Настроить информацию о компании"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=YOUR_DATABAE"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Контакты"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Получить контакты автоматически из LinkedIn"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Включить плагин Thunderbird"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Заказчик"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Свойства заказчика"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Импорт / Экспорт"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Свойства продаж"
-
-#. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Включить плагин Outlook"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Спонсор"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Вы можете использовать этот мастер чтобы изменить терминологию для "
-"заказчиков во всем приложении."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "Эл. почта"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Арендатор"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Интеграция эл. почты"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Поделиться или вставить любой экран OpenERP"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Общие настройки"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Заказчик"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Когда вы создаете новый контакт (человека или компанию), у вас есть "
-"возможность загрузить из LinkedIn всю информацию о нем (адреса, фотографии и "
-"т.д.)"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Получить контакты автоматически из LinkedIn"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
-"Работать в режиме Мульти-компании, с соответствующими правами доступа между "
-"компаниями.\n"
-"                Будет установлен модуль multi_company."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Разрешить заказчикам доступ к своим документам"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
-"Публичный портал доступен только при использовании одной базы данных. Вы "
-"можете\n"
-"                                    запустить сервер OpenERP с этой опцией"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
-"Больше опций вы можете найти в настройках компании: адреса для "
-"верхнего/нижнего колонтитула, тексты для просроченных платежей и т.д."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Гость"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -240,639 +177,214 @@ msgid "How do you call a Customer"
 msgstr "Как вы называете заказчика"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
-"Когда вы отправляете заказчику документы\n"
-"                                    (прайсы, счета), для их получения он "
-"сможет\n"
-"                                    войти на портал, где так же сможет "
-"прочитать\n"
-"                                    новости вашей компании, узнать "
-"обновления по\n"
-"                                    его проектам и т.д."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Импорт / Экспорт"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Клиент"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr "Включая публичную часть, openerp становится общедоступным сайтом."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Контрагент"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Управление несколькими компаниями"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Использовать другое слово вместо \"Заказчик\""
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Участник"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Настройки продаж"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Настройки"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Включить клиентский портал"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Контрагент"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Пациент"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Разрешить совместный доступ к документам"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Доступ к порталу"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(новости компании, вакансии, форма обратной связи т.д.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Предложения и заказы продаж"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Включить публичный портал"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Настроить сервер(а) исходящей почты"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "ПРОДАЖА"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Интеграция с социальными сетями"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Свойства продаж"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Разрешить заказчикам доступ к своим документам"
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Отмена"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Поделиться или вставить любой экран OpenERP"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Применить"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Интеграция с социальными сетями"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Определить терминологию"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "или"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Арендатор"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Настроить информацию о компании"
-
-#~ msgid "City"
-#~ msgstr "Город"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Вы можете начать настройку системы или соединиться непосредственно с базой "
-#~ "данных, используя настройки по умолчанию."
-
-#~ msgid "Zip code"
-#~ msgstr "Почтовый индекс"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Выберите профайл."
-
-#~ msgid "Report header"
-#~ msgstr "Заголовок отчета"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Начать настройку"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Вы можете установить больше модулей позднее при помощи меню "
-#~ "Администрирования."
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Профайл устанавливает заранее выбранные модули для определенных целей. Эти "
-#~ "профайлы были настроены, чтобы помочь вам ознакомиться с различными "
-#~ "аспектами OpenERP. Это просто обзор, имеется  более 300 доступных модулей."
-
-#~ msgid "Next"
-#~ msgstr "Далее"
-
-#~ msgid "E-mail"
-#~ msgstr "Эл.почта"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Теперь новая база данных полностью установлена."
-
-#~ msgid "Profile"
-#~ msgstr "Профайл"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Нижний колонтитул отчета 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Нижний колонитул отчета 2"
-
-#~ msgid "Street2"
-#~ msgstr "Улица (2-я строка)"
-
-#~ msgid "Phone"
-#~ msgstr "Телефон"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Задать головную компанию"
-
-#~ msgid "Country"
-#~ msgstr "Страна"
-
-#~ msgid "Setup"
-#~ msgstr "Установка"
-
-#~ msgid "Summary"
-#~ msgstr "Обзор"
-
-#~ msgid "Install"
-#~ msgstr "Установить"
-
-#~ msgid "Installation Done"
-#~ msgstr "Установка завершена"
-
-#~ msgid "Report Header"
-#~ msgstr "Заголовок отчета"
-
-#~ msgid "Currency"
-#~ msgstr "Валюта"
-
-#~ msgid "Street"
-#~ msgstr "Улица"
-
-#~ msgid "Use Directly"
-#~ msgstr "Использовать непосредственно"
-
-#~ msgid "Previous"
-#~ msgstr "Назад"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Ваш логотип - используйте размер примерно 450x150 пикселей"
-
-#~ msgid "Logo"
-#~ msgstr "Логотип"
-
-#~ msgid "General Information"
-#~ msgstr "Общая информация"
-
-#~ msgid "Base Setup"
-#~ msgstr "Базовая настройка"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Это предложение появится внизу ваших отчетов.\n"
-#~ "Рекомендуем поместить здесь информацию о вашем банке:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Это предложение появится в правом верхнем углу ваших отчетов.\n"
-#~ "Рекомендуем поместить здесь слоган:\n"
-#~ "\"Решения для бизнеса с открытым исходным кодом\"."
-
-#~ msgid "Report Information"
-#~ msgstr "Информация об отчетах"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Это предложение появится внизу ваших отчетов.\n"
-#~ "Рекомендуем поместить здесь юридическую информацию:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "State"
-#~ msgstr "Область/штат"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Кассовый терминал"
-
-#~ msgid "Associations"
-#~ msgstr "Ассоциации"
-
-#~ msgid "Invoicing"
-#~ msgstr "Выставление счетов"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Банковский счет №"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Доп. инструменты"
-
-#~ msgid "Sales Management"
-#~ msgstr "Управление продажами"
-
-#~ msgid "Marketing"
-#~ msgstr "Маркетинг"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid "Fed. State"
-#~ msgstr "Штат"
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid "Advanced Reporting"
-#~ msgstr "Расширенные отчеты"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Использовать другое слово вместо \"Заказчик\""
 
-#~ msgid "Purchase Management"
-#~ msgstr "Управление закупками"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
+"Использовать внешние сервисы аутентификации, например, вход через google, "
+"facebook, ..."
 
-#~ msgid "Street 2"
-#~ msgstr "Улица 2"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Когда вы создаете новый контакт (человека или компанию), у вас есть "
+"возможность загрузить из LinkedIn всю информацию о нем (адреса, фотографии и "
+"т.д.)"
 
-#~ msgid "Accounting & Finance"
-#~ msgstr "Бухгалтерия и Финансы"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Когда вы отправляете заказчику документы\n"
+"                                    (прайсы, счета), для их получения он "
+"сможет\n"
+"                                    войти на портал, где так же сможет "
+"прочитать\n"
+"                                    новости вашей компании, узнать "
+"обновления по\n"
+"                                    его проектам и т.д."
 
-#~ msgid "Warehouse Management"
-#~ msgstr "Управление складом"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Manufacturing"
-#~ msgstr "Производство"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Вы можете использовать этот мастер чтобы изменить терминологию для "
+"заказчиков во всем приложении."
 
-#~ msgid "Project Management"
-#~ msgstr "Управление проектами"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Больше опций вы можете найти в настройках компании: адреса для "
+"верхнего/нижнего колонтитула, тексты для просроченных платежей и т.д."
 
-#~ msgid "Installed Users"
-#~ msgstr "Установленные пользователи"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Управление отношениями с заказчиками"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Пример: http://openerp.com"
-
-#~ msgid "Install Applications"
-#~ msgstr "Установить приложения"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Были введены следующие пользователи: \n"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Пропустить мастер настроек"
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr ""
-#~ "Помогает вам управлять вашими маркетинговыми кампаниями, шаг за шагом."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Устанавливает заданный набор приложений OpenERP, которые помогут вам "
-#~ "управлять вашей отраслью."
-
-#~ msgid "title"
-#~ msgstr "название"
-
-#~ msgid "Human Resources"
-#~ msgstr "Управление персоналом"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Помагает вам управлять процессами производства и создавать отчеты об этих "
-#~ "процессах."
-
-#~ msgid "Your database is now created."
-#~ msgstr "Ваша база данных создана."
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Помогает реализовать потребности в бухгалтерском учёте. Если вы не бухгалтер "
-#~ "— советуем установить только модуль выставления счетов. "
-
-#~ msgid "Company"
-#~ msgstr "Организация"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Вы можете начать настраивать систему или соединиться с базой данных напрямую "
-#~ "в качестве администратора."
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "Информация о вашей компании будет использована для персонализации "
-#~ "документов, выводимых из OpenERP, таких как  счета, заказы на продажу и "
-#~ "многое другое."
-
-#~ msgid "Knowledge Management"
-#~ msgstr "База знаний"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Позволяет устанавливать различные интересные, но не основные инструменты, "
-#~ "например Обзор, Ланч и Коробка идей."
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Помогает Вам управлять процессами, связанными с закупками, такими как "
-#~ "запросы котировок, счета от поставщиков, и т.д…"
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "Помогает вам в управлении персоналом путём описания структуры подчинения, "
-#~ "созданием рабочих графиков, отслеживанием времени присутствия на рабочем "
-#~ "месте и т.д."
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Позволяет Вам выставлять счета и отслеживать платежи. Это упрощенная версия "
-#~ "бухгалтерского модуля для менеджеров, не являющихся бухгалтерами."
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Помогает вам управлять проектами и задачами, отслеживая их, осуществляя "
-#~ "планирование, и т.д. …"
-
-#~ msgid "Company Name"
-#~ msgstr "Наименование организации"
-
-#~ msgid "Zip Code"
-#~ msgstr "Почтовый индекс"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Позволяет устанавливать дополнения, предназначенные для обмена знаниями с и "
-#~ "между вашими сотрудниками."
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Выберите приложения, которые вы хотите видеть в вашей системе. Если вы не "
-#~ "уверены в ваших точных потребностях на этом этапе — вы сможете установить их "
-#~ "позже."
-
-#~ msgid "Company Configuration"
-#~ msgstr "Настройка организации"
-
-#~ msgid "New Database"
-#~ msgstr "Новая база данных"
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr ""
-#~ "Помогает вам обрабатывать запросы котировок, заказы на продажу и счета."
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Помогает вам получить максимальную отдачу от своих торговых точек с помощью "
-#~ "быстрого учета продаж, упрощенного способа регистрации платежей, "
-#~ "автоматического создания комплектовочных ведомостей и т.д."
-
-#~ msgid "Food Industry"
-#~ msgstr "Пищевая промышленность"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Информация о вашей новой базе данных"
-
-#~ msgid "Image"
-#~ msgstr "Изображение"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Устанавливает заранее выбранный набор приложений, отобранных для помощи в "
-#~ "управлении площадками аукционов и сопутствующими бизнес-процессами."
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Позволяет установить различные инструменты для упрощения и улучшения "
-#~ "создания отчетов в OpenERP."
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Настройте информацию о вашей организации"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Установить специальные приложения для отрасли"
-
-#~ msgid "Company Website"
-#~ msgstr "Интернет-сайт организации"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Позволяет вам отслеживать и управлять отношениями с заказчиками, такими как "
-#~ "сделки, запросы, инциденты. Может автоматически направлять напоминания, "
-#~ "выставлять запросы или инициировать специальные действия на основе "
-#~ "стандартных событий."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Устанавливает заранее выбранный набор приложений OpenERP, который поможет "
-#~ "вам управлять вашей ассоциацией  более эффективно."
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Позволяет вам управлять складским учётом и совершать основные складские "
-#~ "операции: формировать заказы на доставку, отчеты о получении и т.д…"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Площадки аукционов"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Этот модуль реализует систему настройки, помогающую пользователю\n"
-#~ "    настроить систему в момент установки новой базы данных.\n"
-#~ "    Он позволяет вам выбирать между перечнями устанавливаемых профилей:\n"
-#~ "    * Минимальный профиль\n"
-#~ "    * Только бухгалтерия\n"
-#~ "    * Компании сферы услуг\n"
-#~ "    * Производящие компании\n"
-#~ "\n"
-#~ "    Он также предлагает заполнять данные, чтобы проще настроить организацию, "
-#~ "колонтитулы\n"
-#~ "    план счетов и язык.\n"
-#~ "    "
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Выполнение настройки"
-
-#~ msgid "Display Tips"
-#~ msgstr "Выводить советы"
-
-#~ msgid "Create"
-#~ msgstr "Создать"
-
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
-
-#~ msgid "Import"
-#~ msgstr "Импорт"
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "Синхронизировать конакты Google"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "Если Вы используете OpenERP первый раз, мы настоятельно советуем выбрать "
-#~ "упрощенный интерфейс, который имеет меньше функций, но является более "
-#~ "легким. Позже Вы всегда сможете сменить интерфейс в настройках пользователя."
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
-
-#~ msgid "Interface"
-#~ msgstr "Интерфейс"
-
-#~ msgid "Language"
-#~ msgstr "Язык"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Отметьте этот квадратик, если вы хотите всегда выводить советы для каждого "
-#~ "пункта меню"
-
-#~ msgid "Simplified"
-#~ msgstr "Упрощенный"
-
-#~ msgid "Timezone"
-#~ msgstr "Часовой пояс"
-
-#~ msgid "Extended"
-#~ msgstr "Расширенный"
-
-#~ msgid "Customers"
-#~ msgstr "Заказчики"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/sk.po b/addons/base_setup/i18n/sk.po
index dcf2ecd402f..56834c8af07 100644
--- a/addons/base_setup/i18n/sk.po
+++ b/addons/base_setup/i18n/sk.po
@@ -1,537 +1,373 @@
 # Slovak translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-08-03 03:13+0000\n"
-"Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovak <sk@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Authentication"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Zrušiť"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Partner"
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Zrušiť"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
-#~ msgid "Next"
-#~ msgstr "Ďalej"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Štart konfigurácie"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Výber profilu"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Môžete začať konfiguráciu systému alebo sa priamo pripojiť k databáze s "
-#~ "použitím predvoleného nastavenia."
-
-#~ msgid "City"
-#~ msgstr "Mesto"
-
-#~ msgid "Zip code"
-#~ msgstr "PSČ"
-
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "State"
-#~ msgstr "Štát"
-
-#~ msgid "Street2"
-#~ msgstr "Ulica2"
-
-#~ msgid "Phone"
-#~ msgstr "Telefón"
-
-#~ msgid "General Information"
-#~ msgstr "Všeobecné informácie"
-
-#~ msgid "Install"
-#~ msgstr "Inštalovať"
-
-#~ msgid "Summary"
-#~ msgstr "Zhrnutie"
-
-#~ msgid "Setup"
-#~ msgstr "Nastavenie"
-
-#~ msgid "Country"
-#~ msgstr "Krajina"
-
-#~ msgid "Currency"
-#~ msgstr "Mena"
-
-#~ msgid "Previous"
-#~ msgstr "Predchádzajúci"
-
-#~ msgid "Street"
-#~ msgstr "Ulica"
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid "Report Information"
-#~ msgstr "Informácia reportu"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Táto veta sa objaví v pravom hornom rohu vašej správy.\n"
-#~ "Odporúčame napríklad slogan:\n"
-#~ "\"Open Source Business Solutions.\""
-
-#~ msgid "Report header"
-#~ msgstr "Záhlavie reportu"
-
-#~ msgid "Use Directly"
-#~ msgstr "Použiť priamo"
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Profil predstavuje výber modulov vhodných na istý účel. Profily boli "
-#~ "zostavené tak, aby vám pomohli objavovať rôzne aspekty OpenERP. Toto je iba "
-#~ "stručný prehľad, máme viac ako 300 dostupných modulov."
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr "Ďalšie moduly budete môcť doinštalovať neskôr v menu Administrácia."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Táto správa sa zobrazí na konci vašich reportov.\n"
-#~ "Doporučujeme dať sem informácie o bankovom spojení:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Táto správa sa zobrazí na konci vašich reportov.\n"
-#~ "Doporučujeme dať sem vaše kontaktné informácie:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Nová databáza je teraz úplne nainštalovaná."
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Ukončenie reportu 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Ukončenie reportu 2"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Definovanie hlavnej firmy"
-
-#~ msgid "Report Header"
-#~ msgstr "Hlavička reportu"
-
-#~ msgid "Installation Done"
-#~ msgstr "Inštalácia dokončená"
-
-#~ msgid "Company Name"
-#~ msgstr "Názov spoločnosti"
-
-#~ msgid "Base Setup"
-#~ msgstr "Základné nastavenie"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Vaše Logo - Použite veľkost okolo 450x150 pixelov."
-
-#~ msgid "Human Resources"
-#~ msgstr "Ľudské zdroje"
-
-#~ msgid "Invoicing"
-#~ msgstr "Fakturácia"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Bankový účet č."
-
-#~ msgid "Extra Tools"
-#~ msgstr "Extra nástroje"
-
-#~ msgid "Sales Management"
-#~ msgstr "Správa predaja"
-
-#~ msgid "Company"
-#~ msgstr "Spoločnosť"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Priebeh nastavenia"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
 
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid "Fed. State"
-#~ msgstr "Federálny štát"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/sl.po b/addons/base_setup/i18n/sl.po
index d56c9375370..9e3ddf05af8 100644
--- a/addons/base_setup/i18n/sl.po
+++ b/addons/base_setup/i18n/sl.po
@@ -1,241 +1,175 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Slovenian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2009-11-17 08:51+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian <sl@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Integracija elektronske pošte"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Gost"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Stiki"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Aktiviranje kupčevega portala"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr "Uporaba zunanjih providerjev, prijava z google, facebook, ..."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Dovoli skupno rabo dokumentov"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
-"OpenERP dovoli avtomatično kreiranje možnosti (ali drugih dokumentov)\n"
-"                            iz vhodne elektronske pošte. Elektronsko pošto "
-"lahko avtomatično sinhronizirate z OpenERP\n"
-"                            z uporabo POP/IMAP profila, z uporabo direktne "
-"integracije skriptov za vaš poštni strežni,\n"
-"                            ali z ročnim pošiljanjem elektronske pošte v "
-"OpenERP z uporabo določenih\n"
-"                            vmesnikov za vašo prioritetno aplikacijo za "
-"elektronsko pošto."
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "PRODAJA"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Dovolite uporabnikom uvoz podatkov iz CSV datotek"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Član"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Uporabi"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Dostop preko portala"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Autentikacija"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Ponudbe in prodajni nalogi"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Splošne nastavitva"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Donator"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "E-pošta"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Bolnik"
+msgid "Client"
+msgstr "Odjemalec"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Dovolite uporabnikom uvoz podatkov iz CSV datotek"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Nastavitev prodaje"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Več podjetij"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Konfiguracija strežnikov izhodne pošte"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "Poštni odjemalec"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Nastavite podatke vašega podjetja"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=YOUR_DATABAE"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Stiki"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Pridobi kontakte direktno iz linkedin"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Omogoči Thunderbird plug-in"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Kupec"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Lastnosti kupca"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Uvoz / Izvoz"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Lastnosti prodaje"
-
-#. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Omogoči Outlook plug-in"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Donator"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr "Ta čarovnik lahko spremeni izraz \"kupec\" v celotni aplikaciji"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "E-pošta"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Najemnik"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Integracija elektronske pošte"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Delite ali pripnite katerikoli ekran iz OpenERP."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Splošne nastavitva"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Kupec"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Ko kreirate nov kontakt (oseba ali podjetje), boste lahko naložili vse "
-"podatke iz Linkedin (fotografije, naslove, itd.)."
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Pridobi kontakte direktno iz linkedin"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
-"Dolo v načinu multi-company, več podjetij, z ustreznim varnostnim dostopom "
-"med podjetju.\n"
-"                 Instalacija modula multi_company."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Omogočite kupcem dostop do njihovih dokumentov."
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
-"Javni portal je dostopen samo, če imate eno bazo podatkov. Lahko\n"
-"                                    po vzpostavite OpenERP Server z opcijo"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
-"Več možnosti najdete v podrobnostik vašega podjetja: naslov za glave in "
-"noge, besedila za zapadla plačila, itd."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Gost"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -245,559 +179,209 @@ msgstr ""
 "...) ?"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
-"Ko pošljete dokument partnerju,\n"
-"                                    (ponudba, račun), se bo vaš partner\n"
-"                                    lahko prijavil in dostopal do vseh "
-"svojih dokumentov,\n"
-"                                    bral novice vašega podjetja, pregledal "
-"svoje projekte\n"
-"                                    in podobno."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Uvoz / Izvoz"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Odjemalec"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr "Omogoči javni del openerp, openerp postane javna spletna stran."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
-"Vmesnik vam dovoljuje arhiviranje elektronske pošte in priponk k izbranim\n"
-"                OpenERP objektom. Izberete lahko partnerja, priložnost in\n"
-"                pripnete izbrano pošto kot .eml datoteko v\n"
-"                priponke izbranega zapisa. Lahko kreirate dokumente za CRM-"
-"priložnosti,\n"
-"                partnerje iz izbranih elektronskih sporočil.\n"
-"                To omogoči instalacija modula plugin_thunderbird."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Poslovni partner"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Več podjetij"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr ""
-"Kateri izraz uporabljate za Kupca (stranka,kupec,poslovni partner ...) ?"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Član"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Nastavitev prodaje"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"Vmesnik za Outlook vam omogoča izbrati objekte, ki jih želite dodati\n"
-"                k vaši elektronski pošti in priponkam iz MS Outlook-a. "
-"Izberete lahko partnerja\n"
-"                ali določen objekt in arhivirate izbrana\n"
-"                elektronska sporočila v OpenERP elektronsko sporočilo s "
-"priponkami.\n"
-"                To omogoča instalacija modula plugin_outlook."
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Možnosti"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Aktiviranje kupčevega portala"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Poslovni partner"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
-"da naredite to.\n"
-"                                    Z aktivacijo bo prijavna stran "
-"nadomeščena z javno spletno stranjo."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Bolnik"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Dovoli skupno rabo dokumentov"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Dostop preko portala"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(novice podjetja, delo, kontaktne forme, itd.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Ponudbe in prodajni nalogi"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Aktiviranje javnega portala"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Konfiguracija strežnikov izhodne pošte"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "PRODAJA"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Integracija socialnega omrežja"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Lastnosti prodaje"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Omogočite kupcem dostop do njihovih dokumentov."
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Prekliči"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Delite ali pripnite katerikoli ekran iz OpenERP."
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Uporabi"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Integracija socialnega omrežja"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Določite svoje izraze"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "ali"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Najemnik"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Nastavite podatke vašega podjetja"
-
-#~ msgid "City"
-#~ msgstr "Mesto"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Začnete lahko s konfiguracijo sistema ali pa se direktno povežete s "
-#~ "skladiščem podatkov s privzetimi nastavitvami."
-
-#~ msgid "Zip code"
-#~ msgstr "Poštna številka"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Izberi profil"
-
-#~ msgid "Report header"
-#~ msgstr "Glava izpisa"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Začni s konfiguracijo"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Kasneje boste lahko namestili še ostale module preko menuja Skrbništvo."
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Profil nastavi predizbrane module za določene potrebe. Ti profili vam "
-#~ "pomagajo odkriti različne vidike OpenERPa. To je samo kratek pregled, na "
-#~ "voljo je še preko 300 modulov."
-
-#~ msgid "Next"
-#~ msgstr "Naprej"
-
-#~ msgid "E-mail"
-#~ msgstr "E-pošta"
-
-#~ msgid "State"
-#~ msgstr "Zvezna država"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Vaše skladišče podatkov je sedaj v celoti nameščeno."
-
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Noga izpisa 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Noga izpisa 2"
-
-#~ msgid "Street2"
-#~ msgstr "Naslov 2"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Določi glavno družbo"
-
-#~ msgid "Country"
-#~ msgstr "Država"
-
-#~ msgid "Setup"
-#~ msgstr "Namestitev"
-
-#~ msgid "Summary"
-#~ msgstr "Povzetek"
-
-#~ msgid "Install"
-#~ msgstr "Namesti"
-
-#~ msgid "Installation Done"
-#~ msgstr "Namestitev končana"
-
-#~ msgid "Report Header"
-#~ msgstr "Glava izpisa"
-
-#~ msgid "Currency"
-#~ msgstr "Valuta"
-
-#~ msgid "Use Directly"
-#~ msgstr "Začni zdaj"
-
-#~ msgid "Previous"
-#~ msgstr "Nazaj"
-
-#~ msgid "Base Setup"
-#~ msgstr "Osnovne nastavitve"
-
-#~ msgid "Report Information"
-#~ msgstr "Podatki o poročilu"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Ta stavek se bo izpisal na dnu vaših poročil.\n"
-#~ "Predlagamo da vsebuje pravna obvestila:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Vaš logotip - uporabite velikost približno 450x150 pik."
-
-#~ msgid "Logo"
-#~ msgstr "Logotip"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Ta stavek se bo izpisal na dnu vaših poročil.\n"
-#~ "Predlagamo da vsebuje podatki o banki:\n"
-#~ "IBAN: SI56 1262 0121 6907 123 - SWIFT: CPDF BE71 - ID za DDV: SI12345678"
-
-#~ msgid "General Information"
-#~ msgstr "Splošne informacije"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Ta stavek se bo izpisal v zgornjem desnem kotu vaših poročil.\n"
-#~ "Predlagamo da izpišete vaš slogan:\n"
-#~ "\"Open Source Business Solutions\"."
-
-#~ msgid "Human Resources"
-#~ msgstr "Človeški viri"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Pomaga vam upravljati proizvodne procese in ustvarjanje poročil o teh "
-#~ "procesih."
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Naslednji uporabniki so bili nameščeni: \n"
-
-#~ msgid "Invoicing"
-#~ msgstr "Izdajanje računov"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Številka bančnega računa"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Dodatna orodja"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Potek konfiguracije"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Vaša baza je bila ustvarjena."
-
-#~ msgid "Fed. State"
-#~ msgstr "Zvezna država"
-
-#~ msgid "Sales Management"
-#~ msgstr "Upravljanje prodaje"
-
-#~ msgid "Company"
-#~ msgstr "Podjetje"
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
-
-#~ msgid "title"
-#~ msgstr "naslov"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Preskoči čarovnike konfiguracije"
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Upravljanje znanja"
-
-#~ msgid "Company Name"
-#~ msgstr "Ime podjetja"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "Zip Code"
-#~ msgstr "Poštna številka"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Avkcijska hiša"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Računovodstvo & Finance"
-
-#~ msgid "Street 2"
-#~ msgstr "Naslov 2"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Upravljanje skladišča"
-
-#~ msgid "Installed Users"
-#~ msgstr "Nameščeni uporabniki"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Upravljanje nabave"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Konfiguracija podjetja"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid "Project Management"
-#~ msgstr "Upravljanje projektov"
-
-#~ msgid "Food Industry"
-#~ msgstr "Prehrambena industrija"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Proizvodnja"
-
-#~ msgid "Image"
-#~ msgstr "Slika"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Informacije o vaši novi zbirki podatkov"
-
-#~ msgid "New Database"
-#~ msgstr "Nova zbirka podatkov"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Konfigurirajte informacije vašega podjetja"
-
-#~ msgid "Company Website"
-#~ msgstr "Spletna stran podjetja"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Primer: http://openerp.com"
-
-#~ msgid "Install Applications"
-#~ msgstr "Namesti aplikacije"
-
-#~ msgid "Street"
-#~ msgstr "Ulica"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Točka Prodaje"
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Napredno Poročanje"
-
-#~ msgid "Create"
-#~ msgstr "Ustvari"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Nastavitev \"glave\" in \"noge\" podjetja"
-
-#~ msgid "Import"
-#~ msgstr "Uvoz"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Nastavitve uporabnika"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Privzete nastavitve uporabnika"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "Če uporabljate OpenERP prvič,je priporočljivo izbrati poenostavljen vmesnik, "
-#~ "ki ima manj možnosti, ampak je lažji za uporabo. Vedno lahko spremenite "
-#~ "način prikaza   v nastavitvah uporabnika."
-
-#~ msgid "Extended"
-#~ msgstr "Razširjeno"
-
-#~ msgid "Interface"
-#~ msgstr "Vmesnik"
-
-#~ msgid "Language"
-#~ msgstr "Jezik"
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Ustvari nove uporabnike"
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "Uvozite Sugarcrm"
-
-#~ msgid "Timezone"
-#~ msgstr "Časovni pas"
-
-#~ msgid "Simplified"
-#~ msgstr "Poenostavljen"
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "Sinhronizacija Google stikov"
-
-#~ msgid "Import Saleforce"
-#~ msgstr "Uvozi Saleforce"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Označite to polje, če želite da so namigi prikazani na vsakem dejanju menija"
-
-#~ msgid "Import or create customers"
-#~ msgstr "Uvoz ali dodajanje kupcev"
-
-#~ msgid "Customers"
-#~ msgstr "Kupci"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Ustvarite ali uvozite Kupce"
-
-#~ msgid "Display Tips"
-#~ msgstr "Prikaz nasvetov"
-
-#~ msgid "For Import Saleforce"
-#~ msgstr "Uvoz Saleforce"
-
-#~ msgid "For Quickbooks Ippids"
-#~ msgstr "Quickbooks Ippids"
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr "Privzeti časovni pas za nove uporabnike"
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "Uvozi Sugarcrm"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "Določitev privzetih nastavitev za obstoječe in nove uporabnike.  Uporabnik "
-#~ "lahko nastavitve kasneje spremeni."
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid "Quickbooks Ippids"
-#~ msgstr "Quickbooks Ippids"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr ""
+"Kateri izraz uporabljate za Kupca (stranka,kupec,poslovni partner ...) ?"
 
-#~ msgid "Sync Google Contact"
-#~ msgstr "Sinhronizacija Google stikov"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr "Uporaba zunanjih providerjev, prijava z google, facebook, ..."
 
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Izpolnite podatke podjetja , ki se bodo uporabljali v poročilih. Predogled  "
-#~ "je dostopen s klikom na gumb \"Predogled glave/noge\"."
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Ko kreirate nov kontakt (oseba ali podjetje), boste lahko naložili vse "
+"podatke iz Linkedin (fotografije, naslove, itd.)."
 
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "Ustvarite ali uvozite Kupce in njihove podatke. Kupce lahko uvozite tudi s "
-#~ "pomočjo čarovnika \"Uvozi podatke\" ."
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Ko pošljete dokument partnerju,\n"
+"                                    (ponudba, račun), se bo vaš partner\n"
+"                                    lahko prijavil in dostopal do vseh "
+"svojih dokumentov,\n"
+"                                    bral novice vašega podjetja, pregledal "
+"svoje projekte\n"
+"                                    in podobno."
 
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Nastavitev privzetega jezika za vse uporabniške vmesnike. Za dodajanje "
-#~ "novega jezika uporabite čarovnika \"Naloži uradni prevod\"."
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr "Ta čarovnik lahko spremeni izraz \"kupec\" v celotni aplikaciji"
 
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Več možnosti najdete v podrobnostik vašega podjetja: naslov za glave in "
+"noge, besedila za zapadla plačila, itd."
 
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/sq.po b/addons/base_setup/i18n/sq.po
index 2c6d05a5668..23249eacbec 100644
--- a/addons/base_setup/i18n/sq.po
+++ b/addons/base_setup/i18n/sq.po
@@ -1,370 +1,373 @@
 # Albanian translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2009-12-29 15:30+0000\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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: 2014-04-22 06:28+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:57+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Authentication"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr ""
+
+#. module: base_setup
+#: help:base.config.settings,font:0
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
 msgstr ""
diff --git a/addons/base_setup/i18n/sr.po b/addons/base_setup/i18n/sr.po
index 7773e88ee69..846b1b0b084 100644
--- a/addons/base_setup/i18n/sr.po
+++ b/addons/base_setup/i18n/sr.po
@@ -1,749 +1,373 @@
 # Serbian translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-07 12:51+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Serbian <sr@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Authentication"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Otkaži"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Partner"
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Otkaži"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Profil određuje pred-izbor modula za specifične potrebe. Ti su profili "
-#~ "podešeni kako biste lakše otkrivali različite aspekte Open ERP-a. Ovo je tek "
-#~ "osvrt, postoji 300+ raspoloživih modula"
-
-#~ msgid "Next"
-#~ msgstr "Sledeće"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr "Moći ćete instalirati više Modula kasnije kroz Administracioni Meni"
-
-#~ msgid "Report header"
-#~ msgstr "Zaglavlje Izveštaja"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Izaberi Profil"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Možete početi s konfiguracijom sistema ili se direktno spojiti na bazu "
-#~ "podataka koristeći predefinisane postavke."
-
-#~ msgid "City"
-#~ msgstr "Grad"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Startuj Konfiguraciju"
-
-#~ msgid "Zip code"
-#~ msgstr "Poštanski broj"
-
-#~ msgid "State"
-#~ msgstr "Stanje"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Vaša nova baza podataka sada je instalirana u potpunosti."
-
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Podnožje izveštaja 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Podnožje izveštaja 2"
-
-#~ msgid "Street2"
-#~ msgstr "Ulica2"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "General Information"
-#~ msgstr "Opšte informacije"
-
-#~ msgid "Report Information"
-#~ msgstr "Informacije Izvestaja"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Definisi Osnovno Preduzece"
-
-#~ msgid "Install"
-#~ msgstr "Instaliraj"
-
-#~ msgid "Report Header"
-#~ msgstr "Zaglavlje izveštaja"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Ova će se rečenica pojavljivati u podnožju vaših izveštaja.\n"
-#~ "Savetujemo vam da ovdje upišete osnovne podatke:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Installation Done"
-#~ msgstr "Instalacija je završena"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Ova će se rečenica pojavljivati u gornjem desnom uglu vaših izveštaja.\n"
-#~ "Savetujemo vam da ovje upišete slogan preduzeca:\n"
-#~ "\"Open Source Business Solucija\""
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Ovaj deo ce se pojavljivati na dnu vasih izvestaja\n"
-#~ "Savetujemo vam da SADA postavite informacije o vasoj  Banci\n"
-#~ "BAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 -PDV: BE0477.472.701"
-
-#~ msgid "Summary"
-#~ msgstr "Sumarno"
-
-#~ msgid "Setup"
-#~ msgstr "Podešavanje"
-
-#~ msgid "Country"
-#~ msgstr "Drzava"
-
-#~ msgid "Company Name"
-#~ msgstr "Naziv Preduzeca"
-
-#~ msgid "Base Setup"
-#~ msgstr "Bazna Podesavanja"
-
-#~ msgid "Use Directly"
-#~ msgstr "Koristi Direktno"
-
-#~ msgid "Previous"
-#~ msgstr "Prethodno"
-
-#~ msgid "Currency"
-#~ msgstr "Valuta"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Vaš logotip - Koristite veličinu oko 450x150 piksela."
-
-#~ msgid "Logo"
-#~ msgstr "Logotip"
-
-#~ msgid "Street"
-#~ msgstr "Ulica"
-
-#~ msgid "Point of Sales"
-#~ msgstr "POS"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Tvoja databaza je kreirana."
-
-#~ msgid "Associations"
-#~ msgstr "Asociacije"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Pomaze vam pri upravljanju proizvodnim procesima i generise izvestaje vezane "
-#~ "za iste."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr ""
-#~ "Pomaze pri upravljanju tvojim marketinskim kampanjama, korak po korak."
-
-#~ msgid "Invoicing"
-#~ msgstr "Fakturisanje"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Br Naloga Banke"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Dodatni Alati"
-
-#~ msgid "Company"
-#~ msgstr "Preduzece"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Proces Konfiguracije"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Mozes poceti sa konfiguracijom sistema, ili se konektovano direktno da "
-#~ "databazu kao administrator."
-
-#~ msgid "Fed. State"
-#~ msgstr "Fed. State"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Pomaze da izadjete na kraj sa racunovodstvenim potrebama. Ako niste "
-#~ "knjigovodja, predlazemo ti da instaliras samo Fakturisanje "
-
-#~ msgid "Sales Management"
-#~ msgstr "Menadzment Prodaje"
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Moze instalirati razne interesatne anli ne i esencijalne alatke kao sto su "
-#~ "Survey, Lunch i Ideas box."
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Napredno Izvestavanje"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Pomaze ti pri rukovodjenju svojim nabavno-relacionim procesima kao sto su "
-#~ "zahtevi za upite, fakture dobavljaca, itd ..."
-
-#~ msgid "Human Resources"
-#~ msgstr "Ljudski Resursi"
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Menadzment Znanja"
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "POmaze da upravljas svojim ljudskim resursima pregledom tvoje strukture "
-#~ "zaposlenih, generisanjem radnih lista, pracenjem prisutnosti na poslu, i jos "
-#~ "mnogo vise."
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Omogucava ti da kreiras svoje fakture i da pratis placanja. Ovo je laksa "
-#~ "verzija racunovodstvenog modula za menadzere koji nisu racunovodje."
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "POmaze ti da rukovodis svojim projektima i zadacima prateci ih, generisanjem "
-#~ "planova, itd..."
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Pomaze da dobijes najvise od POS-a sa brzim pretragom prodaje, "
-#~ "pojednostavljuje nacine placanja, automatski izbor generisanih lista i jos "
-#~ "mnogo vise."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Instalira preselektovani set OPenErp Aplikacija koje ce ti pomoci da "
-#~ "rukuvodis svojom industrijom."
-
-#~ msgid "title"
-#~ msgstr "naslov"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Racunovodstvo & Finansije"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Rukovodjenje Nabavkom"
-
-#~ msgid "Company Configuration"
-#~ msgstr "KOnfiguracija Preduzeca"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "Street 2"
-#~ msgstr "Ulica 2"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Omogucava ti da instaliras dodatke koji se krecu i prenose saznanja sa i "
-#~ "izmedju tvojih zaposlenih."
-
-#~ msgid "Zip Code"
-#~ msgstr "Postanski kod"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Aukcione Kuce"
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "Pomaze ti da savladas svoje upite, prodajne zahteve i fakturisanje."
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Upravljanje Skladistima"
-
-#~ msgid "Installed Users"
-#~ msgstr "Instalirani Korisnici"
-
-#~ msgid "Food Industry"
-#~ msgstr "Industrija Hrane"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Proizvodnja"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Informacije o tvojoj novoj databazi"
-
-#~ msgid "Image"
-#~ msgstr "Slika"
-
-#~ msgid "New Database"
-#~ msgstr "Nova databaza"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Upravljanje korisnickim medjusobnim odnosima"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Instalira preselektovani set OpenERP aplikacija selektovanih da ti pomognu "
-#~ "pri aukcijama kao i svim poslovnim procesima vezanim za aukcije."
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Omogucava instalaciju raznih alatki koje pojednostavljuju i unapredjuju "
-#~ "OpenERP-ovu kreaciju izvestaja."
-
-#~ msgid "Project Management"
-#~ msgstr "Upravljanje Projektom"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "INstalira specificne industrijske aplikacije"
-
-#~ msgid "Company Website"
-#~ msgstr "Web strana preduzeca"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Example: http:/zmajsoft.com"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Pomaze ti da pratis i upravljas odnosima izmedju musterija , zahtevi ili "
-#~ "potrebe. MOze da automatski posalje podsetnike, prosiri zahteve ili "
-#~ "prekidace za specificne akcije baziranim na standardnim dogadjajima."
-
-#~ msgid "Install Applications"
-#~ msgstr "Instalira Aplikacije"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Instalira preselektovani set openERP aplikacija koje ce ti pomoci u "
-#~ "upravljanju svojim asocijacijama efikasnije."
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
 
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "POmaze ti da upravljas svojim inventarom i glavnim magacinskim zadacima: "
-#~ "Isporuka zahteva, prijemi, itd..."
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Sledeci korisnici su instalirani: \n"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/sr@latin.po b/addons/base_setup/i18n/sr@latin.po
index 74ec2cc528d..89e7c50f78b 100644
--- a/addons/base_setup/i18n/sr@latin.po
+++ b/addons/base_setup/i18n/sr@latin.po
@@ -1,270 +1,245 @@
-# Serbian latin translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Serbian Latin translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-07 12:59+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Serbian latin <sr@latin@li.org>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian Latin <sr@latin@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Gost"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Član"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Otkaži"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Donator"
+msgid "Client"
+msgstr "klijent"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Strpljivost"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Mušterija"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Donator"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
-"Mozete koristiti ovaj Čarobnjak da iymenite terminologiju klijenata u celoj "
-"aplikaciji"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Mušterija"
+msgid "Guest"
+msgstr "Gost"
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr "Koji temin želite koristiti za kupce"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
-msgstr "Koji temin želite koristiti za kupce"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "klijent"
+msgid "Member"
+msgstr "Član"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
@@ -273,554 +248,128 @@ msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Koristi drugi termin za reč \"mušterija\""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Strpljivost"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
+#. module: base_setup
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Otkaži"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Koristi drugi termin za reč \"mušterija\""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
-#~ msgid "City"
-#~ msgstr "Grad"
-
-#~ msgid "Invoicing"
-#~ msgstr "Fakturisanje"
-
-#~ msgid "Company Name"
-#~ msgstr "Naziv Preduzeca"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Br Naloga Banke"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Dodatni Alati"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Podnožje izveštaja 1"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Pomaze vam pri upravljanju proizvodnim procesima i generise izvestaje vezane "
-#~ "za iste."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr ""
-#~ "Pomaze pri upravljanju tvojim marketinskim kampanjama, korak po korak."
-
-#~ msgid "Your database is now created."
-#~ msgstr "Tvoja databaza je kreirana."
-
-#~ msgid "Point of Sales"
-#~ msgstr "POS"
-
-#~ msgid "Associations"
-#~ msgstr "Asociacije"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Pomaze da izadjete na kraj sa racunovodstvenim potrebama. Ako niste "
-#~ "knjigovodja, predlazemo ti da instaliras samo Fakturisanje "
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Mozes poceti sa konfiguracijom sistema, ili se konektovano direktno da "
-#~ "databazu kao administrator."
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Proces Konfiguracije"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Podnožje izveštaja 2"
-
-#~ msgid "Currency"
-#~ msgstr "Valuta"
-
-#~ msgid "Fed. State"
-#~ msgstr "Fed. State"
-
-#~ msgid "Marketing"
-#~ msgstr "Marketing"
-
-#~ msgid "Company"
-#~ msgstr "Preduzece"
-
-#~ msgid "Sales Management"
-#~ msgstr "Menadzment Prodaje"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Moze instalirati razne interesatne anli ne i esencijalne alatke kao sto su "
-#~ "Survey, Lunch i Ideas box."
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Napredno Izvestavanje"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "title"
-#~ msgstr "naslov"
-
-#~ msgid "Use Directly"
-#~ msgstr "Koristi Direktno"
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Menadzment Znanja"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Instalira preselektovani set OPenErp Aplikacija koje ce ti pomoci da "
-#~ "rukuvodis svojom industrijom."
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "POmaze ti da rukovodis svojim projektima i zadacima prateci ih, generisanjem "
-#~ "planova, itd..."
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Pomaze da dobijes najvise od POS-a sa brzim pretragom prodaje, "
-#~ "pojednostavljuje nacine placanja, automatski izbor generisanih lista i jos "
-#~ "mnogo vise."
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "POmaze da upravljas svojim ljudskim resursima pregledom tvoje strukture "
-#~ "zaposlenih, generisanjem radnih lista, pracenjem prisutnosti na poslu, i jos "
-#~ "mnogo vise."
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Omogucava ti da kreiras svoje fakture i da pratis placanja. Ovo je laksa "
-#~ "verzija racunovodstvenog modula za menadzere koji nisu racunovodje."
-
-#~ msgid "Human Resources"
-#~ msgstr "Ljudski Resursi"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Pomaze ti pri rukovodjenju svojim nabavno-relacionim procesima kao sto su "
-#~ "zahtevi za upite, fakture dobavljaca, itd ..."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Ovaj deo ce se pojavljivati na dnu vasih izvestaja\n"
-#~ "Savetujemo vam da SADA postavite informacije o vasoj  Banci\n"
-#~ "BAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 -PDV: BE0477.472.701"
-
-#~ msgid "Street 2"
-#~ msgstr "Ulica 2"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "Country"
-#~ msgstr "Drzava"
-
-#~ msgid "Setup"
-#~ msgstr "Podešavanje"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Racunovodstvo & Finansije"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Aukcione Kuce"
-
-#~ msgid "Zip Code"
-#~ msgstr "Postanski kod"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Startuj Konfiguraciju"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Omogucava ti da instaliras dodatke koji se krecu i prenose saznanja sa i "
-#~ "izmedju tvojih zaposlenih."
-
-#~ msgid "Company Configuration"
-#~ msgstr "KOnfiguracija Preduzeca"
-
-#~ msgid "Logo"
-#~ msgstr "Logotip"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Rukovodjenje Nabavkom"
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "Pomaze ti da savladas svoje upite, prodajne zahteve i fakturisanje."
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Upravljanje Skladistima"
-
-#~ msgid "Project Management"
-#~ msgstr "Upravljanje Projektom"
-
-#~ msgid "Installed Users"
-#~ msgstr "Instalirani Korisnici"
-
-#~ msgid "New Database"
-#~ msgstr "Nova databaza"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Upravljanje korisnickim medjusobnim odnosima"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Instalira preselektovani set OpenERP aplikacija selektovanih da ti pomognu "
-#~ "pri aukcijama kao i svim poslovnim procesima vezanim za aukcije."
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Ova će se rečenica pojavljivati u gornjem desnom uglu vaših izveštaja.\n"
-#~ "Savetujemo vam da ovje upišete slogan preduzeca:\n"
-#~ "\"Open Source Business Solucija\""
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Omogucava instalaciju raznih alatki koje pojednostavljuju i unapredjuju "
-#~ "OpenERP-ovu kreaciju izvestaja."
-
-#~ msgid "Report Header"
-#~ msgstr "Zaglavlje izveštaja"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Informacije o tvojoj novoj databazi"
-
-#~ msgid "Image"
-#~ msgstr "Slika"
-
-#~ msgid "Food Industry"
-#~ msgstr "Industrija Hrane"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Proizvodnja"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Vaš logotip - Koristite veličinu oko 450x150 piksela."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Ova će se rečenica pojavljivati u podnožju vaših izveštaja.\n"
-#~ "Savetujemo vam da ovdje upišete osnovne podatke:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Company Website"
-#~ msgstr "Web strana preduzeca"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "INstalira specificne industrijske aplikacije"
-
-#~ msgid "Street"
-#~ msgstr "Ulica"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Example: http:/zmajsoft.com"
-
-#~ msgid "Install Applications"
-#~ msgstr "Instalira Aplikacije"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Pomaze ti da pratis i upravljas odnosima izmedju musterija , zahtevi ili "
-#~ "potrebe. MOze da automatski posalje podsetnike, prosiri zahteve ili "
-#~ "prekidace za specificne akcije baziranim na standardnim dogadjajima."
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "POmaze ti da upravljas svojim inventarom i glavnim magacinskim zadacima: "
-#~ "Isporuka zahteva, prijemi, itd..."
-
-#~ msgid "Base Setup"
-#~ msgstr "Bazna Podesavanja"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Instalira preselektovani set openERP aplikacija koje ce ti pomoci u "
-#~ "upravljanju svojim asocijacijama efikasnije."
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Sledeci korisnici su instalirani: \n"
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "Profil određuje pred-izbor modula za specifične potrebe. Ti su profili "
-#~ "podešeni kako biste lakše otkrivali različite aspekte Open ERP-a. Ovo je tek "
-#~ "osvrt, postoji 300+ raspoloživih modula"
-
-#~ msgid "Next"
-#~ msgstr "Sledeće"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr "Moći ćete instalirati više Modula kasnije kroz Administracioni Meni"
-
-#~ msgid "Report header"
-#~ msgstr "Zaglavlje Izveštaja"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Izaberi Profil"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Možete početi s konfiguracijom sistema ili se direktno spojiti na bazu "
-#~ "podataka koristeći predefinisane postavke."
-
-#~ msgid "Zip code"
-#~ msgstr "Poštanski broj"
-
-#~ msgid "State"
-#~ msgstr "Stanje"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Vaša nova baza podataka sada je instalirana u potpunosti."
-
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Street2"
-#~ msgstr "Ulica2"
-
-#~ msgid "General Information"
-#~ msgstr "Opšte informacije"
-
-#~ msgid "Report Information"
-#~ msgstr "Informacije Izvestaja"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Definisi Osnovno Preduzece"
-
-#~ msgid "Install"
-#~ msgstr "Instaliraj"
-
-#~ msgid "Installation Done"
-#~ msgstr "Instalacija je završena"
-
-#~ msgid "Summary"
-#~ msgstr "Sumarno"
-
-#~ msgid "Previous"
-#~ msgstr "Prethodno"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Postavi zaglavlje i podnožje memoranduma organizacije"
-
-#~ msgid "Create"
-#~ msgstr "Izradi"
-
-#~ msgid "Import"
-#~ msgstr "Uvezi"
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "Sinh Google Kontakte"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Definisi korisnikove parametre"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Definisi Podrazumevane korisnikove parametre"
-
-#~ msgid "Extended"
-#~ msgstr "Prošireno"
-
-#~ msgid "Customers"
-#~ msgstr "Kupci"
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
-
-#~ msgid "Interface"
-#~ msgstr "Interfejs"
-
-#~ msgid "Language"
-#~ msgstr "Jezik"
-
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Postavi podrayumevani jezik za sve korisnike Interfejsa, kada je UI prevod "
-#~ "dostupan.  Ako želite da dodate novi Jezik, možete to uraditi iz \"Učitaj "
-#~ "Ofisijalni prevod\" čarobnjakom kojeg startujete iz \"Administracija\" menija"
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Kreiraj  korisnike programa"
-
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Čekiraj ovu kućicu ako želiš da ti se uvek prikazuju saveti na svakom "
-#~ "prozoru menija."
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Kreirajte ili uvezite podatke o kupcima"
-
-#~ msgid "Timezone"
-#~ msgstr "VremenskaZona"
-
-#~ msgid "Display Tips"
-#~ msgstr "Prikaži Savete"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Mozete koristiti ovaj Čarobnjak da iymenite terminologiju klijenata u celoj "
+"aplikaciji"
 
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Popuni podatke svog preduzeća( adresa, logo, bankovni račun) koji će se "
-#~ "štampati na vašim izveštajima i nalozima. Možete zatim da kliknete na dugme "
-#~ "\"Pregled Zaglavlja\" da bi videli kako to i izgleda na PDF dokumentima."
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index 37b2cdc53c0..a6b9e95a1e9 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/i18n/sv.po
@@ -1,245 +1,175 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.14\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-07 12:56+0000\n"
-"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "E-postintegration"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Gäst"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Kontakter"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Aktivera kundportalen"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Tillåt dokumentdelning"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
-"Använd externa identitetsleverantörer, logga in med google, facebook, ..."
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
-msgstr ""
-"OpenERP gör det möjligt att automatiskt skapa kundämnen (eller andra "
-"dokument)\n"
-"                             från inkommande e-post. Du kan automatiskt "
-"synkronisera e-post med OpenERP\n"
-"                             med vanliga POP / IMAP-konton, med hjälp av ett "
-"e-integrationsprogram för din\n"
-"                             e-postserver, eller genom att manuellt spara e-"
-"post till OpenERP via specifika\n"
-"                             plugins för ditt favorit-e-postprogram."
-
-#. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "FÖRSÄLJNING"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Tillåt använda att importera data från CSV-filer"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Medlem"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Verkställ"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Portaltillgång"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Autentisering"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Offerter och kundorder"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Allmänna inställningar"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Välgörare"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "E-post"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Tålamod"
+msgid "Client"
+msgstr "Klient"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Tillåt använda att importera data från CSV-filer"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Konfigurera försäljningar"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Hantera flera företag"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Konfigurera utgående e-postservrar"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "Med epostklient"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Konfigurera ditt företags data"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=DIN_DATABAS"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Kontakter"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Hämta automatiskt kontakter från LinkedIn"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Aktivera Thunderbird-tillägg"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Kund"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Kundfunktioner"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "Importera/exportera"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Försäljningsfunktioner"
-
-#. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Aktivera Outlook-tillägg"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Välgörare"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Använd guiden för att bestämma terminologin för kunder genom hela systemet."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "E-post"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Hyresgästen"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "E-postintegration"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Dela eller bädda in godtycklig OpenERP-vy."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Allmänna inställningar"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Kund"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"När Du skapar en ny kontakt (person eller fötetag), kommer du få möjlighet "
-"att hämta all data från LinkedIn (foton, adress mm)."
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Hämta automatiskt kontakter från LinkedIn"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
-"Arbeta i flera företagsmiljöer, med lämplig tillgång säkerhet mellan "
-"företagen.\n"
-"                 Detta installerar modulen multi_company."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Ge dina kunder tillgång till deras dokument"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
-"Den offentliga Portalen är tillgänglig endast om du är i en endatabas läge. "
-"Du kan\n"
-"                                     starta OpenERP Server med det "
-"alternativet"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
-"Du hittat fler inställningar i dina företagsuppgifter : adress för "
-"sidhuvud/sidfot, påminnelsetexter om sena betalningar mm."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Gäst"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -247,668 +177,210 @@ msgid "How do you call a Customer"
 msgstr "Hur ringer du en kund"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
-"När du skickar ett dokument till en kund\n"
-"                                     (citat, faktura), kommer kunden att få\n"
-"                                     möjlighet att registrera sig på "
-"webbplatsen för att få alla sina dokument,\n"
-"                                     Läs ditt företag nyheter, följa sitt "
-"projekt,\n"
-"                                     etc."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "Importera/exportera"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Klient"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"Aktivera den publika delen av openerp, openerp blir en publik hemsida."
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
-"Insticksprogrammet låter dig arkivera e-post och bilagor till det valda\n"
-"                 OpenERP-objektet. Du kan välja ett företag, eller ett "
-"kundämne och\n"
-"                 bifoga den markerade posten som en. EML-fil i\n"
-"                 en bilaga. Du kan skapa dokument för CRM kundämnen,\n"
-"                 företag från de valda e-post.\n"
-"                 Detta installerar modulen plugin_thunderbird."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "Partner"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Hantera flera bolag"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "Använd ett annat ord för \"kund\""
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Medlem"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Konfigurera försäljningar"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"I Outlook plugin låter dig välja ett objekt som du vill lägga till\n"
-"                 till din e-post och bilagor från MS Outlook. Du kan välja "
-"ett företag,\n"
-"                 eller en kundämnet och arkivera en vald\n"
-"                 e-post till en OpenERP-meddelande med bilagor.\n"
-"                 Detta installerar modulen plugin_outlook."
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Alternativ"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Aktivera kundportalen"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "Partner"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
-"att göra så.\n"
-"                                     När aktiverad, kommer inloggningssidan "
-"ersättas av den publika webbplatsen."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Tålamod"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Tillåt dokumentdelning"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Portaltillgång"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(företagsnyheter, jobb och kontaktformulär m.m.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Offerter och kundorder"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Aktivera den offentliga portalen"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Konfigurera utgående e-postservrar"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "FÖRSÄLJNING"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Integration med sociala nätverk"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Försäljningsfunktioner"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Ge dina kunder tillgång till deras dokument"
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Avbryt"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Dela eller bädda in godtycklig OpenERP-vy."
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Verkställ"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Integration med sociala nätverk"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Ange din terminologi"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "eller"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Hyresgästen"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Konfigurera ditt företags data"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr ""
-#~ "Du kan börja konfigurera systemet eller ansluta direkt till databasen med "
-#~ "standardkonfigurationen."
-
-#~ msgid "Zip code"
-#~ msgstr "Postnummer"
-
-#~ msgid "Select a Profile"
-#~ msgstr "Välj profil"
-
-#~ msgid "Report header"
-#~ msgstr "Rapporthuvud"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Starta konfigurationen"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr ""
-#~ "Du kommer att kunna installera fler moduler senare via administrationsmenyn."
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "En profil innehåller ett första urval av moduler för specifika behov. Dessa "
-#~ "profiler har inställningar som hjälper dig att upptäcka olika aspekter av "
-#~ "OpenERP. Detta är bara en liten del, det finns många hundra ytterligare "
-#~ "moduler."
-
-#~ msgid "Next"
-#~ msgstr "Nästa"
-
-#~ msgid "E-mail"
-#~ msgstr "E-post"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Din nya databas är klar."
-
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Rapportfot 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Rapportfot 2"
-
-#~ msgid "Street2"
-#~ msgstr "Gata 2"
-
-#~ msgid "Report Information"
-#~ msgstr "Rapportinformation"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
-#~ msgid "Define Main Company"
-#~ msgstr "Definiera huvudföretag"
-
-#~ msgid "Company Name"
-#~ msgstr "Företagsnamn"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Denna mening kommer att visas längst ner i dina rapporter.\n"
-#~ "Vi föreslår att du lägga bank information här:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - Moms: BE0477.472.701"
-
-#~ msgid "Country"
-#~ msgstr "Land"
-
-#~ msgid "Setup"
-#~ msgstr "Ställ in"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Denna mening kommer att visas längst ner i dina rapporter.\n"
-#~ "Vi föreslår att du skriver juridisk information här:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Summary"
-#~ msgstr "Sammanfattning"
-
-#~ msgid "Install"
-#~ msgstr "Installera"
-
-#~ msgid "Installation Done"
-#~ msgstr "Installation klar"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Denna mening kommer att visas i övre högra hörnet av dina rapporter.\n"
-#~ "Vi rekommenderar dig att lägga en slogan här:\n"
-#~ "\"Fria affärslösningar\"."
-
-#~ msgid "Report Header"
-#~ msgstr "Rapporthuvud"
-
-#~ msgid "Currency"
-#~ msgstr "Valuta"
-
-#~ msgid "Street"
-#~ msgstr "Gata"
-
-#~ msgid "Use Directly"
-#~ msgstr "Använd direkt"
-
-#~ msgid "Logo"
-#~ msgstr "Logga"
-
-#~ msgid "Base Setup"
-#~ msgstr "Basala inställningar"
-
-#~ msgid "General Information"
-#~ msgstr "Allmän information"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Hjälper dig att hantera dina tillverkningsprocesser och generera rapporter "
-#~ "till dessa"
-
-#~ msgid "Invoicing"
-#~ msgstr "Fakturering"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Konfigurationsförlopp"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Din databas är nu skapad"
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Hjälper dig att hantera marknadsföringskampanjer steg för steg"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Följande användere har nu blivit installerade \n"
-
-#~ msgid "Sales Management"
-#~ msgstr "Försäljningsadministration"
-
-#~ msgid "Company"
-#~ msgstr "Företag"
-
-#~ msgid "Marketing"
-#~ msgstr "Marknadsföring"
-
-#~ msgid "title"
-#~ msgstr "titel"
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Avancerad rapportering"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Hjälper dig att hantera dina bokföringsbehov. Om du inte jobbar med "
-#~ "redovisning rekommenderar vi dig att enbart installera faktureringsmodulen "
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr ""
-#~ "Låter dig installera tillägg för att dela kunskap mellan medarbetare."
-
-#~ msgid "Zip Code"
-#~ msgstr "Postnummer"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Bokföring och finans"
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Låter dig skapa fakturor och spåra inbetalningar. Detta är en lättare "
-#~ "version av bokföringsmodulen för administratörer som inte kan bokföring."
-
-#~ msgid "Purchase Management"
-#~ msgstr "Inköpshantering"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Företagskonfiguration"
-
-#~ msgid "Project Management"
-#~ msgstr "Projekthantering"
-
-#~ msgid "Installed Users"
-#~ msgstr "Installerade användare"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Tillverkning"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Exempel: http://openerp.com"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid "Install Applications"
-#~ msgstr "Installera applikationer"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Information om din nya databas"
-
-#~ msgid "Image"
-#~ msgstr "Bild"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Hoppa över konfigureringsguide"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Du kan börja konfigurera systemet eller koppla dig direkt till databasen som "
-#~ "en administratör."
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "Street 2"
-#~ msgstr "Gata 2"
-
-#~ msgid "New Database"
-#~ msgstr "Ny databas"
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "Låter dig installera diverse verktyg för att göra det enklare att göra "
-#~ "bättre OpenERP rapporter."
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid "Human Resources"
-#~ msgstr "Personalresurser"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Auktionshus"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Installera specifika industriapplikationer"
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "Hjälper dig att hantera dina offerter, ordrar och fakturor."
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Denna modul implementerar ett konfigurerat system som hjälper "
-#~ "användaren\n"
-#~ "    att konfigurera ett system vid installationen av en ny databas.\n"
-#~ "\n"
-#~ "    Det låter dig välja mellan en lista av profiler att installera:\n"
-#~ "    * Minimal profil\n"
-#~ "    * Enbart bokföring\n"
-#~ "    * Tjänsteföretag\n"
-#~ "    * Tillverkande företag\n"
-#~ "\n"
-#~ "    * Det låter dig också konfigurera ditt företag, ditt sidhuvud och "
-#~ "sidfot, kontoplan och språk.\n"
-#~ "    "
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Konfigurera ditt företags information"
-
-#~ msgid "Food Industry"
-#~ msgstr "Livsmedelsindustri"
-
-#~ msgid "Associations"
-#~ msgstr "Organisationer"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Extraverktyg"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Hjälper dig att hantera kundrelationer, t ex potentiella affärer, "
-#~ "förfrågningar eller supportärenden. Kan automatiskt påminna, eskalera "
-#~ "ärenden eller utlösa affärsspecifika åtgärder."
-
-#~ msgid "Point of Sales"
-#~ msgstr "Kassa"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Kundvård (CRM)"
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Kunskapsförvaltning"
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "Dina företagsuppgifter används för att personalisera dokument som OpenERP "
-#~ "skapar, exempelvis fakturor, ordrar och många fler."
-
-#~ msgid "Company Website"
-#~ msgstr "Företagets webbplats"
-
-#~ msgid "Fed. State"
-#~ msgstr "Amerikansk delstat"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Företagets logotyp - använd en storlek kring 450x150 bildpunkter."
-
-#~ msgid "Bank Account No"
-#~ msgstr "Bankkonto"
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Välj de grundläggande funktioner som du vill konfigurera ditt system med. Är "
-#~ "du osäker på vad du behöver i detta läge så är det inte några problem att "
-#~ "komplettera senare."
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Lagerstyrning"
-
-#~ msgid "State"
-#~ msgstr "Län"
-
-#~ msgid "Display Tips"
-#~ msgstr "Visa tips"
-
-#~ msgid "Create"
-#~ msgstr "Skapa"
-
-#~ msgid "Import"
-#~ msgstr "Importera"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Definiera användarens inställningar"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Definiera standardinställningar för användare"
-
-#~ msgid "Extended"
-#~ msgstr "Utökad"
-
-#~ msgid "Customers"
-#~ msgstr "Kunder"
-
-#~ msgid "Interface"
-#~ msgstr "Gränssnitt"
-
-#~ msgid "Language"
-#~ msgstr "Språk"
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Skapa ytterligare användare"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Skapa eller importera kunder"
-
-#~ msgid "Timezone"
-#~ msgstr "Tidszon"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid "Simplified"
-#~ msgstr "Förenklad"
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid "Import or create customers"
-#~ msgstr "Importera eller skapa kunder"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "Använd ett annat ord för \"kund\""
 
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "Om det är första gången du använder OpenERP så rekomenderar vi förenklat "
-#~ "användargränssnitt, det innehåller färre funktioner men är enklare. Du kan "
-#~ "alltid byta senare."
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Fyll i ditt bolags uppgifter (adress, logotyp, bankgiro etc) så att det "
-#~ "kommer med på dina rapporter. Klicka på knappen \"Visa huvud\" för att se "
-#~ "hur sidhuvud och fot kommer att se ut på PDF-dokumenten"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr ""
+"Använd externa identitetsleverantörer, logga in med google, facebook, ..."
 
-#~ msgid "Sync Google Contact"
-#~ msgstr "Synkronisera Google Contact"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"När Du skapar en ny kontakt (person eller fötetag), kommer du få möjlighet "
+"att hämta all data från LinkedIn (foton, adress mm)."
 
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Markera den här rutan om du alltid vill ha tips för varje menyalternativ"
-
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "Globala inställningar för alla användare, nya som befintliga. Efteråt kan "
-#~ "användare justera sina egna inställningar i deras lokala formulär."
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"När du skickar ett dokument till en kund\n"
+"                                     (citat, faktura), kommer kunden att få\n"
+"                                     möjlighet att registrera sig på "
+"webbplatsen för att få alla sina dokument,\n"
+"                                     Läs ditt företag nyheter, följa sitt "
+"projekt,\n"
+"                                     etc."
 
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "Skapa eller Importera kunder och deras kontakter manuellt från detta "
-#~ "formulär eller så kan du importera dina befintliga företag med CSV-filer "
-#~ "från \"Importera data\" guiden."
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "For Import Saleforce"
-#~ msgstr "För att importera från Saleforce"
-
-#~ msgid "For Quickbooks Ippids"
-#~ msgstr "För Quickbooks Ippids"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Använd guiden för att bestämma terminologin för kunder genom hela systemet."
 
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Ställer in standardspråk för all användargränssnittet, när UI-översättningar "
-#~ "finns tillgängliga. Om du vill lägga till nya språk, kan du lägga till det "
-#~ "från \"Ladda en officiell översättning\"-guiden i  \"Inställningar\"-menyn."
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Du hittat fler inställningar i dina företagsuppgifter : adress för "
+"sidhuvud/sidfot, påminnelsetexter om sena betalningar mm."
 
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "Standardinställningen för nya användarens tidszon, används för att utföra "
-#~ "tidszonsinställningarnas konverteringar mellan servern och klienten."
-
-#~ msgid "Quickbooks Ippids"
-#~ msgstr "Quickbooks Ippids"
-
-#~ msgid "Import Saleforce"
-#~ msgstr "Importera Saleforce"
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "För import från Sugarcrm"
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "Importera Sugarcrm"
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "För att synkronisera Google-kontakter"
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
-
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
-
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
-
-#~ msgid "Previous"
-#~ msgstr "Bakåt"
-
-#~ msgid "City"
-#~ msgstr "Postort"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Sätt bolagets huvud-, fottext och valuta (SEK)"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/th.po b/addons/base_setup/i18n/th.po
index 90b5f2e871d..9048b72f704 100644
--- a/addons/base_setup/i18n/th.po
+++ b/addons/base_setup/i18n/th.po
@@ -1,576 +1,373 @@
 # Thai translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-01-15 08:18+0000\n"
-"Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Thai <th@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "ไม่ใช่สมาชิก"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "ที่อยู่ติดต่อ"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "สมาชิก"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "ใช้งาน"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "การยืนยันตัวบุคคล"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr ""
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
+msgstr "CRM"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "การตั้งค่าทั่วไป"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "ยกเลิก"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr ""
+msgid "Client"
+msgstr "ไคลเอนต์"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "อีเมล์"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
-msgstr "CRM"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "กำหนดค่าข้อมูลของ บริษัท"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr ""
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "ที่อยู่ติดต่อ"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=YOUR_DATABAE"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "อีเมล์"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "นำเข้า / ส่งออก"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "การตั้งค่าทั่วไป"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr ""
+msgid "Guest"
+msgstr "ไม่ใช่สมาชิก"
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "นำเข้า / ส่งออก"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
-
-#. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "ไคลเอนต์"
+msgid "Member"
+msgstr "สมาชิก"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
+msgstr "ตัวเลือก"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
 msgstr "คู่ค้า"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
-msgstr "ตัวเลือก"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "ยกเลิก"
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "ใช้งาน"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "หรือ"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "กำหนดค่าข้อมูลของ บริษัท"
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr ""
-#~ "รูปแบบโมดูลเป็นเพียงการตั้งค่าแนะนำในการใช้งานเพื่อตั้งค่าได้ง่ายขึ้น "
-#~ "แต่เรามีโมดูลที่สามารถหาติดตั้งได้มากกว่า 500 โมดูล"
-
-#~ msgid "E-mail"
-#~ msgstr "อีเมล์"
-
-#~ msgid "Report header"
-#~ msgstr "หัวรายงาน"
-
-#~ msgid "Select a Profile"
-#~ msgstr "เลือกแบบ"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr "คุณอาจจะเริ่มตั้งค่าหรือใช้ค่าพื้นฐานเบื้องต้น"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr "คุณสามารถลงโมดูลใหม่ๆได้ในเมนูการบริหารระบบ"
-
-#~ msgid "Start Configuration"
-#~ msgstr "เริ่มการตั้งค่า"
-
-#~ msgid "Zip code"
-#~ msgstr "รหัสไปรษณีย์"
-
-#~ msgid "Next"
-#~ msgstr "ถัดไป"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "ฐานข้อมูลใหม่ตั้งตั้งเสร็จสิ้น"
-
-#~ msgid "Profile"
-#~ msgstr "รูปแบบ"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "ท้ายรายงาน 2"
-
-#~ msgid "State"
-#~ msgstr "จังหวัด"
-
-#~ msgid "Street2"
-#~ msgstr "ตำบล"
-
-#~ msgid "Phone"
-#~ msgstr "โทรศัพท์"
-
-#~ msgid "Report Information"
-#~ msgstr "ข้อมูลรายงาน"
-
-#~ msgid "General Information"
-#~ msgstr "ข้อมูลทั่วไป"
-
-#~ msgid "Define Main Company"
-#~ msgstr "ตั้งบริษัทหลัก"
-
-#~ msgid "Report Header"
-#~ msgstr "หัวรายงาน"
-
-#~ msgid "Installation Done"
-#~ msgstr "ติดตั้งเสร็จสิ้น"
-
-#~ msgid "Install"
-#~ msgstr "ติดตั้ง"
-
-#~ msgid "Summary"
-#~ msgstr "สรุป"
-
-#~ msgid "Setup"
-#~ msgstr "ตั้งค่า"
-
-#~ msgid "Country"
-#~ msgstr "ประเทศ"
-
-#~ msgid "Company Name"
-#~ msgstr "ชื่อบริษัท"
-
-#~ msgid "Use Directly"
-#~ msgstr "ใช้ทันที"
-
-#~ msgid "Previous"
-#~ msgstr "ก่อนหน้า"
-
-#~ msgid "Street"
-#~ msgstr "ที่อยู่"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "กรุณาใช้โลโก้ขนาด 450X150 px"
-
-#~ msgid "Logo"
-#~ msgstr "โลโก้"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "ข้อมูลนี่จะอยู่ในด้านบนขวาของรายงานท่าน\n"
-#~ "กรุณาใส่ สโลแกน\n"
-#~ "\"Open Source Business Solutions\"."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "ข้อมูลนี่จะอยู่ในท้ายกระดาษของรายงาน\n"
-#~ "เราแนะนำให้เปลี่ยนโดยใส่ข้อมูลของธนาคาร\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "ข้อมูลนี่จะอยู่ในท้ายกระดาษของรายงาน\n"
-#~ "เราแนะนำให้ท่านนำข้อมูลเกี่ยวกับทางกฏหมาย\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "ท้ายรายงาน"
-
-#~ msgid "Human Resources"
-#~ msgstr "ทรัพยากรบุคคล"
-
-#~ msgid "City"
-#~ msgstr "จังหวัด"
-
-#~ msgid "Invoicing"
-#~ msgstr "การแจ้งหนี้"
-
-#~ msgid "Extra Tools"
-#~ msgstr "เครื่องมือเพิ่มเติม"
-
-#~ msgid "Bank Account No"
-#~ msgstr "เลขบัญชีธนาคาร"
-
-#~ msgid "Marketing"
-#~ msgstr "การตลาด"
-
-#~ msgid "Your database is now created."
-#~ msgstr "กำลังสร้างฐานข้อมูลของคุณ"
-
-#~ msgid "Company"
-#~ msgstr "บริษัท"
-
-#~ msgid "title"
-#~ msgstr "คำนำหน้าชื่อ"
-
-#~ msgid "Street 2"
-#~ msgstr "อำเภอ"
-
-#~ msgid "Zip Code"
-#~ msgstr "รหัสไปรษณีย์"
-
-#~ msgid "Auction Houses"
-#~ msgstr "ประมูลบ้าน"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "บัญชีและการเงิน"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "การบริหารสินค้าคงคลัง"
-
-#~ msgid "Purchase Management"
-#~ msgstr "การบริหารการจัดซื้อ"
-
-#~ msgid "Company Configuration"
-#~ msgstr "ตั้งค่าบริษัท"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "การบริหารลูกค้าสัมพันธ์"
-
-#~ msgid "New Database"
-#~ msgstr "สร้างฐานข้อมูลใหม่"
-
-#~ msgid "Project Management"
-#~ msgstr "การบริหารโครงการ"
-
-#~ msgid "Food Industry"
-#~ msgstr "อุตสาหกรรมอาหาร"
-
-#~ msgid "Manufacturing"
-#~ msgstr "การผลิต"
-
-#~ msgid "Image"
-#~ msgstr "รูปภาพ"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
 
-#~ msgid "Base Setup"
-#~ msgstr "ตั้งค่าพื้นฐาน"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Install Applications"
-#~ msgstr "ติดตั้งแอ็พพลิเคชั่น"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
 
-#~ msgid "Currency"
-#~ msgstr "หน่วยเงินตรา"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid "Sales Management"
-#~ msgstr "การบริหารการขาย"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/tlh.po b/addons/base_setup/i18n/tlh.po
index 729cbe412a7..9a33a3e1b0f 100644
--- a/addons/base_setup/i18n/tlh.po
+++ b/addons/base_setup/i18n/tlh.po
@@ -1,369 +1,373 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Klingon translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Klingon <tlh@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Authentication"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Client"
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr ""
+
+#. module: base_setup
+#: help:base.config.settings,font:0
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
 msgstr ""
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index 190cb13fc16..e424d58cc26 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -1,241 +1,175 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* base_setup
+# Turkish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-01-23 21:47+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Eposta entegrasyonu"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "Misafir"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "Kişiler"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "Müşteri portalını etkinleştir"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr "Dış doğrulama sağlayıcıları kullan, google, facebook ile giriş..."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "Belge paylaşımına izin ver"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
-"OpenERP gelen epostalardan kendiliğinden adaylar oluşturur\n"
-"                            (yada başka belgeler). OpenERP ile düzenli "
-"POP/IMAP hesaplarını kullanarak,\n"
-"                            eposta sunucunuz için doğrudan eposta "
-"entegrasyon kodu kullanarak, ya da\n"
-"                            yeğlediğiniz eposta uygulaması eklentileri "
-"kullanarak epostaları elle\n"
-"                            OpenERP ye itekleyebilirsiniz.."
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "SATIŞ"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "Kullanıcıların CSV dosyalarından veri içeaktarmasına izin ver"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "Üye"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "Uygula"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "Portal erişimi"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "Kimlik doğrulama"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "Teklifler ve Satış Siparişleri"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "Genel Ayarlar"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "Bağışçı"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "Eposta"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "İptal"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "Hasta"
+msgid "Client"
+msgstr "Müşteri"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "Kullanıcıların CSV dosyalarından veri içeaktarmasına izin ver"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "Satışları Yapılandır"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "Çoklu şirketleri yönet"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "Giden eposta sunucusunu yapılandır"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "Posta İstemcisinde"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "Şirket verilerinizi yapılandırın"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-süzgeçi=SİZİN_VERİTABANI"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "Kişiler"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "Linkedin'den kişileri otomatik al"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "Thunderbird eklentisini etkinleştir"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "Müşteri"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "Müşteri Özellikleri"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "İçeaktar / Dışaaktar"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "Satış Özellikleri"
-
-#. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "Outlook eklentisini etkinleştir"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "Bağışçı"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr ""
-"Bu sihirbazı kullanarak tüm uygulamanın içinde müşteri terminolojilerini "
-"değiştirebilirsiniz."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "Eposta"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "Kiracı"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Eposta entegrasyonu"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "Herhangi bir opeerp ekranını paylaş ya da göm."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "Genel Ayarlar"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "Müşteri"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr ""
-"Yeni bir kişi (kişi ya da firma) oluşturduğunuzda Linkedin'den tüm verileri "
-"(fotoğraf, adres, v,s,) yükleyebilirsiniz."
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "Linkedin'den kişileri otomatik al"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
-msgstr ""
-"Firmalar arasında uygun güvenli erişimle çok şirketli ortamlarda çalışın.\n"
-"                Bu, multi_company modülünü kurar."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "Müşterilerinize belgelerine erişim verin"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
-"Genel portal, yalnızca tek veritabanlı oddaysanız erişilebilir. OpenERP\n"
-"                                    Sunucusunu bu seçenekle başlatabilirsiniz"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
-"Şirket ayrıntılarınızda daha çok seçenecek bulacaksınız: altbilgi ve "
-"üstbilgi için adres ve vadesi geçmiş ödemeler için metinler, vb."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "Misafir"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -243,686 +177,211 @@ msgid "How do you call a Customer"
 msgstr "Müşterilerinize nasıl isimlendiriyorsunuz ?"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
-"Bir müşteriye bir belge gönderdiğinizde\n"
-"                                    (teklif, fatura), müşterileriniz bütün "
-"bu\n"
-"                                    belgeleri alabilmek, şirket "
-"haberlerinizi,\n"
-"                                    okuyabilmek, projelerini denetlemek, vb. "
-"için\n"
-"                                    kayıt yapabilecektir."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "İçeaktar / Dışaaktar"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "Müşteri"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
-"Openerp nin genel kısmını etkinleştirince, openerp genel bir websitesi olur."
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
-"Eklenti, eposta ve eklerini seçtiğiniz OpenERP nesnelerine arşivlemenizi\n"
-"                sağlar. Bir iş ortağı ya da aday seçebilir ve seçilen bir \n"
-"                kayda ait eklere seçilen epostayı .eml dosyası olarak\n"
-"                ekleyebilirsiniz. Seçilen epostalarda CRM Adayları,\n"
-"                İş Ortakları oluşturabilirsiniz.\n"
-"                Bu, plugin_thunderbird modülünü kurar."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "İş Ortağı"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "Çoklu şirketleri yönet"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "\"Müşteri\" yerine başka bir söz seçin"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "Üye"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "Satışları Yapılandır"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"Outlook eklentisi, Ms Outlooktan epostalarınıza ve eklerine eklemek "
-"isteyebileceğiniz\n"
-"                nesneleri seçmenizi sağlar. Bir iş ortağı ya da aday "
-"seçebilir ve seçilmiş bir\n"
-"                epostayı ekleriyle birlikte bir OpenERP posta iletisine "
-"ekleyebilirsiniz.\n"
-"                Bu, plugin_outlook modülünü kurar."
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "Şeçenekler"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "Müşteri portalını etkinleştir"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "İş Ortağı"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
-"bunu yapmak için.\n"
-"                                    Etkinleştirildiğinde, giriş sayfası "
-"genel websitesiyle değiştirilecektir."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "Hasta"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "Belge paylaşımına izin ver"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "Portal erişimi"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(şirket haberleri, işler, iletişim formu, vb.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "Teklifler ve Satış Siparişleri"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "Genel portalı etkinleştir"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "Giden eposta sunucusunu yapılandır"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "SATIŞ"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "Sosyal Ağ Entegrasyonu"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "Satış Özellikleri"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "Müşterilerinize belgelerine erişim verin"
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "İptal"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "Herhangi bir opeerp ekranını paylaş ya da göm."
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "Uygula"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "Sosyal Ağ Entegrasyonu"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "Terminolojinizi Belirtin"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "ya da"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "Kiracı"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "Şirket verilerinizi yapılandırın"
-
-#~ msgid "State"
-#~ msgstr "Eyalet"
-
-#~ msgid "City"
-#~ msgstr "Şehir"
-
-#~ msgid "Zip code"
-#~ msgstr "Posta Kodu"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Rapor Alt Bilgisi 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Rapor Alt Bilgisi 2"
-
-#~ msgid "General Information"
-#~ msgstr "Genel Bilgiler"
-
-#~ msgid "Street2"
-#~ msgstr "Adres 2"
-
-#~ msgid "Report Information"
-#~ msgstr "Rapor Bilgisi"
-
-#~ msgid "Phone"
-#~ msgstr "Telefon No."
-
-#~ msgid "Define Main Company"
-#~ msgstr "Ana Firma Tanımı"
-
-#~ msgid "Company Name"
-#~ msgstr "Firma Adı"
-
-#~ msgid "Country"
-#~ msgstr "Ülke"
-
-#~ msgid "Summary"
-#~ msgstr "Özet"
-
-#~ msgid "Report Header"
-#~ msgstr "Rapor Üst Bilgisi"
-
-#~ msgid "Currency"
-#~ msgstr "Para Birimi"
-
-#~ msgid "Street"
-#~ msgstr "Adres"
-
-#~ msgid "Use Directly"
-#~ msgstr "Doğrudan Kullan"
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid "Previous"
-#~ msgstr "Önceki"
-
-#~ msgid "Human Resources"
-#~ msgstr "İnsan Kaynakları"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Hızlı Satış Noktası"
-
-#~ msgid "Your database is now created."
-#~ msgstr "Veritabanınız Oluşturuldu"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr ""
-#~ "Üretim süreçlerinizi yönetmeyi ve üretim süreçlerini raporlamanızı sağlar."
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "Pazarlama kampanyalarınızı adım adım yöntemeyi sağlar."
-
-#~ msgid "Invoicing"
-#~ msgstr "Faturalama"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Banka Hesap No"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Ekstra Araçlar"
-
-#~ msgid "Company"
-#~ msgstr "Şirket"
-
-#~ msgid "Sales Management"
-#~ msgstr "Satış Yönetimi"
-
-#~ msgid "Marketing"
-#~ msgstr "Pazarlama"
-
-#~ msgid "Fed. State"
-#~ msgstr "İl"
-
-#~ msgid "Associations"
-#~ msgstr "Bağıntılar"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Yapılandırma Aşaması"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Aşağıdaki kullanıcılar kuruldu: \n"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr ""
-#~ "Çeşitli çok zorunlu olmayan (Anket, Öğle Yemeği, Fikir Kutusu gibi) araçlar "
-#~ "kurmanıza yarar"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "Yapılandırma sihirbazını geç"
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr ""
-#~ "Şirket bilgileriniz OpenERP içinde oluşturduğunuz dökümanların şirketinize "
-#~ "göre özelleştirilmesi için kullanılır."
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Bilgi Yönetimi"
-
-#~ msgid "title"
-#~ msgstr "başlık"
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Gelişmiş Raporlama"
-
-#~ msgid "Street 2"
-#~ msgstr "Sokak 2"
-
-#~ msgid "Zip Code"
-#~ msgstr "Posta Kodu"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Müzayede Salonları"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Muhasebe & Finans"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "Bu cümle raporlarınızın altında görünecek.\n"
-#~ "Bu satırda banka bilgilerinizi koymanızı tavsiye ederiz.\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr ""
-#~ "Faturalarınızı oluşturmanızı ve ödemelerinizi takip edebilmenize olanak "
-#~ "sağlar. Muhasebe modülünün daha basitleştirilmiş halidir. Muhasebeci "
-#~ "olmayanlar için tavsiye edilir."
-
-#~ msgid "Setup"
-#~ msgstr "Kurulum"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid "Warehouse Management"
-#~ msgstr "Depo Yönetimi"
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid "Purchase Management"
-#~ msgstr "Satınalma Yönetimi"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "\"Müşteri\" yerine başka bir söz seçin"
 
-#~ msgid "Company Configuration"
-#~ msgstr "Şirket Ayarları"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr "Dış doğrulama sağlayıcıları kullan, google, facebook ile giriş..."
 
-#~ msgid "Start Configuration"
-#~ msgstr "Yapılandırmayı Başlat"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr ""
+"Yeni bir kişi (kişi ya da firma) oluşturduğunuzda Linkedin'den tüm verileri "
+"(fotoğraf, adres, v,s,) yükleyebilirsiniz."
 
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "Teklifleri, sipariş emirlerini ve faturalarınızı yönetmenizi sağlar"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
+"Bir müşteriye bir belge gönderdiğinizde\n"
+"                                    (teklif, fatura), müşterileriniz bütün "
+"bu\n"
+"                                    belgeleri alabilmek, şirket "
+"haberlerinizi,\n"
+"                                    okuyabilmek, projelerini denetlemek, vb. "
+"için\n"
+"                                    kayıt yapabilecektir."
 
-#~ msgid "Project Management"
-#~ msgstr "Proje Yönetimi"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Installed Users"
-#~ msgstr "Kurulmuş Kullanıcılar"
-
-#~ msgid "Food Industry"
-#~ msgstr "Yemek Endüstrisi"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Üretim"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Logonuz - Yaklaşık 450x150 pixel resim kullanın"
-
-#~ msgid "Information about your new database"
-#~ msgstr "Yeni Veritabanınız hakkında bilgi"
-
-#~ msgid "Image"
-#~ msgstr "Resim"
-
-#~ msgid "New Database"
-#~ msgstr "Yeni Veritabanı"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Müşteri İlişkileri Yönetimi (CRM)"
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr ""
-#~ "OpenERP nin raporlama kabiliyetlerini basitleştirip geliştiren çeşitli "
-#~ "araçlar kurun."
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "Bu cümle raporlarınızın sağ üst köşesinde görünür.\n"
-#~ "Burada bir slogan kullanmanızı öneririz:\n"
-#~ "\"Açık Kaynaklı İş Çözümleri\""
-
-#~ msgid "Base Setup"
-#~ msgstr "Temel Kurulum"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Şirket bilgilerinizi değiştirin"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Endüstriye özel uygulamalar kur"
-
-#~ msgid "Company Website"
-#~ msgstr "Şirket Websitesi"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Örnek: http://openerp.com"
-
-#~ msgid "Install Applications"
-#~ msgstr "Uygulamaları Kur"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr ""
-#~ "Ortaklıklarınızı daha verimli yönetmeniz için önceden seçilmiş OpenERP "
-#~ "uygulama setlerini kurar."
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "Bu Cümle raporlarınızın altında gözükecek.\n"
-#~ "Bu satıra iletişim bilgilerinizi yazmanızı öneririz:\n"
-#~ "Web: http://openerp.com - Faks: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "temel.kurulum.yükleyici"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr ""
-#~ "Satınalma ilişkili işlemleri (teklif istekleri, tedarikçi faturaları gibi) "
-#~ "yönetmenize yardım eder"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr "Haydi bilgiyi çalışanlarınızla paylaşmak için eklentiler kurum."
-
-#~ msgid "base.setup.company"
-#~ msgstr "temel.kurulum.şirket"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr ""
-#~ "Sistemi yapılandırmaya başlayabilirsiniz ya da doğrudan veritabanına "
-#~ "yönetici olarak bağlanabilirsiniz."
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr ""
-#~ "Muhasebe hesaplarını tutmanıza yardımcı olur. Eğer bir muhasebeci değilseniz "
-#~ "sadece Faturalama modülünü kurmanızı tavsiye ederiz. "
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Bu modül kullanıcılara yeni bir veritabanı oluşturulduğunda sistemi\n"
-#~ "    kurmak için bir Yapılandırma sistemi sağlar.\n"
-#~ "\n"
-#~ "    Bunun yanı sıra şirketinizi ayarlarını (alt,üst bilgiler. hesap planı ve "
-#~ "dil gibi)\n"
-#~ "    yapılandırmak için bir sihirbaz da içerir.\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr ""
-#~ "İnsan kaynaklarınızı yönetmenize (çalışanların yapısını kodlayarak, çalışma "
-#~ "sayfaları oluşturarak, işe devamlarını takip ederek vs) yardımcı olur."
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr ""
-#~ "Projelerinizi ve görevlerinizi yönetmenize yardımcı olur (planlamalar "
-#~ "oluşturarak, görev ve projeleri takip ederek, vb...)"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr ""
-#~ "Sektörünüzde size yardımcı olması için önceden seçilmiş bir OpenERP "
-#~ "uygulamaları kümesinin kurulumunu yapar."
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr ""
-#~ "Sisteminizin içermesini istediğiniz uygulamaları seçin. Gereken uygulamalar "
-#~ "konusunda emin değilseniz daha sonra kolaylıkla uygulama ekleyebilirsiniz."
-
-#~ msgid "base.setup.config"
-#~ msgstr "temel.kurulum.ayar"
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr ""
-#~ "Stoklarınızı ve ana stok işlemlerinizi: sevkiyat emirleri, kabuller, v.s. "
-#~ "yönetmenize yardım eder"
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr ""
-#~ "Hızlı satış şifreleme, basit ödeme modu şifreleme, otomatik ayıklama listesi "
-#~ "oluşturma ve daha birçok işlem ile Satış Noktasından en iyi verimi almanıza "
-#~ "yardım eder."
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr ""
-#~ "Adaylar, istekler ve sorunlar gibi Müşterilerle ilişkileri izlemenizi ve "
-#~ "yönetmenizi sağlar. Otomatik olarak hatırlatmalar, artış istekleri gönderir "
-#~ "ve standart olaylara bağlı özel işleri tetikler."
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr ""
-#~ "Müzayedelerinizi ve bunlarla ilgili işlerinizi yönetmede yardımcı olması "
-#~ "için seçilmiş, önseçimli OpenERP uygulama setini kurar."
-
-#~ msgid "E-mail"
-#~ msgstr "E-posta:"
-
-#~ msgid "Install"
-#~ msgstr "Kur"
-
-#~ msgid "Display Tips"
-#~ msgstr "İpuçlarını Göster"
-
-#~ msgid "Create"
-#~ msgstr "Oluştur"
-
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "Şirket Başlık ve Altbilgilerini Ayarla"
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "Google Kişilerle Senkronize Et"
-
-#~ msgid "Import"
-#~ msgstr "İçe Aktar"
-
-#~ msgid "For Quickbooks Ippids"
-#~ msgstr "Quickbooks lppidleri için"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "Kullanıcı Seçeneklerini Tanımlayın"
-
-#~ msgid "For Import Saleforce"
-#~ msgstr "Saleforce'dan aktarım için"
-
-#~ msgid "Define default users preferences"
-#~ msgstr "Öntanımlı Kullanıcı Seçeneklerini Tanımlayın"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr ""
-#~ "OpenERP yi ilk defa kullanıyorsanız basit arayüzü kullanmanızı öneririz. "
-#~ "Daha az seçenek sunar ama daha basittir. Dilediğiniz her zaman kullanıcı "
-#~ "seçeneklerinden detaylı arayüze geçebilirsiniz."
-
-#~ msgid "Extended"
-#~ msgstr "Detaylı"
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr ""
-#~ "Raporlarınızda gösterilmesi için şirket bilgilerinizi doldurun (adres, logo, "
-#~ "banka hesapları). 'Anteti Görüntüle' butonuna tıklayarak antet bilgilerinizi "
-#~ "PDF olarak görüntüleyebilirsiniz."
-
-#~ msgid "Customers"
-#~ msgstr "Müşteriler"
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "migrade.application.installer.modules"
-
-#~ msgid "Interface"
-#~ msgstr "Arayüz"
-
-#~ msgid "Language"
-#~ msgstr "Dil"
-
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "Tüm kullanıcı arayüzü için öntanımlı dil seçilir. Eğer yeni bir dil eklemek "
-#~ "isterseniz 'Ayarlar' menüsünden ekleyebilirsiniz."
-
-#~ msgid "Quickbooks Ippids"
-#~ msgstr "Quickbooks Ippidleri"
-
-#~ msgid "Create Additional Users"
-#~ msgstr "Ek kullanıcılar Oluştur"
-
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
-
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr ""
-#~ "Eğer her menü eyleminde ipuçlarını göstermek istiyorsanız bu kutucuğu "
-#~ "işaretleyin."
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "SugarCRM'den Aktar"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "Müşterileri Oluştur ya da İçeri Aktar"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+"Bu sihirbazı kullanarak tüm uygulamanın içinde müşteri terminolojilerini "
+"değiştirebilirsiniz."
 
-#~ msgid "Timezone"
-#~ msgstr "Saat Dilimi"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
+"Şirket ayrıntılarınızda daha çok seçenecek bulacaksınız: altbilgi ve "
+"üstbilgi için adres ve vadesi geçmiş ödemeler için metinler, vb."
 
-#~ msgid "Import Saleforce"
-#~ msgstr "Saleforce'dan Aktar"
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "SugarCRM'den almak için"
-
-#~ msgid "Simplified"
-#~ msgstr "Sadeleşmiş"
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "Google Kişilerden Senkronize et"
-
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr ""
-#~ "Bu formu kullanarak müşterileri ve ilgili kişileri oluşturabilir ya da içeri "
-#~ "aktarabilirsiniz."
-
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr ""
-#~ "Bu form kayıtlı ve yeni kullanıcılar için öntanımlı seçenekleri "
-#~ "belirlemenizi sağlar. Kullanıcılar daha sonra bu değerleri kendi istekleri "
-#~ "doğrultusunda değiştirebilirler."
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr ""
-#~ "Yeni kullanıcıların öntanımlı saat dilimini belirleyin. Sunucu ve istemci "
-#~ "arasında saat çevirimleri için kullanılır."
-
-#~ msgid "Import or create customers"
-#~ msgstr "Müşterileri oluştur ya da içeri aktar"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/uk.po b/addons/base_setup/i18n/uk.po
index 459813ffd81..3281bd82d4e 100644
--- a/addons/base_setup/i18n/uk.po
+++ b/addons/base_setup/i18n/uk.po
@@ -1,432 +1,373 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Ukrainian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2009-09-08 16:18+0000\n"
-"Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian <uk@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Authentication"
-msgstr ""
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "Скасувати"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Partner"
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "Скасувати"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
-#~ msgid "City"
-#~ msgstr "Місто"
-
-#~ msgid "Zip code"
-#~ msgstr "Індекс"
-
-#~ msgid "Report header"
-#~ msgstr "Верхній колонтитул"
-
-#~ msgid "Next"
-#~ msgstr "Далі"
-
-#~ msgid "E-mail"
-#~ msgstr "Ел.пошта"
-
-#~ msgid "State"
-#~ msgstr "Область"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "Ваша нова база даних повністю встановлена"
-
-#~ msgid "Profile"
-#~ msgstr "Профіль"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "Нижній колонтитул 1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "Нижній колонтитул 2"
-
-#~ msgid "Street2"
-#~ msgstr "Вулиця2"
-
-#~ msgid "Phone"
-#~ msgstr "Телефон"
-
-#~ msgid "Company Name"
-#~ msgstr "Назва компанії"
-
-#~ msgid "Country"
-#~ msgstr "Країна"
-
-#~ msgid "Setup"
-#~ msgstr "Встановлення"
-
-#~ msgid "Summary"
-#~ msgstr "Підсумок"
-
-#~ msgid "Install"
-#~ msgstr "Встановити"
-
-#~ msgid "Report Header"
-#~ msgstr "Верхній колонтитул"
-
-#~ msgid "Currency"
-#~ msgstr "Валюта"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
 
-#~ msgid "Street"
-#~ msgstr "Вулиця"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid "Previous"
-#~ msgstr "Попередня"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr ""
diff --git a/addons/base_setup/i18n/vi.po b/addons/base_setup/i18n/vi.po
index 22a4af73f0c..9769565aa8b 100644
--- a/addons/base_setup/i18n/vi.po
+++ b/addons/base_setup/i18n/vi.po
@@ -1,521 +1,373 @@
 # Vietnamese translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-07 12:42+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Authentication"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
+#: field:sale.config.settings,module_crm:0
+msgid "CRM"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Authentication"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_crm:0
-msgid "CRM"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Customer Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Customer Features"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Tenant"
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.terminology,partner:0
-msgid "How do you call a Customer"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Options"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Partner"
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
 msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
-msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+#: field:base.config.settings,font:0
+msgid "Report Font"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Options"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: help:base.config.settings,font:0
 msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
 msgstr ""
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
 msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "Specify Your Terminology"
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
 msgstr ""
 
-#~ msgid "E-mail"
-#~ msgstr "Thư điện tử"
-
-#~ msgid "City"
-#~ msgstr "Thành phố"
-
-#~ msgid "Bank Account No"
-#~ msgstr "Số tài khoản ngân hàng"
-
-#~ msgid "Invoicing"
-#~ msgstr "Hóa đơn"
-
-#~ msgid "Company Name"
-#~ msgstr "Tên công ty"
-
-#~ msgid "Your database is now created."
-#~ msgstr "CSDL của bạn đã được tạo"
-
-#~ msgid "Currency"
-#~ msgstr "Loại tiền"
-
-#~ msgid "Phone"
-#~ msgstr "Điện thoại"
-
-#~ msgid "Sales Management"
-#~ msgstr "Quản lý bán hàng"
-
-#~ msgid "Company"
-#~ msgstr "Công ty"
-
-#~ msgid "title"
-#~ msgstr "cách xưng hô"
-
-#~ msgid "Knowledge Management"
-#~ msgstr "Quản lý kiến thức"
-
-#~ msgid "Zip Code"
-#~ msgstr "Mã bưu điện"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "Kế toán & Tài chính"
-
-#~ msgid "Setup"
-#~ msgstr "Cài đặt"
-
-#~ msgid "Country"
-#~ msgstr "Quốc gia"
-
-#~ msgid "Install"
-#~ msgstr "Cài đặt"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Tiến trình cấu hình"
-
-#~ msgid "Marketing"
-#~ msgstr "Tiếp thị"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "Những người sử dụng sau đã được cài đặt: \n"
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "Báo cáo cao cấp"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "Auction Houses"
-#~ msgstr "Nhà bán đấu giá"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid "Company Configuration"
-#~ msgstr "Cấu hình Công ty"
-
-#~ msgid "Start Configuration"
-#~ msgstr "Bắt đầu cấu hình"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "Quản lý Kho hàng"
-
-#~ msgid "Purchase Management"
-#~ msgstr "Quản lý Mua hàng"
-
-#~ msgid "Logo"
-#~ msgstr "Biểu tượng"
-
-#~ msgid "New Database"
-#~ msgstr "CSDL mới"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "Quản lý Quan hệ Khách hàng"
-
-#~ msgid "Installed Users"
-#~ msgstr "Người sử dụng đã được cài đặt"
-
-#~ msgid "Manufacturing"
-#~ msgstr "Sản xuất"
-
-#~ msgid "Food Industry"
-#~ msgstr "Công nghiệp Thực phẩm"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "Cài đặt các Ứng dụng đặc thù theo ngành"
-
-#~ msgid "Company Website"
-#~ msgstr "Trang web Công ty"
-
-#~ msgid "Report Header"
-#~ msgstr "Tiêu đề Báo cáo"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "Biểu trưng - Sử dụng kích thước khoảng 450x150 pixels."
-
-#~ msgid "Information about your new database"
-#~ msgstr "Thông tin về CSDL mới của bạn"
-
-#~ msgid "Image"
-#~ msgstr "Hình ảnh"
-
-#~ msgid "Base Setup"
-#~ msgstr "Thiết lập cơ sở"
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "Cấu hình Thông tin Công ty của Bạn"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "Ví dụ: http://openerp.com"
-
-#~ msgid "Install Applications"
-#~ msgstr "Cài đặt các Ứng dụng"
-
-#~ msgid "Street"
-#~ msgstr "Đường phố"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid "Point of Sales"
-#~ msgstr "Điểm bán hàng"
-
-#~ msgid "Extra Tools"
-#~ msgstr "Các công cụ Mở rộng"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
 
-#~ msgid "Human Resources"
-#~ msgstr "Nguồn nhân lực"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr ""
 
-#~ msgid "Project Management"
-#~ msgstr "Quản lý Dự án"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index 5856e9b3fa9..96d06644c54 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -1,230 +1,175 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-22 04:14+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "Email 集成"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "访客"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "联系人"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "激活客户门户"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr "使用OpenID登陆(Google, Facebook...)"
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "允许分享单据"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
-"OpenERP允许从收到的Email 自动创建线索（或者其他单据）\n"
-"    你能自动通过Openerp使用 POP/IMAP 账户同\n"
-"    步 Email，为你 的服务器直接集成Email脚本，\n"
-"    或者通过插件，为你首选的Email 程序手动推送\n"
-"     email到Openerp。"
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "销售"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "允许导入CSV数据"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "会员"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "应用"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "门户访问"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "身份验证"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "报价和销售订单"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "常规设置"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "捐助者"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "Email"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "CRM"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "取消"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "病人"
+msgid "Client"
+msgstr "客户"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "允许导入CSV数据"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "销售模块配置"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "允许多公司操作"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "配置邮箱发件服务器"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "在邮件客户端"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "配置公司信息"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=YOUR_DATABAE"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "联系人"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "自动获取LinkedIn联系人"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "允许 Thunderbird 插件"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "客户"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "客户特性"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "导入/导出"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "销售特性"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "捐助者"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "允许 Outlook 插件"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "Email"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr "你用这个向导能在整个系统中用其他称谓来标识客户"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "Email 集成"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "承租人"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "常规设置"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "分享或者嵌入任意Openerp屏幕"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "客户"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "自动获取LinkedIn联系人"
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr "创建联系人或者公司时,允许自动从LinkedIn载入相关信息(照片,地址等等)."
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "让你的客户访问他们的单据"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
-"工作在多公司环境，公司之间适当地安全访问\n"
-"               为此安装模块multi_company。"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
-msgstr "只用当你在 单数据库 模式时，公共门户才是可以访问的。你能用此选项运行 OpenERP服务器。"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
-msgstr "你能在你的公司明细里找到多个选项：用于页首和页脚的地址，逾期支付文本等"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "访客"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -232,647 +177,197 @@ msgid "How do you call a Customer"
 msgstr "你如何称呼您的客户"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
-msgstr "当你发送单据给客户（报价单，发票），你的可能能登录，获取他单据，阅读你的公司新闻，检查他的项目等。"
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "导入/导出"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "客户"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr "启用Openerp的公共部分，Openerp成为一个公共的web站点"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
-"插件允许把你的email和附件存档到Openerp对象。你能选择一个业务伙伴、或者线索，并 选择邮件存为 .eml 文件 附加到在选中记录的附件中。\n"
-"\n"
-"为此要安装模块 plugin_thunderbird."
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "业务伙伴"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "允许多公司操作"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "称呼客户的另一种方式"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "会员"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "销售模块配置"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
-"Outlook 插件允许你把 邮件和它附件添加到你选择对象里。 你能选择一个业务伙伴或者线索 对象，并且把选择的邮件存档到一个带附件的 Openerp "
-"邮件消息中。\n"
-"为此要安装模块plugin_outlook."
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "选项"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "激活客户门户"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "业务伙伴"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr "这样做了，一旦激活，登录页面将被公共web站点替换。"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "病人"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "允许分享单据"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "门户访问"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "（公司新闻，工作，联系人表单 等）"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "报价和销售订单"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "启用公共门户"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "配置邮箱发件服务器"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "销售"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "集成社交网络"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "销售特性"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "让你的客户访问他们的单据"
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "取消"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "分享或者嵌入任意Openerp屏幕"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "应用"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "集成社交网络"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "指定贵公司所用的术语"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "or"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "承租人"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "配置公司信息"
-
-#~ msgid "Report Header"
-#~ msgstr "报表页眉"
-
-#~ msgid "Profile"
-#~ msgstr "配置"
-
-#~ msgid "Select a Profile"
-#~ msgstr "选择一个配置"
-
-#~ msgid "City"
-#~ msgstr "城市"
-
-#~ msgid "Zip code"
-#~ msgstr "邮编"
-
-#~ msgid "Report header"
-#~ msgstr "报表头"
-
-#~ msgid "Next"
-#~ msgstr "下一个"
-
-#~ msgid "Phone"
-#~ msgstr "电话"
-
-#~ msgid "Company Name"
-#~ msgstr "公司名称"
-
-#~ msgid "Country"
-#~ msgstr "国家"
-
-#~ msgid "Setup"
-#~ msgstr "设置"
-
-#~ msgid "Summary"
-#~ msgstr "概要"
-
-#~ msgid "Install"
-#~ msgstr "安装"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "报表页脚 2"
-
-#~ msgid "Street2"
-#~ msgstr "街区地址2"
-
-#~ msgid "Report Information"
-#~ msgstr "报表信息"
-
-#~ msgid "Installation Done"
-#~ msgstr "安装完成"
-
-#~ msgid "Previous"
-#~ msgstr "上一个"
-
-#~ msgid "Define Main Company"
-#~ msgstr "定义主公司"
-
-#~ msgid "Use Directly"
-#~ msgstr "直接使用"
-
-#~ msgid "General Information"
-#~ msgstr "一般信息"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr "你可以开始设置系统或使用默认的设置连接到数据库"
-
-#~ msgid "Start Configuration"
-#~ msgstr "开始设置"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr "你以后可以通过管理员菜单安装更多的模块."
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr "配置文件规定了预选模块的具体需要.这些配置已经安装以帮助你发现系统的不同的配置.这是一个配置里面含300多个模块."
-
-#~ msgid "E-mail"
-#~ msgstr "电子邮件"
-
-#~ msgid "Base Setup"
-#~ msgstr "基础安装"
-
-#~ msgid "State"
-#~ msgstr "省/州"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "新帐套已安装完毕."
-
-#~ msgid "Your database is now created."
-#~ msgstr "您的帐套（数据库）已经创建。"
-
-#~ msgid "Point of Sales"
-#~ msgstr "销售点"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr "帮助您掌控您的会计需求，如果您不是一个会计人员，我们建议您仅仅安装发票模块。 "
-
-#~ msgid "Invoicing"
-#~ msgstr "发票"
-
-#~ msgid "Extra Tools"
-#~ msgstr "额外工具"
-
-#~ msgid "Sales Management"
-#~ msgstr "销售管理"
-
-#~ msgid "Company"
-#~ msgstr "公司"
-
-#~ msgid "Marketing"
-#~ msgstr "市场营销"
-
-#~ msgid "Fed. State"
-#~ msgstr "省／州"
-
-#~ msgid "Knowledge Management"
-#~ msgstr "知识管理"
-
-#~ msgid "Auction Houses"
-#~ msgstr "拍卖行"
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "帮助您处理报价单、销售单和发票。"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "仓库管理"
-
-#~ msgid "Purchase Management"
-#~ msgstr "采购管理"
-
-#~ msgid "Zip Code"
-#~ msgstr "邮政编码"
-
-#~ msgid "Project Management"
-#~ msgstr "项目管理"
-
-#~ msgid "Installed Users"
-#~ msgstr "已安装的用户"
-
-#~ msgid "Food Industry"
-#~ msgstr "食品工业"
-
-#~ msgid "Company Website"
-#~ msgstr "公司网站"
-
-#~ msgid "Information about your new database"
-#~ msgstr "您的新数据库信息"
-
-#~ msgid "Image"
-#~ msgstr "图片"
-
-#~ msgid "New Database"
-#~ msgstr "新数据库"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "客户关系管理"
-
-#~ msgid ""
-#~ "Lets you install various tools to simplify and enhance OpenERP's report "
-#~ "creation."
-#~ msgstr "让您安装工具来简化和增强 OpenERP 的报表创建功能."
-
-#~ msgid "base.setup.installer"
-#~ msgstr "base.setup.installer"
-
-#~ msgid "Street 2"
-#~ msgstr "街道地址 2"
-
-#~ msgid "base.setup.company"
-#~ msgstr "base.setup.company"
-
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "例如：http://openerp.com"
-
-#~ msgid "base.setup.config"
-#~ msgstr "base.setup.config"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr "帮助您管理采购相关流程，如询价、供货商发票等等"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "报表页脚1"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "下列用户已经安装 \n"
-
-#~ msgid "title"
-#~ msgstr "标题"
-
-#~ msgid "Human Resources"
-#~ msgstr "人力资源"
-
-#~ msgid "Bank Account No"
-#~ msgstr "银行账号"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "设置进度"
-
-#~ msgid "Associations"
-#~ msgstr "商会"
-
-#~ msgid "Currency"
-#~ msgstr "币别"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "跳过设置向导"
-
-#~ msgid "Company Configuration"
-#~ msgstr "公司设置"
-
-#~ msgid "Logo"
-#~ msgstr "Logo"
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "高级报告"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    这模块实现一个设置向导系统帮助用户在一个新数据库配置系统\n"
-#~ "  它允许在设置列表中选择安装:\n"
-#~ "    *最小设置\n"
-#~ "    *只有会计\n"
-#~ "    *服务公司\n"
-#~ "    *制造公司\n"
-#~ "  它还通过界面对话框来帮助您轻松设置您的公司: 报页头，页脚,所用的会计表和要安装的语言\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Allows you to create your invoices and track the payments. It is an easier "
-#~ "version of the accounting module for managers who are not accountants."
-#~ msgstr "允许你创建发票并跟踪付款,这是一个面向没有会计知识的管理人员的简化版会计模块"
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr "你公司的信息会出现在OprnERP的各种文档上，例如发票，销售订单，和其他"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr "您可以开始设置系统或者直接作为管理员连接到数据库。"
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr "帮助你管理你的人力资源员员工架构，生成工作计工单，考勤等"
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr "帮助你管理项目，跟踪任务，生成计划等"
-
-#~ msgid ""
-#~ "Lets you install addons geared towards sharing knowledge with and between "
-#~ "your employees."
-#~ msgstr "让您安装模块使您的员工可以分享知识。"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "会计 & 财务"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "这将显示在报表底部。\n"
-#~ "建议你在这输入银行信息："
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr "帮助你快速设定你的销售点，简化付款方式，自动装箱单等"
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr "选择你系统所包含的模块。如果你当前还不确定，你可以在以后再安装它们"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr ""
-#~ "这将显示在报表的右上角。\n"
-#~ "建议你在这放一个标语："
-
-#~ msgid "Configure Your Company Information"
-#~ msgstr "设置您的公司信息"
-
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "安装特定的行业模块"
-
-#~ msgid "Install Applications"
-#~ msgstr "安装模块"
-
-#~ msgid "Street"
-#~ msgstr "街道"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "这将显示在报表底部。\n"
-#~ "建议你在这放入正式的公司信息和联系方式："
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "你的Logo使用的尺寸为450×150像素"
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr "帮助您管理库存与仓库相关操作：发货单、收货单等"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr "安装这个OpenERP预设模块，帮助你管理拍卖以及相关的业务流程。"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr "安装这个OpenERP预设模块，帮助你管理你的商会。"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr "安装这个OpenERP预设模块，帮助你管理你的企业"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr "帮助您管理您的生产和其生成的报表。"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr "帮助您跟踪和管理与客户的线索，请求或问题。能自动发送提醒，提升请求等级，基于标准的事件触发指定的商业动作。"
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "帮助您管理市场营销。"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr "让你安装各种有趣的但非必需的工具如： 调查, 午餐 和 创意"
-
-#~ msgid "Manufacturing"
-#~ msgstr "生产"
-
-#~ msgid "Display Tips"
-#~ msgstr "显示提示"
-
-#~ msgid ""
-#~ "Set default for new user's timezone, used to perform timezone conversions "
-#~ "between the server and the client."
-#~ msgstr "为新用户设置默认时区, 以在服务端和客户端之间进行时区的转换."
-
-#~ msgid "Import"
-#~ msgstr "导入"
-
-#~ msgid "Sync Google Contact"
-#~ msgstr "同步Google联系人"
-
-#~ msgid "Define Users's Preferences"
-#~ msgstr "定制用户偏好"
-
-#~ msgid ""
-#~ "Create or Import Customers  and their contacts manually from this form or "
-#~ "you can import your existing partners by CSV spreadsheet from \"Import "
-#~ "Data\" wizard"
-#~ msgstr "从本表单手工创建或者导入客户及其联系方式, 您也可以使用\"导入数据\"向导, 从您已有的CSV格式表格中导入."
-
-#~ msgid "Define default users preferences"
-#~ msgstr "定制默认用户偏好"
-
-#~ msgid "Extended"
-#~ msgstr "扩展"
-
-#~ msgid ""
-#~ "Fill in your company data (address, logo, bank accounts) so that it's "
-#~ "printed on your reports. You can click on the button 'Preview Header' in "
-#~ "order to check the header/footer of PDF documents."
-#~ msgstr "填写您公司的信息(地址, 标识, 开户行账号), 以显示于您的报表上. 您可以点击\"预览页头\"按钮 以检查PDF文档的页头页脚."
-
-#~ msgid ""
-#~ "Sets default language for the all user interface, when UI translations are "
-#~ "available. If you want to Add new Language, you can add it from 'Load an "
-#~ "Official Translation' wizard  from 'Administration' menu."
-#~ msgstr ""
-#~ "当用户界面翻译可用时, 为所有的用户界面设置默认语言。如果你要增加新的语言， 可以从 'Administration'菜单的“Load an "
-#~ "Official Translation”向导增加"
-
-#~ msgid ""
-#~ "This will set the default preferences for new users and update all existing "
-#~ "ones. Afterwards, users are free to change those values on their own user "
-#~ "preference form."
-#~ msgstr "这将设置新用户的默认首选项，并更新所有现有的。此后，用户可以在他们自己的\"用户偏好\"表单随意更改自己的值。"
-
-#~ msgid "For Import Sugarcrm"
-#~ msgstr "导入 Sugarcrm"
-
-#~ msgid "Import or create customers"
-#~ msgstr "导入或者创建客户"
-
-#~ msgid "Import Sugarcrm"
-#~ msgstr "导入 Sugarcrm"
-
-#~ msgid "Create or Import Customers"
-#~ msgstr "创建或者导入客户"
-
-#~ msgid "For Sync Google Contact"
-#~ msgstr "同步google 客户"
-
-#~ msgid "Create"
-#~ msgstr "新建"
-
-#~ msgid "product.installer"
-#~ msgstr "product.installer"
-
-#~ msgid "Set Company Header and Footer"
-#~ msgstr "设置公司报表的页眉和页脚"
-
-#~ msgid "For Import Saleforce"
-#~ msgstr "导入 Saleforce"
-
-#~ msgid ""
-#~ "If you use OpenERP for the first time we strongly advise you to select the "
-#~ "simplified interface, which has less features but is easier. You can always "
-#~ "switch later from the user preferences."
-#~ msgstr "如果您是第一次使用 OpenERP 的话我们强烈建议您选择简化界面，虽然功能较少但更加容易使用。您随时能够在用户首选项中切换。"
-
-#~ msgid "For Quickbooks Ippids"
-#~ msgstr "导入Quickbooks Ippids"
-
-#~ msgid "Customers"
-#~ msgstr "客户"
-
-#~ msgid "migrade.application.installer.modules"
-#~ msgstr "Copy text \t migrade.application.installer.modules"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid "Interface"
-#~ msgstr "界面"
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid "Language"
-#~ msgstr "语言"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "称呼客户的另一种方式"
 
-#~ msgid "Quickbooks Ippids"
-#~ msgstr "Quickbooks Ippids"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr "使用OpenID登陆(Google, Facebook...)"
 
-#~ msgid "user.preferences.config"
-#~ msgstr "user.preferences.config"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr "创建联系人或者公司时,允许自动从LinkedIn载入相关信息(照片,地址等等)."
 
-#~ msgid ""
-#~ "Check out this box if you want to always display tips on each menu action"
-#~ msgstr "如果您希望总是在每个菜单动作上显示提示信息，请选中此框"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr "当你发送单据给客户（报价单，发票），你的可能能登录，获取他单据，阅读你的公司新闻，检查他的项目等。"
 
-#~ msgid "Create Additional Users"
-#~ msgstr "新建用户"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Timezone"
-#~ msgstr "时区"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr "你用这个向导能在整个系统中用其他称谓来标识客户"
 
-#~ msgid "Import Saleforce"
-#~ msgstr "导入 Saleforce"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr "你能在你的公司明细里找到多个选项：用于页首和页脚的地址，逾期支付文本等"
 
-#~ msgid "Simplified"
-#~ msgstr "简化界面"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/base_setup/i18n/zh_TW.po b/addons/base_setup/i18n/zh_TW.po
index 5530e5875cf..82a687301a9 100644
--- a/addons/base_setup/i18n/zh_TW.po
+++ b/addons/base_setup/i18n/zh_TW.po
@@ -1,223 +1,175 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_setup
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-12-29 15:39+0000\n"
-"Last-Translator: Andy Cheng <andy@dobtor.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 16:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@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: 2014-04-22 06:29+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-08-15 06:58+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Emails Integration"
-msgstr "電子郵件整合"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr "訪客"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Contacts"
-msgstr "聯絡人"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "(reload fonts)"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_config_settings
-msgid "base.config.settings"
-msgstr "base.config.settings"
+#: field:base.config.settings,module_portal:0
+msgid "Activate the customer portal"
+msgstr "啟動客戶入口網站"
 
 #. module: base_setup
-#: field:base.config.settings,module_auth_oauth:0
-msgid ""
-"Use external authentication providers, sign in with google, facebook, ..."
-msgstr "使用外部驗證提供者, 登入 Google, facebook, ....."
+#: field:base.config.settings,module_share:0
+msgid "Allow documents sharing"
+msgstr "允許文件分享"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid ""
-"OpenERP allows to automatically create leads (or others documents)\n"
-"                            from incoming emails. You can automatically "
-"synchronize emails with OpenERP\n"
-"                            using regular POP/IMAP accounts, using a direct "
-"email integration script for your\n"
-"                            email server, or by manually pushing emails to "
-"OpenERP using specific\n"
-"                            plugins for your preferred email application."
+#: field:base.config.settings,module_google_calendar:0
+msgid "Allow the users to synchronize their calendar  with Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_sale:0
-msgid "SALE"
-msgstr "業務"
+#: field:base.config.settings,module_base_import:0
+msgid "Allow users to import data from CSV files"
+msgstr "允許使用者從CSV檔案格式匯入資料"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr "成員"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Apply"
+msgstr "套用"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Portal access"
-msgstr "入口網站存取"
+#: field:base.config.settings,module_google_drive:0
+msgid "Attach Google documents to any record"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Authentication"
 msgstr "認證"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Quotations and Sales Orders"
-msgstr "報價單與銷售訂單"
-
-#. module: base_setup
-#: view:base.config.settings:0
-#: model:ir.actions.act_window,name:base_setup.action_general_configuration
-#: model:ir.ui.menu,name:base_setup.menu_general_configuration
-msgid "General Settings"
-msgstr "一般設定"
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
-msgstr "主要捐款人"
-
-#. module: base_setup
-#: view:base.config.settings:0
-msgid "Email"
-msgstr "電子郵件"
-
-#. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
 msgstr "客戶關係管理"
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Cancel"
+msgstr "取消"
+
+#. module: base_setup
 #: selection:base.setup.terminology,partner:0
-msgid "Patient"
-msgstr "病人"
+msgid "Client"
+msgstr "客戶端"
 
 #. module: base_setup
-#: field:base.config.settings,module_base_import:0
-msgid "Allow users to import data from CSV files"
-msgstr "允許使用者從CSV檔案格式匯入資料"
+#: model:ir.actions.act_window,name:base_setup.action_sale_config
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Configure Sales"
+msgstr "設定業務作業"
 
 #. module: base_setup
-#: field:base.config.settings,module_multi_company:0
-msgid "Manage multiple companies"
-msgstr "管理多個公司"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure outgoing email servers"
+msgstr "設定外送電子郵件伺服器"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
-msgstr "在郵件客戶端"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Configure your company data"
+msgstr "設定貴公司資料"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "--db-filter=YOUR_DATABAE"
-msgstr "--db-filter=YOUR_DATABAE"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Contacts"
+msgstr "聯絡人"
 
 #. module: base_setup
-#: field:sale.config.settings,module_web_linkedin:0
-msgid "Get contacts automatically from linkedIn"
-msgstr "自動從 linkedIn 獲得連絡人"
+#: field:base.config.settings,create_uid:0
+#: field:base.setup.terminology,create_uid:0
+#: field:sale.config.settings,create_uid:0
+msgid "Created by"
+msgstr ""
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_thunderbird:0
-msgid "Enable Thunderbird plug-in"
-msgstr "啟動 Thunderbird 外掛"
+#: field:base.config.settings,create_date:0
+#: field:base.setup.terminology,create_date:0
+#: field:sale.config.settings,create_date:0
+msgid "Created on"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "客戶"
 
 #. module: base_setup
-#: view:sale.config.settings:0
+#: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Customer Features"
 msgstr "客戶特點"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Import / Export"
-msgstr "匯入／匯出"
-
-#. module: base_setup
-#: view:sale.config.settings:0
-msgid "Sale Features"
-msgstr "銷售特點"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "主要捐款人"
 
 #. module: base_setup
-#: field:sale.config.settings,module_plugin_outlook:0
-msgid "Enable Outlook plug-in"
-msgstr "啟動 Outlook 外掛"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Email"
+msgstr "電子郵件"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
-msgid ""
-"You can use this wizard to change the terminologies for customers in the "
-"whole application."
-msgstr "請使用此精靈來變更用於整個應用程式中的客戶術語。"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Emails Integration"
+msgstr "電子郵件整合"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr "承租人"
+#: view:base.config.settings:base_setup.view_general_configuration
+#: model:ir.actions.act_window,name:base_setup.action_general_configuration
+#: model:ir.ui.menu,name:base_setup.menu_general_configuration
+msgid "General Settings"
+msgstr "一般設定"
 
 #. module: base_setup
-#: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
-msgstr "分享或嵌入OpenERP畫面"
+#: help:sale.config.settings,module_mass_mailing:0
+msgid "Get access to statistics with your mass mailing, manage campaigns."
+msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr "客戶"
+#: field:sale.config.settings,module_web_linkedin:0
+msgid "Get contacts automatically from linkedIn"
+msgstr "自動從 linkedIn 獲得連絡人"
 
 #. module: base_setup
-#: help:sale.config.settings,module_web_linkedin:0
-msgid ""
-"When you create a new contact (person or company), you will be able to load "
-"all the data from LinkedIn (photos, address, etc)."
-msgstr "當建立新的聯絡人時（個人或公司），你就可以從 LinkedIn 載入所有資料（照片、地址等）。"
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr "讓客戶存取其文件"
 
 #. module: base_setup
-#: help:base.config.settings,module_multi_company:0
-msgid ""
-"Work in multi-company environments, with appropriate security access between "
-"companies.\n"
-"                This installs the module multi_company."
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Calendar"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"The public portal is accessible only if you are in a single database mode. "
-"You can\n"
-"                                    launch the OpenERP Server with the option"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Google Drive"
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"You will find more options in your company details: address for the header "
-"and footer, overdue payments texts, etc."
-msgstr "您可在貴公司的詳細資訊中找到更多選項，如表頭和頁尾的地址、付款過期通知等等。"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr "sale.config.settings"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "訪客"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -225,507 +177,197 @@ msgid "How do you call a Customer"
 msgstr "稱呼客戶的方式"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"When you send a document to a customer\n"
-"                                    (quotation, invoice), your customer will "
-"be\n"
-"                                    able to signup to get all his "
-"documents,\n"
-"                                    read your company news, check his "
-"projects,\n"
-"                                    etc."
+#: field:base.config.settings,id:0
+#: field:base.setup.terminology,id:0
+#: field:sale.config.settings,id:0
+msgid "ID"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr "base.setup.terminology"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Import / Export"
+msgstr "匯入／匯出"
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr "客戶端"
+#: field:base.config.settings,write_uid:0
+#: field:base.setup.terminology,write_uid:0
+#: field:sale.config.settings,write_uid:0
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_setup
-#: help:base.config.settings,module_portal_anonymous:0
-msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr "啟動 OpenERP 公開的部分, OpenERP 成為一個公開的網站。"
+#: field:base.config.settings,write_date:0
+#: field:base.setup.terminology,write_date:0
+#: field:sale.config.settings,write_date:0
+msgid "Last Updated on"
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_thunderbird:0
-msgid ""
-"The plugin allows you archive email and its attachments to the selected\n"
-"                OpenERP objects. You can select a partner, or a lead and\n"
-"                attach the selected mail as a .eml file in\n"
-"                the attachment of a selected record. You can create "
-"documents for CRM Lead,\n"
-"                Partner from the selected emails.\n"
-"                This installs the module plugin_thunderbird."
+#: field:sale.config.settings,module_mass_mailing:0
+msgid "Manage mass mailing campaigns"
 msgstr ""
 
 #. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr "夥伴"
+#: field:base.config.settings,module_multi_company:0
+msgid "Manage multiple companies"
+msgstr "管理多個公司"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr "以另一詞彙代表\"客戶\""
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "成員"
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: view:sale.config.settings:0
-msgid "Configure Sales"
-msgstr "設定業務作業"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid ""
+"Odoo allows to automatically create leads (or others documents)\n"
+"                            from incoming emails. You can automatically "
+"synchronize emails with Odoo\n"
+"                            using regular POP/IMAP accounts, using a direct "
+"email integration script for your\n"
+"                            email server, or by manually pushing emails to "
+"Odoo using specific\n"
+"                            plugins for your preferred email application."
+msgstr ""
 
 #. module: base_setup
-#: help:sale.config.settings,module_plugin_outlook:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid ""
-"The Outlook plugin allows you to select an object that you would like to "
-"add\n"
-"                to your email and its attachments from MS Outlook. You can "
-"select a partner,\n"
-"                or a lead object and archive a selected\n"
-"                email into an OpenERP mail message with attachments.\n"
-"                This installs the module plugin_outlook."
+"Once installed, you can configure your API credentials for \"Google "
+"calendar\""
 msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
+#: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
 msgstr "選項"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal:0
-msgid "Activate the customer portal"
-msgstr "啟動客戶入口網站"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "夥伴"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid ""
-"to do so.\n"
-"                                    Once activated, the login page will be "
-"replaced by the public website."
-msgstr ""
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "病人"
 
 #. module: base_setup
-#: field:base.config.settings,module_share:0
-msgid "Allow documents sharing"
-msgstr "允許文件分享"
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid "Portal access"
+msgstr "入口網站存取"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "(company news, jobs, contact form, etc.)"
-msgstr "(公司新聞、工作、聯絡人表格, 等等)"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Quotations and Sales Orders"
+msgstr "報價單與銷售訂單"
 
 #. module: base_setup
-#: field:base.config.settings,module_portal_anonymous:0
-msgid "Activate the public portal"
-msgstr "啟動公開的入口網站"
+#: field:base.config.settings,font:0
+msgid "Report Font"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure outgoing email servers"
-msgstr "設定外送電子郵件伺服器"
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr "業務"
 
 #. module: base_setup
-#: view:sale.config.settings:0
-msgid "Social Network Integration"
-msgstr "社群網路整合"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Sale Features"
+msgstr "銷售特點"
 
 #. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give your customers access to their documents."
-msgstr "讓客戶存取其文件"
+#: help:base.config.settings,font:0
+msgid ""
+"Set the font into the report header, it will be used as default font in the "
+"RML reports of the user company"
+msgstr ""
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Cancel"
-msgstr "取消"
+#: help:base.config.settings,module_share:0
+msgid "Share or embbed any screen of openerp."
+msgstr "分享或嵌入OpenERP畫面"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "Apply"
-msgstr "套用"
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "Social Network Integration"
+msgstr "社群網路整合"
 
 #. module: base_setup
-#: view:base.setup.terminology:0
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "Specify Your Terminology"
 msgstr "設定你的術語"
 
 #. module: base_setup
-#: view:base.config.settings:0
-#: view:sale.config.settings:0
-msgid "or"
-msgstr "或"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "承租人"
 
 #. module: base_setup
-#: view:base.config.settings:0
-msgid "Configure your company data"
-msgstr "設定貴公司資料"
-
-#~ msgid "Next"
-#~ msgstr "下一個"
-
-#~ msgid "City"
-#~ msgstr "城市"
-
-#~ msgid "Zip code"
-#~ msgstr "郵遞區號"
-
-#~ msgid "Phone"
-#~ msgstr "電話"
-
-#~ msgid "Installation Done"
-#~ msgstr "安裝完成"
-
-#~ msgid "Install"
-#~ msgstr "安裝"
-
-#~ msgid "Company Name"
-#~ msgstr "公司名稱"
-
-#~ msgid "Currency"
-#~ msgstr "貨幣"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database "
-#~ "using the default setup."
-#~ msgstr "你可以開始設置系統或使用預設的設置連接到數據庫"
-
-#~ msgid "Select a Profile"
-#~ msgstr "選擇一個配置"
-
-#~ msgid "Report header"
-#~ msgstr "報表頁首"
-
-#~ msgid ""
-#~ "You'll be able to install more modules later through the Administration menu."
-#~ msgstr "你以後可以通過管理員Menu安裝更多的模組."
-
-#~ msgid ""
-#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
-#~ "have been setup to help you discover the different aspects of OpenERP. This "
-#~ "is just an overview, we have 300+ available modules."
-#~ msgstr "配置文件規定了預選模組的具體需要.這些配置已經安裝以幫助你發現系統的不同的配置.這是一個配置裡面含300多個模組."
-
-#~ msgid "E-mail"
-#~ msgstr "電子郵件"
-
-#~ msgid "State"
-#~ msgstr "省市"
-
-#~ msgid "Your new database is now fully installed."
-#~ msgstr "新資料庫已安裝完畢."
-
-#~ msgid "Profile"
-#~ msgstr "配置"
-
-#~ msgid "Report Footer 1"
-#~ msgstr "報表頁尾1"
-
-#~ msgid "Report Footer 2"
-#~ msgstr "報表頁尾2"
-
-#~ msgid "General Information"
-#~ msgstr "一般訊息"
-
-#~ msgid "Street2"
-#~ msgstr "街區地址2"
-
-#~ msgid "Report Information"
-#~ msgstr "報表訊息"
-
-#~ msgid "Define Main Company"
-#~ msgstr "定義主公司"
-
-#~ msgid "Setup"
-#~ msgstr "設置"
-
-#~ msgid "Summary"
-#~ msgstr "概要"
-
-#~ msgid "Report Header"
-#~ msgstr "報表頁首"
-
-#~ msgid "Use Directly"
-#~ msgstr "直接使用"
-
-#~ msgid "Previous"
-#~ msgstr "上一個"
-
-#~ msgid "Human Resources"
-#~ msgstr "人力資源"
-
-#~ msgid "Invoicing"
-#~ msgstr "發票"
-
-#~ msgid "Bank Account No"
-#~ msgstr "銀行帳戶號碼"
-
-#~ msgid "Extra Tools"
-#~ msgstr "額外工具"
-
-#~ msgid "Marketing"
-#~ msgstr "行銷"
-
-#~ msgid "Fed. State"
-#~ msgstr "省或州"
-
-#~ msgid "Point of Sales"
-#~ msgstr "鎖售點 (POS)"
-
-#, python-format
-#~ msgid "The following users have been installed : \n"
-#~ msgstr "已安裝以下用戶： \n"
-
-#~ msgid "Sales Management"
-#~ msgstr "業務管理"
-
-#~ msgid "Company"
-#~ msgstr "公司"
-
-#~ msgid "Knowledge Management"
-#~ msgstr "知識管理"
-
-#~ msgid "title"
-#~ msgstr "稱謂"
-
-#~ msgid "Skip Configuration Wizards"
-#~ msgstr "略過配置精靈"
-
-#~ msgid "base.setup.company"
-#~ msgstr "基礎.設置.公司"
-
-#~ msgid "base.setup.installer"
-#~ msgstr "基礎.設置.安裝"
-
-#~ msgid "Street 2"
-#~ msgstr "街道2"
-
-#~ msgid "Zip Code"
-#~ msgstr "郵遞編碼"
-
-#~ msgid "Auction Houses"
-#~ msgstr "拍賣行"
-
-#~ msgid "Accounting & Finance"
-#~ msgstr "會計及財務"
-
-#~ msgid "Start Configuration"
-#~ msgstr "開始配置"
-
-#~ msgid ""
-#~ "Select the Applications you want your system to cover. If you are not sure "
-#~ "about your exact needs at this stage, you can easily install them later."
-#~ msgstr "選取您要系統涵蓋之範圍。此階段如不確定，可稍後再安裝。"
-
-#~ msgid "Country"
-#~ msgstr "國家或地區"
-
-#~ msgid "Warehouse Management"
-#~ msgstr "庫存管理"
-
-#~ msgid "Purchase Management"
-#~ msgstr "採購管理"
-
-#~ msgid "Company Configuration"
-#~ msgstr "公司配置"
-
-#~ msgid "New Database"
-#~ msgstr "新資料庫"
-
-#~ msgid "Project Management"
-#~ msgstr "專案管理"
-
-#~ msgid "Installed Users"
-#~ msgstr "已安裝用戶"
-
-#~ msgid "Customer Relationship Management"
-#~ msgstr "客戶關係管理 (CRM)"
-
-#~ msgid "Logo"
-#~ msgstr "標誌"
-
-#~ msgid "Manufacturing"
-#~ msgstr "製造業"
-
-#~ msgid "Your Logo - Use a size of about 450x150 pixels."
-#~ msgstr "公司標誌 - 請用大小約為450×150像素圖片"
+#: help:base.config.settings,module_google_calendar:0
+msgid "This installs the module google_calendar."
+msgstr ""
 
-#~ msgid "Information about your new database"
-#~ msgstr "有關新資料庫之資訊"
+#. module: base_setup
+#: help:base.config.settings,module_google_drive:0
+msgid "This installs the module google_docs."
+msgstr ""
 
-#~ msgid "Image"
-#~ msgstr "圖片"
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr "以另一詞彙代表\"客戶\""
 
-#~ msgid "Base Setup"
-#~ msgstr "基礎設置"
+#. module: base_setup
+#: field:base.config.settings,module_auth_oauth:0
+msgid ""
+"Use external authentication providers, sign in with google, facebook, ..."
+msgstr "使用外部驗證提供者, 登入 Google, facebook, ....."
 
-#~ msgid "Configure Your Company Information"
-#~ msgstr "配置公司資訊"
+#. module: base_setup
+#: help:sale.config.settings,module_web_linkedin:0
+msgid ""
+"When you create a new contact (person or company), you will be able to load "
+"all the data from LinkedIn (photos, address, etc)."
+msgstr "當建立新的聯絡人時（個人或公司），你就可以從 LinkedIn 載入所有資料（照片、地址等）。"
 
-#~ msgid "Install Specific Industry Applications"
-#~ msgstr "安裝特定產業應用程式"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"When you send a document to a customer\n"
+"                                    (quotation, invoice), your customer will "
+"be\n"
+"                                    able to signup to get all his "
+"documents,\n"
+"                                    read your company news, check his "
+"projects,\n"
+"                                    etc."
+msgstr ""
 
-#~ msgid "Company Website"
-#~ msgstr "公司網站"
+#. module: base_setup
+#: help:base.config.settings,module_multi_company:0
+msgid ""
+"Work in multi-company environments, with appropriate security access between "
+"companies.\n"
+"-This installs the module multi_company."
+msgstr ""
 
-#~ msgid "Example: http://openerp.com"
-#~ msgstr "例如：http://openerp.com"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr "請使用此精靈來變更用於整個應用程式中的客戶術語。"
 
-#~ msgid "Install Applications"
-#~ msgstr "安裝應用程式"
+#. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+msgid ""
+"You will find more options in your company details: address for the header "
+"and footer, overdue payments texts, etc."
+msgstr "您可在貴公司的詳細資訊中找到更多選項，如表頭和頁尾的地址、付款過期通知等等。"
 
-#~ msgid "Street"
-#~ msgstr "街道"
-
-#~ msgid "base.setup.config"
-#~ msgstr "基礎.設置.配置"
-
-#~ msgid ""
-#~ "This sentence will appear at the top right corner of your reports.\n"
-#~ "We suggest you to put a slogan here:\n"
-#~ "\"Open Source Business Solutions\"."
-#~ msgstr "此句顯示於報表右上角；建議放公司標語。"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to put bank information here:\n"
-#~ "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-#~ msgstr ""
-#~ "此句顯示於報表底部；建議放銀行資訊。\n"
-#~ "如 IBAN 及 SWIFT 編號。"
-
-#~ msgid ""
-#~ "This sentence will appear at the bottom of your reports.\n"
-#~ "We suggest you to write legal sentences here:\n"
-#~ "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-#~ msgstr ""
-#~ "此句顯示於報表底部；建議放公司正規資訊，\n"
-#~ "如網址、傳真號碼等。"
-
-#~ msgid "Food Industry"
-#~ msgstr "食品工業"
-
-#~ msgid ""
-#~ "Helps you manage your manufacturing processes and generate reports on those "
-#~ "processes."
-#~ msgstr "助您管理生產工序及為這些工序製作報告。"
-
-#~ msgid ""
-#~ "Helps you track and manage relations with customers such as leads, requests "
-#~ "or issues. Can automatically send reminders, escalate requests or trigger "
-#~ "business-specific actions based on standard events."
-#~ msgstr "助您追蹤及管理客戶關係，比如潛在客戶、客戶要求、客戶問題等等。也可自動發送提醒，根據標準事件提升要求注意層級、啟動各種商業行動。"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "配置進度"
-
-#~ msgid "Your database is now created."
-#~ msgstr "已建立資料庫。"
-
-#~ msgid ""
-#~ "Helps you handle your accounting needs, if you are not an accountant, we "
-#~ "suggest you to install only the Invoicing "
-#~ msgstr "助您處理會計事情；如閣下非會計師，建議只安裝發票 "
-
-#~ msgid "Associations"
-#~ msgstr "關聯"
-
-#~ msgid "Helps you manage your marketing campaigns step by step."
-#~ msgstr "助您逐步進行行銷活動。"
-
-#~ msgid ""
-#~ "You can start configuring the system or connect directly to the database as "
-#~ "an administrator."
-#~ msgstr "您可立即配置系統或以管理員身份直接連接資料庫。"
-
-#~ msgid ""
-#~ "Your company information will be used to personalize documents issued with "
-#~ "OpenERP such as invoices, sales orders and much more."
-#~ msgstr "您的公司資料會用於設置 OpenERP 發出之各種文件，如發票、銷貨單等等。"
-
-#~ msgid ""
-#~ "Lets you install various interesting but non-essential tools like Survey, "
-#~ "Lunch and Ideas box."
-#~ msgstr "讓您安裝各種非必要但有趣的工作，如問卷調查、午膳管理、點子收集等等。"
-
-#~ msgid "Advanced Reporting"
-#~ msgstr "進階報告功能"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module implements a configuration system that helps user\n"
-#~ "    to configure the system at the installation of a new database.\n"
-#~ "\n"
-#~ "    It allows you to select between a list of profiles to install:\n"
-#~ "    * Minimal profile\n"
-#~ "    * Accounting only\n"
-#~ "    * Services companies\n"
-#~ "    * Manufacturing companies\n"
-#~ "\n"
-#~ "    It also asks screens to help easily configure your company, the header "
-#~ "and\n"
-#~ "    footer, the account chart to install and the language.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    此模組在系統管理內幫助使用者在新增資料庫後作設定\n"
-#~ "\n"
-#~ "\t其功能設定如下:\n"
-#~ "\t* 最小規模\n"
-#~ "\t* 會計單位\n"
-#~ "\t* 服務體系\n"
-#~ "\t* 製造業\n"
-#~ "\n"
-#~ "\t其能在畫面上更容易設定您的公司、頁首和頁尾、會計科目表安裝和語言設置\n"
-#~ "    "
-
-#~ msgid "Helps you handle your quotations, sale orders and invoicing."
-#~ msgstr "助您處理報價單、銷貨單及發票。"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications selected to help you "
-#~ "manage your auctions as well as the business processes around them."
-#~ msgstr "安裝一組預先設定之 OpenERP 應用程式，助您管理拍賣及相關商業事務。"
-
-#~ msgid ""
-#~ "Helps you manage your inventory and main stock operations: delivery orders, "
-#~ "receptions, etc."
-#~ msgstr "助您管理存貨及主要庫存作業: 交貨單、接待等等。"
-
-#~ msgid ""
-#~ "Helps you manage your purchase-related processes such as requests for "
-#~ "quotations, supplier invoices, etc..."
-#~ msgstr "助您管理採購相關事項，比如邀請報價、開立供應商發票等等。"
-
-#~ msgid ""
-#~ "Helps you manage your human resources by encoding your employees structure, "
-#~ "generating work sheets, tracking attendance and more."
-#~ msgstr "助您管理人力資源，記錄員工架構、製作工作表、進行考勤等等。"
-
-#~ msgid ""
-#~ "Helps you manage your projects and tasks by tracking them, generating "
-#~ "plannings, etc..."
-#~ msgstr "助您管理專案及任務，追蹤、製作報告等等。"
-
-#~ msgid ""
-#~ "Helps you get the most out of your points of sales with fast sale encoding, "
-#~ "simplified payment mode encoding, automatic picking lists generation and "
-#~ "more."
-#~ msgstr "助您善用銷售渠道，加快工作流程、簡化付款工序、提貨清單自動化等等。"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your association more efficiently."
-#~ msgstr "安裝一組預先設定之 OpenERP 應用程式，助您管理相關事務更有效率。"
-
-#~ msgid ""
-#~ "Installs a preselected set of OpenERP applications which will help you "
-#~ "manage your industry."
-#~ msgstr "安裝一組預先設定之 OpenERP 應用程式，助您管理廠房及生產工序。"
+#. module: base_setup
+#: view:base.setup.terminology:base_setup.base_setup_terminology_form
+msgid "res_config_contents"
+msgstr "res_config_contents"