From 0d258c1666fde9c90e8031b6233d2afd4dcfc6b5 Mon Sep 17 00:00:00 2001 From: Jonathan Castillo Date: Fri, 19 Mar 2021 15:48:42 +0100 Subject: [PATCH 1/6] [ADD] guidelines: media files section in content guidelines --- .../documentation/content_guidelines.rst | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/contributing/documentation/content_guidelines.rst b/contributing/documentation/content_guidelines.rst index 18185b1f4..47f7acc8c 100644 --- a/contributing/documentation/content_guidelines.rst +++ b/contributing/documentation/content_guidelines.rst @@ -160,6 +160,38 @@ A few tips to improve your screenshots: Resizing the window's width is the most important step to do as Odoo's responsive design automatically resizes all fields to match the window's width. +.. _contributing/media-files: + +Media files +----------- + +A **media filename**: + +- is written in **lower-case letters** +- is **relevant** to the media's content. (E.g., :file:`screenshot-tips.gif`.) +- separates its words with a **hyphen** ``-`` (E.g., :file:`awesome-filename.png`.) + +Each document has its own folder in which the media files are located. The folder's name must be the +same as the document's filename. + +For example, the document :file:`doc_filename.rst` refers to two images that are placed in the +folder ``doc_filename``. + +:: + + ├── section + │ └── doc_filename + │ │ └── screenshot-tips.gif + │ │ └── awesome-filename.png + │ └── doc_filename.rst + +.. note:: + Previously, image filenames would mostly be named with numbers (e.g., :file:`feature01.png`) and + placed in a single ``media`` folder. While it is advised not to name your *new* images in that + fashion, it is also essential **not to rename unchanged files**, as doing this would double the + weight of renamed image files on the repository. They will eventually all be replaced as the + content referencing those images is updated. + .. _contributing/alt-tags: ALT tags From 8e6d9dc7ce548eee6578220c8049635da22b901a Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 4 Apr 2021 02:30:21 +0200 Subject: [PATCH 2/6] [I18N] Update translation terms from Transifex --- locale/es/LC_MESSAGES/accounting.po | 56 +++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/locale/es/LC_MESSAGES/accounting.po b/locale/es/LC_MESSAGES/accounting.po index ef42c053e..5205b1f85 100644 --- a/locale/es/LC_MESSAGES/accounting.po +++ b/locale/es/LC_MESSAGES/accounting.po @@ -54,6 +54,7 @@ # Jesús Alan Ramos Rodríguez , 2020 # Leonardo J. Caballero G. , 2020 # Susanna Pujol, 2020 +# Cinthya Yepez , 2021 # #, fuzzy msgid "" @@ -62,7 +63,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-03 11:34+0200\n" "PO-Revision-Date: 2018-10-19 08:14+0000\n" -"Last-Translator: Susanna Pujol, 2020\n" +"Last-Translator: Cinthya Yepez , 2021\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" @@ -3012,6 +3013,9 @@ msgid "" "definir los datos de la sección fiscal del PDF, así como de la información " "Bancaria." msgstr "" +"Como parte de la información configurable que es enviada en el XML, puedes " +"definir los datos de la sección fiscal del PDF, así como de la información " +"Bancaria." #: ../../accounting/localizations/colombia_ES.rst:70 msgid "" @@ -3210,6 +3214,9 @@ msgid "" "automáticamente al proveedor de la factura electrónica. Este archivo es " "desplegado en el historial." msgstr "" +"Después de que la factura fue validada, un archivo XML se creó y se envió " +"automáticamente al proveedor de la factura electrónica. Este archivo está " +"desplegado en el historial." #: ../../accounting/localizations/colombia_ES.rst:217 msgid "" @@ -3269,6 +3276,10 @@ msgid "" "detalles del error son recuperados en la petición de actualización y " "desplegados en el historial." msgstr "" +"Durante la validación del XML, los errores más comunes usualmente están " +"relacionados con la información principal faltante. En estos casos, los " +"detalles del error son recuperados en la petición de actualización y " +"desplegados en el historial." #: ../../accounting/localizations/colombia_ES.rst:268 msgid "" @@ -3276,6 +3287,8 @@ msgid "" "la nueva información y mandar la versión actualizada usando el siguiente " "botón:" msgstr "" +"Si la información principal es corregida, es posible procesar el XML con la " +"nueva información y mandar la versión actualizada usando el siguiente botón:" #: ../../accounting/localizations/colombia_ES.rst:279 msgid "Casos de Uso adicionales" @@ -4448,7 +4461,7 @@ msgstr "Balanza de Comprobación Electrónica." #: ../../accounting/localizations/mexico.rst:317 msgid "DIOT report." -msgstr "" +msgstr "Reporte DIOT" #: ../../accounting/localizations/mexico.rst:319 msgid "" @@ -4552,7 +4565,7 @@ msgstr "" #: ../../accounting/localizations/mexico.rst:382 msgid "DIOT Report (Requires Accounting App)" -msgstr "" +msgstr "Informe DIOT (Requiere Contabilidad App)" #: ../../accounting/localizations/mexico.rst:384 msgid "**What is the DIOT and the importance of presenting it SAT**" @@ -4751,7 +4764,7 @@ msgstr "" #: ../../accounting/localizations/mexico.rst:498 msgid "Extra Recommended features" -msgstr "" +msgstr "Funciones adicionales recomendadas" #: ../../accounting/localizations/mexico.rst:501 msgid "Contact Module (Free)" @@ -4807,6 +4820,8 @@ msgstr "" msgid "" "Go to :menuselection:`Settings --> Technical --> Actions --> Server Actions`" msgstr "" +"Vaya a :menuselection: `Configuración --> Técnico --> Acciones --> Acciones " +"del servidor`" #: ../../accounting/localizations/mexico.rst:531 msgid "Look for the Action called \"Download XSD files to CFDI\"" @@ -4814,13 +4829,15 @@ msgstr "Busque la acción llamada \"Descargar archivos XSD a CFDI\"" #: ../../accounting/localizations/mexico.rst:532 msgid "Click on button \"Create Contextual Action\"" -msgstr "" +msgstr "Haga clic en el botón \"Crear acción contextual\"" #: ../../accounting/localizations/mexico.rst:533 msgid "" "Go to the company form :menuselection:`Settings --> Users&Companies --> " "Companies`" msgstr "" +"Vaya al formulario de la empresa :menuselection:`Configuración --> Usuarios " +"y empresas --> Empresas`" #: ../../accounting/localizations/mexico.rst:534 msgid "Open any company you have." @@ -4837,6 +4854,9 @@ msgid "" "code which is pretty common) and an explicit error will be shown instead a " "generic one with no explanation." msgstr "" +"Ahora puede hacer una factura con cualquier error (por ejemplo, un producto " +"sin código que es bastante común) y se mostrará un error explícito en su " +"lugar, uno genérico sin explicación." #: ../../accounting/localizations/mexico.rst:545 msgid "If you see an error like this:" @@ -15682,6 +15702,12 @@ msgid "" "easily send a reminder by email or print it as a letter. Then, you can click" " on the *Done* button to view the next follow-up that needs your attention." msgstr "" +"Las facturas vencidas de las que necesita hacer un seguimiento están " +"disponibles de forma predeterminada en: menuselection: `Contabilidad -> " +"Ventas -> Informes de seguimiento`. Allí, puede enviar fácilmente un " +"recordatorio por correo electrónico o imprimirlo como una carta. Luego, " +"puede hacer clic en el botón * Listo * para ver el siguiente seguimiento que" +" necesita su atención." #: ../../accounting/receivables/customer_payments/followup.rst:23 msgid "" @@ -15689,6 +15715,9 @@ msgid "" "later*. You will get the next report according to the *Next Reminder Date* " "set on the statement." msgstr "" +"De lo contrario, si ahora no es el momento para un recordatorio, haga clic " +"en * Recordármelo más tarde *. Obtendrá el siguiente informe de acuerdo con " +"la * Fecha del siguiente recordatorio * establecida en el estado de cuenta." #: ../../accounting/receivables/customer_payments/followup.rst:28 msgid "" @@ -15697,16 +15726,22 @@ msgid "" ":menuselection:`Accounting --> Configuration --> Settings --> Payment " "Follow-up`." msgstr "" +"Para evitar enviar demasiados recordatorios en un corto período de tiempo, " +"cambie el número de días calculados entre cada informe yendo a: " +"menuselection: `Contabilidad -> Configuración -> Configuración -> " +"Seguimiento de pagos`." #: ../../accounting/receivables/customer_payments/followup.rst:33 msgid "" "You can also set a trust level for your customers by marking them as bad, " "normal or good debtors on the follow-up reports." msgstr "" +"También puede establecer un nivel de confianza para sus clientes marcándolos" +" como deudores malos, normales o buenos en los informes de seguimiento." #: ../../accounting/receivables/customer_payments/followup.rst:40 msgid "Send reminders in batch" -msgstr "" +msgstr "Enviar recordatorios por lotes" #: ../../accounting/receivables/customer_payments/followup.rst:42 msgid "" @@ -15724,7 +15759,7 @@ msgstr "" #: ../../accounting/receivables/customer_payments/followup.rst:52 msgid "Plan a follow-up process" -msgstr "" +msgstr "Planifique un proceso de seguimiento" #: ../../accounting/receivables/customer_payments/followup.rst:54 msgid "" @@ -15733,6 +15768,11 @@ msgid "" "under the *Customer Payments* section. Then, click on the new *Follow-up " "Levels* button that has appeared on your settings page." msgstr "" +"Para planificar un proceso de seguimiento, vaya a: menuselection: " +"`Contabilidad -> Configuración -> Configuración` y active la función * " +"Niveles de seguimiento * en la sección * Pagos del cliente *. Luego, haga " +"clic en el nuevo botón * Niveles de seguimiento * que ha aparecido en su " +"página de configuración." #: ../../accounting/receivables/customer_payments/followup.rst:59 msgid "" @@ -15754,6 +15794,8 @@ msgid "" "If you would like to get a reminder before the actual due date, set a " "negative number of due days." msgstr "" +"Si desea recibir un recordatorio antes de la fecha de vencimiento real, " +"establezca un número negativo de días de vencimiento." #: ../../accounting/receivables/customer_payments/payment_sepa.rst:3 #: ../../accounting/receivables/customer_payments/payment_sepa.rst:29 From 5fae52229258df20f01392c89595bcf34c82c837 Mon Sep 17 00:00:00 2001 From: Jonathan Castillo Date: Thu, 8 Apr 2021 12:29:17 +0200 Subject: [PATCH 3/6] [ADD] contributing: title capitalization rule in content guidelines --- .../documentation/content_guidelines.rst | 48 ++++++++++++++++--- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/contributing/documentation/content_guidelines.rst b/contributing/documentation/content_guidelines.rst index 47f7acc8c..65d2ea8ad 100644 --- a/contributing/documentation/content_guidelines.rst +++ b/contributing/documentation/content_guidelines.rst @@ -68,14 +68,48 @@ grammatical way of separating ideas. .. _contributing/titles: -Titles ------- +Titles and headings +------------------- -To write a good title : +To write good titles and headings: - **Be concise.** - **Avoid sentences**, questions, and titles starting with "how to." - **Don't use pronouns** in your titles, especially 2nd person (*your*) +- Use **sentence case**. This means you capitalize only: + + - the first word of the title or heading + - the first word after a colon + - proper nouns (brands, product and service names, etc.) + - app features, as written in the apps + + .. important:: + Do not capitalize common nouns when they are not referred to as features. This is more likely + to happen in headings rather than in titles. + + +------------------+-----------------------------------+--------------------------------------------------------+ + | | Examples | Explanations | + +==================+===================================+========================================================+ + | | **Titles** | *Quotation Templates* | "Quotation Templates" is a feature in Odoo. | + | | (h1) +-----------------------------------+--------------------------------------------------------+ + | | *Lead Mining* | "Lead Mining" is a feature in Odoo. | + | +-----------------------------------+--------------------------------------------------------+ + | | *Resupply from another Warehouse* | "Warehouse" is capitalized as we refer to the feature | + | | | in the app rather than to a real warehouse. | + | +-----------------------------------+--------------------------------------------------------+ + | | *Synchronize Google Calendar | "Google Calendar" is a product and "Odoo" is a brand. | + | | with Odoo* | | + +------------------+-----------------------------------+--------------------------------------------------------+ + | | **Headings** | *Confirm the quotation* | "The quotation" is a common noun not referring to a | + | | (h2, h3, etc.) | | feature in Odoo. | + | +-----------------------------------+--------------------------------------------------------+ + | | *Test environment* | "Environment" is a common noun. | + | +-----------------------------------+--------------------------------------------------------+ + | | *Add a new Payment Acquirer* | "Payment Acquirers" is a feature in Odoo. | + | +-----------------------------------+--------------------------------------------------------+ + | | *Generate SEPA Direct Debit XML | "SEPA Direct Debit" and "XML" are considered as proper | + | | files to submit payments* | nouns. | + +------------------+-----------------------------------+--------------------------------------------------------+ .. _contributing/document-structure: @@ -86,7 +120,7 @@ Use different **headings levels** to organize your text by sections and sub-sect are also displayed in a dynamic *navigation bar* on the side. +---------------------------------------------------------------------------------------+ -| | **H1: Page Title** | +| | **H1: Page title** | | | Your *page title* gives your reader a quick and clear understanding of what your | | content is about. It is also referenced in the section's *table of contents*. | | | @@ -94,11 +128,11 @@ are also displayed in a dynamic *navigation bar* on the side. | of view**, and shouldn't put the emphasis on Odoo, as this is documentation and not | | marketing. | | | -| Start first with a **Lead Paragraph**, which helps the reader make sure that they've | +| Start first with a **lead paragraph**, which helps the reader make sure that they've | | found the right page, then explain the **business aspects of this topic** in the | | following paragraphs. | +-----+---------------------------------------------------------------------------------+ -| | | **H2: Section Title (configuration)** | +| | | **H2: Section title (configuration)** | | | | This first H2 section is about the configuration of the feature, or the | | | prerequisites to achieve a specific goal. To add a path, make sure you | | | use the ``:menuselection:`` specialized directive (see link below). | @@ -107,7 +141,7 @@ are also displayed in a dynamic *navigation bar* on the side. | | | To do so, go to ``:menuselection:`App name --> Menu --> Sub-menu```, and | | | enable the XYZ feature. | +-----+---------------------------------------------------------------------------------+ -| | | **H2: Section Title (main sections)** | +| | | **H2: Section title (main sections)** | | | | Create as many main sections as you have actions or features to distinguish. | | | The title can start with a verb, but try to avoid using "Create ...". | +-----+-----+---------------------------------------------------------------------------+ From 4fe354946a86251bd3ea2471029bdcd7c38f1011 Mon Sep 17 00:00:00 2001 From: "KC (ksc)" Date: Tue, 23 Mar 2021 12:28:42 -0700 Subject: [PATCH 4/6] [IMP] ecommerce: fix grammatical issues in doc about importing products --- sales/products_prices/products/import.rst | 40 +++++++++++------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/sales/products_prices/products/import.rst b/sales/products_prices/products/import.rst index 41d10a2c3..b9b428a2b 100644 --- a/sales/products_prices/products/import.rst +++ b/sales/products_prices/products/import.rst @@ -1,43 +1,43 @@ =================================================== -How to import products with categories and variants +How to import Products with Categories and Variants =================================================== -Import templates are provided in the import tool of the most common data to +Import templates are provided in the **Import Tool** of the most common data to import (contacts, products, bank statements, etc.). -You can open them with any spreadsheets software (Microsoft Office, +You can open them with any spreadsheet software (Microsoft Office, OpenOffice, Google Drive, etc.). How to customize the file ========================= -* Remove columns you don't need. We advise to not remove the *ID* one (see - why here below). +* Remove columns you don't need. However, we advise you to not remove the *ID* column (see + why below). * Set a unique ID to every single record by dragging down the ID sequencing. -* Don't change labels of columns you want to import. Otherwise Odoo won't recognize - them anymore and you will have to map them on your own in the import screen. -* To add new columns,Feel free to add new columns but the fields need to exist in Odoo. If Odoo fails - in matching the column name with a field, you can make it manually when importing +* Don't change the labels of columns you want to import. Otherwise, Odoo won't recognize + them anymore, and you will have to map them on your own in the import screen. +* Feel free to add new columns, but the fields need to exist in Odoo. If Odoo fails + in matching the column name with a field, you can match it manually when importing by browsing a list of available fields. -Why an “ID” column -================== +Why an “ID” column? +=================== -The ID is an unique identifier for the line item. Feel free to use the one of your -previous software to ease the transition to Odoo. +The ID is a truly unique identifier for the line item. Feel free to use one of your +previous software to ease the transition into Odoo. -Setting an ID is not mandatory when importing but it helps in many cases: +Setting an ID is not mandatory when importing, but it helps in many cases: -* Update imports: you can import the same file several times without creating duplicates; +* Update imports: you can import the same file several times without creating duplicates. * Import relation fields (see here below). How to import relation fields ============================= -An Odoo object is always related to many other objects (e.g. a product is linked -to product categories, attributes, vendors, etc.). To import those relations you need to +An Odoo object is always related to many other objects (e.g., a product is linked +to product categories, attributes, vendors, etc.). To import those relations, you need to import the records of the related object first from their own list menu. -You can do it using either the name of the related record or its ID. The ID is expected when -two records have the same name. In such a case add " / ID" at the end of the column title -(e.g. for product attributes: Product Attributes / Attribute / ID). +You can do this using the name of the related record or its ID. The ID is expected when +two records have the same name. In such a case, add " / ID" at the end of the column title +(e.g., for product attributes: Product Attributes / Attribute / ID). From a88479cee59684f1b031a8de06a903284c45f0ba Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 11 Apr 2021 02:30:26 +0200 Subject: [PATCH 5/6] [I18N] Update translation terms from Transifex --- locale/es/LC_MESSAGES/accounting.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/locale/es/LC_MESSAGES/accounting.po b/locale/es/LC_MESSAGES/accounting.po index 5205b1f85..2ae574be0 100644 --- a/locale/es/LC_MESSAGES/accounting.po +++ b/locale/es/LC_MESSAGES/accounting.po @@ -55,6 +55,7 @@ # Leonardo J. Caballero G. , 2020 # Susanna Pujol, 2020 # Cinthya Yepez , 2021 +# Gabriela Enriquez Manzano , 2021 # #, fuzzy msgid "" @@ -63,7 +64,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-03 11:34+0200\n" "PO-Revision-Date: 2018-10-19 08:14+0000\n" -"Last-Translator: Cinthya Yepez , 2021\n" +"Last-Translator: Gabriela Enriquez Manzano , 2021\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" @@ -5139,6 +5140,9 @@ msgid "" "Configuration` then choose the package you want in the **Fiscal " "Localization** section." msgstr "" +"Puede elegir el que desee entrando en :menuselection:`Contabilidad --> " +"Configuración` y luego elija el paquete que desee en la sección ** " +"Localización fiscal **." #: ../../accounting/localizations/spain.rst:20 msgid "" From 1343d9915f177292bf0d8a8246fda40e2f1287eb Mon Sep 17 00:00:00 2001 From: "KC (ksc)" Date: Thu, 25 Mar 2021 09:31:16 -0700 Subject: [PATCH 6/6] [FIX] ecommerce: grammar and screenshot in doc about pricing --- ecommerce/maximizing_revenue/pricing.rst | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/ecommerce/maximizing_revenue/pricing.rst b/ecommerce/maximizing_revenue/pricing.rst index b4aa86155..8c0c2bfb5 100644 --- a/ecommerce/maximizing_revenue/pricing.rst +++ b/ecommerce/maximizing_revenue/pricing.rst @@ -1,29 +1,30 @@ -============================================== -How to adapt the prices to my website visitors -============================================== +================================ +Adapt prices to website visitors +================================ -This section sheds some light on pricing features of eCommerce app: +This section sheds light on pricing features found in the eCommerce app: * force a price by geo-localization, * let the customer choose the currency. -As a pre-requisite, check out how to managing produt pricing: +As a pre-requisite, check out how to managing product pricing: :doc:`../../sales/products_prices/prices/pricing`). -Geo-IP to automatically apply the right price -================================================ +Geo-IP automatically applies the right price +============================================ -Assign country groups to your pricelists. That way, your visitors not yet -logged in will get their own currency when landing on your website. +Assign country groups to your pricelists. That way, visitors who aren't +logged in yet will get their own currency when landing on your website. Once logged in, they get the pricelist matching their country. Currency selector ================= -In case you sell in several currencies, you can let your customers choose -their own currency. Check *Selectable* to add the pricelist to the website drop-down menu. +In the case that you sell in several currencies, you can let your customers choose +their own. Check the *Selectable* box to add the pricelist to the website drop-down menu, which +can be found in *Pricelists* under the *Products* menu, located in the Website application. .. image:: ./media/website_pricelist_select.png :align: center