[MERGE] forward port branch 11.0 up to 39d9c362c5b

1 files changed, 16 insertions, 22 deletions

diff --git a/addons/web/i18n/es_EC.po b/addons/web/i18n/es_EC.po
index f9e2bfa8c05..ff764f72120 100644
--- a/addons/web/i18n/es_EC.po
+++ b/addons/web/i18n/es_EC.po
@@ -12,16 +12,13 @@ msgstr ""
 "POT-Creation-Date: 2016-08-18 14:08+0000\n"
 "PO-Revision-Date: 2016-02-22 05:01+0000\n"
 "Last-Translator: Rick Hunter <rick_hunter_ec@yahoo.com>\n"
-"Language-Team: Spanish (Ecuador) (http://www.transifex.com/odoo/odoo-9/"
-"language/es_EC/)\n"
+"Language-Team: Spanish (Ecuador) (http://www.transifex.com/odoo/odoo-9/language/es_EC/)\n"
 "Language: es_EC\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "#-#-#-#-#  es_EC.po (Odoo 9.0)  #-#-#-#-#\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"#-#-#-#-#  es_EC.po (Odoo 9.0)  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: web
 #. openerp-web
@@ -1472,8 +1469,8 @@ msgstr "Sin actualizar:"
 #: code:addons/web/static/src/js/views/graph_widget.js:95
 #, python-format
 msgid ""
-"No data available for this chart. Try to add some records, or make sure that "
-"there is no active filter in the search bar."
+"No data available for this chart. Try to add some records, or make sure that"
+" there is no active filter in the search bar."
 msgstr ""
 "No existen datos disponibles para este gráfico. Trate de añadir algunos "
 "récords, o asegúrese que no existan filtros activos en la barra de búsqueda."
@@ -1483,10 +1480,8 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:691
 #, python-format
 msgid ""
-"No data available for this pivot table.  Try to add some records, or make "
-"sure\n"
-"                that there is at least one measure and no active filter in "
-"the search bar."
+"No data available for this pivot table.  Try to add some records, or make sure\n"
+"        that there is at least one measure and no active filter in the search bar."
 msgstr ""
 "No existen datos disponibles para esta tabla dinámica. Trate de añadir "
 "algunos registros, o asegúrese que exista por lo menos una medida y no "
@@ -1727,8 +1722,8 @@ msgid ""
 "Pie chart cannot display all zero numbers.. Try to change your domain to "
 "display positive results"
 msgstr ""
-"Los gráficos de pastel no pueden mostrar los números 0. Trate de cambiar sus "
-"filtros para mostrar los resultados positivos."
+"Los gráficos de pastel no pueden mostrar los números 0. Trate de cambiar sus"
+" filtros para mostrar los resultados positivos."
 
 #. module: web
 #. openerp-web
@@ -2221,18 +2216,18 @@ msgstr ""
 #: code:addons/web/static/src/js/views/form_widgets.js:1199
 #, python-format
 msgid "The selected file exceed the maximum file size of %s."
-msgstr "El archivo seleccionado supera el tamaño máximo de% s."
+msgstr "El archivo seleccionado supera el tamaño máximo de %s."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/form_relational_widgets.js:1550
 #, python-format
 msgid ""
-"The type of the field '%s' must be a many2many field with a relation to 'ir."
-"attachment' model."
+"The type of the field '%s' must be a many2many field with a relation to "
+"'ir.attachment' model."
 msgstr ""
-"El tipo de campo '%s' debe ser un campo many2many con una relación a 'ir."
-"attachment' model."
+"El tipo de campo '%s' debe ser un campo many2many con una relación a "
+"'ir.attachment' model."
 
 #. module: web
 #. openerp-web
@@ -2261,10 +2256,8 @@ msgstr "El recurso esta vacío"
 #: code:addons/web/static/src/xml/base.xml:1304
 #, python-format
 msgid ""
-"This wizard will export all data that matches the current search criteria to "
-"a CSV file.\n"
-"            You can export all data or only the fields that can be "
-"reimported after modification."
+"This wizard will export all data that matches the current search criteria to a CSV file.\n"
+"        You can export all data or only the fields that can be reimported after modification."
 msgstr ""
 "Este asistente exportará todos los datos que coincidan con el criterio de "
 "búsqueda actual a un archivo CSV.\n"
@@ -2607,7 +2600,8 @@ msgstr ""
 #. openerp-web
 #: code:addons/web/static/src/js/framework/misc.js:17
 #, python-format
-msgid "You may not believe it,<br />but the application is actually loading..."
+msgid ""
+"You may not believe it,<br />but the application is actually loading..."
 msgstr ""
 "Usted no lo creerá,<br />pero la aplicación actualmente está cargando ..."