From 8fa89877e78cac63cbbe9164702c5563f4293734 Mon Sep 17 00:00:00 2001 From: Alex Tuyls <42001051+alt-odoo@users.noreply.github.com> Date: Thu, 29 Oct 2020 10:33:59 +0100 Subject: [PATCH 1/2] [IMP] odoo_sh: update backup policy before merge (#778) It was not clear enough whether or not a backup was triggered when doing code updates. --- odoo_sh/getting_started/branches.rst | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/odoo_sh/getting_started/branches.rst b/odoo_sh/getting_started/branches.rst index 4ef346818..ad0eaea19 100644 --- a/odoo_sh/getting_started/branches.rst +++ b/odoo_sh/getting_started/branches.rst @@ -245,9 +245,17 @@ This server only keeps one month of backups: 7 daily and 4 weekly backups. Dedicated backup servers keep the same backups, as well as 3 additional monthly backups. To restore or download one of these monthly backups, please `contact us `_. -You can make a backup manually before making big changes in your production database in case something goes wrong -(those manual backups are available for about one week). -To avoid abuse, we limit manual backups to 5 per day. +If you merge a commit updating the version of one or several modules (in :file:`__manifest__.py`), or their linked python +dependencies (in :file:`requirements.txt`), then Odoo.sh performs a backup automatically (flagged with type Update in the list), +as either the container will be changed by the installation of new pip packages, either the database itself will be +changed with the module update triggered afterwards. In these two cases, we are doing a backup as it may potentially +break things. + +If you merge a commit that only changes some code without the above-mentioned modifications, then no backup is done +by Odoo.sh, as neither the container nor the database is modified so the platform considers this safe enough. Of course, +as an extra precaution, you can make a backup manually before making big changes in your production sources in case +something goes wrong (those manual backups are available for about one week). To avoid abuse, we limit manual backups +to 5 per day. The *import database* feature accepts database archives in the format provided by: From af7d307b7657dc935236e6d212271b36527cb4d3 Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 1 Nov 2020 02:30:36 +0100 Subject: [PATCH 2/2] [I18N] Update translation terms from Transifex --- locale/da/LC_MESSAGES/accounting.po | 2 +- locale/es/LC_MESSAGES/inventory.po | 27 ++++++++++++++++++++++++--- locale/it/LC_MESSAGES/purchase.po | 6 +++--- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/locale/da/LC_MESSAGES/accounting.po b/locale/da/LC_MESSAGES/accounting.po index b67f406f8..c3c806743 100644 --- a/locale/da/LC_MESSAGES/accounting.po +++ b/locale/da/LC_MESSAGES/accounting.po @@ -2011,7 +2011,7 @@ msgstr "" #: ../../accounting/localizations.rst:3 msgid "Localizations" -msgstr "" +msgstr "Lokaliseringer" #: ../../accounting/localizations/colombia.rst:3 msgid "Colombia" diff --git a/locale/es/LC_MESSAGES/inventory.po b/locale/es/LC_MESSAGES/inventory.po index 42cf5751d..eeea4d8a0 100644 --- a/locale/es/LC_MESSAGES/inventory.po +++ b/locale/es/LC_MESSAGES/inventory.po @@ -4,7 +4,6 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Jesús Alan Ramos Rodríguez , 2018 # Carlos Lopez , 2018 # David Sanchez , 2018 # Katerina Katapodi , 2018 @@ -27,6 +26,8 @@ # Miquel Torner , 2018 # Jon Perez , 2019 # Martin Trigaux, 2019 +# Jesús Alan Ramos Rodríguez , 2020 +# Susanna Pujol, 2020 # #, fuzzy msgid "" @@ -35,7 +36,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-03 11:34+0200\n" "PO-Revision-Date: 2018-10-19 08:15+0000\n" -"Last-Translator: Martin Trigaux, 2019\n" +"Last-Translator: Susanna Pujol, 2020\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -458,6 +459,12 @@ msgid "" "with the smartphone and work in the warehouse with the possibility to check " "your smartphone from time to time and use the software 'manually'." msgstr "" +"El **escáner bluetooth** se puede combinar con un teléfono inteligente o una" +" tableta y es una buena opción si desea ser móvil pero no necesita una gran " +"inversión. Un enfoque es iniciar sesión en Odoo en su teléfono inteligente, " +"emparejar el escáner bluetooth con el teléfono inteligente y trabajar en el " +"almacén con la posibilidad de revisar su teléfono inteligente de vez en " +"cuando y usar el software 'manualmente'." #: ../../inventory/barcode/setup/hardware.rst:32 msgid "" @@ -469,6 +476,14 @@ msgid "" "job. However, due to the variety of models and configurations on the market," " it is essential to test it first." msgstr "" +"Para uso intensivo, el **escáner de computadora móvil** es la solución más " +"práctica. Consiste en una pequeña computadora con un escáner de código de " +"barras incorporado. Esta puede resultar una solución muy productiva, sin " +"embargo, debe asegurarse de que sea capaz de ejecutar Odoo sin problemas. " +"Los modelos más recientes que usan Android + Google Chrome o Windows + " +"Internet Explorer Mobile deberían hacer el trabajo. Sin embargo, debido a la" +" variedad de modelos y configuraciones en el mercado, es esencial probarlo " +"primero." #: ../../inventory/barcode/setup/hardware.rst:42 msgid "Configure your barcode scanner" @@ -2031,6 +2046,9 @@ msgid "" "To set up your security dates, go to :menuselection:`Settings --> General " "settings` and click on **Configure your company data**." msgstr "" +"Para configurar sus fechas de seguridad, vaya a " +":menuselection:`Configuración -> Configuración general` y haga clic en " +"**Configurar los datos de su empresa**." #: ../../inventory/management/delivery/scheduled_dates.rst:90 msgid "" @@ -7582,7 +7600,7 @@ msgstr "Productos" #: ../../inventory/settings/products/strategies.rst:3 msgid "How to select the right replenishment strategy" -msgstr "" +msgstr "Como escoger la estrategia de reposición adecuada" #: ../../inventory/settings/products/strategies.rst:5 msgid "" @@ -7590,6 +7608,9 @@ msgid "" "different rules. They should be used depending on your manufacturing and " "delivery strategies." msgstr "" +"Las reglas referentes al stock mínimo y la fabricación bajo demanda tienen " +"consecuencias similares pero reglas diferentes. Deberían ser usados según " +"sus estrategias de producción y entrega." #: ../../inventory/settings/products/strategies.rst:15 msgid "" diff --git a/locale/it/LC_MESSAGES/purchase.po b/locale/it/LC_MESSAGES/purchase.po index 46de92062..10feffbc9 100644 --- a/locale/it/LC_MESSAGES/purchase.po +++ b/locale/it/LC_MESSAGES/purchase.po @@ -4,13 +4,13 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Sergio Zanchetta , 2019 # Francesco Garganese , 2019 # Martin Trigaux, 2019 # Tiziano Zambelli , 2019 # maiolif , 2019 # Léonie Bouchat , 2019 # Paolo Valier, 2019 +# Sergio Zanchetta , 2020 # #, fuzzy msgid "" @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-16 15:50+0200\n" "PO-Revision-Date: 2018-10-19 08:15+0000\n" -"Last-Translator: Paolo Valier, 2019\n" +"Last-Translator: Sergio Zanchetta , 2020\n" "Language-Team: Italian (https://www.transifex.com/odoo/teams/41243/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1332,7 +1332,7 @@ msgstr "" #: ../../purchase/replenishment.rst:3 msgid "Replenishment" -msgstr "" +msgstr "Rifornimento" #: ../../purchase/replenishment/flows.rst:3 msgid "Replenishment Flows"