Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20111223054503-il515335tdfkghbw
bzr revid: launchpad_translations_on_behalf_of_openerp-20111223073609-mpe8e232ykba47y0

47 files changed, 17311 insertions, 17507 deletions

diff --git a/addons/base_setup/i18n/ar.po b/addons/base_setup/i18n/ar.po
index 5dc55269b8b..55a12fc26c0 100644
--- a/addons/base_setup/i18n/ar.po
+++ b/addons/base_setup/i18n/ar.po
@@ -6,538 +6,622 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-14 11:20+0000\n"
 "Last-Translator: kifcaliph <kifcaliph@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-15 05:06+0000\n"
-"X-Generator: Launchpad (build 14291)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "المدينة"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "تثبيت"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "الفواتير"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "الموارد البشرية"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "البريد الإلكتروني"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "رقم الحساب المصرفي"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "أدوات إضافية"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "تذييل تقرير 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
-msgstr "يساعدك على إدارة عمليات التصنيع وإصدار تقارير عن هذه العمليات."
-
-#. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "يساعدك على إدارة حملاتك التسويقية خطوة بخطوة."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "تم إنشاء قاعدة البيانات"
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "نقاط البيع"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "الجمعيات"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"يساعدك على التعامل مع احتياجاتك المحاسبية. إذا لم تكن محاسباً، نقترح تثبيت "
-"\"الفواتير\" فقط "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "تمت إضافة المستخدمين التالين: \n"
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "تقدم الإعدادات"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "تذييل تقرير 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "العملة"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "المحافظة / الولاية"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "التسويق"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "الشركة"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "إدارة المبيعات"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"يمكّنك من تثبيت عدد من الأدوات المفيدة ولكن غير الضرورية، مثل الاستبانات "
-"والوجبات وصندوق الأفكار."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
-msgstr "يمكنك الشروع في إعداد النظام أو استخدام النظام مباشرة كمدير."
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "تقارير متقدمة"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-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."
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
-"سيتمّ استخدام معلومات شركتك لتخصيص المستندات التي يصدرها OpenERP مثل "
-"الفواتير وأوامر المبيعات وغير ذلك الكثير."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "العنوان"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "إدارة المعارف"
-
-#. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"يقوم بتثبيت مجموعة من تطبيقات OpenERP مختارة مسبقاً تساعدك على إدارة نوع "
-"الصناعة الخاص بك."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"يساعدك على إدارة مشاريعك ومهامك عن طريق متابعتهم وإصدار الخطط وما إلى ذلك."
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "اسم الشركة"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "تجاوز معالجات الإعدادات"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
-"يساعدك على إدارة مواردك البشرية عن طريق فهم هيكل الموظفين وإصدار أوراق العمل "
-"ومتابعة الحضور وغير ذلك."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
-"يمكّنك من إصدار الفواتير و متابعة المدفوعات.  يعدّ نسخة مبسطة من "
-"\"المحاسبة\" مناسبة للمدراء غير المحاسِبين."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
+#: help:user.preferences.config,context_lang:0
 msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+"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 ""
-"يساعدك على إدارة العمليات المتعلقة بالشراء مثل طلبات التسعير وفواتير "
-"الموردين وما إلى ذلك."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:user.preferences.config:0
 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"
+"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 ""
-"ستظهر هذه الجملة أسفل التقارير.\n"
-"نقترح عليك وضع معلوماتك المصرفية هنا:\n"
-"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
 
 #. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "العنوان 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "الدولة"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "إعداد"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "الحسابات و المالية"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "الرمز البريدي"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-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
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
-msgstr "يمكّنك من تثبيت إضافات غرضها نشر ومشاركة المعارف بين موظفيك."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: help:user.preferences.config,menu_tips:0
 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."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"اختر التطبيقات الي تريد أن يتضمنها النظام. إذا لم تكن متأكداً من احتياجاتك "
-"بدقة في هذه المرحلة، يمكنك تثبيت أي من التطبيقات بسهولة لاحقاً."
-
-#. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "إعدادات الشركة"
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "الشعار"
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
+msgid "Image"
+msgstr "صورة"
 
 #. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
-"يساعدك على تشغيل نقاط البيع بكفاءة عن طريق تسجيل عمليات البيع بسرعة وتوفير "
-"وضع مبسط للدفع وإصدار تلقائي لقوائم الالتقاط وغير ذلك."
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "إدارة المشتريات"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr "يساعدك على التعامل مع التسعيرات وأوامر المبيعات والفواتير."
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "إدارة المخازن و المستودعات"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "إدارة المشاريع"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "المستخدمون المعرّفون"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "قاعدة بيانات جديدة"
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "إدارة علاقات العملاء"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
-"يقوم بتثبيت مجموعة من تطبيقات OpenERP مختارة مسبقاً لتساعدك على إدارة "
-"المزادات والعمليات المتعلقة بها."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
-"ستظهر هذه الجملة في الزاوية اليمنى في رأس كل تقرير.\n"
-"نقترح عليك وضع شعار هنا:\n"
-"\"حلول أعمال مفتوحة المصدر\"."
 
-#. module: base_setup
-#: help:base.setup.installer,report_designer:0
-msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
-msgstr "يمكّنك من تثبيت عدة أدوات تسهل وتحسن إنشاء التقارير."
+#~ msgid "Accounting & Finance"
+#~ msgstr "الحسابات و المالية"
 
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "رأس التقرير"
+#~ msgid "Invoicing"
+#~ msgstr "الفواتير"
 
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "معلومات عن قاعدة البيانات الجديدة"
+#~ msgid "Bank Account No"
+#~ msgstr "رقم الحساب المصرفي"
 
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
-msgid "Image"
-msgstr "صورة"
+#~ msgid "Extra Tools"
+#~ msgstr "أدوات إضافية"
 
-#. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "الصناعات الغذائية"
+#~ msgid "Point of Sales"
+#~ msgstr "نقاط البيع"
 
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "التصنيع"
+#~ msgid "Your database is now created."
+#~ msgstr "تم إنشاء قاعدة البيانات"
 
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "الشعار - استخدم صورة بحجم 150x450 نقطة"
+#~ msgid "Sales Management"
+#~ msgstr "إدارة المبيعات"
 
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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 "Advanced Reporting"
+#~ msgstr "تقارير متقدمة"
 
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "الموقع الإلكتروني للشركة"
+#~ msgid "Purchase Management"
+#~ msgstr "إدارة المشتريات"
 
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "ثبّت تطبيقات صناعات معينة"
+#~ msgid "Company Configuration"
+#~ msgstr "إعدادات الشركة"
 
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "العنوان"
+#~ msgid "Project Management"
+#~ msgstr "إدارة المشاريع"
 
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "إعداد البيانات الخاصة بشركتكم"
+#~ msgid "Installed Users"
+#~ msgstr "المستخدمون المعرّفون"
 
-#. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "مثال: http://openerp.com"
+#~ msgid "Food Industry"
+#~ msgstr "الصناعات الغذائية"
 
-#. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "تثبيت تطبيقات"
+#~ msgid "Information about your new database"
+#~ msgstr "معلومات عن قاعدة البيانات الجديدة"
 
-#. module: base_setup
-#: help:base.setup.installer,crm:0
-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 "Customer Relationship Management"
+#~ msgstr "إدارة علاقات العملاء"
 
-#. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
-msgstr ""
-"يساعدك على إدارة العمليات المتعلقة بكميات المخزون مثل أوامر التسليم "
-"والاستلام وما إلى ذلك."
+#~ msgid "Company Website"
+#~ msgstr "الموقع الإلكتروني للشركة"
 
-#. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "الإعدادات الأساسية"
+#~ msgid "Example: http://openerp.com"
+#~ msgstr "مثال: http://openerp.com"
 
-#. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
-msgstr ""
-"يقوم بتثبيت مجموعة من تطبيقات OpenERP مختارة مسبقاً لتساعدك على إدارة جمعيتك "
-"بكفاءة أعلى."
+#~ msgid "Your Logo - Use a size of about 450x150 pixels."
+#~ msgstr "الشعار - استخدم صورة بحجم 150x450 نقطة"
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#~ msgid "Base Setup"
+#~ msgstr "الإعدادات الأساسية"
 
-#~ msgid "Point of Sales"
-#~ 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 "Install"
+#~ 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 "يمكنك الشروع في إعداد النظام أو استخدام النظام مباشرة كمدير."
+
+#~ msgid "Marketing"
+#~ 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 "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 "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"
+#~ "    "
diff --git a/addons/base_setup/i18n/bg.po b/addons/base_setup/i18n/bg.po
index e00d8c838da..bb79e03d877 100644
--- a/addons/base_setup/i18n/bg.po
+++ b/addons/base_setup/i18n/bg.po
@@ -6,552 +6,282 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:47+0000\n"
 "Last-Translator: lem0na <nickyk@gmx.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Град"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Инсталиране"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Фактуриране"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Човешки ресурси"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "Имейл"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Номер на банкова сметка"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Допълнителни инструменти"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Долен колонтитул на справка 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Помага за управлението на вашите производствени процеси и генерира справки "
-"по тези процеси."
-
-#. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "Помага за управление на маркетингови компании стъпка по стъпка."
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Базата данни е създадена"
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "POS продажби"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Асоциации"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Помага да се справите с вашите счетоводни нужди, ако не сте счетоводител ви "
-"препоръчваме да инсталирате само фактуриране "
-
-#. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Следните потребители са инсталирани: \n"
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Прогрес на настройките"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Долен колонтитул на справка 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Валута"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Област"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Маркетинг"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Фирма"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Управление на продажби"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Позволява инсталацията на различни интересни, но не задължителни инструменти "
-"като анкета, обяд и идеи."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Може да започнете настройване на системата или да се свържете директно към "
-"базата като администратор."
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Разширени отчети"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Телефон"
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
-"Информацията за вашата фирма ще бъде използвана за персонализиране на "
-"документи издадени през OpenERP като фактури, нареждания за продажби и много "
-"други."
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "заглавие"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Управление на Знания"
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Инсталира предварително избран комплект от приложения на Open ERP, което да "
-"помогне за управлението на бизнеса."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Помага ви да управлявате своите проекти и задачи, като ги проследяване, "
-"генерирайки планиране и др .."
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Име на фирма"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Прескачане на Помощници за настройки"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
-"Помага за  управлението на  човешките ресурси чрез кодиране структурата на "
-"служителите,  генериране на графици за заетост, проследяване на присъствията "
-"и др."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
-"Позволява създаването на фактури и проследяване на плащанията. Това е по-"
-"лесна версия на счетоводния модул за мениджъри, които не са счетоводители."
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
-"Помага управлението на процеси свързани със закупуване като запитвания за "
-"оферти, фактури към доставчици и  др."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: help:user.preferences.config,context_lang:0
 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"
+"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 ""
-"Изречението ще се появи в долната част на вашите справки,\n"
-"Предлагаме ви тук да включите финансова информация:\n"
-"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Улица 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Държава"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Инсталация"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Счетоводство и финанси"
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Аукционни къщи"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Пощенски код"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Започни настройване"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: view:user.preferences.config:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
-"Позволява инсталирането на добавки помагащи споделянето на знания с вашите "
-"служители."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
-"Изберете приложенията, с които желаете вашата система да работи. Ако не сте "
-"сигурни какви са точно нуждите ви на този етап, то лесно можете да добавяте "
-"по-късно."
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Настройка на фирма"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Лого"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
-"Помага да получите максимума от вашите точки за продажба с помоща на бързо "
-"отчитане на продажбите, улеснено регистриране на плащания, автоматични "
-"списъци за вдигане и др."
-
-#. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Управление на поръчки"
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr "Помога за управление на вашите запитвания, продажби и фактури."
-
-#. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Складово стопанство"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Управление на проекти"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Инсталирани потребители"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Нова база данни"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Управление на връзки с клиенти"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
-"Инсталира предварително избран комплект от Open ERP приложения за управление "
-"на търгове, както и бизнес процесите свързани с тях."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 msgstr ""
-"Изречението ще се появи в долната част на вашите справки,\n"
-"Предлагаме ви тук да включите девиз:\n"
-"\"Open Source Business Solutions\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Позволява инсталиране на различни инструменти за улеснение на работа ви и "
-"разширяване изготвянето на отчети."
 
 #. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Горен колонтитул на отчет"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Информация за новата база данни"
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Изображение"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Хрантелна промишленост"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Производство"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Вашето лого - използвайте размер 450x150 пиксела."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
-"Изречението ще се появи в долната част на вашите справки.\n"
-"Предлагаме ви тук да включите юридическа информация:\n"
-"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Фирмен уебсайт"
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Инсталира специфични за всеки бизнес приложения"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Улица"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Настройване на информацията за вашата фирма"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Пример: http://openerp.com"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Инсталиране на приложения"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
-"Помага за следене и управление на връзки с клиенти като жалби, молби и "
-"проблеми"
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
-"Помага за управление на наличности и основни стокови операции: delivery "
-"orders, receptions, etc."
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Настройки на базата"
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
-"Инсталира предварително избран комплект Open ERP приложения за управление на "
-"асоциации по-ефективно."
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#~ msgid "City"
+#~ msgstr "Град"
 
 #~ msgid ""
 #~ "You can start configuring the system or connect directly to the database "
@@ -590,17 +320,374 @@ msgstr "base.setup.config"
 #~ 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 "Cancel"
 #~ 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, което да "
+#~ "помогне за управлението на бизнеса."
+
+#~ msgid "Zip Code"
+#~ 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 ""
+#~ "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 ""
+#~ "Помага да получите максимума от вашите точки за продажба с помоща на бързо "
+#~ "отчитане на продажбите, улеснено регистриране на плащания, автоматични "
+#~ "списъци за вдигане и др."
diff --git a/addons/base_setup/i18n/bs.po b/addons/base_setup/i18n/bs.po
index d16261f722b..1f3256ab2ef 100644
--- a/addons/base_setup/i18n/bs.po
+++ b/addons/base_setup/i18n/bs.po
@@ -6,496 +6,278 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2010-09-29 09:28+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Grad"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Instaliraj"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-mail"
-
-#. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Podnožje izvještaja 1"
-
-#. module: base_setup
-#: help:base.setup.installer,mrp:0
-msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: selection:product.installer,customers:0
+msgid "Create"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: help:user.preferences.config,context_tz:0
 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
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Podnožje izvještaja 2"
-
-#. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Valuta"
-
-#. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+#: field:product.installer,customers:0
+msgid "Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefon"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Naziv poduzeća"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:base.setup.terminology:0
 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"
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 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"
 
 #. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Država"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Podešavanje"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Započnite konfiguriranje"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: help:user.preferences.config,context_lang:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: view:user.preferences.config:0
 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."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logotip"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: 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.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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\""
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Zaglavlje izvještaja"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Vaš Logo: Koristite veličinu slike od cca. 450x150 pixela."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 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"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Ulica"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
-msgstr ""
-
-#. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Osnovno podešavanje"
-
-#. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
 
 #~ msgid ""
@@ -510,6 +292,9 @@ msgstr ""
 #~ msgid "Next"
 #~ msgstr "Dalje"
 
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
 #~ msgid "Report header"
 #~ msgstr "Zaglavlje Izvještaja"
 
@@ -523,11 +308,17 @@ 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"
 
@@ -537,12 +328,21 @@ msgstr ""
 #~ 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"
 
@@ -552,17 +352,74 @@ msgstr ""
 #~ 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"
+
 #~ msgid "Cancel"
 #~ msgstr "Otkaži"
+
+#~ msgid "Currency"
+#~ msgstr "Valuta"
+
+#~ msgid "Your Logo - Use a size of about 450x150 pixels."
+#~ msgstr "Vaš Logo: Koristite veličinu slike od cca. 450x150 pixela."
+
+#~ msgid "Logo"
+#~ msgstr "Logotip"
diff --git a/addons/base_setup/i18n/ca.po b/addons/base_setup/i18n/ca.po
index fec53e21170..a3a49a16f72 100644
--- a/addons/base_setup/i18n/ca.po
+++ b/addons/base_setup/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:56+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\n"
@@ -14,559 +14,288 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Ciutat"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Instal·la"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Facturació"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Recursos humans"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "Correu electrònic"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Núm. compte bancari"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Eines extres"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Peu de pàgina 1 dels informes"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"L'ajuda a gestionar els seus processos de fabricació i generar informes "
-"sobre aquests processos."
-
-#. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "L'ajuda a gestionar les seves campanyes de màrqueting pas a pas."
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "La seva base de dades ja està creada."
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Terminal punt de venda"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Associacions"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"L'ajuda a gestionar les seves necessitats comptables. Si no és comptable, li "
-"suggerim instal·lar només la facturació. "
-
-#. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Els següents usuaris han estat instal·lats : \n"
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progrés de la configuració"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Peu de pàgina 2 dels informes"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Moneda"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Província"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Màrqueting"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Companyia"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Gestió de vendes"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Permet instal·lar diverses eines interessants però no essencials com a "
-"Informes, menjars i caixa d'Idees."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Podeu començar configurant el sistema o connectant directament a la base de "
-"dades com un administrador."
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Informes avançats"
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telèfon"
-
-#. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_continguts"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
-"La informació de la seva companyia s'utilitzarà per personalitzar els "
-"documents expedits amb OpenERP, com les factures, comandes i molt més."
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "títol"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Gestió del coneixement"
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Instal·la un conjunt preseleccionat d'aplicacions d'OpenERP que poden ajudar-"
-"vos a gestionar la seva indústria."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Li ajuda a gestionar els seus projectes i tasques realitzant un seguiment "
-"dels mateixos, generant planificacions, ..."
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Nom de la companyia"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Omet assistents de configuració"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 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, ..."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 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."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.companyia"
-
-#. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
-"Li ajuda a gestionar els seus processos relacionats amb les compres com "
-"peticions de pressupostos, factures de proveïdor, ..."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: help:user.preferences.config,context_lang:0
 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"
+"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 ""
-"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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Carrer 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.instal·lador"
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "País"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Instal·lació"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Comptabilitat i finances"
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Cases de subhastes"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Codi postal"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Inicia configuració"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: view:user.preferences.config:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
-"Li permet instal·lar addons orientats a compartir el coneixement amb i entre "
-"els seus treballadors."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 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."
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Configuració de la compañía"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 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, ..."
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Gestió de compres"
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
-"Li ajuda a gestionar els seus pressupostos, comandes de venda i facturació."
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Gestió de magatzems"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Gestió de projectes"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Usuaris instal·lats"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Nova base de dades"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Gestió de les relacions amb el client (CRM)"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 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."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Li permet instal·lar diverses eines per simplificar i millorar la creació "
-"d'informes en OpenERP."
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Capçalera dels informes"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Informació sobre la seva nova base de dades"
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Imatge"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Indústria alimentària"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Producció"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "El vostre logo – Utilitzeu una mida de 450x150 píxels aprox."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 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"
-
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Pàgina web de la companyia"
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Instal·la aplicacions específiques per a la indústria"
-
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Carrer"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Configura la informació de la seva companyia"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Exemple: http://openerp.com"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Instal·la aplicacions"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 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."
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
-"Li ajuda a gestionar el seu inventari i les operacions principals d'estoc: "
-"les ordres de lliurament, recepcions, ..."
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Configuració bàsica"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
-"Instal·la un conjunt preseleccionat d'aplicacions en OpenERP que li ajudarà "
-"a administrar la seva associació de manera més eficient."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
+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 ""
@@ -585,6 +314,9 @@ msgstr "base.setup.config"
 #~ msgid "Next"
 #~ msgstr "Següent"
 
+#~ msgid "E-mail"
+#~ msgstr "Correu electrònic"
+
 #~ msgid "State"
 #~ msgstr "Estat"
 
@@ -594,6 +326,12 @@ msgstr "base.setup.config"
 #~ 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"
 
@@ -603,21 +341,63 @@ msgstr "base.setup.config"
 #~ 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 "Cancel"
 #~ msgstr "Cancel·la"
 
+#~ msgid "Logo"
+#~ msgstr "Logo"
+
 #~ msgid "Previous"
 #~ msgstr "Anterior"
 
+#~ msgid "Base Setup"
+#~ msgstr "Configuració bàsica"
+
 #~ msgid "Define Main Company"
 #~ msgstr "Definiu la companyia principal"
 
@@ -628,5 +408,312 @@ msgstr "base.setup.config"
 #~ "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."
+
+#~ msgid "title"
+#~ msgstr "títol"
+
+#~ msgid "Company Configuration"
+#~ msgstr "Configuració de la compañía"
+
+#~ 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 "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, ..."
diff --git a/addons/base_setup/i18n/cs.po b/addons/base_setup/i18n/cs.po
index 595a3cd5c33..e8a51507551 100644
--- a/addons/base_setup/i18n/cs.po
+++ b/addons/base_setup/i18n/cs.po
@@ -6,538 +6,283 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Město"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Instalovat"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Fakturace"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Lidské zdroje"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-mail"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Číslo bankovního účtu"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Další nástroje"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Zápatí výpisu 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Pomůže vám spravovat vaše výrobní procesy a generovat výkazy nad těmito "
-"procesy."
-
-#. module: base_setup
-#: help:base.setup.installer,marketing:0
-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
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Vaše databáze je nyní vytvořena."
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Prodejní místo"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Přidružení"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Pomůže vám zvládnout vaše účetní potřeby. Pokud nejste účetní, doporučujeme "
-"vám instalovat pouze Fakturaci. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Byli instalováni následující uživatelů : \n"
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Průběh nastavení"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Zápatí výpisu 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Měna"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Fed. stát"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marketing"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Společnost"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Řízení prodeje"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 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ů."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Můžete začít s nastavením systému nebo se přímo připojit k databázi jako "
-"správce."
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Pokročilé vykazování"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefon"
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 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."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "název"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Správa znalostí"
-
-#. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Instalovat předvybranou sadu aplikací OpenERP, která vám pomůže spravovat "
-"vaše odvětví."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Pomůže vám spravovat projekty a úkoly jejich sledováním, generováním plánů, "
-"aj."
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Název společnosti"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Přeskočit průvodce nastavení"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 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ší."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 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."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
-
-#. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
-"Pomůže vám spravovat vaše nákupní procesy jako požadavky na ocenění, faktury "
-"dodavatelů, aj."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: help:user.preferences.config,context_lang:0
 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"
+"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 ""
-"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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Ulice 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Země"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Nastavení"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Účetnictví & peněžnictví"
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Aukční domy"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "PSČ"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Start nastavení"
 
 #. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: view:user.preferences.config:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
-"Umožní vám instalovat doplňky zaměřené na sdílení znalostí s a mezi vašimi "
-"zaměstnanci."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 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."
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Nastavení společnosti"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 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ší."
-
-#. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Řízení nákupu"
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
-"Pomáhá vám spravovat vaše cenové nabídky, prodejní příkazy a fakturaci."
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Správa skladů"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Projektové řízení"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Instalováni uživatelé"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Nová databáze"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Řízení vztahů se zákazníky"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
-"Instaluje předvybranou sadu aplikací OpenERP, která je vybraná, aby vám "
-"pomohla spravovat vaše aukce stejně tak jako obchodní procesy kolem."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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í\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Umožní vám instalovat rozličné nástroje ke zjednodušení a vylepšení "
-"vytváření výkazů OpenERP."
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Záhlaví výpisu"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Informace o vaší nové databázi"
 
 #. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Obrázek"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Potravinářský průmysl"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Výroba"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Vaše logo - Použijte velikost okolo 450x150 obrazových bodů."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 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"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Stránky společnosti"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Instalovat určité průmyslové aplikace"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Ulice"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Nastavit informace vaší společnosti"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Příklad: http://openerp.com"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Instalovat aplikace"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 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."
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
-"Pomůže vám spravovat váš inventář a hlavní skladové operace: doručovací "
-"příkazy, příjmy, aj."
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Základní nastavení"
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
-"Instalovat předvybranou sadu aplikací OpenERP, které vám pomůžou spravovat "
-"efektivněji vaše asociace."
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#~ msgid "City"
+#~ msgstr "Město"
 
 #~ msgid "Zip code"
 #~ msgstr "PSČ"
@@ -560,23 +305,348 @@ msgstr "base.setup.config"
 #~ 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 "Cancel"
 #~ msgstr "Storno"
 
 #~ 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"
+
+#~ msgid "Report Footer 1"
+#~ msgstr "Zápatí výpisu 1"
+
+#~ 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."
+
+#~ msgid "Helps you manage your marketing campaigns step by step."
+#~ msgstr "Pomáhá vámkrok za krokem spravovat vaše marketingové kampaně."
+
+#~ msgid "Your database is now created."
+#~ msgstr "Vaše databáze je nyní vytvořena."
+
 #~ msgid "Point of Sales"
 #~ msgstr "Prodejní místo"
+
+#~ msgid "Associations"
+#~ msgstr "Přidružení"
+
+#~ 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. "
+
+#~ 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 "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í"
+
+#~ 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."
diff --git a/addons/base_setup/i18n/da.po b/addons/base_setup/i18n/da.po
index e6c165e4cf3..71b3202c705 100644
--- a/addons/base_setup/i18n/da.po
+++ b/addons/base_setup/i18n/da.po
@@ -7,544 +7,631 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-08 10:30+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\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: 2011-11-10 04:57+0000\n"
-"X-Generator: Launchpad (build 14263)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "By"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Installer"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Fakturering"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Personale (HR)"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-mail"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Bankkonto nr."
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Ekstra værktøjer"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Rapport sidefod 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Hjælper med at styre produktionsprocesser og lave rapporter over disse."
-
-#. module: base_setup
-#: help:base.setup.installer,marketing:0
-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.setup.config:0
-msgid "Your database is now created."
-msgstr "Din database er nu oprettet"
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Salgssted"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Organisationer"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Hjælper dig med at håndtere dine regnskabsmæssige behov. Hvis du ikke er "
-"revisor, foreslår vi dig kun at installere faktureringsmodulet "
-
-#. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Følgende brugere er installeret: \n"
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Konfigurationsfremgang"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Rapport sidefod 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Valuta"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Delstat"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Markedsføring"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Firma"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Salgsstyring"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Du kan installere forskellige interessante, men ikke afgørende værktøjer som "
-"meningsmåling, frokost og idéer."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Du kan starte med at konfigurere systemet eller tilslutte dig direkte til "
-"databasen som administrator."
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Avanceret rapportering"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefon"
-
-#. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
-"Dine virksomhedsoplysninger vil blive brugt til at individualisere "
-"dokumenter fra OpenERP som fakturaer, salgsordrer m.m."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "titel"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Videnstyring"
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
+#: view:base.setup.terminology:0
 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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Installerer en sæt OpenERP moduler, der vil hjælpe dig med at administrere "
-"din branche."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
-"Hjælper dig med at styre dine projekter og opgaver ved at spore dem, lave "
-"planlægning, osv. .."
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Firmanavn"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Spring konfigurationsguide over"
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,context_lang:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
-"Hjælper dig med at styre dit personale ved at indkode dine medarbejderes "
-"struktur, opret arbejdsplaner, checke fremmøde og m.m."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
+#: view:user.preferences.config:0
 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."
+"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 ""
-"Lader dig oprette fakturaer og spore betalinger. Det er en lettere udgave af "
-"regnskabsmodulet for ledere, der ikke er regnskabskyndige.."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
-"Hjælper dig med at styre dine indkøbsrelaterede processer som anmodninger om "
-"tilbud, leverandørfakturaer, osv. .."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
-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"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 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"
 
 #. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Adresse 2"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Land"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Opsætning"
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Regnskab & finans"
+#: help:user.preferences.config,menu_tips:0
+msgid ""
+"Check out this box if you want to always display tips on each menu action"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Auktionshuse"
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
+msgid "Image"
+msgstr "Billede"
 
 #. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Postnr"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Startkonfiguration"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 msgstr ""
-"Lader dig installere tillægsmodul beregnet til at dele viden med og mellem "
-"dine medarbejdere."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 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."
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Firmaopsætning"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
-"Hjælper dig med at få det bedste ud af dit detailhandelssystem med hurtigt "
-"salg, enkel betaling, automatisk plukliste m.m."
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Indkøbsstyring"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr "Hjælper dig med dina tilbud, salgsordre och fakturer."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Lagerstyrning"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
+msgstr ""
 
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Projektstyring"
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
 
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Installerede brugere"
+#~ msgid "City"
+#~ msgstr "By"
 
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Ny database"
+#~ msgid "Install"
+#~ msgstr "Installer"
 
-#. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Kundestyring (CRM)"
+#~ msgid "Invoicing"
+#~ msgstr "Fakturering"
 
-#. module: base_setup
-#: help:base.setup.installer,auction:0
-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 "Extra Tools"
+#~ msgstr "Ekstra værktøjer"
 
-#. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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 "Marketing"
+#~ msgstr "Markedsføring"
 
-#. module: base_setup
-#: help:base.setup.installer,report_designer:0
-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 "Point of Sales"
+#~ msgstr "Point of sales"
 
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Rapporthoved"
+#~ msgid "Currency"
+#~ msgstr "Valuta"
 
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Information om din nye database"
+#~ msgid "title"
+#~ msgstr "titel"
 
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
-msgid "Image"
-msgstr "Billede"
+#~ msgid "Advanced Reporting"
+#~ msgstr "Avanceret rapportering"
 
-#. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Fødevareindustri"
+#~ msgid "base.setup.company"
+#~ msgstr "base.setup.company"
 
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Produktion"
+#~ msgid "Company Name"
+#~ msgstr "Firmanavn"
 
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Dit Logo - Brug en størrelse på ca. 450x150 pixels."
+#~ msgid "Zip Code"
+#~ msgstr "Postnr"
 
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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.installer"
+#~ msgstr "base.setup.installer"
 
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Firmaets hjemmeside"
+#~ msgid "Street 2"
+#~ msgstr "Adresse 2"
 
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Installerer specifikke branchemoduler"
+#~ msgid "Auction Houses"
+#~ msgstr "Auktionshuse"
 
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Gade"
+#~ msgid "Country"
+#~ msgstr "Land"
 
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Opsætter dit firmaoplysninger"
+#~ msgid "Logo"
+#~ msgstr "Logo"
 
-#. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Eksempel: http://openerp.com"
+#~ msgid "Manufacturing"
+#~ msgstr "Produktion"
 
-#. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Installer moduler"
+#~ msgid "New Database"
+#~ msgstr "Ny database"
 
-#. module: base_setup
-#: help:base.setup.installer,crm:0
-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 "Street"
+#~ msgstr "Gade"
 
-#. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
-msgstr "Hjælper med lageroperationer: Levering, modtagelse osv."
+#~ msgid "Helps you manage your marketing campaigns step by step."
+#~ msgstr "Hjælper dig med din maketingskampagne skridt for skridt"
 
-#. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Basal opsætning"
+#~ msgid "Human Resources"
+#~ msgstr "Personale (HR)"
 
-#. module: base_setup
-#: help:base.setup.installer,association:0
-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 "Bank Account No"
+#~ msgstr "Bankkonto nr."
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#~ 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."
 
-#~ msgid "Point of Sales"
-#~ msgstr "Point of sales"
+#~ 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 ""
+#~ "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"
diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po
index 942bc9a5dd6..542e81f059c 100644
--- a/addons/base_setup/i18n/de.po
+++ b/addons/base_setup/i18n/de.po
@@ -6,555 +6,282 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:46+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Stadt"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Installiere"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Offene Posten Buchhaltung"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Personal & Zeiterfassung"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-Mail"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Bankkonto"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Extra Werkzeuge"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Bericht Fusszeile 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
-msgstr "Management Ihrer Fertigungsprozesse und Erstellung von Auswertungen"
-
-#. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Management von Marketingkampagnen zur Automatisierung von Vertriebsaktionen"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Ihre Datenbank ist jetzt vollständig installiert"
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "POS & Kasse"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Vereine & Verbände"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Management Ihrer Finanzen. Falls Sie keine vollständige Finanzbuchhaltung "
-"benötigen, empfehlen wir nur die Installation der Anwendung Offene Posten "
-"Buchhaltung. "
-
-#. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Folgende Benutzer wurden installiert : \n"
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Konfiguration Abfolge"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Bericht Fusszeile 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Währung"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Bundesland"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marketing & Kampagnen"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Unternehmen"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Angebote & Rechnungen"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Optionale Erweiterung interessanter, aber nicht zwingend zu installierender "
-"Applikationen, wie z.B. Umfragen, Vorschlagswesen etc."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Sie können Ihr System jetzt entweder über den Assistenten vorkonfigurieren "
-"oder sofort mit der Arbeit auf dieser Datenbank beginnen."
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Reports & Auswertungen"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefon"
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
-"Ihre Unternehmensinformationen werden benötigt, damit diese Daten auf "
-"Rechnungen, Verkaufsaufträgen und anderen Dokumenten erscheinen."
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "Bezeichnung"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Knowledge & Dokumente"
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Installiert eine Vorauswahl von OpenERP Modulen zur Anwendung in Ihrem "
-"Betrieb."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Management, Planung und Überwachnung von Projekten, Aufgaben, Zeiten und "
-"Kosten ..."
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Unternehmensname"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Überspringe Konfigurationsassistent"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
-"Personalwesen zur Verwaltung von Mitarbeitern, Arbeitszeiten,  Zeiterfassung "
-"von Mitarbeitern, Urlaubsverwaltung, Spesenabrechnung usw."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 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."
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
-"Unterstützung aller Beschaffungsvorgänge, wie z.B. Bedarfsmeldung, "
-"Angebotsanfrage, Bestellung und Rechnungskontrolle."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: help:user.preferences.config,context_lang:0
 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"
+"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 ""
-"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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Strasse 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Land"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Installation"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Finanzen & Controlling"
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Auktionen & Versteigerungen"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Postleitzahl"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Beginne Konfiguration"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: view:user.preferences.config:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
-"Installiert die Anwendungen zur Verwaltung von Wissen und Daten und "
-"ermöglicht einen effizienten Austausch und die gemeinsame Bearbeitung von "
-"Dokumenten."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 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."
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Konfiguration Unternehmen"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
-"Applikation für Ihren Point of Sales mit Schnellerfassung von Verkäufen, "
-"vereinfachter Zahlungserfassung, automatische Lieferscheinerstellung u.a. "
-"Anwendungen."
-
-#. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Disposition & Einkauf"
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr "Erstellen Sie Angebote, Aufträge und Rechnungen."
-
-#. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Lager & Logistik"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Projekte & Aufgaben"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Existierende Benutzer"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Neue Datenbank"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "CRM & SRM"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
-"Installiert ein vordefiniertes Set an Anwendungen für das Management von "
-"Auktionshäusern und deren Prozesse."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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'."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Installation der Werkzeuge für die Erstellung und Verwaltung von Reports."
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Bericht Kopfzeile"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Information zur Datenbank"
 
 #. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Bild"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Nahrung & Genuss"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Stücklisten & Fertigungsaufträge"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Ihr Logo – sollte ca 450x150 Pixel groß sein"
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 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"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Webpage"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Installation Branchenanwendungen"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Strasse"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Konfigurieren Sie Ihre Unternehmensdaten"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Beispiel: http://openerp.com"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Installiere Module"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 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."
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
-"Management von Lagerorten und Verwaltung von Beständen, z.B. durch  Erfassen "
-"von Lieferungen, Durchführung von Inventuren, etc."
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Basis Setup"
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
-"Installation von definierten Sets an Anwendungen für das Management von "
-"Vereinen oder Verbänden."
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#~ msgid "City"
+#~ msgstr "Stadt"
 
 #~ msgid ""
 #~ "You can start configuring the system or connect directly to the database "
@@ -566,6 +293,9 @@ msgstr "base.setup.config"
 #~ 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 ""
@@ -590,6 +320,12 @@ msgstr "base.setup.config"
 #~ 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"
 
@@ -599,32 +335,383 @@ msgstr "base.setup.config"
 #~ 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 "Cancel"
 #~ msgstr "Abbruch"
 
 #~ 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 "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"
+
+#~ 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 ..."
+
+#~ msgid "Human Resources"
+#~ msgstr "Personal & Zeiterfassung"
+
+#~ msgid "Accounting & Finance"
+#~ msgstr "Finanzen & Controlling"
+
+#~ msgid "Auction Houses"
+#~ msgstr "Auktionen & Versteigerungen"
+
+#~ msgid "Purchase Management"
+#~ msgstr "Disposition & Einkauf"
+
+#~ msgid "Helps you handle your quotations, sale orders and invoicing."
+#~ msgstr "Erstellen Sie Angebote, Aufträge und Rechnungen."
+
+#~ msgid "Warehouse Management"
+#~ msgstr "Lager & Logistik"
+
+#~ 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"
diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po
index 8837d6d223e..86ee3e44d1e 100644
--- a/addons/base_setup/i18n/el.po
+++ b/addons/base_setup/i18n/el.po
@@ -7,554 +7,279 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:51+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Πόλη"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Εγκατάσταση"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Τιμολόγηση"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Ανθρώπινο Δυναμικό"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-mail"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Αρ. Λογαριασμού Τραπέζης"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Επιπλέον Εργαλεία"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Υποσέλιδο Αναφοράς 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Βοηθά στην διαχείρηση των διαδικασιών παραγωγής και παράγει αναφορές γι' "
-"αυτές"
-
-#. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "Βοηθά στην διαχείριση των εκστρατειών μάρκετινγκ βήμα προς βήμα."
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Η βάση σου έχει δημιουργηθεί"
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Σημείο πώλησης"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Αντιστοιχήσεις"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Σε βοηθά να διαχειριστείς τις λογιστικές σου ανάγκες, εάν δεν είσαι "
-"λογιστής, σας προτείνουμε να εγκαταστήσετε μόνο την Τιμολόγηση "
-
-#. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Οι ακόλουθοι χρήστες έχουν εγκατασταθεί: \n"
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Πρόοδος Ρυθμίσεων"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Υποσέλιδο Αναφοράς 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Νόμισμα"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Πολιτεία"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Μάρκετινγκ"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Εταιρία"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Διαχείριση Πωλήσεων"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Σας επιτρέπει να εγκαταστήσετε διάφορα ενδιαφέροντα αλλά όχι απαραίτητα "
-"εργαλεία όπως την Έρευνα (Survey), το Γεύμα και το Κουτί ιδεών."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Μπορείς να ξεκινήσεις την παραμετροποίηση του συστήματος ή να συνδεθείς "
-"απευθείας στην βάση ως διαχειριστής."
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Προχωρημένες Αναφορές"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Τηλέφωνο"
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
-"Οι πληροφορίες της εταιρίας που θα χρησιμοποιηθούν για την εξατομίκευση των "
-"εγγράφων του OpenERP  όπως τιμολόγια, παραγγελίες πώλησης και πολλά άλλα."
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "τίτλος"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Διαχείριση Γνώσης"
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Εγκαθίστανται μια σειρά από προεγκατεστημένες εφαρμογές του OpenERP που θα "
-"σε βοηθήσουν να διαχειριστείς την εταιρία σου"
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Βοηθά στην παρακολούθηση των έργων και εργασιών παράγοντας σχέδια , κλπ..."
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Επωνυμία Επιχείρησης"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Παράβλεψη των οδηγών διαμόρφωσης"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
-"Σε βοηθά να διαχειριστείς τους ανθρώπινους πόρους καταγράφοντας τη δομή των "
-"υπαλήλων,δημιουργώντας φύλλα εργασιών, καταγραφή παρουσίας"
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
-"Επιτρέπει να δημιουργήσεις τιμολόγια και να παρακολουθήσεις τις πληρωμές. "
-"Είναι μια πρώιμη έκδοση του πρόσθετου της Λογιστικής για διαχειριστές που "
-"δεν είναι λογιστές."
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
-"Σας βοηθάει να διαχειριστείτε τις σχετικές με τις προμήθειες διαδικασίες σας "
-"όπως αιτήματα προσφορών, τιμολόγια προμηθευτών κλπ"
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: help:user.preferences.config,context_lang:0
 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"
+"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 ""
-"Αυτή η πρόταση θα εμφανίζεται στο κάτω μέρος των αναφορών σας.\n"
-"Σας προτείνουμε να εισάγετε πληροφορίες τράπεζας εδω:\n"
-"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Οδός 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Χώρα"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Εγκατάσταση"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Λογιστικά & Χρηματοοικονομικά"
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Οίκοι δημοπρασιών"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Ταχυδρομικός Κώδικας"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Έναρξη Παραμετροποίησης"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: view:user.preferences.config:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
-"Σας επιτρέπει να εγκαταστήσετε πρόσθετα σχεδιασμένα να προωθούν τη διάχυση "
-"της γνώσης μεταξύ εσάς και των υπαλλήλων σας."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
-"Επιλέξτε τις εφαρμογές που θέλετε να καλύπτει το σύστημά σας. Εάν δεν είστε "
-"σίγουροι για τις ακριβής ανάγκες σε αυτην την φάση, μπορείτε να τις "
-"εγκαταστήσετε εύκολα αργότερα."
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Ρύθμιση Εταιρίας"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Λογότυπο"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
-"Σας βοηθά να αξιοποιήσετε στο μέγιστο τα σημεία σας πωλήσεων με γρήγορη "
-"κωδικοποίηση πωλήσεων, απλοποιημένη κωδικοποίηση τρόπου πληρωμής, αυτόματα "
-"δημιουργία λιστών περισυλλογής και άλλα."
-
-#. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Διαχείριση Αγορών"
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
-"Σας βοηθά να διαχειριστείτε τις προσφορές, παραγγελίες πωλήσεων και την "
-"τιμολόγηση"
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Διαχείριση Αποθήκης"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Διαχείριση Έργων"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Εγκατεστημένοι χρήστες"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Νέα Βάση Δεδομένων"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Διαχείριση Πελατειακών Σχέσεων (CRM)"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
-"Εγκαθιστά ένα προεπιλεγμένο σύνολο εφαρμογών του OpenERP επιλεγμένων για να "
-"σας βοηθήσουν να διαχειριστείτε τις δημοπρασίες σας καθώς και τις "
-"επιχειρησιακές διαδικασίες γύρω από αυτές."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 msgstr ""
-"Αυτή η εγκατάσταση θα εμφανίζεται στην πάνω δεξιά γωνία των αναφορών σας.\n"
-"Σας προτείνουμε να βάλετε το slogan σας εδώ:\n"
-"\"Open Source Business Solutions\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Γίνεται εγκατάσταση εργαλείων για την απλοποίηση και την ενίσχυση των "
-"αναφορών του OpenERP"
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Κεφαλίδα Αναφοράς"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Πληροφορίες σχετικά με την νέα βάση δεδομένων"
 
 #. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Εικόνα"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Βιομηχανία Τροφίμων"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Παραγωγή"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Λογότυπο - Χρησιμοποιείστε μέγεθος 450x150 pixels."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
-"Αυτή η πρόταση θα εμφανίζεται στο κάτω μέρος των αναφορών σας.\n"
-"Σας προτείνουμε να γράψετε προτάσεις όπως:\n"
-"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Ιστοσελίδα Εταιρίας"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Εγκαθιστά Συγκεκριμένες Επιχειρησιακές Εφαρμογές"
-
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Οδός"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Ρυθμίστε τις Πληροφορίες της Εταιρίας Σας"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Παράδειγμα: http://openerp.com"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Εγκατάσταση Εφαρμογών"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
-"Σε βοηθά να καταγράψεις και και να διαχειριστείς τις σχέσεις με τους "
-"υποψήφιους πελάτες, αιτήσεις και θέματα. Μπορεί να στείλει υπενθυμίσεις "
-"αυτόματα, να κλημακώσει απαιτήσεις ή να ενεργήσει βάσει κάποιον γεγονότων."
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
-"Σας βοηθάει να διαχειριστείτε την αποθήκη σας και τις κύριες λειτουργίες "
-"αποθέματος: παράδοση παραγγελιών, παραλαβές κλπ"
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Βασική Εγκατάσταση"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
-"Εγκαθιστά ένα προεπιλεγμένο σύνολο εφαρμογών του OpenERP που θα σας "
-"βοηθήσουν να διαχειριστείτε την εταιρεία σας πιο αποτελεσματικά."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
+msgstr ""
 
 #~ msgid ""
 #~ "A profile sets a pre-selection of modules for specific needs. These profiles "
@@ -566,6 +291,9 @@ msgstr "base.setup.config"
 #~ "τις διαφορετικές οπτικές του OpenERP. Αυτό είναι απλά μιά περίληψη, έχουμε "
 #~ "πάνω απο 300 ενότητες διαθέσιμες."
 
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
 #~ msgid "Report header"
 #~ msgstr "Κεφαλίδα αναφοράς"
 
@@ -579,12 +307,18 @@ msgstr "base.setup.config"
 #~ "Μπορείτε να ξεκινήσετε την παραμετροποίηση του συστήματος ή να συνδεθείτε "
 #~ "απευθείας στην βάση δεδομένων χρησιμοποιώντας την προκαθορισμένη εγκατάσταση."
 
+#~ 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 "Ταχυδρομικος Κώδικας"
 
@@ -597,12 +331,21 @@ msgstr "base.setup.config"
 #~ 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 "Πληροφορίες Αναφοράς"
 
@@ -612,20 +355,364 @@ msgstr "base.setup.config"
 #~ 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 "Cancel"
 #~ 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 "Μάρκετινγκ"
+
+#~ msgid ""
+#~ "Helps you handle your accounting needs, if you are not an accountant, we "
+#~ "suggest you to install only the Invoicing "
+#~ 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 "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"
+#~ "    "
diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po
index a71e2900e12..dc5c56bd391 100644
--- a/addons/base_setup/i18n/es.po
+++ b/addons/base_setup/i18n/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:53+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,553 +14,279 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Ciudad"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Instalar"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Facturación"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Recursos humanos"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "Correo electrónico"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Nº cuenta bancaria"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Herramientas extras"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Pie de página 1 de los informes"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Le ayuda a gestionar sus procesos de fabricación y generar informes sobre "
-"estos procesos."
-
-#. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "Le ayuda a gestionar sus campañas de marketing paso a paso."
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Su base de datos ya está creada."
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Terminal punto de venta"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Asociaciones"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Le ayuda a gestionar sus necesidades contables. Si no es un contable, le "
-"sugerimos instalar sólo la facturación. "
-
-#. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Los siguientes usuarios han sido instalados : \n"
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso configuración"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Pie de página 2 de los informes"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Moneda"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Provincia"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marketing"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Compañía"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Gestión ventas"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Permite instalar varias herramientas interesantes pero no esenciales como "
-"Informes, Comidas y caja de Ideas."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Puede empezar configurando el sistema o conectando directamente a la base de "
-"datos como un administrador."
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Informes avanzados"
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Teléfono"
-
-#. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contenidos"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 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."
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Gestión conocimiento"
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Instala un conjunto preseleccionado de aplicaciones OpenERP que pueden "
-"ayudarle a gestionar su industria."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Le ayuda a gestionar sus proyectos y tareas mediante el seguimiento de "
-"ellas, generando planificaciones, ..."
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Nombre de la compañía"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Omitir asistentes configuración"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 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, ..."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 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
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.compañía"
-
-#. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
-"Le ayuda a gestionar sus procesos relacionados con las compras como "
-"peticiones de presupuestos, facturas de proveedor, ..."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: help:user.preferences.config,context_lang:0
 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"
+"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 ""
-"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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Calle 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.instalador"
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "País"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Instalación"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Contabilidad y finanzas"
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Casas de subastas"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Código postal"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Empezar configuración"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: view:user.preferences.config:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
-"Le permite instalar addons orientados a compartir el conocimiento con y "
-"entre sus empleados."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 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."
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Configuración compañía"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 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
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Gestión de compras"
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
-"Le ayuda a gestionar sus presupuestos, pedidos de venta y facturación."
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Gestión de almacenes"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Gestión de proyectos"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Usuarios instalados"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Nueva base de datos"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Gestión relaciones con el cliente (CRM)"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
-"Instala un conjunto preseleccionado de aplicaciones OpenERP para ayudarle a "
-"gestionar sus subastas como también los procesos de negocio alrededor de "
-"ellas."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Le permite instalar varias herramientas para simplificar y mejorar la "
-"creación de informes OpenERP."
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Cabecera de los informes"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Información sobre su nueva base de datos"
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Imagen"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Industria alimentaria"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Fabricación"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Su logo – Utilice un tamaño de 450x150 píxeles aprox."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 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"
-
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Sitio web compañía"
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Instala aplicaciones específicas para la industria"
-
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Calle"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Configurar la información de su compañía"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Ejemplo: http://openerp.com"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Instala aplicaciones"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 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."
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
-"Le ayuda a gestionar su inventario y las operaciones principales de stock: "
-"las órdenes de entrega, recepciones, ..."
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Configuración básica"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
-"Instala un conjunto preseleccionado de aplicaciones OpenERP que le ayudará a "
-"administrar su asociación de manera más eficiente."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
+msgstr ""
 
 #~ 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."
@@ -574,6 +300,9 @@ msgstr "base.setup.config"
 #~ 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 ""
@@ -592,6 +321,9 @@ msgstr "base.setup.config"
 #~ msgid "Next"
 #~ msgstr "Siguiente"
 
+#~ msgid "E-mail"
+#~ msgstr "Correo electrónico"
+
 #~ msgid "State"
 #~ msgstr "Estado"
 
@@ -601,6 +333,12 @@ msgstr "base.setup.config"
 #~ 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"
 
@@ -610,23 +348,372 @@ msgstr "base.setup.config"
 #~ 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 "Cancel"
 #~ msgstr "Cancelar"
 
+#~ 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, ..."
+
+#~ 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 "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"
+#~ "    "
diff --git a/addons/base_setup/i18n/es_AR.po b/addons/base_setup/i18n/es_AR.po
index c646a7145ac..d928c8a1de8 100644
--- a/addons/base_setup/i18n/es_AR.po
+++ b/addons/base_setup/i18n/es_AR.po
@@ -6,498 +6,292 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2009-09-15 15:41+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Ciudad"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Instalar"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "Correo electrónico"
-
-#. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Pie de página 1 de los informes"
-
-#. module: base_setup
-#: help:base.setup.installer,mrp:0
-msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
+#: selection:product.installer,customers:0
+msgid "Create"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: help:user.preferences.config,context_tz:0
 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
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Pie de página 2 de los informes"
-
-#. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Moneda"
-
-#. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+#: field:product.installer,customers:0
+msgid "Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Teléfono"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Nombre de la compañía"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:base.setup.terminology:0
 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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "País"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Configuración"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Empezar la configuración"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: help:user.preferences.config,context_lang:0
 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 ""
-
-#. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
+#: view:user.preferences.config:0
 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
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: 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.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Encabezado del Reporte"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Su logo – Utilice un tamaño de 450x150 píxeles aprox."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 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"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Calle"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
 
-#. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Configuración básica"
-
-#. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
-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"
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr ""
+#~ msgid "Company Name"
+#~ msgstr "Nombre de la compañía"
 
 #~ msgid "Use Directly"
 #~ msgstr "Usar directamente"
@@ -506,6 +300,15 @@ msgstr ""
 #~ 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 ""
@@ -527,6 +330,9 @@ msgstr ""
 #~ msgid "Report Information"
 #~ msgstr "Información de los informes"
 
+#~ msgid "Install"
+#~ msgstr "Instalar"
+
 #~ msgid "Cancel"
 #~ msgstr "Cancelar"
 
@@ -535,6 +341,12 @@ msgstr ""
 #~ 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 "
@@ -545,26 +357,71 @@ msgstr ""
 #~ "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"
+
 #~ msgid "Report header"
 #~ msgstr "Encabezado del Reporte"
+
+#~ msgid "E-mail"
+#~ msgstr "Correo electrónico"
diff --git a/addons/base_setup/i18n/es_CL.po b/addons/base_setup/i18n/es_CL.po
index 011ed071d89..d413742a7ef 100644
--- a/addons/base_setup/i18n/es_CL.po
+++ b/addons/base_setup/i18n/es_CL.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-01-14 04:34+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,552 +14,639 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Ciudad"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Instalar"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Facturación"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Recursos humanos"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "Correo electrónico"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Nº cuenta bancaria"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Herramientas extras"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Pie de página 1 de los informes"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Le ayuda a gestionar sus procesos de fabricación y generar informes sobre "
-"estos procesos."
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "Le ayuda a gestionar sus campañas de marketing paso a paso."
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Su base de datos ya está creada."
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Asociaciones"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Le ayuda a gestionar sus necesidades contables. Si no es un contable, le "
-"sugerimos instalar sólo la facturación. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Los siguientes usuarios han sido instalados : \n"
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso configuración"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Pie de página 2 de los informes"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Moneda"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Provincia"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marketing"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Compañía"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Gestión ventas"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Permite instalar varias herramientas interesantes pero no esenciales como "
-"Informes, Comidas y caja de Ideas."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Puede empezar configurando el sistema o conectando directamente a la base de "
-"datos como un administrador."
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Informes avanzados"
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Teléfono"
-
-#. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contenidos"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 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."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Gestión conocimiento"
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
+#: view:base.setup.terminology:0
 msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Instala un conjunto preseleccionado de aplicaciones OpenERP que pueden "
-"ayudarle a gestionar su industria."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
-"Le ayuda a gestionar sus proyectos y tareas mediante el seguimiento de "
-"ellas, generando planificaciones, ..."
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Nombre de la compañía"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Omitir asistentes configuración"
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,context_lang:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
-"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, ..."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
+#: view:user.preferences.config:0
 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."
+"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 ""
-"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
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.compañía"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
-"Le ayuda a gestionar sus procesos relacionados con las compras como "
-"peticiones de presupuestos, facturas de proveedor, ..."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
-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"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 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"
 
 #. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Calle 2"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.instalador"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "País"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Instalación"
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Contabilidad y finanzas"
+#: help:user.preferences.config,menu_tips:0
+msgid ""
+"Check out this box if you want to always display tips on each menu action"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Casas de subastas"
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
+msgid "Image"
+msgstr "Imagen"
 
 #. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Código postal"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Empezar configuración"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 msgstr ""
-"Le permite instalar addons orientados a compartir el conocimiento con y "
-"entre sus empleados."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 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."
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Configuración compañía"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 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
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Gestión de compras"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
-"Le ayuda a gestionar sus presupuestos, pedidos de venta y facturación."
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Gestión de almacenes"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
+msgstr ""
 
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Gestión de proyectos"
+#~ msgid "City"
+#~ msgstr "Ciudad"
 
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Usuarios instalados"
+#~ msgid "Install"
+#~ msgstr "Instalar"
 
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Nueva base de datos"
+#~ msgid "Invoicing"
+#~ msgstr "Facturación"
 
-#. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Gestión relaciones con el cliente (CRM)"
+#~ msgid "Human Resources"
+#~ msgstr "Recursos humanos"
 
-#. module: base_setup
-#: help:base.setup.installer,auction:0
-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 "E-mail"
+#~ msgstr "Correo electrónico"
 
-#. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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 "Bank Account No"
+#~ msgstr "Nº cuenta bancaria"
 
-#. module: base_setup
-#: help:base.setup.installer,report_designer:0
-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 "Extra Tools"
+#~ msgstr "Herramientas extras"
 
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Cabecera de los informes"
+#~ msgid "Report Footer 1"
+#~ msgstr "Pie de página 1 de los informes"
 
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Información sobre su nueva base de datos"
+#~ 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."
 
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
-msgid "Image"
-msgstr "Imagen"
+#~ msgid "Helps you manage your marketing campaigns step by step."
+#~ msgstr "Le ayuda a gestionar sus campañas de marketing paso a paso."
 
-#. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Industria alimentaria"
+#~ msgid "Your database is now created."
+#~ msgstr "Su base de datos ya está creada."
 
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Fabricación"
+#~ msgid "Point of Sales"
+#~ msgstr "Terminal punto de venta"
 
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Su logo – Utilice un tamaño de 450x150 píxeles aprox."
+#~ msgid "Associations"
+#~ msgstr "Asociaciones"
 
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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 ""
+#~ "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. "
 
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Sitio web compañía"
+#, python-format
+#~ msgid "The following users have been installed : \n"
+#~ msgstr "Los siguientes usuarios han sido instalados : \n"
 
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Instala aplicaciones específicas para la industria"
+#~ msgid "Configuration Progress"
+#~ msgstr "Progreso configuración"
 
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Calle"
+#~ msgid "Report Footer 2"
+#~ msgstr "Pie de página 2 de los informes"
 
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Configurar la información de su compañía"
+#~ msgid "Currency"
+#~ msgstr "Moneda"
 
-#. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Ejemplo: http://openerp.com"
+#~ msgid "Fed. State"
+#~ msgstr "Provincia"
 
-#. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Instala aplicaciones"
+#~ msgid "Marketing"
+#~ msgstr "Marketing"
 
-#. module: base_setup
-#: help:base.setup.installer,crm:0
-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 "Company"
+#~ msgstr "Compañía"
 
-#. module: base_setup
-#: help:base.setup.installer,stock:0
-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 "Sales Management"
+#~ msgstr "Gestión ventas"
 
-#. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Configuración básica"
+#~ 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.setup.installer,association:0
-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 ""
+#~ "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."
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#~ msgid "Advanced Reporting"
+#~ msgstr "Informes avanzados"
 
-#~ msgid "Point of Sales"
-#~ msgstr "Terminal punto de venta"
+#~ 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 "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"
diff --git a/addons/base_setup/i18n/es_EC.po b/addons/base_setup/i18n/es_EC.po
index 9c4a446168b..4d67bc2bb2d 100644
--- a/addons/base_setup/i18n/es_EC.po
+++ b/addons/base_setup/i18n/es_EC.po
@@ -7,556 +7,279 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2010-12-27 16:41+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\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: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Ciudad"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Instalar"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Facturación"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Recursos Humanos"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "Correo electrónico"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Cuenta Bancaria No."
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Herramientas extras"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Pie de página 1 de los informes"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Le ayuda a gestionar sus procesos de fabricación y generar informes sobre "
-"estos procesos."
-
-#. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "Le ayuda a gestionar sus campañas de marketing paso a paso."
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Su base de datos ya está creada."
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Asociaciones"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Le ayuda a gestionar sus necesidades contables. Si no es un contable, le "
-"sugerimos instalar sólo la facturación. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Los siguientes usuarios han sido instalados : \n"
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso de Configuración"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Pie de página 2 de los informes"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Moneda"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Provincia"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marketing"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Compañía"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Ventas"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Permite instalar varias herramientas interesantes pero no esenciales como "
-"Informes, Comidas y caja de Ideas."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Puede empezar configurando el sistema o conectando directamente a la base de "
-"datos como un administrador."
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Informes avanzados"
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Teléfono"
-
-#. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 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."
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "Título"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Gestión conocimiento"
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Instala un conjunto preseleccionado de aplicaciones OpenERP que pueden "
-"ayudarle a gestionar su industria."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Le ayuda a gestionar sus proyectos y tareas mediante el seguimiento de "
-"ellas, generando planificaciones, ..."
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Nombre de la compañía"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Omitir asistentes configuración"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 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, ..."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 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
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "Configuración Base de la Compañia"
-
-#. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
-"Le ayuda a gestionar sus procesos relacionados con las compras como "
-"peticiones de presupuestos, facturas de proveedor, ..."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: help:user.preferences.config,context_lang:0
 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"
+"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 ""
-"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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Calle 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "Instalador"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "País"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Instalación"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Contabilidad y finanzas"
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Casas de subastas"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Código postal"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Empezar configuración"
 
 #. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: view:user.preferences.config:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
-"Le permite instalar addons orientados a compartir el conocimiento con y "
-"entre sus empleados."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 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."
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Configuración compañía"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 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
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Gestión de compras"
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
-"Le ayuda a gestionar sus presupuestos, pedidos de venta y facturación."
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Gestión de inventario"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Gestión de proyectos"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Usuarios instalados"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Nueva base de datos"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Gestión relaciones con el cliente (CRM)"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
-"Instala un conjunto preseleccionado de aplicaciones OpenERP para ayudarle a "
-"gestionar sus subastas como también los procesos de negocio alrededor de "
-"ellas."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Le permite instalar varias herramientas para simplificar y mejorar la "
-"creación de informes OpenERP."
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Cabecera del informe"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Información sobre su nueva base de datos"
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Imágen"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Industria alimentaria"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Producción"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Su logo – Utilice un tamaño de 450x150 píxeles aprox."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 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"
-
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Sitio web compañía"
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Instala aplicaciones específicas para la industria"
-
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Calle"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Configura información de tu Compañia"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Ejemplo: http://openerp.com"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Instala aplicaciones"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 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."
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
-"Le ayuda a gestionar su inventario y las operaciones principales de stock: "
-"las órdenes de entrega, recepciones, ..."
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Configuración básica"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
-"Instala un conjunto preseleccionado de aplicaciones OpenERP que le ayudará a "
-"administrar su asociación de manera más eficiente."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "Configuración"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
+msgstr ""
 
 #~ msgid ""
 #~ "A profile sets a pre-selection of modules for specific needs. These profiles "
@@ -571,6 +294,9 @@ msgstr "Configuración"
 #~ msgid "Next"
 #~ msgstr "Siguiente"
 
+#~ msgid "E-mail"
+#~ msgstr "Correo electrónico"
+
 #~ msgid "Report header"
 #~ msgstr "Cabecera de los informes"
 
@@ -584,23 +310,38 @@ msgstr "Configuración"
 #~ "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"
 
@@ -610,23 +351,369 @@ msgstr "Configuración"
 #~ 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 "Cancel"
 #~ msgstr "Cancelar"
 
+#~ 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 "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"
+#~ "    "
diff --git a/addons/base_setup/i18n/es_PY.po b/addons/base_setup/i18n/es_PY.po
index 2db06e83fb4..923db7a2cec 100644
--- a/addons/base_setup/i18n/es_PY.po
+++ b/addons/base_setup/i18n/es_PY.po
@@ -7,556 +7,643 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-03-18 12:16+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: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Ciudad"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Instalar"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Facturación"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Recursos humanos"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "Correo electrónico"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Nº cuenta bancaria"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Herramientas extras"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Pie de página 1 del informe"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Le ayuda a gestionar sus procesos de fabricación y generar informes sobre "
-"estos procesos."
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "Le ayuda a gestionar sus campañas de marketing paso a paso."
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Su base de datos ya está creada."
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Asociaciones"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Le ayuda a gestionar sus necesidades contables. Si no es un contable, le "
-"sugerimos instalar sólo la facturación. "
-
-#. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Los siguientes usuarios han sido instalados : \n"
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso de la configuración"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Pie de página 2 de los informes"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Moneda"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Provincia"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marketing"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Compañía"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Gestión ventas"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Permite instalar varias herramientas interesantes pero no esenciales como "
-"Informes, Comidas y caja de Ideas."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Puede empezar configurando el sistema o conectando directamente a la base de "
-"datos como un administrador."
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Informes avanzados"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Teléfono"
-
-#. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contenidos"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 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."
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "título"
 
 #. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Gestión conocimiento"
-
-#. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Instala un conjunto preseleccionado de aplicaciones OpenERP que pueden "
-"ayudarle a gestionar su industria."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Le ayuda a gestionar sus proyectos y tareas realizando un seguimiento de los "
-"mismos, generando planificaciones, ..."
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Nombre de la compañía"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Omitir asistentes configuración"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 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, ..."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 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
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.compañía"
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
+#: help:user.preferences.config,context_lang:0
 msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+"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 ""
-"Le ayuda a gestionar sus procesos relacionados con las compras como "
-"peticiones de presupuestos, facturas de proveedor, ..."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:user.preferences.config:0
 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"
+"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 ""
-"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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Calle 2"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.instalador"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "País"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Instalación"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Contabilidad y finanzas"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Casas de subastas"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Código postal"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Empezar configuración"
+#: 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.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 msgstr ""
-"Le permite instalar addons orientados a compartir el conocimiento con y "
-"entre sus empleados."
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: help:user.preferences.config,menu_tips:0
 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."
+"Check out this box if you want to always display tips on each menu action"
 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."
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Configuración compañía"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
+msgid "Image"
+msgstr "Imagen"
 
 #. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 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
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Gestión de compras"
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
-"Le ayuda a gestionar sus presupuestos, pedidos de venta y facturación."
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Gestión de almacenes"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Gestión de proyectos"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Usuarios instalados"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Nueva base de datos"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Gestión relaciones con el cliente (CRM)"
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
-"Instala un conjunto preseleccionado de aplicaciones OpenERP para ayudarle a "
-"gestionar sus subastas como también los procesos de negocio alrededor de "
-"ellas."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 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\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
-msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
-"Le permite instalar varias herramientas para simplificar y mejorar la "
-"creación de informes OpenERP."
 
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Cabecera de los informes"
+#~ msgid "E-mail"
+#~ msgstr "Correo electrónico"
 
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Información sobre su nueva base de datos"
+#~ msgid "Report Footer 1"
+#~ msgstr "Pie de página 1 del informe"
 
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
-msgid "Image"
-msgstr "Imagen"
+#~ msgid "Helps you manage your marketing campaigns step by step."
+#~ msgstr "Le ayuda a gestionar sus campañas de marketing paso a paso."
 
-#. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Industria alimentaria"
+#~ msgid "Human Resources"
+#~ msgstr "Recursos humanos"
 
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Fabricación"
+#~ msgid "Install"
+#~ msgstr "Instalar"
 
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Su logo – Utilice un tamaño de 450x150 píxeles aprox."
+#~ msgid "City"
+#~ msgstr "Ciudad"
 
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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 ""
+#~ "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."
 
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Sitio web compañía"
+#~ msgid "Extra Tools"
+#~ msgstr "Herramientas extras"
 
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Instala aplicaciones específicas para la industria"
+#~ msgid "Invoicing"
+#~ msgstr "Facturación"
 
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Calle"
+#~ msgid "Bank Account No"
+#~ msgstr "Nº cuenta bancaria"
 
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Configurar la información de su compañía"
+#~ msgid "Report Footer 2"
+#~ msgstr "Pie de página 2 de los informes"
 
-#. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Ejemplo: http://openerp.com"
+#~ msgid "Currency"
+#~ msgstr "Moneda"
 
-#. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Instala aplicaciones"
+#~ msgid "Configuration Progress"
+#~ msgstr "Progreso de la configuración"
 
-#. module: base_setup
-#: help:base.setup.installer,crm:0
-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 "Marketing"
+#~ msgstr "Marketing"
 
-#. module: base_setup
-#: help:base.setup.installer,stock:0
-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 "Fed. State"
+#~ msgstr "Provincia"
 
-#. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Configuración básica"
+#~ msgid "Point of Sales"
+#~ msgstr "Terminal punto de venta"
 
-#. module: base_setup
-#: help:base.setup.installer,association:0
-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 "Your database is now created."
+#~ msgstr "Su base de datos ya está creada."
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-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 ""
+#~ "Le ayuda a gestionar sus necesidades contables. Si no es un contable, le "
+#~ "sugerimos instalar sólo la facturación. "
 
-#~ msgid "Point of Sales"
-#~ msgstr "Terminal punto de venta"
+#~ 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 ""
+#~ "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"
diff --git a/addons/base_setup/i18n/et.po b/addons/base_setup/i18n/et.po
index 178eceacde7..65958e2c6c9 100644
--- a/addons/base_setup/i18n/et.po
+++ b/addons/base_setup/i18n/et.po
@@ -6,499 +6,283 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-10-10 19:33+0000\n"
 "Last-Translator: Aare Vesi <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Linn"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Paigalda"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Arveldamine"
-
-#. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Inimressursid"
-
-#. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-post"
-
-#. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Pangakonto number"
-
-#. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Aruande jalus 1"
-
-#. module: base_setup
-#: help:base.setup.installer,mrp:0
-msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
+#: selection:product.installer,customers:0
+msgid "Create"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Seadistamise edenemine"
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Aruande jalus 2"
-
-#. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Valuuta"
-
-#. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Maakond"
-
-#. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Turundus"
-
-#. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Müügihaldus"
-
-#. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
+#: field:product.installer,customers:0
+msgid "Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefon"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "pealkiri"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Ettevõtte nimi"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:base.setup.terminology:0
 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"
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 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"
 
 #. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Riik"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Häälestus"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Postiindeks"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Alusta Seadistamist"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: help:user.preferences.config,context_lang:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: view:user.preferences.config:0
 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."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Ostuhaldus"
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Laohaldus"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Projektihaldus"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Uus andmebaas"
-
-#. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Kliendisuhete haldus"
-
-#. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
-"See lause ilmub sinu aruannetes paremal üleval nurgas.\n"
-"Me soovitame sul panna loosung siia:\n"
-"\"Avatud Lähtekoodiga Äritarkvara\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
-msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Aruande päis"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
+#: help:user.preferences.config,menu_tips:0
+msgid ""
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Pilt"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Toidutööstus"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Tootmine"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Teie logo - Kasutage suurust umbes 450x150 pikselit."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 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"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Tänav"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Baashäälestus"
-
-#. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
 
+#~ msgid "City"
+#~ msgstr "Linn"
+
 #~ msgid ""
 #~ "You can start configuring the system or connect directly to the database "
 #~ "using the default setup."
@@ -515,6 +299,9 @@ msgstr ""
 #~ 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üü."
@@ -531,12 +318,21 @@ msgstr ""
 #~ 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"
 
@@ -546,23 +342,132 @@ msgstr ""
 #~ 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 "Cancel"
 #~ msgstr "Loobu"
 
+#~ 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"
diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po
index 9f902b1a90e..56d300d82d0 100644
--- a/addons/base_setup/i18n/fa.po
+++ b/addons/base_setup/i18n/fa.po
@@ -7,497 +7,282 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2010-08-03 03:47+0000\n"
 "Last-Translator: avion <nat@sethack.com>\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: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "شهر"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "برپایی"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "ایمیل"
-
-#. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "پانویس گزارش ۱"
-
-#. module: base_setup
-#: help:base.setup.installer,mrp:0
-msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: selection:product.installer,customers:0
+msgid "Create"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: help:user.preferences.config,context_tz:0
 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
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "پانویس گزارش ۲"
-
-#. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "ارز"
-
-#. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+#: field:product.installer,customers:0
+msgid "Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "تلفن"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "نام شرکت"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:base.setup.terminology:0
 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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "کشور"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "سوارکردن"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "آغاز پیکربندی"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: help:user.preferences.config,context_lang:0
 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 ""
-
-#. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "نشان"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
+#: view:user.preferences.config:0
 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."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 msgstr ""
-"این جمله در گوشه بالا سمت راست گزارش‌های شما ظاهر خواهد شد.\n"
-"پیشنهاد می‌کنیم شعار خود را اینجا قرار دهید:\n"
-"\"راهکارهای بازمتن برای تجارت\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "سرنویس گزارش"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "نشان شما - اندازه تصویری ۱۵۰×۴۵۰ پیکسل را بکار برید."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 msgstr ""
-"این جمله در پایین گزارش‌های شما ظاهر خواهد شد.\n"
-"پیشنهاد می‌کنیم تا از عبارات قانونی در اینجا بکار ببرید:\n"
-"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "خیابان"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
 
-#. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "سوارکردن پایه"
-
-#. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr ""
+#~ msgid "City"
+#~ msgstr "شهر"
 
 #~ msgid ""
 #~ "You can start configuring the system or connect directly to the database "
@@ -515,6 +300,9 @@ msgstr ""
 #~ msgid "Report header"
 #~ msgstr "سرنویس گزارش"
 
+#~ msgid "Start Configuration"
+#~ msgstr "آغاز پیکربندی"
+
 #~ msgid ""
 #~ "You'll be able to install more modules later through the Administration menu."
 #~ msgstr ""
@@ -534,6 +322,9 @@ msgstr ""
 #~ msgid "Next"
 #~ msgstr "پس"
 
+#~ msgid "E-mail"
+#~ msgstr "ایمیل"
+
 #~ msgid "State"
 #~ msgstr "استان"
 
@@ -543,6 +334,12 @@ msgstr ""
 #~ msgid "Profile"
 #~ msgstr "پروفایل"
 
+#~ msgid "Report Footer 1"
+#~ msgstr "پانویس گزارش ۱"
+
+#~ msgid "Report Footer 2"
+#~ msgstr "پانویس گزارش ۲"
+
 #~ msgid "General Information"
 #~ msgstr "آگهگان عمومی"
 
@@ -552,20 +349,80 @@ 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 "Cancel"
 #~ msgstr "لغو"
 
+#~ msgid "Logo"
+#~ msgstr "نشان"
+
+#~ msgid "Base Setup"
+#~ msgstr "سوارکردن پایه"
+
 #~ msgid "Previous"
 #~ msgstr "پیش"
diff --git a/addons/base_setup/i18n/fi.po b/addons/base_setup/i18n/fi.po
index 967797046a5..bf05e578fb7 100644
--- a/addons/base_setup/i18n/fi.po
+++ b/addons/base_setup/i18n/fi.po
@@ -7,569 +7,349 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:49+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Kaupunki"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Asenna"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Laskutus"
-
-#. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Henkilöstön hallinta"
-
-#. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "Sähköposti"
-
-#. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Pankkitilin numero"
-
-#. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Lisätyökalut"
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Raportin alatunniste 1"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
-msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
 msgstr ""
-"Auttaa sinua hallitsemaan valmistusprosessia ja luomaan raportteja näistä "
-"prosesseista."
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "Auttaa sinua hallitsemaan markkinointikampanjoita vaihe vaiheelta."
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Tietokantasi on nyt luotu."
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Myyntipiste"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Assosiaatiot"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Auttaa sinua hoitamaan kirjanpidolliset tarpeet, jos et ole kirjanpitäjä, "
-"suosittelemme että asennat vain laskutuksen "
-
-#. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Seuraavat käyttäjät on asennettu: \n"
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Konfiguraation eteneminen"
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Raportin alatunniste 2"
-
-#. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Valuutta"
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Osavaltio"
-
-#. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Markkinointi"
-
-#. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Yritys"
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Myynninhallinta"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
-"Antaa sinun asentaa monia kiinnostavia mutta ei välttämättömiä työkaluja "
-"kuten kysely, lounas, idealaatikko."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Voit aloittaa järjestelmän konfiguroinnin suoraan tietokantaan pääkäyttäjänä."
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Kehittynyt raportointi"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Puhelin"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+"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 ""
-"Yritystietojasi käytetään personoimaan OpenERP dokumenttejä kuten laskuja, "
-"myyntitilauksia yms."
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "otsikko"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Osaamisenhallinta"
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
-"Asentaa esivalitun sarjan OpenERP ohjelmia, joka auttaa sinua hallitsemaan "
-"teollisuudenalaasi."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
 msgstr ""
-"Auttaa sinua hallitsemaan projektejasi ja tehtäviäsi seuraamalla niitä, "
-"luomalla suunnitelmia yms."
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Yrityksen nimi"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Ohita asetusvelhot"
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
-"Auttaa sinua hallitsemaan henkilöstöresurssejasi määrittelemällä "
-"henkilöstörakenteen, luomalla työlistat, seuraamalla läsnäoloa jne."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
 msgstr ""
-"Mahdollistaa laskujen laadinnan ja maksujen seurannan. On helpompi versio "
-"kirjanpitomoduulista päälliköille jotka eivät ole kirjanpitäjiä."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Auttaa sinua hallitsemaan ostoon liittyviä prosesseja kuten esim. "
-"tarjouspyyntöjä, toimittajien laskuja yms."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:base.setup.terminology:0
 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"
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Katuosoite 2"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Maa"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Asetukset"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Kirjanpito ja talous"
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Huutokauppatalot"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Postinumero"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Aloita konfigurointi"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
-"Mahdollistaa lisäosien asentamisen, näiden tarkoituksena on tiedonjako "
-"henkilöstön kanssa ja henkilöstön kesken."
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: help:user.preferences.config,context_lang:0
 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."
+"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 ""
-"Valitse ohjelmat jotka haluat kuuluvan järjestelmääsi. Jos et ole varma "
-"tarpeistasi vielä, voit lisätä niitä helposti myöhemminkin."
-
-#. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Yrityksen konfigurointi"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
 
 #. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
+#: view:user.preferences.config:0
 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."
+"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 ""
-"Auttaa sinua saamaan mahdollisimman paljon tulosta myyntipisteestäsi "
-"käyttäen nopeaa myynnin kirjausta, yksinkertaistettua maksunkoodausta, "
-"automaattista keräilylistan luontia jne."
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Ostojen hallinta"
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr "Auttaa sinua hallitsemaan tarjouksia, myyntitilauksia ja laskuja"
-
-#. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Varastonhallinta"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Projektinhallinta"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Asennetut käyttäjät"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Uusi tietokanta"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Asiakkuuden hallinta"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
-"Asentaa esivalitun ryhmän OpenERP ohjelmia auttaakseen hallitsemaan "
-"huutokauppojasi ja niihin liittyviä bisnes prosesseja."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 msgstr ""
-"Tämä lause tulee raporttien oikeaan ylänurkkaan.\n"
-"Suosittelemme laittamaan iskulauseesi tähän:\n"
-"\"Avoimen lähdekoodin yritysratkaisuja\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Mahdollistaa lisätyökalujen asentamiksen OpenERP raporttien luomisen "
-"helpottamiseksi."
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Raportin ylätunniste"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Tietoja uudesta tietokannastasi"
 
 #. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Kuva"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Ruokateollisuus"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Valmistava"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Logo - Käytä kokoa noin 450x150 pikseliä."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 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"
-
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Yrityksen nettisivut"
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Asenna tietyn toimialan ohjelmistot"
-
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Katuosoite"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Määrittele yrityksesi tiedot"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "esim. http://openerp.com"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Asenna ohjelmat"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 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."
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
-"Auttaa sinua hallitsemaan varastoa ja varaston päätoimenpiteitä, "
-"toimitusmääräyksiä, vastaanottoja yms."
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Perusasetukset"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
-"Asentaa perussarjan OpenERP ohjelmia jotka auttavat sinua hallitsemaan "
-"yhdistystäsi tehokkaammin."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
 
 #~ 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 "Cancel"
 #~ msgstr "Peruuta"
 
+#~ 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 "
@@ -591,6 +371,9 @@ msgstr ""
 #~ "You'll be able to install more modules later through the Administration menu."
 #~ msgstr "Voit asentaa myöhemmin lisää moduuleja Hallinto-valikon kautta."
 
+#~ msgid "Start Configuration"
+#~ msgstr "Aloita konfigurointi"
+
 #~ msgid "State"
 #~ msgstr "Osavaltio"
 
@@ -603,8 +386,286 @@ msgstr ""
 #~ msgid "Use Directly"
 #~ msgstr "Käytä suoraan"
 
+#~ msgid "Street"
+#~ msgstr "Katuosoite"
+
+#~ 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\"."
+
+#~ 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 ""
+#~ "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"
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index 92e683590f3..2b4d527a37d 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/i18n/fr.po
@@ -6,554 +6,282 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:49+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Ville"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Installer"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Facturation"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Ressources humaines"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "Courriel"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "N° de compte bancaire"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Outils supplémentaires"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Pied de page 1 de rapport"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Vous aide à gérer vos processus de fabrication et à générer des rapports sur "
-"ces processus."
-
-#. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "Vous aide à gérer vos campagnes marketing pas à pas"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Votre base de données est maintenant créée."
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Point de vente"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Associations"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Vous aide à gérer vos besoins comptables. Si vous n'êtes pas comptable, nous "
-"vous suggérons d'installer uniquement la facturation. "
-
-#. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Les utilisateurs suivants ont été installés : \n"
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Avancement de la configuration"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Pied de page 2 de rapport"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Devise"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "État fédéral"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marketing"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Société"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Gestion des ventes"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 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."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Vous pouvez commencer à configurer le système, ou vous connecter directement "
-"à la base de données en tant qu'administrateur."
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Rapports avancés"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Téléphone"
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
-"La description de votre société personnalisera les documents générés par "
-"OpenERP (factures, bons de commande, etc.)"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "titre"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Gestion des connaissances"
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Installe un ensemble d'applications d'OpenERP pré-sélectionnées qui vont "
-"vous aider à gérer votre industrie."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Vous aide à gérer vos projets et tâches, en assurant leur suivi, en générant "
-"des plannings, etc..."
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Nom de la société"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Passer l'étape des assistants de configuration"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 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.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 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."
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
-"Vous aide à gérer vos processus d'achats, tels que les appels d'offres, les "
-"factures fournisseurs, etc..."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: help:user.preferences.config,context_lang:0
 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"
+"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 ""
-"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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Rue 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Pays"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Installation"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Comptabilité & finance"
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Maisons de ventes aux enchères"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Code postal"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Commencer la configuration"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: view:user.preferences.config:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
-"Vous permet d'installer des extensions visant le partage des connaissances "
-"entre les employés."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 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."
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Configuration de la société"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 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."
-
-#. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Gestion des achats"
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr "Vous aide à gérer vos devis, commandes et factures"
-
-#. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Gestion d'entrepôts"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Gestion de projets"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Utilisateurs installés"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Nouvelle base de données"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Gestion de la relation client (CRM)"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 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."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Vous permet d'installer différents outils destinés à simplifier et à "
-"améliorer la création de rapports dans OpenERP."
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "En-tête de rapport"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Informations sur la nouvelle base de données"
 
 #. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Image"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Industrie agroalimentaire"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Gestion de production"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Votre logo - Utilisez une taille approximative de 450x150 pixels."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 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"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Site web de la société"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Installez des applications spécifiques"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Rue"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Configurez les informations de la société"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Exemple : http://openerp.com"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Installez les applications"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 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."
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
-"Vous aide à gérer votre inventaire et les principales opérations de stocks : "
-"bon de livraison, réceptions, etc..."
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Module pour la configuration de base"
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
-"Installe un ensemble d'applications OpenERP présélectionnées pour vous aider "
-"à gérer efficacement votre association."
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#~ msgid "City"
+#~ msgstr "Ville"
 
 #~ msgid ""
 #~ "You can start configuring the system or connect directly to the database "
@@ -571,6 +299,9 @@ msgstr "base.setup.config"
 #~ 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 ""
@@ -599,6 +330,12 @@ msgstr "base.setup.config"
 #~ 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"
 
@@ -608,23 +345,373 @@ msgstr "base.setup.config"
 #~ 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 "Cancel"
 #~ msgstr "Annuler"
 
+#~ 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."
+
+#~ 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."
+
+#~ 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..."
+
+#~ msgid "Company Configuration"
+#~ msgstr "Configuration de la société"
+
+#~ msgid "base.setup.installer"
+#~ msgstr "base.setup.installer"
+
+#~ msgid "Zip Code"
+#~ msgstr "Code postal"
+
+#~ msgid "Purchase Management"
+#~ msgstr "Gestion des achats"
+
+#~ msgid "New Database"
+#~ msgstr "Nouvelle base de données"
+
+#~ 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 "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"
diff --git a/addons/base_setup/i18n/gl.po b/addons/base_setup/i18n/gl.po
index a92e4b42916..97de6094137 100644
--- a/addons/base_setup/i18n/gl.po
+++ b/addons/base_setup/i18n/gl.po
@@ -7,501 +7,286 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2009-09-08 15:27+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Cidade"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Instalar"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "Correo-e"
-
-#. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Pé de páxina 1 do informe"
-
-#. module: base_setup
-#: help:base.setup.installer,mrp:0
-msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: selection:product.installer,customers:0
+msgid "Create"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: help:user.preferences.config,context_tz:0
 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
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Pé de páxina 2 do informe"
-
-#. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Moeda"
-
-#. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+#: field:product.installer,customers:0
+msgid "Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Teléfono"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Nome da compañía"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:base.setup.terminology:0
 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"
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 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"
 
 #. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "País"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Configuración"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Comezar configuración"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: help:user.preferences.config,context_lang:0
 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 ""
-
-#. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logotipo"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
+#: view:user.preferences.config:0
 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
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: 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.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Título do informe"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "O seu logotipo - Use unha imaxe que teña sobre 450x150 píxels."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 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"
-
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Rúa"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Instalación base"
-
-#. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
 
 #~ msgid "Next"
 #~ msgstr "Seguinte"
 
+#~ msgid "E-mail"
+#~ msgstr "Correo-e"
+
 #~ msgid "Report header"
 #~ msgstr "Título do informe"
 
@@ -515,12 +300,18 @@ 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"
 
@@ -530,9 +321,18 @@ msgstr ""
 #~ 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"
 
@@ -545,9 +345,54 @@ msgstr ""
 #~ 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"
 
@@ -557,6 +402,18 @@ msgstr ""
 #~ msgid "Cancel"
 #~ msgstr "Cancelar"
 
+#~ 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"
+
 #~ msgid "Installation Done"
 #~ msgstr "Instalación concluída"
 
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index e65d8d9141c..c059b73bb1d 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.po
@@ -6,508 +6,308 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2010-06-06 23:31+0000\n"
 "Last-Translator: Drazen Bosak <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 "Language: hr\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Grad"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Instaliraj"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-Mail"
-
-#. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Podnožje Izvještaja 1"
-
-#. module: base_setup
-#: help:base.setup.installer,mrp:0
-msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
+#: selection:product.installer,customers:0
+msgid "Create"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: help:user.preferences.config,context_tz:0
 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
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Podnožje Izvještaja 2"
-
-#. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Valuta"
-
-#. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+#: field:product.installer,customers:0
+msgid "Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefon"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Ime Tvrtke"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:base.setup.terminology:0
 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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Država"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Postava"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Započnite Konfiguriranje"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: help:user.preferences.config,context_lang:0
 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 ""
-
-#. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
+#: view:user.preferences.config:0
 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
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: 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.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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\""
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Zaglavlje Izvještaja"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Vaš Logo: Koristite veličinu slike od cca. 450x150 pixela."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 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"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Ulica"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
 
-#. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Osnovni Postav"
-
-#. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
-msgstr ""
+#~ msgid "Currency"
+#~ msgstr "Valuta"
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr ""
+#~ msgid "Install"
+#~ msgstr "Instaliraj"
 
 #~ msgid "Cancel"
 #~ msgstr "Odustani"
 
+#~ 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."
@@ -524,6 +324,9 @@ msgstr ""
 #~ 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 ""
@@ -541,12 +344,21 @@ msgstr ""
 #~ 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"
 
@@ -556,14 +368,59 @@ msgstr ""
 #~ 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"
diff --git a/addons/base_setup/i18n/hu.po b/addons/base_setup/i18n/hu.po
index de41cc5a5b4..33d20fc9c67 100644
--- a/addons/base_setup/i18n/hu.po
+++ b/addons/base_setup/i18n/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:54+0000\n"
 "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
 "<openerp@novotrade.hu>\n"
@@ -14,547 +14,634 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Város"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Telepítés"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Számlázás"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Humán Erőforrás"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-mail"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Bankszámlaszám"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "További eszközök"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Jelentés lábléc 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Segít Önnek a gyártási folyamatok kezelésében és az azokhoz tartozó "
-"jelentések létrehozásában."
-
-#. module: base_setup
-#: help:base.setup.installer,marketing:0
-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."
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Az Ön adatbázisa létrejött."
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Pénztárgép működés"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Egyesületek"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Segít Önnek a könyvelésben, de ha Ön nem könyvelő, azt javasoljuk, hogy csak "
-"a Számlázást telepítse. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "A következő felhasználók lettek létrehozva : \n"
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Beállítás előrehaladása"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Jelentés lábléc 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Pénznem"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Szövetségi állam"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marketing"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Vállalat"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Értékesítés kezelés"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 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."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Elkezdheti a rendszer konfigurálását vagy közvetlenül kapcsolódhat az "
-"adatbázishoz rendszergazdaként."
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Haladó jelentés"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefon"
-
-#. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 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."
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "Pozíció"
 
 #. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Tudáskezelés"
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
+#: view:base.setup.terminology:0
 msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 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."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 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..."
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Vállalat neve"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Beállítási lépések kihagyása"
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,context_lang:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
-"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."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
+#: view:user.preferences.config:0
 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."
+"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 ""
-"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."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 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..."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
-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"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 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"
 
 #. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Utca 2"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Ország"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Beállítás"
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Könyvelés és pénzügy"
+#: help:user.preferences.config,menu_tips:0
+msgid ""
+"Check out this box if you want to always display tips on each menu action"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Aukciós házak"
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
+msgid "Image"
+msgstr "Kép"
 
 #. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Irányítószám"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Konfigurálás indítása"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 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."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 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."
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Cég testreszabás"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Embléma"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 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..."
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Beszerzés kezelés"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
-"Segít Önnek az árajánlatok, a vevői megrendelések és a számlázás kezelésében."
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Raktár kezelés"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
+msgstr ""
 
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Projekt kezelés"
+#~ msgid "City"
+#~ msgstr "Város"
 
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Telepített felhasználók"
+#~ msgid "Invoicing"
+#~ msgstr "Számlázás"
 
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Új adatbázis"
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
 
-#. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Ügyfélkapcsolat kezelés"
+#~ msgid "Bank Account No"
+#~ msgstr "Bankszámlaszám"
 
-#. module: base_setup
-#: help:base.setup.installer,auction:0
-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 "Currency"
+#~ msgstr "Pénznem"
 
-#. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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 "Marketing"
+#~ msgstr "Marketing"
 
-#. module: base_setup
-#: help:base.setup.installer,report_designer:0
-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 "Advanced Reporting"
+#~ msgstr "Haladó jelentés"
 
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Jelentés fejléc"
+#~ msgid "Phone"
+#~ msgstr "Telefon"
 
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Információk az Ön új adatbázisáról"
+#~ msgid "base.setup.installer"
+#~ msgstr "base.setup.installer"
 
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
-msgid "Image"
-msgstr "Kép"
+#~ msgid "Country"
+#~ msgstr "Ország"
 
-#. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Élelmiszeripar"
+#~ msgid "Auction Houses"
+#~ msgstr "Aukciós házak"
 
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Gyártás"
+#~ msgid "Zip Code"
+#~ msgstr "Irányítószám"
 
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Az Ön logója - használható méret kb. 450x150 pixel"
+#~ msgid "New Database"
+#~ msgstr "Új adatbázis"
 
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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 "Information about your new database"
+#~ msgstr "Információk az Ön új adatbázisáról"
 
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Vállalat weboldala"
+#~ msgid "Food Industry"
+#~ msgstr "Élelmiszeripar"
 
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Különböző profilú cégekhez kialakított modulok telepítése"
+#~ msgid "Manufacturing"
+#~ msgstr "Gyártás"
 
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Utca"
+#~ msgid "Street"
+#~ msgstr "Utca"
 
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Adja meg a cégének az adatait"
+#~ msgid "base.setup.company"
+#~ msgstr "base.setup.company"
 
-#. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Például: http://openerp.com"
+#~ msgid "Example: http://openerp.com"
+#~ msgstr "Például: http://openerp.com"
 
-#. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Alkalmazások telepítése"
+#~ msgid "Install Applications"
+#~ msgstr "Alkalmazások telepítése"
 
-#. module: base_setup
-#: help:base.setup.installer,crm:0
-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 "base.setup.config"
+#~ msgstr "base.setup.config"
 
-#. module: base_setup
-#: help:base.setup.installer,stock:0
-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 "Install"
+#~ msgstr "Telepítés"
 
-#. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Alapbeállítás"
+#~ msgid "Human Resources"
+#~ msgstr "Humán Erőforrás"
 
-#. module: base_setup
-#: help:base.setup.installer,association:0
-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 "Report Footer 1"
+#~ msgstr "Jelentés lábléc 1"
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#~ msgid "Report Footer 2"
+#~ msgstr "Jelentés lábléc 2"
+
+#~ msgid "Fed. State"
+#~ msgstr "Szövetségi állam"
+
+#~ msgid "Company"
+#~ msgstr "Vállalat"
+
+#~ msgid "title"
+#~ msgstr "Pozíció"
+
+#~ msgid "Company Name"
+#~ msgstr "Vállalat neve"
+
+#~ msgid "Street 2"
+#~ msgstr "Utca 2"
+
+#~ msgid "Setup"
+#~ msgstr "Beállítás"
+
+#~ msgid "Accounting & Finance"
+#~ msgstr "Könyvelés és pénzügy"
+
+#~ msgid "Start Configuration"
+#~ msgstr "Konfigurálás indítása"
+
+#~ 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."
diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po
index 660100f151c..424bb00afab 100644
--- a/addons/base_setup/i18n/id.po
+++ b/addons/base_setup/i18n/id.po
@@ -6,511 +6,352 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2010-05-28 02:39+0000\n"
 "Last-Translator: Abdul Munif Hanafi <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Kota"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Instal"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Penagihan"
-
-#. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Sumber Daya Manusia"
-
-#. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-mail"
-
-#. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "No Rekening Bank"
-
-#. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Tools Extra"
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Judul Bawah 1"
-
-#. module: base_setup
-#: help:base.setup.installer,mrp:0
-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."
-
-#. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "Untuk memandu Anda langkah demi langkah dalam kampanye pemasaran."
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
-msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+#: selection:product.installer,customers:0
+msgid "Create"
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,profile_tools:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telepon"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
+#: field:product.installer,customers:0
+msgid "Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Nama Perusahaan"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
-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"
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Negara"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Atur"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
+#: view:base.setup.terminology:0
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: help:user.preferences.config,context_lang:0
 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 ""
-
-#. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Lambang"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
+#: view:user.preferences.config:0
 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."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,report_designer:0
-msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Jalan"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 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 "Cancel"
 #~ msgstr "Batal"
+
+#~ 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"
diff --git a/addons/base_setup/i18n/it.po b/addons/base_setup/i18n/it.po
index 61b01d6a487..a67182b2ea2 100644
--- a/addons/base_setup/i18n/it.po
+++ b/addons/base_setup/i18n/it.po
@@ -6,555 +6,291 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:49+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Città"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Installa"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Fatturazione"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Risorse Umane"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-mail"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Conto Banca n."
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Strumenti extra"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Report - Piè di Pagina 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Aiuta a gestire i processi di produzione ed a generare i report di questi "
-"processi."
-
-#. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "Aiuta a gestire passo passo la campagne di marketing."
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Il nuovo database è creato."
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Punto vendita"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Associazioni"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Aiuta a gestire le necessità contabili, se non si è un contabile, suggeriamo "
-"di installare solo la fatturazione "
-
-#. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "I seguenti utenti sono stati installati: \n"
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Avanzamento Configurazione"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Report - Piè di Pagina 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Valuta"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Stato fed."
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marketing"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Azienda"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Gestione Vendite"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Vi permette di installare vari, interessanti ma non essenziali, strumenti "
-"per gestire: Sondaggio, Pranzo e cassetto delle idee."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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' possibile iniziare a configurare il sistema oppure connetterti "
-"direttamente al database come amministratore."
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Reporting Avanzato"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefono"
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "Copy text   \t res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
-"Le informazioni relative alla vostra azienda verranno utilizzate per "
-"personalizzare documenti che riguardano OpenERP, come: fatture, ordini di "
-"vendita e altri ancora."
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "titolo"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Gestione conoscenze"
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Installa un preselezionato set di applicazioni OpenERP che aiuterà nella "
-"gestione della vostra industria."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Aiuta a gestire i progetti e le attività attraverso il loro tracciamento, "
-"pianificazione, ecc..."
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Nome Azienda"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Salta Wizard di configurazione"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
-"Aiuta a gestire le risorse umane codificando la struttura dei dipendenti, "
-"generando fogli di lavoro, tracciando le presenze e altro."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 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."
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
-"Aiuta a gestire i processi legati agli acquisti come le richieste di "
-"preventivo, le fatture fornitore, ecc..."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: help:user.preferences.config,context_lang:0
 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"
+"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 ""
-"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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Via (2)"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Nazione"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Configurazione"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Contabilità & Finanza"
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Case d'Asta"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "CAP"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Inizia Configurazione"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: view:user.preferences.config:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
-"Consente di installare addons orientati verso la condivisione della "
-"conoscenza con e tra i vostri dipendenti."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 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."
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Configurazione azienda"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 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."
-
-#. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Gestione Acquisti"
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
-"Aiuta a gestire i preventivi, gli ordini di vendita e la fatturazione."
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Gestione Magazzino"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Gestione progetti"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Utenti installati"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Nuovo Database"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Gestione dei rapporti con i clienti"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 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."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Permette di installare una serie di strumenti per semplificare e potenziare "
-"la creazione dei report in OpenERP"
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Report - Intestazione"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Informazioni ralative al nuovo database"
 
 #. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Immagine"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Industria alimentare"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Produzione"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Il tuo Logo - Usare una dimensione di circa 450x150 pixel"
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 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"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Sito internet aziendale"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Installa applicazioni specifiche per l'industria"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Indirizzo"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Configura le informazioni della vostra azienda"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Esempio: http://openerp.com"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Installa applicazioni"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 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."
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
-"Aiuta a gestire l'inventario e le operazioni principali di magazzino: ordini "
-"di consegna, di ricezione, ecc..."
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Configurazione di base"
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
-"Installa un gruppo prestabilito di applicazioni OpenERP che permetterà di "
-"gestire l'associazione in maniera più efficiente."
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#~ 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 "
@@ -572,6 +308,9 @@ msgstr "base.setup.config"
 #~ 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 ""
@@ -591,6 +330,9 @@ msgstr "base.setup.config"
 #~ msgid "Next"
 #~ msgstr "Avanti"
 
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
 #~ msgid "State"
 #~ msgstr "Stato"
 
@@ -600,6 +342,12 @@ msgstr "base.setup.config"
 #~ 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"
 
@@ -609,23 +357,362 @@ msgstr "base.setup.config"
 #~ msgid "Report Information"
 #~ msgstr "Informazion Report"
 
+#~ 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 "Cancel"
 #~ msgstr "Annulla"
 
+#~ 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..."
+
+#~ 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"
+
+#~ msgid "base.setup.installer"
+#~ msgstr "base.setup.installer"
+
+#~ msgid "Zip Code"
+#~ msgstr "CAP"
+
+#~ msgid "Accounting & Finance"
+#~ msgstr "Contabilità & Finanza"
+
+#~ msgid "Installed Users"
+#~ msgstr "Utenti installati"
+
+#~ msgid "Food Industry"
+#~ msgstr "Industria alimentare"
+
+#~ msgid "base.setup.company"
+#~ msgstr "base.setup.company"
+
+#~ 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 "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."
diff --git a/addons/base_setup/i18n/ko.po b/addons/base_setup/i18n/ko.po
index f708a4785e8..ab39dbdcc15 100644
--- a/addons/base_setup/i18n/ko.po
+++ b/addons/base_setup/i18n/ko.po
@@ -7,493 +7,278 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2009-09-08 12:19+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.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: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "시/군"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "설치"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "이메일"
-
-#. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "리포트 푸터 1"
-
-#. module: base_setup
-#: help:base.setup.installer,mrp:0
-msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: selection:product.installer,customers:0
+msgid "Create"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: help:user.preferences.config,context_tz:0
 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
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "리포트 푸터 2"
-
-#. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "통화"
-
-#. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+#: field:product.installer,customers:0
+msgid "Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "전화"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "회사 이름"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:base.setup.terminology:0
 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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "국가"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "셋업"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "구성 시작"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: help:user.preferences.config,context_lang:0
 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 ""
-
-#. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "로고"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
+#: view:user.preferences.config:0
 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."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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 "이 문장은 귀하의 리포트 상단에 표시됩니다."
-
-#. module: base_setup
-#: help:base.setup.installer,report_designer:0
-msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "리포트 헤더"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "귀하의 로고 - 대략 450x150 픽셀 사이즈를 이용하십시오."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 msgstr ""
-"이 문장은 귀하의 리포트 하단에 표시됩니다. \n"
-"귀하의 법적 문구를 여기에 작성하십시오. \n"
-"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "도로명"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
-msgstr ""
-
-#. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "베이스 셋업"
-
-#. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
 
 #~ msgid ""
@@ -507,6 +292,12 @@ msgstr ""
 #~ msgid "Next"
 #~ msgstr "다음"
 
+#~ msgid "E-mail"
+#~ msgstr "이메일"
+
+#~ msgid "Start Configuration"
+#~ msgstr "구성 시작"
+
 #~ msgid "Report header"
 #~ msgstr "리포트 헤더"
 
@@ -518,6 +309,9 @@ msgstr ""
 #~ "using the default setup."
 #~ msgstr "시스템 구성을 시작하거나, 디폴트 셋업을 이용하여 데이터베이스에 바로 접속할 수 있습니다."
 
+#~ msgid "City"
+#~ msgstr "시/군"
+
 #~ msgid ""
 #~ "You'll be able to install more modules later through the Administration menu."
 #~ msgstr "나중에 관리 패널을 이용하여 모듈들을 추가할 수 있습니다."
@@ -531,12 +325,21 @@ 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 "리포트 정보"
 
@@ -546,17 +349,71 @@ 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 "Cancel"
 #~ msgstr "취소"
+
+#~ msgid "Currency"
+#~ msgstr "통화"
+
+#~ msgid "Your Logo - Use a size of about 450x150 pixels."
+#~ msgstr "귀하의 로고 - 대략 450x150 픽셀 사이즈를 이용하십시오."
+
+#~ msgid "Logo"
+#~ msgstr "로고"
diff --git a/addons/base_setup/i18n/lt.po b/addons/base_setup/i18n/lt.po
index 73e3011abea..3a53ecbeebb 100644
--- a/addons/base_setup/i18n/lt.po
+++ b/addons/base_setup/i18n/lt.po
@@ -6,487 +6,278 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2009-12-15 18:45+0000\n"
-"Last-Translator: Donatas Stonys TeraxIT <donatelonow@hotmail.com>\n"
+"Last-Translator: Donatas Stonys Blue Whale SEO <donatelonow@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Miestas"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "El. paštas"
-
-#. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
+#: selection:product.installer,customers:0
+msgid "Create"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,account_accountant:0
-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
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
+#: field:product.installer,customers:0
+msgid "Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:base.setup.terminology:0
 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 ""
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Pradėti konfigūravimą"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: help:user.preferences.config,context_lang:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: view:user.preferences.config:0
 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."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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 ""
-
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
 
 #~ msgid ""
@@ -500,6 +291,9 @@ msgstr ""
 #~ msgid "Next"
 #~ msgstr "Toliau"
 
+#~ msgid "E-mail"
+#~ msgstr "El. paštas"
+
 #~ msgid "Report header"
 #~ msgstr "Pranešimo antraštė"
 
@@ -510,10 +304,16 @@ 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ą"
+
 #~ msgid "Zip code"
 #~ msgstr "Pašto kodas"
 
diff --git a/addons/base_setup/i18n/lv.po b/addons/base_setup/i18n/lv.po
index 003c661d82a..5d6baf736da 100644
--- a/addons/base_setup/i18n/lv.po
+++ b/addons/base_setup/i18n/lv.po
@@ -7,485 +7,336 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2010-11-30 14:24+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Pilsēta"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Personāla Vadība"
-
-#. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-pasts"
-
-#. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Bankas konta numurs"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
+#: selection:product.installer,customers:0
+msgid "Create"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
-msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: help:user.preferences.config,context_tz:0
+msgid ""
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
+#: field:product.installer,customers:0
+msgid "Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Konfigurācijas Progress"
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Valūta"
-
-#. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Uzņēmums"
-
-#. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Tālrunis"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
+#: help:user.preferences.config,view:0
+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 ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
+#: view:base.setup.terminology:0
 msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Uzņēmuma nosaukums"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,context_lang:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
+#: view:user.preferences.config:0
 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."
+"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 ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
-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"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Valsts"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Finanses un Grāmatvedība"
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Izsoļu nami"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Pasta indekss"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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 ""
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
+msgid "Image"
+msgstr "Attēls"
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logotips"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Projektu Vadība"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
 
-#. module: base_setup
-#: help:base.setup.installer,report_designer:0
-msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
-msgstr ""
+#~ msgid "City"
+#~ msgstr "Pilsēta"
 
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr ""
+#~ msgid "E-mail"
+#~ msgstr "E-pasts"
 
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr ""
+#~ msgid "Bank Account No"
+#~ msgstr "Bankas konta numurs"
 
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
-msgid "Image"
-msgstr "Attēls"
+#~ msgid "Company Name"
+#~ msgstr "Uzņēmuma nosaukums"
 
-#. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr ""
+#~ msgid "Currency"
+#~ msgstr "Valūta"
 
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Ražošana"
+#~ msgid "Configuration Progress"
+#~ msgstr "Konfigurācijas Progress"
 
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Jūsu Logo - Izmēram jābūt apt. 450x150 pikseļi."
+#~ msgid "Phone"
+#~ msgstr "Tālrunis"
 
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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 ""
+#~ msgid "Company"
+#~ msgstr "Uzņēmums"
 
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Uzņēmuma mājaslapa"
+#~ msgid "Human Resources"
+#~ msgstr "Personāla Vadība"
 
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr ""
+#~ msgid "Zip Code"
+#~ msgstr "Pasta indekss"
 
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Iela"
+#~ msgid "Auction Houses"
+#~ msgstr "Izsoļu nami"
 
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr ""
+#~ msgid "Accounting & Finance"
+#~ msgstr "Finanses un Grāmatvedība"
 
-#. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Piemērs: http://www.openerp.lv"
+#~ msgid "Country"
+#~ msgstr "Valsts"
 
-#. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr ""
+#~ msgid "Logo"
+#~ msgstr "Logotips"
 
-#. module: base_setup
-#: help:base.setup.installer,crm:0
-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 "Project Management"
+#~ msgstr "Projektu Vadība"
 
-#. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
-msgstr ""
+#~ msgid "Manufacturing"
+#~ msgstr "Ražošana"
 
-#. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr ""
+#~ msgid "Your Logo - Use a size of about 450x150 pixels."
+#~ msgstr "Jūsu Logo - Izmēram jābūt apt. 450x150 pikseļi."
 
-#. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
-msgstr ""
+#~ msgid "Company Website"
+#~ msgstr "Uzņēmuma mājaslapa"
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr ""
+#~ msgid "Example: http://openerp.com"
+#~ msgstr "Piemērs: http://www.openerp.lv"
+
+#~ msgid "Street"
+#~ msgstr "Iela"
diff --git a/addons/base_setup/i18n/mn.po b/addons/base_setup/i18n/mn.po
index 3c15f553bf2..fa3dc96a3e8 100644
--- a/addons/base_setup/i18n/mn.po
+++ b/addons/base_setup/i18n/mn.po
@@ -7,507 +7,295 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:43+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Сум/Дүүрэг"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Суулгах"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Нэхэмжлэл"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Хүний нөөц"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "Э-мэйл"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Банкны дансны дугаар"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Нэмэлт багаж"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Тайлангийн хөл 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Үйлдвэрлэлийн үйл ажиллагааг удирдах, тэдгээр үйл ажиллагааны тайлан "
-"үүсгэхэд туслана."
-
-#. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "Маркетингийн үйл ажиллагааг удирдахад алхам алхамаар туслана."
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Таний өгөгдлийн сан үүсгэгдсэн."
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Борлуулалтын цэг"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Нийгэмлэг"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Дараагийн хэрэглэгчийн суулгасан байх : \n"
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Тохиргооны явц"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Тайлангийн хөл 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Валют"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Аймаг/Хот"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Маркетинг"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Компани"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Борлуулалтын менежмент"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Асуулга, Үдийн зоог болон Саналын хайрцаг гэх мэт шаардлагатай бус боловч "
-"олон сонирхолтой хэрэгслүүдийг суулгана."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Та системд тохиргоо хийх юмуу эсвэл өгөгдмөл тохиргоог ашиглан баазруу шууд "
-"холболт хийж болно."
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Дээд төвшний тайлан"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Утас"
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "гарчиг"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Баримтын менежмент"
-
-#. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
-msgstr "Таны үйлдвэрлэлд тус болох OpenERP цогц аппликэшнүүдийг суулгана."
-
-#. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Компаний нэр"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Тохиргооны визардыг алгасах"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
-
-#. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
-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"
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
-"Энэ өгүүлбэр таны тайлангийн доод хэсэгт харагдана.\n"
-"Банкны мэдээлэл ээ энд оруулана уу:\n"
-"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Гудамж 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Улс"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Тохируулах"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Санхүү"
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Үнэ хаялцах худалдаа"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Зип код"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Тохиргоо эхлэх"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: help:user.preferences.config,context_lang:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: view:user.preferences.config:0
 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."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Компаний тохиоргоо"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Лого"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Худалдан авалтын менежмент"
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Агуулахын менежмент"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Төслийн менежмент"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Суулгагдсан хэрэглэгч"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Шинэ өгөгдлийн сан"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Үйлчлүүлэгчтэй харилцах менежмент"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: 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.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 msgstr ""
-"Энэ өгүүлбэр таны тайлангийн баруун дээд буланд харагдана.\n"
-"Уриагаа энд байрлуулахыг зөвлөж байна:\n"
-"\"Нээлттэй Эхийн Бизнес Шийдэл\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Тайлангийн толгой"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Таний шинэ өгөгдлийн сангийн мэдээлэл"
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Зураг"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Хоол үйлдвэрлэл"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Үйлдвэрлэх"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Таний лого - Хэмжээ нь 450x150 пиксел байна."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
-"Энэ өгүүлбэр таны тайлангийн доод хэсэгт харагдана.\n"
-"Албан ёсны мэдээлэл ээ энд оруулна уу:\n"
-"Вэб: http://openerp.com - Факс: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Компаний Вэбсайт"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Гудамж"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Жишээ нь: http://openerp.com"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Хэрэглээний програм суулгах"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Үндсэн тохируулга"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
+msgstr ""
 
 #~ msgid "State"
 #~ msgstr "Төлөв"
 
+#~ msgid "Phone"
+#~ msgstr "Утас"
+
+#~ msgid "Country"
+#~ msgstr "Улс"
+
+#~ msgid "Currency"
+#~ msgstr "Валют"
+
+#~ msgid "Logo"
+#~ msgstr "Лого"
+
 #~ msgid "Zip code"
 #~ msgstr "Зип код"
 
@@ -538,12 +326,21 @@ msgstr "base.setup.config"
 #~ msgid "Summary"
 #~ msgstr "Дүгнэлт"
 
+#~ msgid "Install"
+#~ msgstr "Суулгах"
+
 #~ msgid "Installation Done"
 #~ msgstr "Суулгагдсан"
 
+#~ msgid "Street"
+#~ msgstr "Гудамж"
+
 #~ msgid "Cancel"
 #~ msgstr "Цуцлах"
 
+#~ msgid "Base Setup"
+#~ msgstr "Үндсэн тохируулга"
+
 #~ msgid "Previous"
 #~ msgstr "Өмнөх"
 
@@ -563,6 +360,15 @@ msgstr "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 ""
+#~ "Энэ өгүүлбэр таны тайлангийн баруун дээд буланд харагдана.\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."
@@ -571,8 +377,191 @@ msgstr "base.setup.config"
 #~ "байрлуулдаг. Эдгээр хувийн тохиргоонууд нь 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 "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 ""
+#~ "Асуулга, Үдийн зоог болон Саналын хайрцаг гэх мэт шаардлагатай бус боловч "
+#~ "олон сонирхолтой хэрэгслүүдийг суулгана."
+
+#~ msgid "Auction Houses"
+#~ msgstr "Үнэ хаялцах худалдаа"
diff --git a/addons/base_setup/i18n/nb.po b/addons/base_setup/i18n/nb.po
index 550fb9d10c3..58d9dc9d81e 100644
--- a/addons/base_setup/i18n/nb.po
+++ b/addons/base_setup/i18n/nb.po
@@ -7,551 +7,638 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:48+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "By"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Installer"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Fakturering"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Menneskelige Ressurser"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-post"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Bankkonto Nr"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Ekstra Verktøy"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Rapport Bunntekst 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Hjelper deg med å administrere dine produksjons prosesser og generere "
-"rapporter på disse prosessene."
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
-"Hjelper deg med å administrere dine markedsførings kampanjer trinn for trinn."
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Din database er nå opprettet."
-
-#. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Utsalgssted"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Assosiasjoner"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Hjelper deg med å håndtere dine regnskaps behov, dersom du ikke er "
-"regnskapsfører, anbefaler vi at du kun installerer Fakturering "
-
-#. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Følgende brukere er blitt installert: \n"
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Konfigurasjons Fremdrift"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Rapport Bunntekst 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Valuta"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Fylke"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Markedsføring"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Firma"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Salgs Håndtering"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Lar deg installere diverse interessante men ikke essensielle verktøy som "
-"Undersøkelse, Lunch og Ide boks."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Du kan starte konfigurasjon av systemet eller koble direkte til databasen "
-"som en administrator."
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Avansert Rapportering"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefon"
-
-#. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_konfig_innhold"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
-"Din firmainformasjon vil brukes til å tilpasse dokumenter utstedt med "
-"OpenERP som for eksempel fakturaer, salgsordrer og mye mer."
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "tittel"
 
 #. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Kunnskaps håndtering"
-
-#. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Innstallerer et forhåndsutvalgt sett av OpenERP programmer som hjelper deg å "
-"håndtere din industri."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Hjelper deg med å håndtere dine prosjekter og oppgaver ved å spore dem, "
-"generere planer, osv..."
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Firmanavn"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Hopp over Konfigurasjons Veiviser"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
-"Hjelper deg med å håndtere dine menneskelige ressurser ved å kode din "
-"ansatte struktur, opprette arbeids ark, spore oppmøte og mer."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
-"Tillater deg å opprette dine fakturaer, og spore betalinger. Det er en "
-"enklere versjon av regnskapsmodulen for ledere som ikke er regnskapsførere."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.oppsett.firma"
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
+#: help:user.preferences.config,context_lang:0
 msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+"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 ""
-"Hjelper deg med å håndtere dine innkjøps-relaterte prosesser slik som "
-"forespørsler på tilbud, leverandørfaktura, osv..."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:user.preferences.config:0
 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"
+"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 ""
-"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"
 
 #. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Gate 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.oppsett.installerer"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Land"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Oppsett"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Regnskap & Finans"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Auksjonshus"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Postnummer"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Start Konfigurasjon"
+#: 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.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 msgstr ""
-"Lar deg installere tillegg rettet mot deling av kunnskap med og mellom dine "
-"ansatte."
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: help:user.preferences.config,menu_tips:0
 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."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Velg programmene du ønsker at systemet skal dekke. Hvis du ikke er sikker på "
-"dine behov, kan du enkelt installere disse senere."
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Firma Konfigurasjon"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
+msgid "Image"
+msgstr "Bilde"
 
 #. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
-"Hjelper den med å få det meste ut av utsalgssteder med rask salgshåndtering, "
-"forenklet betalingsmåte, automatisk plukkliste generering og mer."
-
-#. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Innkjøpstyring"
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr "Hjelper deg med å håndtere dine tilbud, salgsordrer og fakturering."
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Lagerstyring"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Prosjektstyring"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Installerte Brukere"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Ny Database"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Kunde Relasjons Styring"
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
-"Installerer et forhåndsdefinert sett med OpenERP programmer valgt til å "
-"hjelp deg med å håndtere auksjoner og forretningsprosessene rundt dem."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 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\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
-msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
-"Lar deg installere forskjellige verktøy for å foenkle og forbedre OpenERP's "
-"rapport opprettelse."
 
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Rapportens topptekst"
+#~ msgid "Report Footer 1"
+#~ msgstr "Rapport Bunntekst 1"
 
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Informasjon om din nye database"
+#~ msgid "E-mail"
+#~ msgstr "E-post"
 
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
-msgid "Image"
-msgstr "Bilde"
+#~ msgid "Human Resources"
+#~ msgstr "Menneskelige Ressurser"
 
-#. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Mat Industri"
+#~ msgid "City"
+#~ msgstr "By"
 
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Produksjon"
+#~ 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."
 
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Din Logo - Bruk en størrelse på rundt 450x150 punkter."
+#~ msgid "Helps you manage your marketing campaigns step by step."
+#~ msgstr ""
+#~ "Hjelper deg med å administrere dine markedsførings kampanjer trinn for trinn."
 
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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 "Install"
+#~ msgstr "Installer"
 
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Firma Nettside"
+#~ msgid "Invoicing"
+#~ msgstr "Fakturering"
 
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Installer Spesifikke Industri Programmer"
+#~ msgid "Bank Account No"
+#~ msgstr "Bankkonto Nr"
 
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Gate"
+#~ msgid "Extra Tools"
+#~ msgstr "Ekstra Verktøy"
 
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Konfigurer Din Firma Informasjon"
+#~ msgid "Report Footer 2"
+#~ msgstr "Rapport Bunntekst 2"
 
-#. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Eksempel: http://openerp.com"
+#~ msgid "Configuration Progress"
+#~ msgstr "Konfigurasjons Fremdrift"
 
-#. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Installer Programmer"
+#~ msgid "Marketing"
+#~ msgstr "Markedsføring"
 
-#. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#~ msgid "Point of Sales"
+#~ msgstr "Utsalgssted"
 
-#. module: base_setup
-#: help:base.setup.installer,stock:0
-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."
+#~ msgid "Your database is now created."
+#~ msgstr "Din database er nå opprettet."
 
-#. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Base Oppsett"
+#~ 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 "
 
-#. module: base_setup
-#: help:base.setup.installer,association:0
-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 "Associations"
+#~ msgstr "Assosiasjoner"
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.oppsett.konfig"
+#~ msgid "Fed. State"
+#~ msgstr "Fylke"
 
-#~ msgid "Point of Sales"
-#~ msgstr "Utsalgssted"
+#~ 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 ""
+#~ "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"
+
+#~ 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."
+
+#~ msgid "Configure Your Company Information"
+#~ msgstr "Konfigurer Din Firma Informasjon"
+
+#~ msgid "Install Specific Industry Applications"
+#~ msgstr "Installer Spesifikke Industri Programmer"
+
+#~ msgid "Company Website"
+#~ msgstr "Firma Nettside"
+
+#~ 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 ""
+#~ "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."
+
+#~ msgid "Install Applications"
+#~ msgstr "Installer Programmer"
+
+#~ msgid "Street"
+#~ msgstr "Gate"
+
+#~ 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"
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index 3fefd2f2fb5..7b48101a5b4 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -6,550 +6,279 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:48+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Woonplaats"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Installeren"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Facturatie"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Personeel"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-mail"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Bankrekening Nr"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Extra hulpmiddelen"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Rapport Voettekst 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Helpt uw productieprocessen te beheren en genereert overzichten van die "
-"processen."
-
-#. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "Helpt uw marketing campagnes stap voor stap te beheren."
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Uw database is nu gemaakt."
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Kassa's"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Verenigingen"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Helpt uw boekhouding te regelen; al u geen boekhouder bent, stellen we voor "
-"om alleen de facturatie te installeren "
-
-#. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "De volgende gebruikers zijn geïnstalleerd: \n"
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Voortgang configuratie"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Rapport Voettekst 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Valuta"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Staat/Provincie"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marketing"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Bedrijf"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Verkoopbeheer"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Laat u verschillende interessante maar niet-noodzakelijke hulpmiddelen zoals "
-"enquête, lunch en ideeënbus installeren."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"U kunt beginnen met de configuratie van het systeem of direct verbinden met "
-"de database als beheerder."
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Geavanceerde overzichten"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefoon"
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
-"Uw bedrijfsinformatie wordt gebruikt voor het personaliseren van OpenERP "
-"documenten zoals facturen, verkooporders en nog veel meer."
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "titel"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Kennisbeheer"
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Installeert een voorgeselecteerde groep OpenERP applicaties die u helpen bij "
-"het beheren van uw bedrijfstak."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Helpt uw projecten en taken te beheren door ze te volgen, planningen te "
-"genereren, etc..."
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Bedrijfsnaam"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Configuratie assistenten overslaan"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
-"Helpt uw personeel te beheren door uw personeel structuur te coderen, "
-"werkbladen te genereren, aanwezigheid te volgen en meer."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 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
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
-"Helpt de inkoop-gerelateerde processen te beheren zoals inkoop "
-"prijsaanvragen, inkoopfacturen, etc..."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: help:user.preferences.config,context_lang:0
 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"
+"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 ""
-"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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Straat 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Land"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Instellingen"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Boekhouding & Financiën"
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Veilinghuizen"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Postcode"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Configuratie beginnen"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: view:user.preferences.config:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
-"Laat u aanvullingen installeren die gericht zijn op het delen van kennis met "
-"en tussen uw medewerkers."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 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."
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Bedrijf configuratie"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
-"Helpt u het meeste te halen uit uw kassa's met snelle codering, eenvoudige "
-"betaalmethode codering, automatische piklijst generatie en meer."
-
-#. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Inkoopbeheer"
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr "Helpt u offertes, verkooporders en facturen te beheren."
-
-#. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Magazijnbeheer"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Projectbeheer"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Geïnstalleerde gebruikers"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Nieuwe database"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Klantrelatiebeheer"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
-"Installeert een voorgeselecteerde groep OpenERP applicaties die u helpt bij "
-"het beheren van veilingen evenals de processen eromheen."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Laat u verschillende hulpmiddelen installeren die OpenERP's overzichten "
-"aanmaak verbeteren en vereenvoudigen."
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Rapport koptekst"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Informatie over uw nieuwe database"
 
 #. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Afbeelding"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Voedingsindustrie"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Productie"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Uw Logo - Gebruik een afmeting van ongeveer 450x150 pixels."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 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"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Website bedrijf"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Installeer specifieke bedrijfstak applicaties"
-
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Adres"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Uw bedrijfsinformatie configureren"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Voorbeeld: http://openerp.com"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Installeer applicaties"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 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."
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
-"Helpt uw voorraad te beheren en bij belangrijke voorraad bewerkingen: "
-"leveringen, ontvangsten, etc."
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Basis setup"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
-"Installeert een voorgeselecteerde groep applicaties die u helpen om uw "
-"vereniging efficiënter te beheren."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
+msgstr ""
 
 #~ msgid ""
 #~ "You can start configuring the system or connect directly to the database "
@@ -567,6 +296,9 @@ msgstr "base.setup.config"
 #~ 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 ""
@@ -585,6 +317,9 @@ msgstr "base.setup.config"
 #~ msgid "Next"
 #~ msgstr "Volgende"
 
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
 #~ msgid "State"
 #~ msgstr "Staat/Provincie"
 
@@ -594,6 +329,12 @@ msgstr "base.setup.config"
 #~ 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"
 
@@ -603,23 +344,369 @@ msgstr "base.setup.config"
 #~ 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\"."
+
+#~ msgid "Report Header"
+#~ msgstr "Rapport koptekst"
+
+#~ msgid "Your Logo - Use a size of about 450x150 pixels."
+#~ msgstr "Uw Logo - Gebruik een afmeting van ongeveer 450x150 pixels."
+
+#~ msgid "Currency"
+#~ msgstr "Valuta"
+
+#~ msgid "Street"
+#~ msgstr "Adres"
+
 #~ msgid "Use Directly"
 #~ msgstr "Direct Gebruiken"
 
 #~ msgid "Cancel"
 #~ msgstr "Annuleren"
 
+#~ msgid "Logo"
+#~ msgstr "Logo"
+
 #~ 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."
+
+#~ msgid "Advanced Reporting"
+#~ msgstr "Geavanceerde overzichten"
+
+#~ 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."
+
+#~ 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 "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"
diff --git a/addons/base_setup/i18n/nl_BE.po b/addons/base_setup/i18n/nl_BE.po
index 301a65a5673..67d47c99383 100644
--- a/addons/base_setup/i18n/nl_BE.po
+++ b/addons/base_setup/i18n/nl_BE.po
@@ -6,499 +6,282 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2009-04-24 15:11+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Plaats"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
+#: selection:product.installer,customers:0
+msgid "Create"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Bankrekeningnr."
-
-#. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Rapportvoettekst 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Verenigingen"
-
-#. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Helpt u om uw boekhouding te voeren. Als u geen boekhouder bent, raden wij u "
-"aan om enkel Facturatie te installeren. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
+#: field:product.installer,customers:0
+msgid "Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Configuratie Voortgang"
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Rapportvoettekst 2"
-
-#. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Valuta"
-
-#. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Staat/Provincie"
-
-#. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marketing"
-
-#. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Bedrijf"
-
-#. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Verkoopbeheer"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
-"Hiermee kunt u verschillende interessante modules installeren, zoals "
-"Enquêtes, Lunch en Ideeënbus."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"U kunt beginnen met de configuratie van het systeem of u onmiddellijk als "
-"beheerder aanmelden op de database."
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefoon"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
 msgstr ""
-"Met uw bedrijfsinformatie kunt u OpenERP-documenten zoals facturen, "
-"verkooporders, e.d. personaliseren."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "Titel"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Bedrijfsnaam"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Configuratieassistenten overslaan"
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
-
-#. module: base_setup
-#: help:base.setup.installer,purchase:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
-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"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Straat 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Land"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Instellingen"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Boekhouding & financiën"
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Veilinghuizen"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Postcode"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Beginnen met de configuratie"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: help:user.preferences.config,context_lang:0
 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."
+"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 ""
-"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."
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Bedrijfsconfiguratie"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
+#: view:user.preferences.config:0
 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."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Aankoopbeheer"
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr "Hiermee kunt u offertes, verkooporders en facturen maken."
-
-#. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Magazijnbeheer"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Projectbeheer"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Geïnstalleerde gebruikers"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Nieuwe database"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Klantenrelatiebeheer"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: 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.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Rapporthoofding"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Informatie over uw nieuwe database"
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Afbeelding"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Voedingsindustrie"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Productie"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Uw Logo - Gebruik een afmeting van ongeveer 450x150 pixels."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Straat"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Uw bedrijfsinformatie configureren"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Voorbeeld: http://openerp.com"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#~ msgid "Logo"
+#~ msgstr "Logo"
 
 #~ msgid "Installation Done"
 #~ msgstr "Installatie gereed"
@@ -506,9 +289,24 @@ msgstr "base.setup.config"
 #~ msgid "Summary"
 #~ msgstr "Samenvatting"
 
+#~ msgid "Fed. State"
+#~ msgstr "Staat/Provincie"
+
+#~ msgid "Street"
+#~ msgstr "Straat"
+
+#~ msgid "Company Name"
+#~ msgstr "Bedrijfsnaam"
+
 #~ msgid "Cancel"
 #~ msgstr "Afbreken"
 
+#~ msgid "Company"
+#~ msgstr "Bedrijf"
+
+#~ msgid "City"
+#~ msgstr "Plaats"
+
 #~ msgid "Street2"
 #~ msgstr "Adres 2"
 
@@ -518,5 +316,168 @@ msgstr "base.setup.config"
 #~ 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 "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"
diff --git a/addons/base_setup/i18n/pl.po b/addons/base_setup/i18n/pl.po
index 18c0f19159f..fd030b88b0d 100644
--- a/addons/base_setup/i18n/pl.po
+++ b/addons/base_setup/i18n/pl.po
@@ -6,540 +6,283 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:47+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Miasto"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Instaluj"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Fakturowanie"
-
-#. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Kadry"
-
-#. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-mail"
-
-#. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Nr Konta Bankowego"
-
-#. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Dodatkowe narzędzia"
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Stopka raportu 1"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
-msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
-msgstr "Pomaga w prowadzeniu działalności produkcyjnej."
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "Pomaga prowadzić kampanie marekringowe"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Baza danych została utworzaona"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Punkt sprzedaży"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Stowarzyszenia"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Pomaga prowadzić księgowość. Jeśli nie jesteś księgowym, to sugerujemy "
-"instalowanie tylko fakturowania. "
-
-#. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Następujący użytkownicy zostali utworzeni : \n"
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Postęp konfiguracji"
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Stopka raportu 2"
-
-#. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Waluta"
-
-#. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "woj."
-
-#. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Firma"
-
-#. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Sprzedaż"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
-"Pozwala zainstalować ciekawe, ale nie kluczowe narzędzia jak: Ankieta, "
-"Posiłki, Pomysły."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Możesz rozpocząć konfigurację systemu lub połączyć się z nim od razu jako "
-"administrator."
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Zaawansowane raportowanie"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefon"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+"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 ""
-"Informacja o firmie będzie stosowana jako dane do drukowania na dokumentach "
-"drukowanych z OpenERP. Dotyczy to faktur, ofert, zamówień zakupu itp."
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "tytuł"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Zarządzanie wiedzą"
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
-"Instaluje przygotowany zestaw aplikacji OpenERP, które pomogą zarządzać "
-"określonym rodzajem przedsiębiorstwa."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
-msgstr "Pomaga prowadzić projekty i zadania, pomaga w planowaniu itd..."
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Nazwa firmy"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Pomiń kreatory konfiguracji"
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
-"Pomaga zarządzać danymi kadrowymi. Definiuje strukturę pracowników, "
-"obsługuje karty czasu pracy, rejestruje nieobecności."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
 msgstr ""
-"Pozwala tworzyć faktury i płatności. Jest to prostsza wersja modułu "
-"księgowego."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Pomaga organizować procesy zakupów jak zapytania ofertowe, faktury od "
-"dostawców itp."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:base.setup.terminology:0
 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"
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 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"
 
 #. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Ulica 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Kraj"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Konfiguracja"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Księgowość"
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Aukcje"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Kod pocztowy"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Rozpocznij konfigurację"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
-"Pozwala instalować moduły do współdzielenia informacji pomiędzy pracownikami."
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: help:user.preferences.config,context_lang:0
 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."
+"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 ""
-"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."
-
-#. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Konfiguracja firmy"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
 
 #. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
+#: view:user.preferences.config:0
 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."
+"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 ""
-"Pomaga stosować system jako punkt sprzedaży, gdzie funkcje sprzedaży są "
-"przygotowane do szybkich działań."
-
-#. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Zakupy"
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr "Pomaga operować ofertami, zamówieniami sprzedazy i fakturowaniem."
-
-#. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Magazyn"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Projekty"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Zainstalowani użytkownicy"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Nowa baza danych"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Relacje z klientami (CRM)"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
-"Instaluje przygotowany zestaw aplikacji OpenERP do prowadzenia aukcji."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 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."
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Nagłówek raportu"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Informacje o twojej nowej bazie"
+"Check out this box if you want to always display tips on each menu action"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Obraz"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Produkcja żywności"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Produkowanie"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Twoje logo - stosuj obrazek ok 450x150 pikseli"
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 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"
-
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Strona www firmy"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Instaluj aplikacje wybranych branż"
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Ulica"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Konfiguruj informacje twojej firmy"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Przykład: http://openerp.com"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Instaluj aplikacje"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 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ń."
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
-"Pomaga zarządzać magazynem i jego operacjami jak: przyjęcia, wydania, "
-"przesunięcia itp."
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Ustawienia podstawowe"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
-"Instaluje przygotowany zestaw aplikacji OpenERP do obsługi stowarzyszenia."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
 
+#~ msgid "City"
+#~ msgstr "Miasto"
+
 #~ msgid ""
 #~ "You can start configuring the system or connect directly to the database "
 #~ "using the default setup."
@@ -553,9 +296,15 @@ msgstr ""
 #~ 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"
 
@@ -565,18 +314,36 @@ msgstr ""
 #~ 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 "Cancel"
 #~ msgstr "Anuluj"
 
 #~ 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 "
@@ -594,20 +361,328 @@ msgstr ""
 #~ 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 "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."
diff --git a/addons/base_setup/i18n/pt.po b/addons/base_setup/i18n/pt.po
index 0f7395bc92b..e79fd723ecf 100644
--- a/addons/base_setup/i18n/pt.po
+++ b/addons/base_setup/i18n/pt.po
@@ -6,530 +6,282 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:42+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Cidade"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Instalar"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Faturação"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Recursos Humanos"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-mail"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Número de conta bancária"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Ferramentas extras"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Rodapé do Relatório 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Ajuda-o a gerir os seus processos de produção e gera relatórios relativos "
-"aos mesmos."
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-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.setup.config:0
-msgid "Your database is now created."
-msgstr "A sua base de dados foi criada"
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Ponto de Venda"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Associações"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Ajuda na gestão da contabilidade. Se não é contabilista, sugerimos que "
-"instale apenas o módulo Facturação "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Foram instalados os seguintes utilizadores: \n"
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progresso da configuração"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Rodapé do Relatório 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Moeda"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Distrito"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marketing"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Empresa"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Gestão de vendas"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Permite a instalação de várias ferramentas interessantes mas não essenciais, "
-"como Inquéritos, Almoços, e Caixa de Ideias."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Pode começar a configurar o sistema ou ligar-se diretamente à base de dados, "
-"como administrador"
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Relatórios avançados"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefone"
-
-#. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
-"As informações da empresa serão utilizadas para personalizar os documentos "
-"gerados pelo OpenERP, como facturas, ordens de veda e muitos outros."
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "título"
 
 #. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Gestão de Conhecimento"
-
-#. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Instala um conjunto pré-selecionado de módulos OpenERP que o ajudarão a "
-"gerir o seu negócio."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Ajuda-o a gerir os seus projetos e tarefas, registando-os, gerando "
-"planeamentos, etc..."
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Nome da Empresa"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Ignorar os assistentes de configuração"
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 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."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 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."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
-
-#. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
-"Ajuda na gestão dos processos de aprovisionamento, como pedidos de cotação, "
-"facturas de fornecedores, etc..."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: help:user.preferences.config,context_lang:0
 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"
+"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 ""
-"Esta frase irá aparecer no rodapé do seu relatório.\n"
-"Sugerimos que ponta as informações banáarias aqui:"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Rua (2)"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "País"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Configurar"
 
 #. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Contabilidade e Finanças"
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Leiloeiras"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Código Postal"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Iniciar Configuração"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: view:user.preferences.config:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
-"Permite-lhe instalar extras com o objetivo de partilhar informações com e "
-"entre os seus empregados."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 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."
-
-#. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Configuração da empresa"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logotipo"
 
 #. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Gestão de compras"
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr "Ajuda na gestão de cotações, ordens de venda e facturação."
-
-#. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Gestão de armazém"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Gestão de projetos"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Utilizadores instalados"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Nova base de dados"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Gestão de relacionamentos com clientes"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 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."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Instala várias ferramentas que simplificam e melhoram a criação de "
-"relatórios no OpenERP."
 
 #. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Cabeçalho do Relatório"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Informação sobre a sua nova base de dados"
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Imagem"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Indústria alimentar"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Produção"
-
-#. module: base_setup
-#: view:base.setup.company:0
-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.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
-"Esta frase irá aparecer no rodapé dos seus relatórios.\n"
-"Sugerimos que escreva uma frase legal aqui:"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Página web da empresa"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Instalar aplicações de indústrias específicas."
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Rua"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Configure a informação da sua empresa"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Exemplo: http://openerp.com"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Instalar aplicações"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
-"Ajuda na gestão do inventário e outras operações de gestão de stock: ordens "
-"de envio, recepções, etc."
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Configurarção da Base"
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
-"Instala um conjunto pré-seleccionado de aplicações OpenERP, escolhidas para "
-"ajudar na gestão de associações."
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#~ msgid "City"
+#~ msgstr "Cidade"
 
 #~ msgid "Zip code"
 #~ msgstr "Caixa postal"
@@ -537,6 +289,9 @@ msgstr "base.setup.config"
 #~ msgid "Next"
 #~ msgstr "Seguinte"
 
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
+
 #~ msgid "State"
 #~ msgstr "Estado"
 
@@ -546,9 +301,27 @@ msgstr "base.setup.config"
 #~ 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 "Cancel"
 #~ msgstr "Cancelar"
 
@@ -568,6 +341,9 @@ msgstr "base.setup.config"
 #~ 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 ""
@@ -583,6 +359,12 @@ msgstr "base.setup.config"
 #~ "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"
 
@@ -595,11 +377,287 @@ msgstr "base.setup.config"
 #~ 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 "Base Setup"
+#~ msgstr "Configurarção da Base"
+
+#~ msgid "Your database is now created."
+#~ msgstr "A sua base de dados foi criada"
+
+#~ msgid "Associations"
+#~ msgstr "Associações"
+
+#~ msgid "Invoicing"
+#~ msgstr "Faturação"
+
+#~ 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 "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"
+
+#~ msgid "base.setup.company"
+#~ msgstr "base.setup.company"
+
+#~ msgid "Install Applications"
+#~ msgstr "Instalar aplicações"
+
+#~ msgid "Food Industry"
+#~ msgstr "Indústria alimentar"
+
+#~ msgid "Skip Configuration Wizards"
+#~ msgstr "Ignorar os assistentes de configuração"
+
+#~ msgid "Information about your new database"
+#~ msgstr "Informação sobre a sua nova base de dados"
+
+#~ msgid "Fed. State"
+#~ msgstr "Distrito"
+
+#~ 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 diretamente à base de dados, "
+#~ "como administrador"
+
+#~ 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."
+
+#~ msgid "Helps you manage your marketing campaigns step by step."
+#~ msgstr "Ajuda-o a gerir as suas campanhas de marketing, passo a passo"
+
+#, 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 ""
+#~ "Lets you install addons geared towards sharing knowledge with and between "
+#~ "your employees."
+#~ msgstr ""
+#~ "Permite-lhe instalar extras com o objetivo de partilhar informações com e "
+#~ "entre os seus empregados."
+
+#~ 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."
diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po
index 0c0e036c6f5..c847fb2e050 100644
--- a/addons/base_setup/i18n/pt_BR.po
+++ b/addons/base_setup/i18n/pt_BR.po
@@ -6,550 +6,282 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:56+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Cidade"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Instalar"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Faturamento"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Recursos humanos"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-mail"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Conta Bancária"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Ferramentas Extras"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Rodapé 1 do relatório"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Auxilia o gerenciamento dos processos de manufatura e geração de relatórios "
-"sobre estes processos."
-
-#. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "Auxilia o gerenciamento de campanhas de marketing passo a passo."
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "O banco de dados foi criado."
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Ponto de Vendas"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Associações"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Auxilia no manuseio das contabilizações. Se você não é contador, sugerimos a "
-"instalação apenas do Faturamento "
-
-#. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Os seguintes usuário foram instalados: \n"
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Configuração em Progresso"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Rodapé 2 do relatório"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Moeda"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Estado(UF)"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marketing"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Empresa"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Gestão de Vendas"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Permite instalar várias ferramentas interessantes mas não essenciais, como "
-"Pesquisas, Lanches e Caixa de Idéias."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Voce pode iniciar as configurações do sistema ou conectar diretamente no "
-"banco de dados como administrador."
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Relatórios Avançados"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefone"
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
-"Informação da sua empresa será usada para personalizar documentos gerados "
-"pelo OpenERP como faturas, ordens de venda e muito mais."
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "Título"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Gestão de Conhecimento"
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Instala uma pré-seleção de Apliacações do OpenERP que ajudarão você a "
-"gerenciar sua indústria."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Ajuda você a gerenciar seus projetos e tarefas, controlando-os, gerando "
-"planejamentos, etc..."
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Nome da Empresa"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Pular Assistentes de Configuração"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
-"Ajuda você a gerenciar seus recursos humanos codificando sua estrutura de "
-"funcionários, gerando planilhas de trabalho, controlando frequência e mais."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 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."
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
-"Ajuda você a gerenciar processos relacionados a compras como solicitações de "
-"cotação, notas fiscais de entrada de fornecedores, etc..."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: help:user.preferences.config,context_lang:0
 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"
+"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 ""
-"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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Rua 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "País"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Configurar"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Contabilidade e Finanças"
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Casas de Leilão"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Código Postal (CEP)"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Iniciar configuração"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: view:user.preferences.config:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
-"Permite instalar addons orientadas a compartilhar conhecimento com e entre "
-"seus funcionários."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 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."
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Configuração da Empresa"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logotipo"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 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."
-
-#. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Gestão de Compras"
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr "Ajuda você a lidar com suas cotações, pedidos e faturamento."
-
-#. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Gestão de Estoques"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Gestão de Projetos"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Usuários Instalados"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Nova Base de Dados"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Gestão de Relacionamento com o Cliente"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 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."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Permite instalar várias ferramentas que simplificam e incrementam a criação "
-"de relatórios no OpenERP."
 
 #. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Cabeçalho do Relatório"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Informação sobre sua nova base de dados"
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Imagem"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Indústria de Alimentos"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Manufatura"
-
-#. module: base_setup
-#: view:base.setup.company:0
-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.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 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"
-
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Site da Empresa"
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Instalar Aplicações Específicas para Indústria"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Rua"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Configure as Informações da Sua Empresa"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Examplo: http://openerp.com"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Instalar Aplicações"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 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."
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
-"Ajuda você a gerenciar seu inventário e principais operações de estoque: "
-"ordens de entrega, recebimentos, etc."
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Configuração Base"
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
-"Instala uma pré-seleção de aplicações do OpenERP que ajudarão você a "
-"gerenciar sua associação mais eficientemente."
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#~ msgid "City"
+#~ msgstr "Cidade"
 
 #~ msgid "Zip code"
 #~ msgstr "CEP"
@@ -560,30 +292,63 @@ msgstr "base.setup.config"
 #~ 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 "Cancel"
 #~ msgstr "Cancelar"
 
+#~ msgid "Logo"
+#~ msgstr "Logotipo"
+
 #~ msgid "Previous"
 #~ msgstr "Anterior"
 
@@ -616,11 +381,333 @@ msgstr "base.setup.config"
 #~ msgid "Your new database is now fully installed."
 #~ msgstr "Sua nova base de dados está agora completamente instalada."
 
+#~ msgid "Setup"
+#~ msgstr "Configurar"
+
 #~ msgid "Installation Done"
 #~ msgstr "Instalação concluída"
 
 #~ msgid "Summary"
 #~ msgstr "Resumo"
 
+#~ msgid "Your Logo - Use a size of about 450x150 pixels."
+#~ msgstr "Seu logotipo - Use um tamanho de aproximadamente 450x150 pixels."
+
+#~ msgid "Report Header"
+#~ msgstr "Cabeçalho do Relatório"
+
+#~ msgid "Base Setup"
+#~ msgstr "Configuração Base"
+
+#~ 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 "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"
+#~ "    "
diff --git a/addons/base_setup/i18n/ro.po b/addons/base_setup/i18n/ro.po
index 015eb620e8e..2e0bad1bf9a 100644
--- a/addons/base_setup/i18n/ro.po
+++ b/addons/base_setup/i18n/ro.po
@@ -6,528 +6,288 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:48+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Oraş"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Instalare"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Facturare"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Resurse umane"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-mail"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Cont bancar"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Unelte suplimentare"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Subsol raport 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Ajută la administrarea proceselor de fabricație și la generarea de rapoarte "
-"pentru acestea."
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "Ajută la administrarea campaniilor de marketing, pas cu pas."
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Baza de date a fost creată."
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Punct de vînzare"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Asocieri"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Modulul de contabilitate. Dacă nu sunteți contabil, vă sugerăm să instalați "
-"doar modulul de Facturare. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Utilizatorii din lista de mai jos nu au fost instalați : \n"
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progres Configurare"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Subsol raport 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Valută"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Stat federal"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marketing"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Companie"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Vînzări"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Permite instalarea de module adiționale (neesențiale). De exemplu Survey, "
-"Lunch și Ideas box."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Puteți începe configurarea sistemului, sau să vă conectați ca administrator."
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Rapoarte avansate"
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefon"
-
-#. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "titlu"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Managementul cunoștințelor"
-
-#. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
-msgstr "Instalarea uniu set prestabilit de aplicații OpenERP."
-
-#. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Ajută la gestionarea proiectelor și a sarcinilor : monitorizare, "
-"planificări, etc..."
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Nume companie"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Salt peste wizard-urile de configurare"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Ajută la gestionarea resurselor umane : specificarea structurii "
-"organizatorice, generarea de pontaje, urmărirea prezenței și altele."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
-"Permite emiterea de facturi și monitorizarea încasărilor. Acesta este un "
-"modul simplificat de contabilitate pentru managerii care nu sunt contabili."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
-
-#. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
-"Ajută la gestionarea achizițiilor : cereri de oferte , facturi de la "
-"furnizori , etc ..."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
-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"
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Strada 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Ţara"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Instalare"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Contabilitate și finanțe"
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Case de licitații"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Cod poştal"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Start configurare"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: help:user.preferences.config,context_lang:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
-"Permite instalarea de module pentru schimbul de cunoștinte cu și între "
-"angajați."
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: view:user.preferences.config:0
 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."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Configurarea companiei"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 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."
-
-#. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Aprovizionare"
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
-"Ajută la gestionarea ofertelor de prețuri, a comenzilor de la furnizori și a "
-"facturilor de intrare."
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Gestiunea stocurilor"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Managementul proiectelor"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Utilizatorii instalați"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Bază de date nouă"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Gestionarea relaţiilor cu clienţii"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
-"Instalarea unui set predefinit de aplicații OpenERP pentru gestionarea "
-"licitațiilor și a proceselor implicate."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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\""
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
-msgstr "Permite instalarea de unelte pentru crearea de rapoarte OpenERP."
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Antetul raportului"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Informații despre noua bază de date"
+"Check out this box if you want to always display tips on each menu action"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Imagine"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Industria alimentară"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Producție"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Logo-ul vostru - utilizaţi o dimensiune de aprox. 450x150 pixeli."
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 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"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Site-ul companiei"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Instalarea de aplicații specifice diverselor industrii"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Strada"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Exemplu http://openerp.com"
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Instalarea de aplicații"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 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."
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
-"Ajută la gestionarea inventarului și a stocurilor : ordine de livrare, de "
-"recepție,etc."
 
-#. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Setare de bază"
+#~ msgid "Street"
+#~ msgstr "Strada"
 
-#. module: base_setup
-#: help:base.setup.installer,association:0
-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 "Logo"
+#~ msgstr "Logo"
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#~ msgid "E-mail"
+#~ msgstr "E-mail"
 
 #~ msgid "Report header"
 #~ msgstr "Antet raport"
@@ -535,12 +295,24 @@ msgstr "base.setup.config"
 #~ 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"
 
@@ -554,12 +326,18 @@ msgstr "base.setup.config"
 #~ "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 "
@@ -585,20 +363,299 @@ msgstr "base.setup.config"
 #~ 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 "Cancel"
 #~ msgstr "Revocare"
 
+#~ 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."
+
+#~ msgid "Zip Code"
+#~ msgstr "Cod poştal"
+
+#~ msgid "base.setup.installer"
+#~ msgstr "base.setup.installer"
+
+#~ msgid "Purchase Management"
+#~ msgstr "Aprovizionare"
+
+#~ msgid "Company Configuration"
+#~ msgstr "Configurarea companiei"
+
+#~ msgid "Warehouse Management"
+#~ msgstr "Gestiunea stocurilor"
+
+#~ msgid "New Database"
+#~ msgstr "Bază de date nouă"
+
+#~ msgid "Project Management"
+#~ msgstr "Managementul proiectelor"
+
+#~ msgid "Installed Users"
+#~ msgstr "Utilizatorii instalați"
+
+#~ 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 "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"
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index 0080ba636f1..02786282ffb 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.po
@@ -6,554 +6,282 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Город"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Установить"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Выставление счетов"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Управление персоналом"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "Эл.почта"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Банковский счет №"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Доп. инструменты"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Нижний колонтитул отчета 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Помагает вам управлять процессами производства и создавать отчеты об этих "
-"процессах."
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
-"Помогает вам управлять вашими маркетинговыми кампаниями, шаг за шагом."
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Ваша база данных создана."
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Кассовый терминал"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Ассоциации"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Помогает реализовать потребности в бухгалтерском учёте. Если вы не бухгалтер "
-"— советуем установить только модуль выставления счетов. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Были введены следующие пользователи: \n"
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Выполнение настройки"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Нижний колонитул отчета 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Валюта"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Штат"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Маркетинг"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Организация"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Управление продажами"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Позволяет устанавливать различные интересные, но не основные инструменты, "
-"например Обзор, Ланч и Коробка идей."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Вы можете начать настраивать систему или соединиться с базой данных напрямую "
-"в качестве администратора."
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Расширенные отчеты"
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Телефон"
-
-#. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
-"Информация о вашей компании будет использована для персонализации "
-"документов, выводимых из OpenERP, таких как  счета, заказы на продажу и "
-"многое другое."
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "название"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "База знаний"
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Устанавливает заданный набор приложений OpenERP, которые помогут вам "
-"управлять вашей отраслью."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Помогает вам управлять проектами и задачами, отслеживая их, осуществляя "
-"планирование, и т.д. …"
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Наименование организации"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Пропустить мастер настроек"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
-"Помогает вам в управлении персоналом путём описания структуры подчинения, "
-"созданием рабочих графиков, отслеживанием времени присутствия на рабочем "
-"месте и т.д."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
-"Позволяет Вам выставлять счета и отслеживать платежи. Это упрощенная версия "
-"бухгалтерского модуля для менеджеров, не являющихся бухгалтерами."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
-
-#. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
-"Помогает Вам управлять процессами, связанными с закупками, такими как "
-"запросы котировок, счета от поставщиков, и т.д…"
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: help:user.preferences.config,context_lang:0
 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"
+"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 ""
-"Это предложение появится внизу ваших отчетов.\n"
-"Рекомендуем поместить здесь информацию о вашем банке:\n"
-"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Улица 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Страна"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Установка"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Бухгалтерия и Финансы"
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Площадки аукционов"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Почтовый индекс"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Начать настройку"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: view:user.preferences.config:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
-"Позволяет устанавливать дополнения, предназначенные для обмена знаниями с и "
-"между вашими сотрудниками."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
-"Выберите приложения, которые вы хотите видеть в вашей системе. Если вы не "
-"уверены в ваших точных потребностях на этом этапе — вы сможете установить их "
-"позже."
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Настройка организации"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Логотип"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
-"Помогает вам получить максимальную отдачу от своих торговых точек с помощью "
-"быстрого учета продаж, упрощенного способа регистрации платежей, "
-"автоматического создания комплектовочных ведомостей и т.д."
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Управление закупками"
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
-"Помогает вам обрабатывать запросы котировок, заказы на продажу и счета."
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Управление складом"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Управление проектами"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Установленные пользователи"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Новая база данных"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Управление отношениями с заказчиками"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: 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.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 msgstr ""
-"Это предложение появится в правом верхнем углу ваших отчетов.\n"
-"Рекомендуем поместить здесь слоган:\n"
-"\"Решения для бизнеса с открытым исходным кодом\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Позволяет установить различные инструменты для упрощения и улучшения "
-"создания отчетов в OpenERP."
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Заголовок отчета"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Информация о вашей новой базе данных"
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Изображение"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Пищевая промышленность"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Производство"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Ваш логотип - используйте размер примерно 450x150 пикселей"
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
-"Это предложение появится внизу ваших отчетов.\n"
-"Рекомендуем поместить здесь юридическую информацию:\n"
-"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
-
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Интернет-сайт организации"
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Установить специальные приложения для отрасли"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Улица"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Настройте информацию о вашей организации"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Пример: http://openerp.com"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Установить приложения"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
-"Позволяет вам отслеживать и управлять отношениями с заказчиками, такими как "
-"сделки, запросы, инциденты. Может автоматически направлять напоминания, "
-"выставлять запросы или инициировать специальные действия на основе "
-"стандартных событий."
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
-"Позволяет вам управлять складским учётом и совершать основные складские "
-"операции: формировать заказы на доставку, отчеты о получении и т.д…"
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Базовая настройка"
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
-"Устанавливает заранее выбранный набор приложений OpenERP, который поможет "
-"вам управлять вашей ассоциацией  более эффективно."
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#~ msgid "City"
+#~ msgstr "Город"
 
 #~ msgid ""
 #~ "You can start configuring the system or connect directly to the database "
@@ -571,6 +299,9 @@ msgstr "base.setup.config"
 #~ msgid "Report header"
 #~ msgstr "Заголовок отчета"
 
+#~ msgid "Start Configuration"
+#~ msgstr "Начать настройку"
+
 #~ msgid ""
 #~ "You'll be able to install more modules later through the Administration menu."
 #~ msgstr ""
@@ -589,24 +320,54 @@ msgstr "base.setup.config"
 #~ 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 "Использовать непосредственно"
 
@@ -616,14 +377,340 @@ msgstr "base.setup.config"
 #~ 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 "Маркетинг"
+
+#~ msgid "Fed. State"
+#~ msgstr "Штат"
+
+#~ msgid "Advanced Reporting"
+#~ msgstr "Расширенные отчеты"
+
+#~ msgid "Purchase Management"
+#~ msgstr "Управление закупками"
+
+#~ msgid "Street 2"
+#~ msgstr "Улица 2"
+
+#~ msgid "Accounting & Finance"
+#~ msgstr "Бухгалтерия и Финансы"
+
+#~ msgid "Warehouse Management"
+#~ msgstr "Управление складом"
+
+#~ msgid "Manufacturing"
+#~ msgstr "Производство"
+
+#~ msgid "Project Management"
+#~ 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 ""
+#~ "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 "Выполнение настройки"
diff --git a/addons/base_setup/i18n/sk.po b/addons/base_setup/i18n/sk.po
index cd4ffd266ae..f71bb7cecf6 100644
--- a/addons/base_setup/i18n/sk.po
+++ b/addons/base_setup/i18n/sk.po
@@ -7,501 +7,289 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2010-08-03 03:13+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\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: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Mesto"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Inštalovať"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Fakturácia"
-
-#. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Ľudské zdroje"
-
-#. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-mail"
-
-#. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Bankový účet č."
-
-#. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Extra nástroje"
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Ukončenie reportu 1"
-
-#. module: base_setup
-#: help:base.setup.installer,mrp:0
-msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
+#: selection:product.installer,customers:0
+msgid "Create"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
-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
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Priebeh nastavenia"
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Ukončenie reportu 2"
-
-#. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Mena"
-
-#. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Federálny štát"
-
-#. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marketing"
-
-#. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Spoločnosť"
-
-#. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Správa predaja"
-
-#. module: base_setup
-#: help:base.setup.installer,profile_tools:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefón"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
+#: field:product.installer,customers:0
+msgid "Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Názov spoločnosti"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
-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"
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
 
 #. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Krajina"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Nastavenie"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
+#: view:base.setup.terminology:0
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Štart konfigurácie"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: help:user.preferences.config,context_lang:0
 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 ""
-
-#. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
+#: view:user.preferences.config:0
 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
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: 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.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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.\""
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Hlavička reportu"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Vaše Logo - Použite veľkost okolo 450x150 pixelov."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 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"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Ulica"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Základné nastavenie"
-
-#. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 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"
 
@@ -512,6 +300,9 @@ 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Č"
 
@@ -524,21 +315,51 @@ msgstr ""
 #~ 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 "Cancel"
 #~ msgstr "Zrušiť"
 
+#~ 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"
 
@@ -558,11 +379,74 @@ msgstr ""
 #~ "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"
+
+#~ msgid "Marketing"
+#~ msgstr "Marketing"
+
+#~ msgid "Fed. State"
+#~ msgstr "Federálny štát"
diff --git a/addons/base_setup/i18n/sl.po b/addons/base_setup/i18n/sl.po
index 42c245534a7..f1690b1cd4e 100644
--- a/addons/base_setup/i18n/sl.po
+++ b/addons/base_setup/i18n/sl.po
@@ -6,499 +6,282 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2009-11-17 08:51+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Mesto"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Namesti"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Izdajanje računov"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Človeški viri"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-pošta"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Številka bančnega računa"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Dodatna orodja"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Noga izpisa 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Pomaga vam upravljati proizvodne procese in ustvarjanje poročil o teh "
-"procesih."
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Vaša baza je bila ustvarjena."
-
-#. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Naslednji uporabniki so bili nameščeni: \n"
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Potek konfiguracije"
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Noga izpisa 2"
-
-#. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Valuta"
-
-#. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Zvezna država"
-
-#. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marketing"
-
-#. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Podjetje"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Upravljanje prodaje"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefon"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "naslov"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Upravljanje znanja"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Ime podjetja"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Preskoči čarovnike konfiguracije"
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
-
-#. module: base_setup
-#: help:base.setup.installer,purchase:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
-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"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Naslov 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Država"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Namestitev"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Računovodstvo & Finance"
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Avkcijska hiša"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Poštna številka"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Začni s konfiguracijo"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: help:user.preferences.config,context_lang:0
 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."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Konfiguracija podjetja"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logotip"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
+#: view:user.preferences.config:0
 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."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Upravljanje nabave"
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Upravljanje skladišča"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Upravljanje projektov"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Nameščeni uporabniki"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Nova zbirka podatkov"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: 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.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Glava izpisa"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Informacije o vaši novi zbirki podatkov"
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Slika"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Prehrambena industrija"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Proizvodnja"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Vaš logotip - uporabite velikost približno 450x150 pik."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 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"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Spletna stran podjetja"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Ulica"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Konfigurirajte informacije vašega podjetja"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Primer: http://openerp.com"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Namesti aplikacije"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Osnovne nastavitve"
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#~ msgid "City"
+#~ msgstr "Mesto"
 
 #~ msgid ""
 #~ "You can start configuring the system or connect directly to the database "
@@ -516,6 +299,9 @@ msgstr "base.setup.config"
 #~ 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 ""
@@ -533,6 +319,9 @@ msgstr "base.setup.config"
 #~ msgid "Next"
 #~ msgstr "Naprej"
 
+#~ msgid "E-mail"
+#~ msgstr "E-pošta"
+
 #~ msgid "State"
 #~ msgstr "Zvezna država"
 
@@ -542,18 +331,42 @@ msgstr "base.setup.config"
 #~ 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"
 
@@ -563,8 +376,166 @@ msgstr "base.setup.config"
 #~ 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 "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"
diff --git a/addons/base_setup/i18n/sq.po b/addons/base_setup/i18n/sq.po
index 9e3df647985..433da6fe183 100644
--- a/addons/base_setup/i18n/sq.po
+++ b/addons/base_setup/i18n/sq.po
@@ -7,485 +7,276 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2009-12-29 15:30+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: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
+#: selection:product.installer,customers:0
+msgid "Create"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,account_accountant:0
-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
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
+#: field:product.installer,customers:0
+msgid "Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:base.setup.terminology:0
 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 ""
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: help:user.preferences.config,context_lang:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: view:user.preferences.config:0
 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."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,auction:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,report_designer:0
-msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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 ""
-
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
diff --git a/addons/base_setup/i18n/sr.po b/addons/base_setup/i18n/sr.po
index a95a53dfc00..4f13a7ce009 100644
--- a/addons/base_setup/i18n/sr.po
+++ b/addons/base_setup/i18n/sr.po
@@ -7,533 +7,279 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:51+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Grad"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Instaliraj"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Fakturisanje"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Ljudski Resursi"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-mail"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Br Naloga Banke"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Dodatni Alati"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Podnožje izveštaja 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Pomaze vam pri upravljanju proizvodnim procesima i generise izvestaje vezane "
-"za iste."
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
-"Pomaze pri upravljanju tvojim marketinskim kampanjama, korak po korak."
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Tvoja databaza je kreirana."
-
-#. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "POS"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Asociacije"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Pomaze da izadjete na kraj sa racunovodstvenim potrebama. Ako niste "
-"knjigovodja, predlazemo ti da instaliras samo Fakturisanje "
-
-#. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Sledeci korisnici su instalirani: \n"
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Proces Konfiguracije"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Podnožje izveštaja 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Valuta"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Fed. State"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marketing"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Preduzece"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Menadzment Prodaje"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Moze instalirati razne interesatne anli ne i esencijalne alatke kao sto su "
-"Survey, Lunch i Ideas box."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Mozes poceti sa konfiguracijom sistema, ili se konektovano direktno da "
-"databazu kao administrator."
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Napredno Izvestavanje"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefon"
-
-#. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "naslov"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Menadzment Znanja"
-
-#. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Instalira preselektovani set OPenErp Aplikacija koje ce ti pomoci da "
-"rukuvodis svojom industrijom."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"POmaze ti da rukovodis svojim projektima i zadacima prateci ih, generisanjem "
-"planova, itd..."
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Naziv Preduzeca"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
-"POmaze da upravljas svojim ljudskim resursima pregledom tvoje strukture "
-"zaposlenih, generisanjem radnih lista, pracenjem prisutnosti na poslu, i jos "
-"mnogo vise."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
-"Omogucava ti da kreiras svoje fakture i da pratis placanja. Ovo je laksa "
-"verzija racunovodstvenog modula za menadzere koji nisu racunovodje."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
-
-#. module: base_setup
-#: help:base.setup.installer,purchase:0
+#: help:user.preferences.config,context_lang:0
 msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+"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 ""
-"Pomaze ti pri rukovodjenju svojim nabavno-relacionim procesima kao sto su "
-"zahtevi za upite, fakture dobavljaca, itd ..."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:user.preferences.config:0
 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"
+"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 ""
-"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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Ulica 2"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Drzava"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Podešavanje"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Racunovodstvo & Finansije"
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Aukcione Kuce"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Postanski kod"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Startuj Konfiguraciju"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
-"Omogucava ti da instaliras dodatke koji se krecu i prenose saznanja sa i "
-"izmedju tvojih zaposlenih."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "KOnfiguracija Preduzeca"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logotip"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
-"Pomaze da dobijes najvise od POS-a sa brzim pretragom prodaje, "
-"pojednostavljuje nacine placanja, automatski izbor generisanih lista i jos "
-"mnogo vise."
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Rukovodjenje Nabavkom"
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr "Pomaze ti da savladas svoje upite, prodajne zahteve i fakturisanje."
-
-#. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Upravljanje Skladistima"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Upravljanje Projektom"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Instalirani Korisnici"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Nova databaza"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Upravljanje korisnickim medjusobnim odnosima"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
-"Instalira preselektovani set OpenERP aplikacija selektovanih da ti pomognu "
-"pri aukcijama kao i svim poslovnim procesima vezanim za aukcije."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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\""
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Omogucava instalaciju raznih alatki koje pojednostavljuju i unapredjuju "
-"OpenERP-ovu kreaciju izvestaja."
 
 #. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Zaglavlje izveštaja"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Informacije o tvojoj novoj databazi"
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Slika"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Industrija Hrane"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Proizvodnja"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Vaš logotip - Koristite veličinu oko 450x150 piksela."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 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"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Web strana preduzeca"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "INstalira specificne industrijske aplikacije"
-
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Ulica"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Example: http:/zmajsoft.com"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Instalira Aplikacije"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 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."
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
-"POmaze ti da upravljas svojim inventarom i glavnim magacinskim zadacima: "
-"Isporuka zahteva, prijemi, itd..."
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Bazna Podesavanja"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
-"Instalira preselektovani set openERP aplikacija koje ce ti pomoci u "
-"upravljanju svojim asocijacijama efikasnije."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
+msgstr ""
 
 #~ msgid ""
 #~ "A profile sets a pre-selection of modules for specific needs. These profiles "
@@ -547,6 +293,9 @@ msgstr "base.setup.config"
 #~ 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"
@@ -564,6 +313,12 @@ msgstr "base.setup.config"
 #~ "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"
 
@@ -576,9 +331,18 @@ msgstr "base.setup.config"
 #~ 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"
 
@@ -588,12 +352,57 @@ msgstr "base.setup.config"
 #~ 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"
 
@@ -603,5 +412,250 @@ msgstr "base.setup.config"
 #~ msgid "Cancel"
 #~ msgstr "Otkaži"
 
+#~ 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 "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."
+
+#~ 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.config"
+#~ msgstr "base.setup.config"
+
+#, python-format
+#~ msgid "The following users have been installed : \n"
+#~ msgstr "Sledeci korisnici su instalirani: \n"
diff --git a/addons/base_setup/i18n/sr@latin.po b/addons/base_setup/i18n/sr@latin.po
index 25fa7984891..e580ec02dbe 100644
--- a/addons/base_setup/i18n/sr@latin.po
+++ b/addons/base_setup/i18n/sr@latin.po
@@ -7,540 +7,591 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Grad"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Instaliraj"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Fakturisanje"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Ljudski Resursi"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-mail"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Br Naloga Banke"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Dodatni Alati"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Podnožje izveštaja 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Pomaze vam pri upravljanju proizvodnim procesima i generise izvestaje vezane "
-"za iste."
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
-"Pomaze pri upravljanju tvojim marketinskim kampanjama, korak po korak."
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Tvoja databaza je kreirana."
-
-#. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "POS"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Asociacije"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Pomaze da izadjete na kraj sa racunovodstvenim potrebama. Ako niste "
-"knjigovodja, predlazemo ti da instaliras samo Fakturisanje "
-
-#. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Sledeci korisnici su instalirani: \n"
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Proces Konfiguracije"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Podnožje izveštaja 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Valuta"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Fed. State"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marketing"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Preduzece"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Menadzment Prodaje"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Moze instalirati razne interesatne anli ne i esencijalne alatke kao sto su "
-"Survey, Lunch i Ideas box."
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Mozes poceti sa konfiguracijom sistema, ili se konektovano direktno da "
-"databazu kao administrator."
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Napredno Izvestavanje"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefon"
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "naslov"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Menadzment Znanja"
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
+#: view:base.setup.terminology:0
 msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Instalira preselektovani set OPenErp Aplikacija koje ce ti pomoci da "
-"rukuvodis svojom industrijom."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
-"POmaze ti da rukovodis svojim projektima i zadacima prateci ih, generisanjem "
-"planova, itd..."
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Naziv Preduzeca"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,context_lang:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
-"POmaze da upravljas svojim ljudskim resursima pregledom tvoje strukture "
-"zaposlenih, generisanjem radnih lista, pracenjem prisutnosti na poslu, i jos "
-"mnogo vise."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
+#: view:user.preferences.config:0
 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."
+"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 ""
-"Omogucava ti da kreiras svoje fakture i da pratis placanja. Ovo je laksa "
-"verzija racunovodstvenog modula za menadzere koji nisu racunovodje."
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
-"Pomaze ti pri rukovodjenju svojim nabavno-relacionim procesima kao sto su "
-"zahtevi za upite, fakture dobavljaca, itd ..."
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
-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"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 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"
 
 #. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Ulica 2"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Drzava"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Podešavanje"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Racunovodstvo & Finansije"
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Aukcione Kuce"
+#: help:user.preferences.config,menu_tips:0
+msgid ""
+"Check out this box if you want to always display tips on each menu action"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Postanski kod"
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
+msgid "Image"
+msgstr "Slika"
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Startuj Konfiguraciju"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
-"Omogucava ti da instaliras dodatke koji se krecu i prenose saznanja sa i "
-"izmedju tvojih zaposlenih."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "KOnfiguracija Preduzeca"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logotip"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
-"Pomaze da dobijes najvise od POS-a sa brzim pretragom prodaje, "
-"pojednostavljuje nacine placanja, automatski izbor generisanih lista i jos "
-"mnogo vise."
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Rukovodjenje Nabavkom"
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr "Pomaze ti da savladas svoje upite, prodajne zahteve i fakturisanje."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Upravljanje Skladistima"
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Upravljanje Projektom"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
+msgstr ""
 
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Instalirani Korisnici"
+#~ msgid "City"
+#~ msgstr "Grad"
 
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Nova databaza"
+#~ msgid "Invoicing"
+#~ msgstr "Fakturisanje"
 
-#. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Upravljanje korisnickim medjusobnim odnosima"
+#~ msgid "Company Name"
+#~ msgstr "Naziv Preduzeca"
 
-#. module: base_setup
-#: help:base.setup.installer,auction:0
-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 "E-mail"
+#~ msgstr "E-mail"
 
-#. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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 "Bank Account No"
+#~ msgstr "Br Naloga Banke"
 
-#. module: base_setup
-#: help:base.setup.installer,report_designer:0
-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 "Extra Tools"
+#~ msgstr "Dodatni Alati"
 
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Zaglavlje izveštaja"
+#~ msgid "Report Footer 1"
+#~ msgstr "Podnožje izveštaja 1"
 
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Informacije o tvojoj novoj databazi"
+#~ 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."
 
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
-msgid "Image"
-msgstr "Slika"
+#~ msgid "Helps you manage your marketing campaigns step by step."
+#~ msgstr ""
+#~ "Pomaze pri upravljanju tvojim marketinskim kampanjama, korak po korak."
 
-#. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Industrija Hrane"
+#~ msgid "Your database is now created."
+#~ msgstr "Tvoja databaza je kreirana."
 
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Proizvodnja"
+#~ msgid "Point of Sales"
+#~ msgstr "POS"
 
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Vaš logotip - Koristite veličinu oko 450x150 piksela."
+#~ msgid "Associations"
+#~ msgstr "Asociacije"
 
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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 ""
+#~ "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 "
 
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Web strana preduzeca"
+#~ 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."
 
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "INstalira specificne industrijske aplikacije"
+#~ msgid "Configuration Progress"
+#~ msgstr "Proces Konfiguracije"
 
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Ulica"
+#~ msgid "Report Footer 2"
+#~ msgstr "Podnožje izveštaja 2"
 
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr ""
+#~ msgid "Currency"
+#~ msgstr "Valuta"
 
-#. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Example: http:/zmajsoft.com"
+#~ msgid "Fed. State"
+#~ msgstr "Fed. State"
 
-#. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Instalira Aplikacije"
+#~ msgid "Marketing"
+#~ msgstr "Marketing"
 
-#. module: base_setup
-#: help:base.setup.installer,crm:0
-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 "Company"
+#~ msgstr "Preduzece"
 
-#. module: base_setup
-#: help:base.setup.installer,stock:0
-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 "Sales Management"
+#~ msgstr "Menadzment Prodaje"
 
-#. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Bazna Podesavanja"
+#~ 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."
 
-#. module: base_setup
-#: help:base.setup.installer,association:0
-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 "Advanced Reporting"
+#~ msgstr "Napredno Izvestavanje"
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#~ msgid "Phone"
+#~ msgstr "Telefon"
 
-#~ msgid "Point of Sales"
-#~ msgstr "POS"
+#~ 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 "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 "
@@ -594,6 +645,9 @@ msgstr "base.setup.config"
 #~ msgid "Define Main Company"
 #~ msgstr "Definisi Osnovno Preduzece"
 
+#~ msgid "Install"
+#~ msgstr "Instaliraj"
+
 #~ msgid "Installation Done"
 #~ msgstr "Instalacija je završena"
 
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index 0dfabca49da..6862f5929cb 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/i18n/sv.po
@@ -6,530 +6,279 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:56+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Ort"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Installera"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Fakturering"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Personalresurser"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-post"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Bankkonto"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Extraverktyg"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Rapportfot 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Hjälper dig att hantera dina tillverkningsprocesser och generera rapporter "
-"till dessa"
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "Hjälper dig att hantera marknadsföringskampanjer steg för steg"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Din databas är nu skapad"
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Kassa"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Organisationer"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Hjälper dig att hantera dina bokföringsbehov. Om du inte jobbar med "
-"redovisning rekommenderar vi dig att enbart installera faktureringsmodulen "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Följande användere har nu blivit installerade \n"
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Konfigurationsförlopp"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Rapportfot 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Valuta"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "Amerikansk delstat"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Marknadsföring"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Företag"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Försäljningsadministration"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Du kan börja konfigurera systemet eller koppla dig direkt till databasen som "
-"en administratör."
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Avancerad rapportering"
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefon"
-
-#. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
-"Dina företagsuppgifter används för att personalisera dokument som OpenERP "
-"skapar, exempelvis fakturor, ordrar och många fler."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "titel"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Kunskapsförvaltning"
-
-#. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Företagsnamn"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Hoppa över konfigureringsguide"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 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."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
-
-#. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: help:user.preferences.config,context_lang:0
 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"
+"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 ""
-"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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Gata 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Land"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Ställ in"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Bokföring och finans"
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Auktionshus"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Postnummer"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Starta konfigurationen"
 
 #. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: view:user.preferences.config:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
-"Låter dig installera tillägg för att dela kunskap mellan medarbetare."
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 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."
-
-#. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Företagskonfiguration"
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logga"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Inköpshantering"
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr "Hjälper dig att hantera dina offerter, ordrar och fakturor."
-
-#. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Lagerstyrning"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Projekthantering"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Installerade användare"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Ny databas"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Kundvård (CRM)"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: 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.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Låter dig installera diverse verktyg för att göra det enklare att göra "
-"bättre OpenERP rapporter."
 
 #. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Rapporthuvud"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Information om din nya databas"
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Bild"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Livsmedelsindustri"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Tillverkning"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Företagets logotyp - använd en storlek kring 450x150 bildpunkter."
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 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"
-
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Företagets webbplats"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Installera specifika industriapplikationer"
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Gata"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Konfigurera ditt företags information"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Exempel: http://openerp.com"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Installera applikationer"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 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."
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Basala inställningar"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
+msgstr ""
 
 #~ msgid ""
 #~ "You can start configuring the system or connect directly to the database "
@@ -547,6 +296,9 @@ msgstr "base.setup.config"
 #~ 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 ""
@@ -565,41 +317,330 @@ msgstr "base.setup.config"
 #~ 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 "Cancel"
 #~ msgstr "Avbryt"
 
+#~ msgid "Logo"
+#~ msgstr "Logga"
+
+#~ msgid "Base Setup"
+#~ msgstr "Basala inställningar"
+
 #~ msgid "Previous"
 #~ msgstr "Föregårende"
 
 #~ msgid "General Information"
 #~ msgstr "Allmän information"
 
+#~ msgid "City"
+#~ msgstr "Ort"
+
+#~ 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 "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"
diff --git a/addons/base_setup/i18n/th.po b/addons/base_setup/i18n/th.po
index eacc77db53d..e0c56577dee 100644
--- a/addons/base_setup/i18n/th.po
+++ b/addons/base_setup/i18n/th.po
@@ -7,496 +7,278 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-01-15 08:18+0000\n"
 "Last-Translator: Rungsan Suyala <rungsan@gmail.com>\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: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "จังหวัด"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "ติดตั้ง"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "การแจ้งหนี้"
-
-#. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "ทรัพยากรบุคคล"
-
-#. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "อีเมล์"
-
-#. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "เลขบัญชีธนาคาร"
-
-#. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "เครื่องมือเพิ่มเติม"
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "ท้ายรายงาน"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
-msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "กำลังสร้างฐานข้อมูลของคุณ"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "ท้ายรายงาน 2"
-
-#. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "หน่วยเงินตรา"
-
-#. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "การตลาด"
-
-#. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "บริษัท"
-
-#. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "การบริหารการขาย"
-
-#. module: base_setup
-#: help:base.setup.installer,profile_tools:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+#: field:product.installer,customers:0
+msgid "Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "โทรศัพท์"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "คำนำหน้าชื่อ"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "ชื่อบริษัท"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:base.setup.terminology:0
 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"
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"ข้อมูลนี่จะอยู่ในท้ายกระดาษของรายงาน\n"
-"เราแนะนำให้เปลี่ยนโดยใส่ข้อมูลของธนาคาร\n"
-"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "อำเภอ"
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "ประเทศ"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "ตั้งค่า"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "บัญชีและการเงิน"
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "ประมูลบ้าน"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "รหัสไปรษณีย์"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "เริ่มการตั้งค่า"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: help:user.preferences.config,context_lang:0
 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."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "ตั้งค่าบริษัท"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "โลโก้"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
+#: view:user.preferences.config:0
 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."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "การบริหารการจัดซื้อ"
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "การบริหารสินค้าคงคลัง"
-
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "การบริหารโครงการ"
-
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "สร้างฐานข้อมูลใหม่"
-
-#. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "การบริหารลูกค้าสัมพันธ์"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
 msgstr ""
-"ข้อมูลนี่จะอยู่ในด้านบนขวาของรายงานท่าน\n"
-"กรุณาใส่ สโลแกน\n"
-"\"Open Source Business Solutions\"."
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
-msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "หัวรายงาน"
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
+#: help:user.preferences.config,menu_tips:0
+msgid ""
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "รูปภาพ"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "อุตสาหกรรมอาหาร"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "การผลิต"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "กรุณาใช้โลโก้ขนาด 450X150 px"
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
-"ข้อมูลนี่จะอยู่ในท้ายกระดาษของรายงาน\n"
-"เราแนะนำให้ท่านนำข้อมูลเกี่ยวกับทางกฏหมาย\n"
-"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "ที่อยู่"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "ติดตั้งแอ็พพลิเคชั่น"
-
-#. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "ตั้งค่าพื้นฐาน"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
 
 #~ msgid ""
@@ -507,6 +289,9 @@ msgstr ""
 #~ "รูปแบบโมดูลเป็นเพียงการตั้งค่าแนะนำในการใช้งานเพื่อตั้งค่าได้ง่ายขึ้น "
 #~ "แต่เรามีโมดูลที่สามารถหาติดตั้งได้มากกว่า 500 โมดูล"
 
+#~ msgid "E-mail"
+#~ msgstr "อีเมล์"
+
 #~ msgid "Report header"
 #~ msgstr "หัวรายงาน"
 
@@ -522,6 +307,9 @@ msgstr ""
 #~ "You'll be able to install more modules later through the Administration menu."
 #~ msgstr "คุณสามารถลงโมดูลใหม่ๆได้ในเมนูการบริหารระบบ"
 
+#~ msgid "Start Configuration"
+#~ msgstr "เริ่มการตั้งค่า"
+
 #~ msgid "Zip code"
 #~ msgstr "รหัสไปรษณีย์"
 
@@ -534,12 +322,18 @@ msgstr ""
 #~ msgid "Profile"
 #~ msgstr "รูปแบบ"
 
+#~ msgid "Report Footer 2"
+#~ msgstr "ท้ายรายงาน 2"
+
 #~ msgid "State"
 #~ msgstr "จังหวัด"
 
 #~ msgid "Street2"
 #~ msgstr "ตำบล"
 
+#~ msgid "Phone"
+#~ msgstr "โทรศัพท์"
+
 #~ msgid "Report Information"
 #~ msgstr "ข้อมูลรายงาน"
 
@@ -549,17 +343,146 @@ 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 "Cancel"
 #~ 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 "Base Setup"
+#~ msgstr "ตั้งค่าพื้นฐาน"
+
+#~ msgid "Install Applications"
+#~ msgstr "ติดตั้งแอ็พพลิเคชั่น"
+
+#~ msgid "Currency"
+#~ msgstr "หน่วยเงินตรา"
+
+#~ msgid "Sales Management"
+#~ msgstr "การบริหารการขาย"
diff --git a/addons/base_setup/i18n/tlh.po b/addons/base_setup/i18n/tlh.po
index 6f8b89d6cd8..da83b685e0c 100644
--- a/addons/base_setup/i18n/tlh.po
+++ b/addons/base_setup/i18n/tlh.po
@@ -6,485 +6,276 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2009-02-03 06:25+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
+#: selection:product.installer,customers:0
+msgid "Create"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,account_accountant:0
-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
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
+#: field:product.installer,customers:0
+msgid "Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:base.setup.terminology:0
 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 ""
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
+#: help:user.preferences.config,context_lang:0
 msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: view:user.preferences.config:0
 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."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,auction:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,report_designer:0
-msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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 ""
-
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index 0f279bc80c0..0cc157f9757 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -6,548 +6,295 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:47+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Şehir"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Kur"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Faturalama"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "İnsan Kaynakları"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "E-posta:"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Banka Hesap No"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Ekstra Araçlar"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Rapor Alt Bilgisi 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
-"Üretim süreçlerinizi yönetmeyi ve üretim süreçlerini raporlamanızı sağlar."
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "Pazarlama kampanyalarınızı adım adım yöntemeyi sağlar."
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "Veritabanınız Oluşturuldu"
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Hızlı Satış Noktası"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "Bağıntılar"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
-"Muhasebe hesaplarını tutmanıza yardımcı olur. Eğer bir muhasebeci değilseniz "
-"sadece Faturalama modülünü kurmanızı tavsiye ederiz. "
-
-#. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Aşağıdaki kullanıcılar kuruldu: \n"
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Yapılandırma Aşaması"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Rapor Alt Bilgisi 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Para Birimi"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "İl"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Pazarlama"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Şirket"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Satış Yönetimi"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
-"Çeşitli çok zorunlu olmayan (Anket, Öğle Yemeği, Fikir Kutusu gibi) araçlar "
-"kurmanıza yarar"
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
-"Sistemi yapılandırmaya başlayabilirsiniz ya da doğrudan veritabanına "
-"yönetici olarak bağlanabilirsiniz."
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Gelişmiş Raporlama"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Telefon No."
-
-#. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
-"Şirket bilgileriniz OpenERP içinde oluşturduğunuz dökümanların şirketinize "
-"göre özelleştirilmesi için kullanılır."
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "başlık"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Bilgi Yönetimi"
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
-"Sektörünüzde size yardımcı olması için önceden seçilmiş bir OpenERP "
-"uygulamaları kümesinin kurulumunu yapar."
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
+#: view:base.setup.terminology:0
 msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"Projelerinizi ve görevlerinizi yönetmenize yardımcı olur (planlamalar "
-"oluşturarak, görev ve projeleri takip ederek, vb...)"
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Firma Adı"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "Yapılandırma sihirbazını geç"
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 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."
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 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."
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "temel.kurulum.şirket"
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
-"Satınalma ilişkili işlemleri (teklif istekleri, tedarikçi faturaları gibi) "
-"yönetmenize yardım eder"
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: help:user.preferences.config,context_lang:0
 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"
+"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 ""
-"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"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "Sokak 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "temel.kurulum.yükleyici"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Ülke"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Kurulum"
 
 #. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Muhasebe & Finans"
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Müzayede Salonları"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Posta Kodu"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Yapılandırmayı Başlat"
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
-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."
-
-#. module: base_setup
-#: view:base.setup.installer:0
+#: view:user.preferences.config:0
 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."
+"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 ""
-"Sisteminizin içermesini istediğiniz uygulamaları seçin. Gereken uygulamalar "
-"konusunda emin değilseniz daha sonra kolaylıkla uygulama ekleyebilirsiniz."
-
-#. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Şirket Ayarları"
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
-
-#. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 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."
-
-#. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Satınalma Yönetimi"
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-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
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Depo Yönetimi"
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Proje Yönetimi"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Kurulmuş Kullanıcılar"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "Yeni Veritabanı"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Müşteri İlişkileri Yönetimi (CRM)"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
-"Müzayedelerinizi ve bunlarla ilgili işlerinizi yönetmede yardımcı olması "
-"için seçilmiş, önseçimli OpenERP uygulama setini kurar."
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 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\""
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"OpenERP nin raporlama kabiliyetlerini basitleştirip geliştiren çeşitli "
-"araçlar kurun."
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Rapor Üst Bilgisi"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Yeni Veritabanınız hakkında bilgi"
 
 #. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "Resim"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Yemek Endüstrisi"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Üretim"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "Logonuz - Yaklaşık 450x150 pixel resim kullanın"
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 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"
-
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Şirket Websitesi"
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Endüstriye özel uygulamalar kur"
-
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Adres"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Şirket bilgilerinizi değiştirin"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Örnek: http://openerp.com"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Uygulamaları Kur"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 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."
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
-"Stoklarınızı ve ana stok işlemlerinizi: sevkiyat emirleri, kabuller, v.s. "
-"yönetmenize yardım eder"
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Temel Kurulum"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
-"Ortaklıklarınızı daha verimli yönetmeniz için önceden seçilmiş OpenERP "
-"uygulama setlerini kurar."
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "temel.kurulum.ayar"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
+msgstr ""
 
 #~ 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"
 
@@ -557,20 +304,360 @@ msgstr "temel.kurulum.ayar"
 #~ 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 "Cancel"
 #~ msgstr "İptal"
 
+#~ 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"
+
+#~ msgid "Warehouse Management"
+#~ msgstr "Depo Yönetimi"
+
+#~ msgid "Purchase Management"
+#~ msgstr "Satınalma Yönetimi"
+
+#~ msgid "Company Configuration"
+#~ msgstr "Şirket Ayarları"
+
+#~ msgid "Start Configuration"
+#~ msgstr "Yapılandırmayı Başlat"
+
+#~ msgid "Helps you handle your quotations, sale orders and invoicing."
+#~ msgstr "Teklifleri, sipariş emirlerini ve faturalarınızı yönetmenizi sağlar"
+
+#~ msgid "Project Management"
+#~ msgstr "Proje Yönetimi"
+
+#~ 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 "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"
diff --git a/addons/base_setup/i18n/uk.po b/addons/base_setup/i18n/uk.po
index ae7cb912e4e..d2d4b97aecf 100644
--- a/addons/base_setup/i18n/uk.po
+++ b/addons/base_setup/i18n/uk.po
@@ -6,488 +6,282 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2009-09-08 16:18+0000\n"
 "Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Місто"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Встановити"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "Ел.пошта"
-
-#. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Нижній колонтитул 1"
-
-#. module: base_setup
-#: help:base.setup.installer,mrp:0
-msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: selection:product.installer,customers:0
+msgid "Create"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: help:user.preferences.config,context_tz:0
 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
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Нижній колонтитул 2"
-
-#. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Валюта"
-
-#. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+#: field:product.installer,customers:0
+msgid "Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Телефон"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+"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 ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Назва компанії"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:base.setup.terminology:0
 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 ""
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Країна"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Встановлення"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.installer:0
+#: help:user.preferences.config,context_lang:0
 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 ""
-
-#. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
+#: view:user.preferences.config:0
 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."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Installs a preselected set of OpenERP applications selected to help you "
-"manage your auctions as well as the business processes around them."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,report_designer:0
-msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Верхній колонтитул"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr ""
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr ""
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr ""
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Вулиця"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
 msgstr ""
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr ""
+#~ msgid "City"
+#~ msgstr "Місто"
 
 #~ msgid "Zip code"
 #~ msgstr "Індекс"
@@ -498,6 +292,9 @@ msgstr ""
 #~ msgid "Next"
 #~ msgstr "Далі"
 
+#~ msgid "E-mail"
+#~ msgstr "Ел.пошта"
+
 #~ msgid "State"
 #~ msgstr "Область"
 
@@ -507,12 +304,42 @@ 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 "Валюта"
+
+#~ msgid "Street"
+#~ msgstr "Вулиця"
+
 #~ msgid "Cancel"
 #~ msgstr "Скасувати"
 
diff --git a/addons/base_setup/i18n/vi.po b/addons/base_setup/i18n/vi.po
index 2d63ca2d0fc..1901dfa5ec6 100644
--- a/addons/base_setup/i18n/vi.po
+++ b/addons/base_setup/i18n/vi.po
@@ -7,488 +7,424 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:42+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "Thành phố"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "Cài đặt"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "Hóa đơn"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "Nguồn nhân lực"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "Thư điện tử"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "Số tài khoản ngân hàng"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "Các công cụ Mở rộng"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
+#: selection:product.installer,customers:0
+msgid "Import"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "CSDL của bạn đã được tạo"
-
-#. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "Điểm bán hàng"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"Helps you handle your accounting needs, if you are not an accountant, we "
-"suggest you to install only the Invoicing "
+"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 ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "Những người sử dụng sau đã được cài đặt: \n"
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Tiến trình cấu hình"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "Loại tiền"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "Tiếp thị"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "Công ty"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "Quản lý bán hàng"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "Báo cáo cao cấp"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "Điện thoại"
-
-#. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
+#: field:user.preferences.config,view:0
+msgid "Interface"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "cách xưng hô"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "Quản lý kiến thức"
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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 ""
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
+#: view:base.setup.terminology:0
 msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "Tên công ty"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,context_lang:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
+#: view:user.preferences.config:0
 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."
+"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 ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
-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"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "Quốc gia"
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr ""
 
 #. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "Cài đặt"
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "Kế toán & Tài chính"
+#: help:user.preferences.config,menu_tips:0
+msgid ""
+"Check out this box if you want to always display tips on each menu action"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "Nhà bán đấu giá"
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
+msgid "Image"
+msgstr "Hình ảnh"
 
 #. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "Mã bưu điện"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "Bắt đầu cấu hình"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-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."
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "Cấu hình Công ty"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Biểu tượng"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-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."
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "Quản lý Mua hàng"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "Quản lý Kho hàng"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
+msgstr ""
 
-#. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "Quản lý Dự án"
+#~ msgid "E-mail"
+#~ msgstr "Thư điện tử"
 
-#. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "Người sử dụng đã được cài đặt"
+#~ msgid "City"
+#~ msgstr "Thành phố"
 
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "CSDL mới"
+#~ msgid "Bank Account No"
+#~ msgstr "Số tài khoản ngân hàng"
 
-#. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "Quản lý Quan hệ Khách hàng"
+#~ msgid "Invoicing"
+#~ msgstr "Hóa đơn"
 
-#. module: base_setup
-#: help:base.setup.installer,auction:0
-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 "Company Name"
+#~ msgstr "Tên công ty"
 
-#. module: base_setup
-#: help:base.setup.company,rml_header1:0
-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 "Your database is now created."
+#~ msgstr "CSDL của bạn đã được tạo"
 
-#. module: base_setup
-#: help:base.setup.installer,report_designer:0
-msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
-msgstr ""
+#~ msgid "Currency"
+#~ msgstr "Loại tiền"
 
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "Tiêu đề Báo cáo"
+#~ msgid "Phone"
+#~ msgstr "Điện thoại"
 
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "Thông tin về CSDL mới của bạn"
+#~ msgid "Sales Management"
+#~ msgstr "Quản lý bán hàng"
 
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
-msgid "Image"
-msgstr "Hình ảnh"
+#~ msgid "Company"
+#~ msgstr "Công ty"
 
-#. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "Công nghiệp Thực phẩm"
+#~ msgid "title"
+#~ msgstr "cách xưng hô"
 
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "Sản xuất"
+#~ msgid "Knowledge Management"
+#~ msgstr "Quản lý kiến thức"
 
-#. module: base_setup
-#: view:base.setup.company:0
-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 "Zip Code"
+#~ msgstr "Mã bưu điện"
 
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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 ""
+#~ msgid "Accounting & Finance"
+#~ msgstr "Kế toán & Tài chính"
 
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "Trang web Công ty"
+#~ msgid "Setup"
+#~ msgstr "Cài đặt"
 
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "Cài đặt các Ứng dụng đặc thù theo ngành"
+#~ msgid "Country"
+#~ msgstr "Quốc gia"
 
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "Đường phố"
+#~ msgid "Install"
+#~ msgstr "Cài đặt"
 
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "Cấu hình Thông tin Công ty của Bạn"
+#~ msgid "Configuration Progress"
+#~ msgstr "Tiến trình cấu hình"
 
-#. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "Ví dụ: http://openerp.com"
+#~ msgid "Marketing"
+#~ msgstr "Tiếp thị"
 
-#. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "Cài đặt các Ứng dụng"
+#, python-format
+#~ msgid "The following users have been installed : \n"
+#~ msgstr "Những người sử dụng sau đã được cài đặt: \n"
 
-#. module: base_setup
-#: help:base.setup.installer,crm:0
-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 "Advanced Reporting"
+#~ msgstr "Báo cáo cao cấp"
 
-#. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
-msgstr ""
+#~ msgid "base.setup.installer"
+#~ msgstr "base.setup.installer"
 
-#. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "Thiết lập cơ sở"
+#~ msgid "Auction Houses"
+#~ msgstr "Nhà bán đấu giá"
 
-#. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
-msgstr ""
+#~ msgid "base.setup.company"
+#~ msgstr "base.setup.company"
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#~ 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 "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"
+
+#~ msgid "Human Resources"
+#~ msgstr "Nguồn nhân lực"
+
+#~ msgid "Project Management"
+#~ msgstr "Quản lý Dự án"
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index 670a9f6ed58..1763ecccc60 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -6,503 +6,282 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:44+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "城市"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "安装"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "发票"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "人力资源"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "电子邮件"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "银行账号"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "额外工具"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "报表页脚1"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
+#: help:user.preferences.config,context_tz:0
 msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
-msgstr "帮助您管理您的生产和其生成的报表。"
-
-#. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "帮助您管理市场营销。"
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "您的帐套（数据库）已经创建。"
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "销售点"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "商会"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 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
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "下列用户已经安装 \n"
+"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 ""
 
 #. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "设置进度"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "报表页脚 2"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "币别"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "省／州"
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+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 ""
 
 #. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "市场营销"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "公司"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "销售管理"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
-msgstr "让你安装各种有趣的但非必需的工具如： 调查, 午餐 和 创意"
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: help:user.preferences.config,view:0
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
-msgstr "您可以开始设置系统或者直接作为管理员连接到数据库。"
-
-#. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "高级报告"
-
-#. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-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."
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
 msgid "res_config_contents"
 msgstr "res_config_contents"
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid ""
-"Your company information will be used to personalize documents issued with "
-"OpenERP such as invoices, sales orders and much more."
-msgstr "你公司的信息会出现在OprnERP的各种文档上，例如发票，销售订单，和其他"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "title"
-msgstr "标题"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-msgstr "知识管理"
-
-#. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
-msgstr "安装这个OpenERP预设模块，帮助你管理你的企业"
-
-#. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
-msgstr "帮助你管理项目，跟踪任务，生成计划等"
-
-#. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "公司名称"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "跳过设置向导"
-
-#. module: base_setup
-#: help:base.setup.installer,hr:0
-msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
-msgstr "帮助你管理你的人力资源员员工架构，生成工作计工单，考勤等"
-
-#. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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 "允许你创建发票并跟踪付款,这是一个面向没有会计知识的管理人员的简化版会计模块"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "base.setup.company"
+#: field:user.preferences.config,view:0
+msgid "Interface"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
-msgstr "帮助您管理采购相关流程，如询价、供货商发票等等"
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:base.setup.terminology:0
 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"
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"这将显示在报表底部。\n"
-"建议你在这输入银行信息："
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "街道地址 2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "base.setup.installer"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "国家"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "设置"
 
 #. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "会计 & 财务"
-
-#. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "拍卖行"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "邮政编码"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "开始设置"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
-msgstr "让您安装模块使您的员工可以分享知识。"
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: help:user.preferences.config,context_lang:0
 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 "选择你系统所包含的模块。如果你当前还不确定，你可以在以后再安装它们"
-
-#. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "公司设置"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-msgstr "Logo"
+"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 ""
 
 #. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
+#: view:user.preferences.config:0
 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
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "采购管理"
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
-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."
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "仓库管理"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "项目管理"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "已安装的用户"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "新数据库"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "客户关系管理"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-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预设模块，帮助你管理拍卖以及相关的业务流程。"
+#: 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.setup.company,rml_header1:0
-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\"."
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
 msgstr ""
-"这将显示在报表的右上角。\n"
-"建议你在这放一个标语："
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
-msgstr "让您安装工具来简化和增强 OpenERP 的报表创建功能."
-
-#. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "报表页眉"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "您的新数据库信息"
+"Check out this box if you want to always display tips on each menu action"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "图片"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "食品工业"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "生产"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "你的Logo使用的尺寸为450×150像素"
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
-"这将显示在报表底部。\n"
-"建议你在这放入正式的公司信息和联系方式："
 
 #. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "公司网站"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "安装特定的行业模块"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "街道"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "设置您的公司信息"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "例如：http://openerp.com"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "安装模块"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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 "帮助您跟踪和管理与客户的线索，请求或问题。能自动发送提醒，提升请求等级，基于标准的事件触发指定的商业动作。"
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
-msgstr "帮助您管理库存与仓库相关操作：发货单、收货单等"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "基础安装"
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
-msgstr "安装这个OpenERP预设模块，帮助你管理你的商会。"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
+msgstr ""
 
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "base.setup.config"
+#~ msgid "Report Header"
+#~ msgstr "报表页眉"
 
 #~ msgid "Profile"
 #~ msgstr "配置"
@@ -510,6 +289,9 @@ msgstr "base.setup.config"
 #~ msgid "Select a Profile"
 #~ msgstr "选择一个配置"
 
+#~ msgid "City"
+#~ msgstr "城市"
+
 #~ msgid "Zip code"
 #~ msgstr "邮编"
 
@@ -519,12 +301,30 @@ msgstr "base.setup.config"
 #~ msgid "Next"
 #~ msgstr "下一个"
 
+#~ msgid "Phone"
+#~ msgstr "电话"
+
+#~ msgid "Company Name"
+#~ msgstr "公司名称"
+
+#~ msgid "Country"
+#~ msgstr "国家"
+
+#~ msgid "Setup"
+#~ msgstr "设置"
+
 #~ msgid "Summary"
 #~ msgstr "概要"
 
+#~ msgid "Install"
+#~ msgstr "安装"
+
 #~ msgid "Cancel"
 #~ msgstr "取消"
 
+#~ msgid "Report Footer 2"
+#~ msgstr "报表页脚 2"
+
 #~ msgid "Street2"
 #~ msgstr "街区地址2"
 
@@ -551,6 +351,9 @@ msgstr "base.setup.config"
 #~ "using the default setup."
 #~ msgstr "你可以开始设置系统或使用默认的设置连接到数据库"
 
+#~ msgid "Start Configuration"
+#~ msgstr "开始设置"
+
 #~ msgid ""
 #~ "You'll be able to install more modules later through the Administration menu."
 #~ msgstr "你以后可以通过管理员菜单安装更多的模块."
@@ -561,11 +364,295 @@ msgstr "base.setup.config"
 #~ "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 "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 "生产"
diff --git a/addons/base_setup/i18n/zh_TW.po b/addons/base_setup/i18n/zh_TW.po
index e56ace16d84..6076f2f759a 100644
--- a/addons/base_setup/i18n/zh_TW.po
+++ b/addons/base_setup/i18n/zh_TW.po
@@ -6,516 +6,307 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"POT-Creation-Date: 2011-12-22 18:44+0000\n"
 "PO-Revision-Date: 2011-11-07 12:53+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-23 06:07+0000\n"
+"X-Generator: Launchpad (build 14560)\n"
 
 #. module: base_setup
-#: field:base.setup.company,city:0
-msgid "City"
-msgstr "城市"
-
-#. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install"
-msgstr "安裝"
-
-#. module: base_setup
-#: field:base.setup.installer,account_voucher:0
-msgid "Invoicing"
-msgstr "發票"
-
-#. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
-msgstr "人力資源"
-
-#. module: base_setup
-#: field:base.setup.company,email:0
-msgid "E-mail"
-msgstr "電子郵件"
-
-#. module: base_setup
-#: field:base.setup.company,account_no:0
-msgid "Bank Account No"
-msgstr "銀行帳戶號碼"
-
-#. module: base_setup
-#: field:base.setup.installer,profile_tools:0
-msgid "Extra Tools"
-msgstr "額外工具"
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "報表頁尾1"
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,mrp:0
-msgid ""
-"Helps you manage your manufacturing processes and generate reports on those "
-"processes."
-msgstr "助您管理生產工序及為這些工序製作報告。"
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,marketing:0
-msgid "Helps you manage your marketing campaigns step by step."
-msgstr "助您逐步進行行銷活動。"
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Your database is now created."
-msgstr "已建立資料庫。"
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sale"
-msgstr "鎖售點 (POS)"
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,association:0
-msgid "Associations"
-msgstr "關聯"
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_accountant:0
+#: help:user.preferences.config,context_tz:0
 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
-#: code:addons/base_setup/__init__.py:50
-#, python-format
-msgid "The following users have been installed : \n"
-msgstr "已安裝以下用戶： \n"
-
-#. module: base_setup
-#: field:base.setup.company,progress:0
-#: field:base.setup.installer,progress:0
-msgid "Configuration Progress"
-msgstr "配置進度"
-
-#. module: base_setup
-#: field:base.setup.company,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "報表頁尾2"
-
-#. module: base_setup
-#: field:base.setup.company,currency:0
-#: model:ir.model,name:base_setup.model_res_currency
-msgid "Currency"
-msgstr "貨幣"
-
-#. module: base_setup
-#: field:base.setup.company,state_id:0
-msgid "Fed. State"
-msgstr "省或州"
-
-#. module: base_setup
-#: field:base.setup.installer,marketing:0
-msgid "Marketing"
-msgstr "行銷"
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,company_id:0
-msgid "Company"
-msgstr "公司"
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,sale:0
-msgid "Sales Management"
-msgstr "業務管理"
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,profile_tools:0
-msgid ""
-"Lets you install various interesting but non-essential tools like Survey, "
-"Lunch and Ideas box."
-msgstr "讓您安裝各種非必要但有趣的工作，如問卷調查、午膳管理、點子收集等等。"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
 msgid ""
-"You can start configuring the system or connect directly to the database as "
-"an administrator."
-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."
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,report_designer:0
-msgid "Advanced Reporting"
-msgstr "進階報告功能"
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,phone:0
-msgid "Phone"
-msgstr "電話"
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "res_config_contents"
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
 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.setup.installer:0
-msgid "title"
-msgstr "稱謂"
-
-#. module: base_setup
-#: field:base.setup.installer,knowledge:0
-msgid "Knowledge Management"
-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"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,description:base_setup.module_meta_information
-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"
-"    "
-
-#. module: base_setup
-#: help:base.setup.installer,product_expiry:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your industry."
-msgstr "安裝一組預先設定之 OpenERP 應用程式，助您管理廠房及生產工序。"
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,project:0
-msgid ""
-"Helps you manage your projects and tasks by tracking them, generating "
-"plannings, etc..."
-msgstr "助您管理專案及任務，追蹤、製作報告等等。"
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
-msgstr "公司名稱"
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr "略過配置精靈"
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,hr:0
+#: help:user.preferences.config,view:0
 msgid ""
-"Helps you manage your human resources by encoding your employees structure, "
-"generating work sheets, tracking attendance and more."
-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."
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,account_voucher:0
-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."
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
-msgstr "基礎.設置.公司"
+#: field:user.preferences.config,view:0
+msgid "Interface"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,purchase:0
-msgid ""
-"Helps you manage your purchase-related processes such as requests for "
-"quotations, supplier invoices, etc..."
-msgstr "助您管理採購相關事項，比如邀請報價、開立供應商發票等等。"
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,rml_footer2:0
+#: view:base.setup.terminology:0
 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"
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
 msgstr ""
-"此句顯示於報表底部；建議放銀行資訊。\n"
-"如 IBAN 及 SWIFT 編號。"
-
-#. module: base_setup
-#: field:base.setup.company,street2:0
-msgid "Street 2"
-msgstr "街道2"
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_installer
-msgid "base.setup.installer"
-msgstr "基礎.設置.安裝"
-
-#. module: base_setup
-#: field:base.setup.company,country_id:0
-msgid "Country"
-msgstr "國家或地區"
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_base_setup
-msgid "Setup"
-msgstr "設置"
-
-#. module: base_setup
-#: field:base.setup.installer,account_accountant:0
-msgid "Accounting & Finance"
-msgstr "會計及財務"
 
 #. module: base_setup
-#: field:base.setup.installer,auction:0
-msgid "Auction Houses"
-msgstr "拍賣行"
-
-#. module: base_setup
-#: field:base.setup.company,zip:0
-msgid "Zip Code"
-msgstr "郵遞編碼"
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "Start Configuration"
-msgstr "開始配置"
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,knowledge:0
-msgid ""
-"Lets you install addons geared towards sharing knowledge with and between "
-"your employees."
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
 msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
+#: help:user.preferences.config,context_lang:0
 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 "選取您要系統涵蓋之範圍。此階段如不確定，可稍後再安裝。"
-
-#. module: base_setup
-#: view:base.setup.company:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
-msgid "Company Configuration"
-msgstr "公司配置"
-
-#. module: base_setup
-#: field:base.setup.company,logo:0
-msgid "Logo"
-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."
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
+#: view:user.preferences.config:0
 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
-#: field:base.setup.installer,purchase:0
-msgid "Purchase Management"
-msgstr "採購管理"
-
-#. module: base_setup
-#: help:base.setup.installer,sale:0
-msgid "Helps you handle your quotations, sale orders and invoicing."
-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."
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,stock:0
-msgid "Warehouse Management"
-msgstr "庫存管理"
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,project:0
-msgid "Project Management"
-msgstr "專案管理"
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.config,installed_users:0
-msgid "Installed Users"
-msgstr "已安裝用戶"
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.config:0
-msgid "New Database"
-msgstr "新資料庫"
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,crm:0
-msgid "Customer Relationship Management"
-msgstr "客戶關係管理 (CRM)"
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,auction:0
-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 應用程式，助您管理拍賣及相關商業事務。"
+#: 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.setup.company,rml_header1:0
-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 "此句顯示於報表右上角；建議放公司標語。"
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,report_designer:0
+#: help:user.preferences.config,menu_tips:0
 msgid ""
-"Lets you install various tools to simplify and enhance OpenERP's report "
-"creation."
+"Check out this box if you want to always display tips on each menu action"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,rml_header1:0
-msgid "Report Header"
-msgstr "報表頁首"
-
-#. module: base_setup
-#: view:base.setup.config:0
-msgid "Information about your new database"
-msgstr "有關新資料庫之資訊"
-
-#. module: base_setup
-#: field:base.setup.company,config_logo:0
-#: field:base.setup.config,config_logo:0
-#: field:base.setup.installer,config_logo:0
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
 msgid "Image"
 msgstr "圖片"
 
 #. module: base_setup
-#: field:base.setup.installer,product_expiry:0
-msgid "Food Industry"
-msgstr "食品工業"
-
-#. module: base_setup
-#: field:base.setup.installer,mrp:0
-msgid "Manufacturing"
-msgstr "製造業"
-
-#. module: base_setup
-#: view:base.setup.company:0
-msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "公司標誌 - 請用大小約為450×150像素圖片"
-
-#. module: base_setup
-#: help:base.setup.company,rml_footer1:0
-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"
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
 msgstr ""
-"此句顯示於報表底部；建議放公司正規資訊，\n"
-"如網址、傳真號碼等。"
-
-#. module: base_setup
-#: field:base.setup.company,website:0
-msgid "Company Website"
-msgstr "公司網站"
 
 #. module: base_setup
-#: view:base.setup.installer:0
-msgid "Install Specific Industry Applications"
-msgstr "安裝特定產業應用程式"
-
-#. module: base_setup
-#: field:base.setup.company,street:0
-msgid "Street"
-msgstr "街道"
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.company:0
-msgid "Configure Your Company Information"
-msgstr "配置公司資訊"
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.company,website:0
-msgid "Example: http://openerp.com"
-msgstr "例如：http://openerp.com"
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: view:base.setup.installer:0
-#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
-msgid "Install Applications"
-msgstr "安裝應用程式"
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,crm:0
-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 "助您追蹤及管理客戶關係，比如潛在客戶、客戶要求、客戶問題等等。也可自動發送提醒，根據標準事件提升要求注意層級、啟動各種商業行動。"
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,stock:0
-msgid ""
-"Helps you manage your inventory and main stock operations: delivery orders, "
-"receptions, etc."
-msgstr "助您管理存貨及主要庫存作業: 交貨單、接待等等。"
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.module.module,shortdesc:base_setup.module_meta_information
-msgid "Base Setup"
-msgstr "基礎設置"
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,association:0
-msgid ""
-"Installs a preselected set of OpenERP applications which will help you "
-"manage your association more efficiently."
-msgstr "安裝一組預先設定之 OpenERP 應用程式，助您管理相關事務更有效率。"
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
+msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_config
-msgid "base.setup.config"
-msgstr "基礎.設置.配置"
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
+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 "Cancel"
 #~ msgstr "取消"
 
+#~ msgid "Currency"
+#~ msgstr "貨幣"
+
 #~ msgid ""
 #~ "You can start configuring the system or connect directly to the database "
 #~ "using the default setup."
@@ -537,6 +328,9 @@ msgstr "基礎.設置.配置"
 #~ "is just an overview, we have 300+ available modules."
 #~ msgstr "配置文件規定了預選模組的具體需要.這些配置已經安裝以幫助你發現系統的不同的配置.這是一個配置裡面含300多個模組."
 
+#~ msgid "E-mail"
+#~ msgstr "電子郵件"
+
 #~ msgid "State"
 #~ msgstr "省市"
 
@@ -546,6 +340,12 @@ msgstr "基礎.設置.配置"
 #~ msgid "Profile"
 #~ msgstr "配置"
 
+#~ msgid "Report Footer 1"
+#~ msgstr "報表頁尾1"
+
+#~ msgid "Report Footer 2"
+#~ msgstr "報表頁尾2"
+
 #~ msgid "General Information"
 #~ msgstr "一般訊息"
 
@@ -558,14 +358,286 @@ 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像素圖片"
+
+#~ msgid "Information about your new database"
+#~ msgstr "有關新資料庫之資訊"
+
+#~ 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 "Install Applications"
+#~ 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 應用程式，助您管理廠房及生產工序。"