[MERGE] forward port of branch 8.0 up to 3735394

3 files changed, 33 insertions, 27 deletions

diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot
index a4ae58e8131..2d9fb94ee22 100644
--- a/addons/base_setup/i18n/base_setup.pot
+++ b/addons/base_setup/i18n/base_setup.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
+"Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-14 13:08+0000\n"
+"POT-Creation-Date: 2015-01-21 14:07+0000\n"
+"PO-Revision-Date: 2015-01-21 14:07+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -276,7 +276,7 @@ msgstr ""
 
 #. module: base_setup
 #: help:base.config.settings,module_share:0
-msgid "Share or embbed any screen of openerp."
+msgid "Share or embbed any screen of Odoo."
 msgstr ""
 
 #. module: base_setup
@@ -345,6 +345,12 @@ msgid "You will find more options in your company details: address for the heade
 msgstr ""
 
 #. module: base_setup
+#: view:base.config.settings:base_setup.view_general_configuration
+#: view:sale.config.settings:base_setup.view_sale_config_settings
+msgid "or"
+msgstr ""
+
+#. module: base_setup
 #: view:base.setup.terminology:base_setup.base_setup_terminology_form
 msgid "res_config_contents"
 msgstr ""
diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po
index aeef6851c48..50e5097fcf0 100644
--- a/addons/base_setup/i18n/fa.po
+++ b/addons/base_setup/i18n/fa.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-14 16:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-12-25 20:44+0000\n"
+"Last-Translator: ErfanJeddy <erfanjeddy@yahoo.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: 2014-08-15 06:58+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
+"X-Launchpad-Export-Date: 2014-12-26 07:11+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
 msgid "(reload fonts)"
-msgstr ""
+msgstr "(بارگذاری مجدد قلم ها)"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
@@ -30,7 +30,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.config.settings,module_share:0
 msgid "Allow documents sharing"
-msgstr ""
+msgstr "اجازه به اشتراک گذاری اسناد"
 
 #. module: base_setup
 #: field:base.config.settings,module_google_calendar:0
@@ -78,7 +78,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base_setup.action_sale_config
 #: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Configure Sales"
-msgstr "تنظیمات فروش"
+msgstr "پیکربندی فروش"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
@@ -88,7 +88,7 @@ msgstr ""
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
 msgid "Configure your company data"
-msgstr "تنظیم اطلاعات شرکت"
+msgstr "پیکربندی اطلاعات شرکت"
 
 #. module: base_setup
 #: view:sale.config.settings:base_setup.view_sale_config_settings
@@ -100,14 +100,14 @@ msgstr "تماس ها"
 #: field:base.setup.terminology,create_uid:0
 #: field:sale.config.settings,create_uid:0
 msgid "Created by"
-msgstr ""
+msgstr "ایجاد شده توسط"
 
 #. module: base_setup
 #: field:base.config.settings,create_date:0
 #: field:base.setup.terminology,create_date:0
 #: field:sale.config.settings,create_date:0
 msgid "Created on"
-msgstr ""
+msgstr "ایجاد شده در"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -159,7 +159,7 @@ msgstr ""
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
 msgid "Google Calendar"
-msgstr ""
+msgstr "تقویم گوگل"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
@@ -181,7 +181,7 @@ msgstr ""
 #: field:base.setup.terminology,id:0
 #: field:sale.config.settings,id:0
 msgid "ID"
-msgstr ""
+msgstr "شناسه"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
@@ -193,14 +193,14 @@ msgstr "Import / Export"
 #: field:base.setup.terminology,write_uid:0
 #: field:sale.config.settings,write_uid:0
 msgid "Last Updated by"
-msgstr ""
+msgstr "آخرین به روز رسانی توسط"
 
 #. module: base_setup
 #: field:base.config.settings,write_date:0
 #: field:base.setup.terminology,write_date:0
 #: field:sale.config.settings,write_date:0
 msgid "Last Updated on"
-msgstr ""
+msgstr "آخرین به روز رسانی در"
 
 #. module: base_setup
 #: field:sale.config.settings,module_mass_mailing:0
@@ -240,12 +240,12 @@ msgstr ""
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
 msgid "Options"
-msgstr ""
+msgstr "گزینه ها"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
-msgstr "همکار"
+msgstr "شریک تجاری"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -260,12 +260,12 @@ msgstr "دسترسی پورتال"
 #. module: base_setup
 #: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Quotations and Sales Orders"
-msgstr ""
+msgstr "پیش فاکتور ها و سفارشات فروش"
 
 #. module: base_setup
 #: field:base.config.settings,font:0
 msgid "Report Font"
-msgstr ""
+msgstr "قلم گزارش"
 
 #. module: base_setup
 #: field:sale.config.settings,module_sale:0
@@ -292,7 +292,7 @@ msgstr ""
 #. module: base_setup
 #: view:sale.config.settings:base_setup.view_sale_config_settings
 msgid "Social Network Integration"
-msgstr ""
+msgstr "یکپارچه سازی با شبکه اجتماعی"
 
 #. module: base_setup
 #: view:base.setup.terminology:base_setup.base_setup_terminology_form
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index a81e719426f..0fadf4e6027 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-16 13:20+0000\n"
+"PO-Revision-Date: 2014-12-12 21:22+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-08-17 06:47+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
+"X-Launchpad-Export-Date: 2014-12-13 08:16+0000\n"
+"X-Generator: Launchpad (build 17286)\n"
 
 #. module: base_setup
 #: view:base.config.settings:base_setup.view_general_configuration
@@ -300,7 +300,7 @@ msgstr ""
 #. module: base_setup
 #: help:base.config.settings,module_share:0
 msgid "Share or embbed any screen of openerp."
-msgstr "Deel of embbed iedere scherm van OpenERP"
+msgstr "Deel of embbed iedere scherm van Odoo"
 
 #. module: base_setup
 #: view:sale.config.settings:base_setup.view_sale_config_settings