From b2f9292d6d3cc8ca16b9ad0d6d92dd7042b3d595 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 26 Apr 2016 10:19:17 +0200 Subject: [PATCH] [I18N] fetch new terms from Transifex --- locale/es/LC_MESSAGES/inventory.po | 136 +++---- locale/es/LC_MESSAGES/point_of_sale.po | 97 ++--- locale/es/LC_MESSAGES/project.po | 45 ++- locale/es/LC_MESSAGES/sales.po | 173 ++++---- locale/nl/LC_MESSAGES/crm.po | 52 +-- locale/nl/LC_MESSAGES/inventory.po | 136 +++---- locale/nl/LC_MESSAGES/point_of_sale.po | 97 ++--- locale/nl/LC_MESSAGES/project.po | 54 +-- locale/nl/LC_MESSAGES/sales.po | 173 ++++---- locale/zh_CN/LC_MESSAGES/accounting.po | 32 +- locale/zh_CN/LC_MESSAGES/crm.po | 62 +-- locale/zh_CN/LC_MESSAGES/discuss.po | 4 +- locale/zh_CN/LC_MESSAGES/getting_started.po | 6 +- locale/zh_CN/LC_MESSAGES/inventory.po | 158 ++++---- locale/zh_CN/LC_MESSAGES/point_of_sale.po | 425 ++++++++++---------- locale/zh_CN/LC_MESSAGES/project.po | 40 +- locale/zh_CN/LC_MESSAGES/purchase.po | 118 +++--- locale/zh_CN/LC_MESSAGES/sales.po | 187 +++++---- locale/zh_CN/LC_MESSAGES/website.po | 4 +- 19 files changed, 1048 insertions(+), 951 deletions(-) diff --git a/locale/es/LC_MESSAGES/inventory.po b/locale/es/LC_MESSAGES/inventory.po index a9aab3c2a..f192036c1 100644 --- a/locale/es/LC_MESSAGES/inventory.po +++ b/locale/es/LC_MESSAGES/inventory.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-17 13:58+0100\n" -"PO-Revision-Date: 2016-04-02 05:52+0000\n" -"Last-Translator: Katerina Katapodi \n" +"POT-Creation-Date: 2016-04-22 13:58+0200\n" +"PO-Revision-Date: 2016-04-23 10:07+0000\n" +"Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (http://www.transifex.com/odoo/odoo-9-doc/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -7262,148 +7262,136 @@ msgid "How to get UPS credentials for integration with Odoo?" msgstr "" #: ../../inventory/shipping/setup/ups_credentials.rst:5 -msgid "" -"Please note that only those customers that are based in the US can open a " -"UPS account number online. If you are located in a country other than the " -"US, you will need to contact Customer Service for your country location to " -"open UPS account number." +msgid "In order to use the Odoo UPS API, you will need:" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:10 -msgid "" -"In order to use the UPS APIs from Odoo, you will need to have the items " -"listed below:" +#: ../../inventory/shipping/setup/ups_credentials.rst:7 +msgid "A UPS.com user ID and password" +msgstr "" + +#: ../../inventory/shipping/setup/ups_credentials.rst:9 +msgid "A UPS account number" +msgstr "" + +#: ../../inventory/shipping/setup/ups_credentials.rst:11 +msgid "An Access Key" msgstr "" #: ../../inventory/shipping/setup/ups_credentials.rst:13 -msgid "UPS.com user ID and password" -msgstr "" - -#: ../../inventory/shipping/setup/ups_credentials.rst:15 -msgid "UPS account number" -msgstr "" - -#: ../../inventory/shipping/setup/ups_credentials.rst:17 -msgid "Access Key" -msgstr "" - -#: ../../inventory/shipping/setup/ups_credentials.rst:19 msgid "" "An Access Key is a 16 character alpha-numeric code that allows access to the" " UPS Developer Kit API Development and Production servers." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:23 -msgid "Create an UPS Account" +#: ../../inventory/shipping/setup/ups_credentials.rst:17 +msgid "Create a UPS Account" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:25 -msgid "To register with MyUPS.com, please follow these steps:" +#: ../../inventory/shipping/setup/ups_credentials.rst:19 +msgid "" +"Note that only customers located in the US can open a UPS account online. If" +" you are located outside the US, you will need to contact UPS Customer " +"Service in order to to open an account." +msgstr "" + +#: ../../inventory/shipping/setup/ups_credentials.rst:23 +msgid "" +"You can read additional information about opening a UPS account on the their" +" website, on the page, `How to Open a UPS Account Online " +"`_" msgstr "" #: ../../inventory/shipping/setup/ups_credentials.rst:27 msgid "" +"If you don't already have a UPS account, you can create one along with your " +"online profile by following these steps:" +msgstr "" + +#: ../../inventory/shipping/setup/ups_credentials.rst:30 +msgid "" "1. Access the UPS.com web site at `www.ups.com `__, and" " click the **New User** link at the top of the page." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:31 +#: ../../inventory/shipping/setup/ups_credentials.rst:34 msgid "" "2. Click the **Register for MyUPS** button, and follow the prompts to " "complete the registration process." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:34 -msgid "" -"To open an account with UPS and receive a UPS shipper number, please follow " -"the steps below:" -msgstr "" - #: ../../inventory/shipping/setup/ups_credentials.rst:37 msgid "" -"`http://www.ups.com/content/de/en/contact/index.html?WT.svl=Footer " -"`__" +"If you already have a UPS account, you can add it to your online profile as " +"follows:" msgstr "" #: ../../inventory/shipping/setup/ups_credentials.rst:39 msgid "" -"Once you have created a UPS.com user ID profile you will need to add your " -"UPS account number to your UPS.com profile, please follow the steps below:" -msgstr "" - -#: ../../inventory/shipping/setup/ups_credentials.rst:43 -msgid "" "1. Log in to the UPS.com site (`http://www.ups.com `__)" " using your UPS.com User ID and Password." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:47 +#: ../../inventory/shipping/setup/ups_credentials.rst:43 msgid "Click the **My UPS** tab." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:49 +#: ../../inventory/shipping/setup/ups_credentials.rst:45 msgid "Click the **Account Summary** link." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:51 +#: ../../inventory/shipping/setup/ups_credentials.rst:47 msgid "" "4. Click the **Add an Existing UPS Account** link in the **UPS Account " "Details** section of the page." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:54 +#: ../../inventory/shipping/setup/ups_credentials.rst:50 msgid "" "5. In the **Add New Account** screen, enter the **UPS Account Number**, " -"**Account Name**, and **Postal Code** fields. The country automatically " -"defaults to United States. If desired, select the **Make this my default " -"payment account** link to set the account as the default billing method for " -"the profile." +"**Account Name**, and **Postal Code** fields. The country defaults to United" +" States.q" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:60 +#: ../../inventory/shipping/setup/ups_credentials.rst:54 msgid "Click the **Next** button to continue." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:63 +#: ../../inventory/shipping/setup/ups_credentials.rst:57 msgid "Get an Access Key" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:65 +#: ../../inventory/shipping/setup/ups_credentials.rst:59 msgid "" -"After you have added your UPS account number to your user ID profile you can" -" request an Access Key from UPS using the steps below:" +"After you have added your UPS account number to your user profile you can " +"request an Access Key from UPS using the steps below:" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:68 -msgid "Log into UPS.com with your user ID and password." -msgstr "" - -#: ../../inventory/shipping/setup/ups_credentials.rst:70 +#: ../../inventory/shipping/setup/ups_credentials.rst:62 msgid "" -"2. Go to the **UPS Developer Kit** web page " +"1. Go to the **UPS Developer Kit** web page " "`https://www.ups.com/upsdeveloperkit?loc=en\\_US " "`__" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:73 +#: ../../inventory/shipping/setup/ups_credentials.rst:65 +msgid "Log into UPS.com with your user ID and password" +msgstr "" + +#: ../../inventory/shipping/setup/ups_credentials.rst:67 msgid "Click on the link **Request an access key**." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:75 -msgid "Verify the **Primary Contact Information**" +#: ../../inventory/shipping/setup/ups_credentials.rst:69 +msgid "Verify your contact information" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:77 -msgid "Enter the **Secondary Contact Information**" -msgstr "" - -#: ../../inventory/shipping/setup/ups_credentials.rst:79 +#: ../../inventory/shipping/setup/ups_credentials.rst:71 msgid "Click the **Request Access Key** button." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:81 +#: ../../inventory/shipping/setup/ups_credentials.rst:73 msgid "" -"Once completed, the **Access Key** will be provided to you on the web page, " -"and an email with the Access Key will be sent to the email address for the " -"primary contact information." +"The **Access Key** will be provided to you on the web page, and an email " +"with the Access Key will be sent to the email address of the primary " +"contact." msgstr "" diff --git a/locale/es/LC_MESSAGES/point_of_sale.po b/locale/es/LC_MESSAGES/point_of_sale.po index b0bbbb722..f0e020879 100644 --- a/locale/es/LC_MESSAGES/point_of_sale.po +++ b/locale/es/LC_MESSAGES/point_of_sale.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2015, Odoo S.A. +# Copyright (C) 2015-TODAY, Odoo S.A. # This file is distributed under the same license as the Odoo Business package. # # Translators: @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-21 11:00+0100\n" -"PO-Revision-Date: 2016-01-18 19:08+0000\n" -"Last-Translator: Alejandra Escandón Del Real \n" +"POT-Creation-Date: 2016-04-04 16:08+0200\n" +"PO-Revision-Date: 2016-04-05 08:39+0000\n" +"Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (http://www.transifex.com/odoo/odoo-9-doc/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -809,17 +809,11 @@ msgid "" "website `_." msgstr "El gobierno belga requiere de ciertas empresas a utilizar un dispositivo certificado por el gobierno llamado **Módulo de Datos Fiscales**, (también conocido como una **caja negra**). Este dispositivo trabaja en conjunto con la aplicación del Punto de Venta y registra ciertas transacciones. Además de eso, la aplicación del Punto de Venta utilizada, también debe ser certificada por el gobierno y debe cumplir con los estrictos estándares especificados por ellos. `Odoo 9 es una aplicación certificada `_. Para más información referente al Módulo de Datos Fiscales se puede encontrar en el sitio web oficial `_." -#: ../../point_of_sale/belgian_fdm/setup.rst:19 -msgid "" -"**As of December 2015, due to Belgian government restriction, the " -"certification is only valid for Odoo Online instances.**" -msgstr "**A partir de diciembre de 2015, debido a la restricción del gobierno belga, la certificación es válida sólo para Odoo de casos en línea.**" - -#: ../../point_of_sale/belgian_fdm/setup.rst:23 +#: ../../point_of_sale/belgian_fdm/setup.rst:20 msgid "Required hardware" msgstr "El hardware requerido" -#: ../../point_of_sale/belgian_fdm/setup.rst:25 +#: ../../point_of_sale/belgian_fdm/setup.rst:22 msgid "" "A government certified `Fiscal Data Module " "`_ por el Punto de Venta, todos ellos deben trabajar, pero se recomienda el Cleancash SC-B, que también se necesitará:" -#: ../../point_of_sale/belgian_fdm/setup.rst:30 +#: ../../point_of_sale/belgian_fdm/setup.rst:27 msgid "" "Serial null modem cable per FDM (`example `__)" msgstr "Serial cable de módem nulo por FDM (`ejemplo `__)" -#: ../../point_of_sale/belgian_fdm/setup.rst:32 +#: ../../point_of_sale/belgian_fdm/setup.rst:29 msgid "" "Serial-to-USB adapter per FDM (`example " "`__)" msgstr "Adaptador Serial-to-USB para FDM (`ejemplo `__)" -#: ../../point_of_sale/belgian_fdm/setup.rst:35 -msgid "A POSBox per POS" -msgstr "Una Terminal de Punto de Venta por cada Punto de Venta" +#: ../../point_of_sale/belgian_fdm/setup.rst:32 +msgid "A registered POSBox per POS configuration" +msgstr "" -#: ../../point_of_sale/belgian_fdm/setup.rst:38 +#: ../../point_of_sale/belgian_fdm/setup.rst:35 msgid "Setup" msgstr "Establecer" -#: ../../point_of_sale/belgian_fdm/setup.rst:41 +#: ../../point_of_sale/belgian_fdm/setup.rst:38 msgid "POSBox" msgstr "Terminal del Punto de Venta" -#: ../../point_of_sale/belgian_fdm/setup.rst:43 +#: ../../point_of_sale/belgian_fdm/setup.rst:40 msgid "" -"In order to setup the blackbox, you will first have to ensure that the " -"POSBoxes you're using have a recent image on them (support for the FDM was " -"added to the POSBox image on the 10th of December 2015). See " -":doc:`../overview/setup` on how to upgrade the POSBox. You can verify that " -"the Fiscal Data Module is recognized by the POSBox by going to the *Hardware" -" status page* via the POSBox homepage." -msgstr "Con el fin de configurar la caja negra, primero tendrá que asegurarse de que las Terminales de los Puntos de Venta que está utilizando, tienen una imagen reciente en ellos (apoyo se añadió la FDM a la imagen del Terminal de Punto de Venta el 10 de diciembre de 2015). Ver :doc:`../overview/setup` sobre cómo actualizar la Terminal del Punto de Venta. Usted puede verificar que el módulo de datos fiscales es reconocido por la Terminal del Punto de Venta para ir a la página del estado *Hardware* a través de la página de inicio de la Terminal del Punto de Venta." +"In order to use a Fiscal Data Module, you will need a registered POSBox. " +"These POSBoxes are similar to the regular POSBoxes we sell, but they are " +"registered with the Belgian government. This is required by law. Attempting " +"to use a Fiscal Data Module on a non-registered POSBox will not work. You " +"can verify that the Fiscal Data Module is recognized by the POSBox by going " +"to the *Hardware status page* via the POSBox homepage." +msgstr "" -#: ../../point_of_sale/belgian_fdm/setup.rst:54 +#: ../../point_of_sale/belgian_fdm/setup.rst:52 msgid "Odoo" msgstr "Odoo" -#: ../../point_of_sale/belgian_fdm/setup.rst:56 +#: ../../point_of_sale/belgian_fdm/setup.rst:54 msgid "" -"An Odoo POS is turned into a certified POS by installing the **Belgian " -"Registered Cash Register** app (technical name: ``pos_blackbox_be``). " -"Because of government restrictions imposed on us, this installation cannot " -"be undone. After this, you will have to ensure that each POS configuration " -"has a unique POSBox associated with it (:menuselection:`Point of Sale --> " -"Configuration --> Point of Sale` and ensure Hardware Proxy / POSBox is set)." +"An Odoo POS app can be given certified POS capabilities by installing the " +"**Belgian Registered Cash Register** app (technical name: " +"``pos_blackbox_be``). Because of government restrictions imposed on us, this" +" installation cannot be undone. After this, you will have to ensure that " +"each POS configuration has a unique registered POSBox associated with it " +"(:menuselection:`Point of Sale --> Configuration --> Point of Sale` and " +"ensure Hardware Proxy / POSBox and the serial number of your POSBox is set)." " The first time you open the Point of Sale and attempt to do a transaction, " "you will be asked to input the PIN that you received with your VAT signing " "card." -msgstr "En el Punto de Venta de Odoo se convirtió en un Punto de Venta certificado al instalar el módulo **Belgo de Registro de Efectivo** (nombre técnico: ``pos_blackbox_be``). Debido a las restricciones gubernamentales impuestas a nosotros, esta instalación no se puede deshacer. Después de esto, usted tendrá que asegurarse de que cada configuración del Punto de Venta tenga una Terminal del Punto de Venta único asociado a él (:menuselection:`Punto de Venta --> Configuración --> Punto de Venta` y garantizar que el Hardware Proxy / Terminal del Punto de Venta esté establecido). La primera vez que abra el punto de venta y trate de hacer una transacción, se le pedirá que introduzca el NIP que recibió con su tarjeta." +msgstr "" -#: ../../point_of_sale/belgian_fdm/setup.rst:70 +#: ../../point_of_sale/belgian_fdm/setup.rst:69 +msgid "On-premise" +msgstr "" + +#: ../../point_of_sale/belgian_fdm/setup.rst:71 +msgid "" +"We do not only support the Fiscal Data Module on our SaaS platform, we also " +"support the Fiscal Data Module in on-premise installations. The main " +"restriction is that this requires an obfuscated version of the " +"``pos_blackbox_be`` module we will provide on request." +msgstr "" + +#: ../../point_of_sale/belgian_fdm/setup.rst:77 msgid "Restrictions" msgstr "Restricciones" -#: ../../point_of_sale/belgian_fdm/setup.rst:72 +#: ../../point_of_sale/belgian_fdm/setup.rst:79 msgid "" "As mentioned before, in order to get certified the POS application must " "adhere to strict government guidelines. Because of this, a certified Odoo " "POS has some limitations not present in the non-certified Odoo POS." msgstr "Como se mencionó anteriormente, de acuerdo con el certificado del módulo de Punto de Venta deben cumplir las especificaciones del Gobierno descritas. Por lo mismo, el certificado de la Terminal del Punto de Venta de Odoo tiene algunas limitaciones no presentes en el no certificado del Punto de Venta de Odoo." -#: ../../point_of_sale/belgian_fdm/setup.rst:77 +#: ../../point_of_sale/belgian_fdm/setup.rst:84 msgid "Refunding is disabled" msgstr "El reembolso se desactiva" -#: ../../point_of_sale/belgian_fdm/setup.rst:78 +#: ../../point_of_sale/belgian_fdm/setup.rst:85 msgid "Modifying orderline prices" msgstr "Modificación de precios de las líneas de pedido" -#: ../../point_of_sale/belgian_fdm/setup.rst:79 +#: ../../point_of_sale/belgian_fdm/setup.rst:86 msgid "Creating/modifying/deleting POS orders" msgstr "Crear/modificar/eliminar órdenes del Punto de Venta" -#: ../../point_of_sale/belgian_fdm/setup.rst:80 +#: ../../point_of_sale/belgian_fdm/setup.rst:87 msgid "Selling products without a valid tax" msgstr "Vender productos sin el impuesto válido" -#: ../../point_of_sale/belgian_fdm/setup.rst:81 +#: ../../point_of_sale/belgian_fdm/setup.rst:88 msgid "Multiple Odoo POS configurations per POSBox are not allowed" msgstr "Múltiples configuraciones del Punto de Venta por Terminal del Punto del Venta no son permitidas" -#: ../../point_of_sale/belgian_fdm/setup.rst:82 +#: ../../point_of_sale/belgian_fdm/setup.rst:89 msgid "Using the POS without a connection to the POSBox (and thus FDM)" msgstr "Usar el Punto de Venta sin la conexión de la Terminal del Punto de Venta (y por lo tanto FDM)" -#: ../../point_of_sale/belgian_fdm/setup.rst:83 +#: ../../point_of_sale/belgian_fdm/setup.rst:90 msgid "Blacklisted modules: pos_discount, pos_reprint, pos_loyalty" msgstr "Lista negra de módulos: pos_discount, pos_reprint, pos_loyalty" diff --git a/locale/es/LC_MESSAGES/project.po b/locale/es/LC_MESSAGES/project.po index 4e8347d5d..2efa529fa 100644 --- a/locale/es/LC_MESSAGES/project.po +++ b/locale/es/LC_MESSAGES/project.po @@ -1,17 +1,18 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2015, Odoo S.A. +# Copyright (C) 2015-TODAY, Odoo S.A. # This file is distributed under the same license as the Odoo Business package. # # Translators: # Alejandra Escandón Del Real , 2015 +# Miguel Mendez , 2016 # Rojas Pablo , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-17 14:30+0100\n" -"PO-Revision-Date: 2016-03-18 08:15+0000\n" -"Last-Translator: Martin Trigaux\n" +"POT-Creation-Date: 2016-04-06 08:44+0200\n" +"PO-Revision-Date: 2016-04-25 08:08+0000\n" +"Last-Translator: Miguel Mendez \n" "Language-Team: Spanish (http://www.transifex.com/odoo/odoo-9-doc/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -506,18 +507,18 @@ msgstr "¿Cómo administrar y colaborar en tareas? " #: ../../project/configuration/collaboration.rst:6 msgid "Responsibilities" -msgstr "" +msgstr "Responsabilidades" #: ../../project/configuration/collaboration.rst:8 msgid "In Odoo, you can assign the person who is in charge of the task." -msgstr "" +msgstr "In Odoo, tu puedes asignar a la persona que se encargara de la tarea." #: ../../project/configuration/collaboration.rst:10 msgid "" "When creating a task, by default you are responsible for it. You can change " "this by simply typing the username of someone else and choosing it from the " "suggestions in the drop down menu." -msgstr "" +msgstr "Al crear una tarea, por defecto usted es responsable de ella. Puede cambiar esto simplemente escribiendo el nombre de usuario de otra persona y que la elección de las sugerencias en el menú desplegable." #: ../../project/configuration/collaboration.rst:15 msgid "" @@ -811,70 +812,70 @@ msgstr "" #: ../../project/configuration/collaboration.rst:229 msgid "" "If you just need the pad and not the whole task page, you can click on the " -"icon on the top right to get to the pad directly. This also gives you the " -"direct url of the task description: useful if you want to send it to someone" -" without adding this person as a follower." +"icon on the top right to get to the pad directly in a full screen view. " +"Click on the icon to get the direct URL of the task description: useful " +"if you want to send it to someone without adding this person as a follower." msgstr "" -#: ../../project/configuration/collaboration.rst:238 +#: ../../project/configuration/collaboration.rst:239 msgid "Tasks states" msgstr "" -#: ../../project/configuration/collaboration.rst:241 +#: ../../project/configuration/collaboration.rst:242 msgid "Set the state of a task" msgstr "" -#: ../../project/configuration/collaboration.rst:243 +#: ../../project/configuration/collaboration.rst:244 msgid "" "The status of the task is the easiest way to inform your colleagues when you" " are working on a task, if the task is ready or if it is blocked. It is a " "visual indicator that is seen in a glance." msgstr "" -#: ../../project/configuration/collaboration.rst:247 +#: ../../project/configuration/collaboration.rst:248 msgid "" "You can change the status of the task from the kanban view or directly from " "the task. Just click on the status ball to get the choices:" msgstr "" -#: ../../project/configuration/collaboration.rst:257 +#: ../../project/configuration/collaboration.rst:258 msgid "Custom states" msgstr "" -#: ../../project/configuration/collaboration.rst:259 +#: ../../project/configuration/collaboration.rst:260 msgid "" "You can decide what the different status mean for each stage of your " "project. On the kanban view, click on the gear icon on the top of the stage," " then click on edit:" msgstr "" -#: ../../project/configuration/collaboration.rst:266 +#: ../../project/configuration/collaboration.rst:267 msgid "Next to the color ball, write the explanation of the state." msgstr "" -#: ../../project/configuration/collaboration.rst:271 +#: ../../project/configuration/collaboration.rst:272 msgid "Now, the explanation will be displayed instead of the generic text:" msgstr "" -#: ../../project/configuration/collaboration.rst:277 +#: ../../project/configuration/collaboration.rst:278 msgid "Color Tags" msgstr "" -#: ../../project/configuration/collaboration.rst:279 +#: ../../project/configuration/collaboration.rst:280 msgid "" "In every task, you can add a tag. Tags are very useful to categorize the " "tasks. It helps you to highlight a task from the Kanban view or better find " "them thanks to the filters." msgstr "" -#: ../../project/configuration/collaboration.rst:283 +#: ../../project/configuration/collaboration.rst:284 msgid "" "If you are always working with a specific type of tag, you can highlight the" " tasks containing the tag with the colors. Each tag can get a specific " "color, it's very visual on the Kanban view." msgstr "" -#: ../../project/configuration/collaboration.rst:290 +#: ../../project/configuration/collaboration.rst:291 msgid "" "In order to make it appear on the kanban view, you have to set a color on " "the tag, directly from the task:" diff --git a/locale/es/LC_MESSAGES/sales.po b/locale/es/LC_MESSAGES/sales.po index e25a53001..aa44878c6 100644 --- a/locale/es/LC_MESSAGES/sales.po +++ b/locale/es/LC_MESSAGES/sales.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-18 16:07+0100\n" -"PO-Revision-Date: 2016-03-19 09:54+0000\n" +"POT-Creation-Date: 2016-04-22 13:58+0200\n" +"PO-Revision-Date: 2016-04-23 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (http://www.transifex.com/odoo/odoo-9-doc/language/es/)\n" "MIME-Version: 1.0\n" @@ -317,9 +317,10 @@ msgstr "También puede usar la facturación de proyecto por porcentajes del proy #: ../../sales/invoicing/services/reinvoice.rst:95 #: ../../sales/invoicing/services/support.rst:17 #: ../../sales/products_prices/prices/B2B_B2C.rst:60 +#: ../../sales/quotation/online/creation.rst:6 #: ../../sales/quotation/setup/different_addresses.rst:14 #: ../../sales/quotation/setup/first_quote.rst:21 -#: ../../sales/quotation/setup/optional.rst:19 +#: ../../sales/quotation/setup/optional.rst:16 #: ../../sales/quotation/setup/terms_conditions.rst:27 msgid "Configuration" msgstr "Configuración" @@ -1458,8 +1459,85 @@ msgid "Online Quotation" msgstr "Cotización en línea" #: ../../sales/quotation/online/creation.rst:3 -msgid "How to create/ edit an online quotation?" -msgstr "¿Cómo crear / editar una cotización en línea?" +msgid "How to create and edit an online quotation?" +msgstr "" + +#: ../../sales/quotation/online/creation.rst:9 +msgid "Enable Online Quotations" +msgstr "" + +#: ../../sales/quotation/online/creation.rst:11 +msgid "" +"To send online quotations, you must first enable online quotations in the " +"Sales app from :menuselection:`Configuration --> Settings`. Doing so will " +"prompt you to install the Website app if you haven't already." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:18 +msgid "" +"You can view the online version of each quotation you create after enabling " +"this setting by selecting **Preview** from the top of the quotation." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:25 +msgid "Edit Your Online Quotations" +msgstr "" + +#: ../../sales/quotation/online/creation.rst:27 +msgid "" +"The online quotation page can be edited for each quotation template in the " +"Sales app via :menuselection:`Configuration --> Quotation Templates`. From " +"within any quotation template, select **Edit Template** to be taken to the " +"corresponding page of your website." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:34 +msgid "" +"You can add text, images, and structural elements to the quotation page by " +"dragging and dropping blocks from the pallet on the left sidebar menu. A " +"table of contents will be automatically generated based on the content you " +"add." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:38 +msgid "" +"Advanced descriptions for each product on a quotation are displayed on the " +"online quotation page. These descriptions are inherited from the product " +"page in your eCommerce Shop, and can be edited directly on the page through " +"the inline text editor." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:45 +msgid "" +"You can choose to allow payment immediately after the customer validates the" +" quote by selecting a payment option on the quotation template." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:48 +msgid "" +"You can edit the webpage of an individual quotation as you would for any web" +" page by clicking the **Edit** button. Changes made in this way will only " +"affect the individual quotation." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:52 +msgid "Using Online Quotations" +msgstr "" + +#: ../../sales/quotation/online/creation.rst:54 +msgid "" +"To share an online quotation with your customer, copy the URL of the online " +"quotation, then share it with customer." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:60 +msgid "" +"Alternatively, your customer can access their online quotations by logging " +"into your website through the customer portal. Your customer can accept or " +"reject the quotation, print it, or negotiate the terms in the chat box. You " +"will also receive a notification in the chatter within Odoo whenever the " +"customer views the quotation." +msgstr "" #: ../../sales/quotation/online/followup.rst:3 msgid "How to follow up a quotation sent to a opportunity?" @@ -1708,83 +1786,42 @@ msgid "" "purchase in one of several locations." msgstr "" -#: ../../sales/quotation/setup/optional.rst:15 -msgid "" -"This document covers the configuration and use of suggested products in " -"Odoo." -msgstr "" - -#: ../../sales/quotation/setup/optional.rst:21 +#: ../../sales/quotation/setup/optional.rst:18 msgid "" "Suggested products can be added to quotations directly, or to the ecommerce " "platform via each product form. In order to use suggested products, you will" -" need to have the **Ecommerce** applications installed:" +" need to have the **Ecommerce** app installed:" msgstr "" -#: ../../sales/quotation/setup/optional.rst:26 -msgid "Product" +#: ../../sales/quotation/setup/optional.rst:23 +msgid "Quotations" msgstr "" -#: ../../sales/quotation/setup/optional.rst:28 +#: ../../sales/quotation/setup/optional.rst:25 msgid "" -"On the product form view, under the **Sales** tab, you can set optional " -"products on that will be proposed on an order each time that this product is" -" added in the cart or on the sale order. On the picture below, we set 2 " -"optional products on a computer case." +"To add suggested products to quotations, you must first enable online " +"quotations in the Sales app from :menuselection:`Configuration --> " +"Settings`. Doing so will prompt you to install the Website app if you " +"haven't already." msgstr "" -#: ../../sales/quotation/setup/optional.rst:37 -msgid "Quotation template" +#: ../../sales/quotation/setup/optional.rst:32 +msgid "" +"You will then be able to add suggested products to your individual " +"quotations and quotation templates under the **Suggested Products** tab of a" +" quotation." msgstr "" #: ../../sales/quotation/setup/optional.rst:39 +msgid "Website Sales" +msgstr "" + +#: ../../sales/quotation/setup/optional.rst:41 msgid "" -"We can configure also configure optional products on quotation template like" -" on the picture below." -msgstr "" - -#: ../../sales/quotation/setup/optional.rst:45 -msgid "" -"For online quotation design you can follow following topic: " -":doc:`../online/creation`" -msgstr "" - -#: ../../sales/quotation/setup/optional.rst:48 -msgid "Orders with optional product" -msgstr "" - -#: ../../sales/quotation/setup/optional.rst:51 -msgid "Online order" -msgstr "" - -#: ../../sales/quotation/setup/optional.rst:53 -msgid "" -"Now, if a customer is adding in his cart the Computer Case product on which " -"we set 2 suggested products," -msgstr "" - -#: ../../sales/quotation/setup/optional.rst:59 -msgid "" -"on the same page are displayed these 2 products that they can add to their " -"cart too." -msgstr "" - -#: ../../sales/quotation/setup/optional.rst:64 -msgid "" -"The customer can after that complete the sale process from the checkout to " -"the payment. For more information on sales you can follow another topic: " -":doc:`../../overview/process/from_quote_to_so`" -msgstr "" - -#: ../../sales/quotation/setup/optional.rst:68 -msgid "Quotation backend" -msgstr "" - -#: ../../sales/quotation/setup/optional.rst:70 -msgid "" -"We are creating a quotation in the sales application by using a template. " -"The system will propose on the sale order form under the **Suggested " -"Products** tab the products that were defined on the template." +"You can add suggested products to a product on its product form, under the " +"Website heading in the **Sales** tab. **Suggested products** will appear on " +"the *product* page, and **Accessory Products** will appear on the *cart* " +"page prior to checkout." msgstr "" #: ../../sales/quotation/setup/recurring.rst:3 diff --git a/locale/nl/LC_MESSAGES/crm.po b/locale/nl/LC_MESSAGES/crm.po index 5abd4e17e..02bb8e2db 100644 --- a/locale/nl/LC_MESSAGES/crm.po +++ b/locale/nl/LC_MESSAGES/crm.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-18 14:22+0100\n" -"PO-Revision-Date: 2016-03-19 12:04+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2016-04-11 07:45+0000\n" +"Last-Translator: Yenthe Van Ginneken \n" "Language-Team: Dutch (http://www.transifex.com/odoo/odoo-9-doc/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -844,64 +844,64 @@ msgstr ":doc:`automatic_assignation`" #: ../../crm/leads/voip.rst:3 msgid "Odoo VOIP" -msgstr "" +msgstr "Odoo VOIP" #: ../../crm/leads/voip/setup.rst:3 msgid "Installation and Setup" -msgstr "" +msgstr "Installatie en opzet" #: ../../crm/leads/voip/setup.rst:6 msgid "Installing Asterisk server" -msgstr "" +msgstr "Asterisk server installeren" #: ../../crm/leads/voip/setup.rst:9 msgid "Dependencies" -msgstr "" +msgstr "Afhankelijkheden" #: ../../crm/leads/voip/setup.rst:11 msgid "" "Before installing Asterisk you need to install the following dependencies:" -msgstr "" +msgstr "Voordat u Asterisk installeert moet u de volgende afhankelijkheden installeren:" #: ../../crm/leads/voip/setup.rst:13 msgid "wget" -msgstr "" +msgstr "wget" #: ../../crm/leads/voip/setup.rst:14 msgid "gcc" -msgstr "" +msgstr "gcc" #: ../../crm/leads/voip/setup.rst:15 msgid "gcc-c++" -msgstr "" +msgstr "gcc-c++" #: ../../crm/leads/voip/setup.rst:16 msgid "ncurses-devel" -msgstr "" +msgstr "ncurses-devel" #: ../../crm/leads/voip/setup.rst:17 msgid "libxml2-devel" -msgstr "" +msgstr "libxml2-devel" #: ../../crm/leads/voip/setup.rst:18 msgid "sqlite-devel" -msgstr "" +msgstr "sqlite-devel" #: ../../crm/leads/voip/setup.rst:19 msgid "libsrtp-devel" -msgstr "" +msgstr "libsrtp-devel" #: ../../crm/leads/voip/setup.rst:20 msgid "libuuid-devel" -msgstr "" +msgstr "libuuid-devel" #: ../../crm/leads/voip/setup.rst:21 msgid "openssl-devel" -msgstr "" +msgstr "openssl-devel" #: ../../crm/leads/voip/setup.rst:23 msgid "If libsrtp is not available in the repo install it from source." -msgstr "" +msgstr "Indien libstrp niet beschikbaar is in de repository installeert u ze vanuit de bron." #: ../../crm/leads/voip/setup.rst:34 msgid "" @@ -928,15 +928,15 @@ msgstr "" #: ../../crm/leads/voip/setup.rst:62 msgid "**Verify that pjproject is installed:**" -msgstr "" +msgstr "**Verifieer dat pjproject geïnstalleerd is:**" #: ../../crm/leads/voip/setup.rst:68 msgid "**The result should be:**" -msgstr "" +msgstr "**Het resultaat zou moeten zijn:**" #: ../../crm/leads/voip/setup.rst:75 msgid "Asterisk" -msgstr "" +msgstr "Asterisk" #: ../../crm/leads/voip/setup.rst:77 msgid "" @@ -971,7 +971,7 @@ msgstr "" #: ../../crm/leads/voip/setup.rst:105 msgid "Compile and install Asterisk:" -msgstr "" +msgstr "Compileer en installeer Asterisk:" #: ../../crm/leads/voip/setup.rst:111 msgid "" @@ -982,7 +982,7 @@ msgstr "" #: ../../crm/leads/voip/setup.rst:114 msgid "DTLS Certificates" -msgstr "" +msgstr "DTLS certificaten" #: ../../crm/leads/voip/setup.rst:116 msgid "After you need to setup the DTLS certificates." @@ -1000,7 +1000,7 @@ msgstr "" #: ../../crm/leads/voip/setup.rst:135 msgid "Configure Asterisk server" -msgstr "" +msgstr "Configureer Asterisk server" #: ../../crm/leads/voip/setup.rst:137 msgid "" @@ -1028,15 +1028,15 @@ msgstr "" #: ../../crm/leads/voip/setup.rst:182 msgid "Lastly, set up extensions.conf:" -msgstr "" +msgstr "Stel als laatste extensions.conf in:" #: ../../crm/leads/voip/setup.rst:191 msgid "Configure Odoo VOIP" -msgstr "" +msgstr "Configureer Odoo VOIP" #: ../../crm/leads/voip/setup.rst:193 msgid "In Odoo, the configuration should be done in the user's preferences." -msgstr "" +msgstr "De configuratie moet in Odoo gedaan worden onder de gebruikersvoorkeuren." #: ../../crm/leads/voip/setup.rst:195 msgid "" diff --git a/locale/nl/LC_MESSAGES/inventory.po b/locale/nl/LC_MESSAGES/inventory.po index 9c235ed6a..d73357659 100644 --- a/locale/nl/LC_MESSAGES/inventory.po +++ b/locale/nl/LC_MESSAGES/inventory.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-17 13:58+0100\n" -"PO-Revision-Date: 2016-03-20 23:09+0000\n" -"Last-Translator: Alain van Hall \n" +"POT-Creation-Date: 2016-04-22 13:58+0200\n" +"PO-Revision-Date: 2016-04-23 10:07+0000\n" +"Last-Translator: Martin Trigaux\n" "Language-Team: Dutch (http://www.transifex.com/odoo/odoo-9-doc/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -7261,148 +7261,136 @@ msgid "How to get UPS credentials for integration with Odoo?" msgstr "" #: ../../inventory/shipping/setup/ups_credentials.rst:5 -msgid "" -"Please note that only those customers that are based in the US can open a " -"UPS account number online. If you are located in a country other than the " -"US, you will need to contact Customer Service for your country location to " -"open UPS account number." +msgid "In order to use the Odoo UPS API, you will need:" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:10 -msgid "" -"In order to use the UPS APIs from Odoo, you will need to have the items " -"listed below:" +#: ../../inventory/shipping/setup/ups_credentials.rst:7 +msgid "A UPS.com user ID and password" +msgstr "" + +#: ../../inventory/shipping/setup/ups_credentials.rst:9 +msgid "A UPS account number" +msgstr "" + +#: ../../inventory/shipping/setup/ups_credentials.rst:11 +msgid "An Access Key" msgstr "" #: ../../inventory/shipping/setup/ups_credentials.rst:13 -msgid "UPS.com user ID and password" -msgstr "" - -#: ../../inventory/shipping/setup/ups_credentials.rst:15 -msgid "UPS account number" -msgstr "" - -#: ../../inventory/shipping/setup/ups_credentials.rst:17 -msgid "Access Key" -msgstr "" - -#: ../../inventory/shipping/setup/ups_credentials.rst:19 msgid "" "An Access Key is a 16 character alpha-numeric code that allows access to the" " UPS Developer Kit API Development and Production servers." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:23 -msgid "Create an UPS Account" +#: ../../inventory/shipping/setup/ups_credentials.rst:17 +msgid "Create a UPS Account" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:25 -msgid "To register with MyUPS.com, please follow these steps:" +#: ../../inventory/shipping/setup/ups_credentials.rst:19 +msgid "" +"Note that only customers located in the US can open a UPS account online. If" +" you are located outside the US, you will need to contact UPS Customer " +"Service in order to to open an account." +msgstr "" + +#: ../../inventory/shipping/setup/ups_credentials.rst:23 +msgid "" +"You can read additional information about opening a UPS account on the their" +" website, on the page, `How to Open a UPS Account Online " +"`_" msgstr "" #: ../../inventory/shipping/setup/ups_credentials.rst:27 msgid "" +"If you don't already have a UPS account, you can create one along with your " +"online profile by following these steps:" +msgstr "" + +#: ../../inventory/shipping/setup/ups_credentials.rst:30 +msgid "" "1. Access the UPS.com web site at `www.ups.com `__, and" " click the **New User** link at the top of the page." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:31 +#: ../../inventory/shipping/setup/ups_credentials.rst:34 msgid "" "2. Click the **Register for MyUPS** button, and follow the prompts to " "complete the registration process." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:34 -msgid "" -"To open an account with UPS and receive a UPS shipper number, please follow " -"the steps below:" -msgstr "" - #: ../../inventory/shipping/setup/ups_credentials.rst:37 msgid "" -"`http://www.ups.com/content/de/en/contact/index.html?WT.svl=Footer " -"`__" +"If you already have a UPS account, you can add it to your online profile as " +"follows:" msgstr "" #: ../../inventory/shipping/setup/ups_credentials.rst:39 msgid "" -"Once you have created a UPS.com user ID profile you will need to add your " -"UPS account number to your UPS.com profile, please follow the steps below:" -msgstr "" - -#: ../../inventory/shipping/setup/ups_credentials.rst:43 -msgid "" "1. Log in to the UPS.com site (`http://www.ups.com `__)" " using your UPS.com User ID and Password." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:47 +#: ../../inventory/shipping/setup/ups_credentials.rst:43 msgid "Click the **My UPS** tab." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:49 +#: ../../inventory/shipping/setup/ups_credentials.rst:45 msgid "Click the **Account Summary** link." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:51 +#: ../../inventory/shipping/setup/ups_credentials.rst:47 msgid "" "4. Click the **Add an Existing UPS Account** link in the **UPS Account " "Details** section of the page." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:54 +#: ../../inventory/shipping/setup/ups_credentials.rst:50 msgid "" "5. In the **Add New Account** screen, enter the **UPS Account Number**, " -"**Account Name**, and **Postal Code** fields. The country automatically " -"defaults to United States. If desired, select the **Make this my default " -"payment account** link to set the account as the default billing method for " -"the profile." +"**Account Name**, and **Postal Code** fields. The country defaults to United" +" States.q" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:60 +#: ../../inventory/shipping/setup/ups_credentials.rst:54 msgid "Click the **Next** button to continue." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:63 +#: ../../inventory/shipping/setup/ups_credentials.rst:57 msgid "Get an Access Key" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:65 +#: ../../inventory/shipping/setup/ups_credentials.rst:59 msgid "" -"After you have added your UPS account number to your user ID profile you can" -" request an Access Key from UPS using the steps below:" +"After you have added your UPS account number to your user profile you can " +"request an Access Key from UPS using the steps below:" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:68 -msgid "Log into UPS.com with your user ID and password." -msgstr "" - -#: ../../inventory/shipping/setup/ups_credentials.rst:70 +#: ../../inventory/shipping/setup/ups_credentials.rst:62 msgid "" -"2. Go to the **UPS Developer Kit** web page " +"1. Go to the **UPS Developer Kit** web page " "`https://www.ups.com/upsdeveloperkit?loc=en\\_US " "`__" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:73 +#: ../../inventory/shipping/setup/ups_credentials.rst:65 +msgid "Log into UPS.com with your user ID and password" +msgstr "" + +#: ../../inventory/shipping/setup/ups_credentials.rst:67 msgid "Click on the link **Request an access key**." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:75 -msgid "Verify the **Primary Contact Information**" +#: ../../inventory/shipping/setup/ups_credentials.rst:69 +msgid "Verify your contact information" msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:77 -msgid "Enter the **Secondary Contact Information**" -msgstr "" - -#: ../../inventory/shipping/setup/ups_credentials.rst:79 +#: ../../inventory/shipping/setup/ups_credentials.rst:71 msgid "Click the **Request Access Key** button." msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:81 +#: ../../inventory/shipping/setup/ups_credentials.rst:73 msgid "" -"Once completed, the **Access Key** will be provided to you on the web page, " -"and an email with the Access Key will be sent to the email address for the " -"primary contact information." +"The **Access Key** will be provided to you on the web page, and an email " +"with the Access Key will be sent to the email address of the primary " +"contact." msgstr "" diff --git a/locale/nl/LC_MESSAGES/point_of_sale.po b/locale/nl/LC_MESSAGES/point_of_sale.po index 63c95c9f8..554fd8b78 100644 --- a/locale/nl/LC_MESSAGES/point_of_sale.po +++ b/locale/nl/LC_MESSAGES/point_of_sale.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2015, Odoo S.A. +# Copyright (C) 2015-TODAY, Odoo S.A. # This file is distributed under the same license as the Odoo Business package. # # Translators: @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-21 11:00+0100\n" -"PO-Revision-Date: 2016-03-11 12:45+0000\n" -"Last-Translator: Yenthe Van Ginneken \n" +"POT-Creation-Date: 2016-04-04 16:08+0200\n" +"PO-Revision-Date: 2016-04-05 08:39+0000\n" +"Last-Translator: Martin Trigaux\n" "Language-Team: Dutch (http://www.transifex.com/odoo/odoo-9-doc/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -808,17 +808,11 @@ msgid "" "website `_." msgstr "De Belgische regering vereist sommige bedrijven om een door de regering goedgekeurd toestel te gebruiken, genaamd een **Fiscale data module** (ook bekend als de **zwarte kassa**). Dit toestel werkt samen met de POS applicatie en logt bepaalde transacties. Hier bovenop moet de gebruikte POS applicatie ook gecertificeerd worden door de staat en moet deze voldoen aan strikte standaarden. `Odoo 9 is een gecertificeerde applicatie `_. Meer informatie over de Fiscale data module kan gevonden worden op `de officiële website `_." -#: ../../point_of_sale/belgian_fdm/setup.rst:19 -msgid "" -"**As of December 2015, due to Belgian government restriction, the " -"certification is only valid for Odoo Online instances.**" -msgstr "**Vanaf Decemer 2015, door de restricties van de Belgische wetgeving, is de certificering enkel geld voor Odoo Online instanties.**" - -#: ../../point_of_sale/belgian_fdm/setup.rst:23 +#: ../../point_of_sale/belgian_fdm/setup.rst:20 msgid "Required hardware" msgstr "Vereiste hardware" -#: ../../point_of_sale/belgian_fdm/setup.rst:25 +#: ../../point_of_sale/belgian_fdm/setup.rst:22 msgid "" "A government certified `Fiscal Data Module " "`_ per Kassa, ze zouden allemaal moeten werken, maar de Cleancash SC-B is aanbevolen, u heeft ook het volgende nodig:" -#: ../../point_of_sale/belgian_fdm/setup.rst:30 +#: ../../point_of_sale/belgian_fdm/setup.rst:27 msgid "" "Serial null modem cable per FDM (`example `__)" msgstr "Seriële nul modem kabel per FDM (`bijvoorbeeld `__)" -#: ../../point_of_sale/belgian_fdm/setup.rst:32 +#: ../../point_of_sale/belgian_fdm/setup.rst:29 msgid "" "Serial-to-USB adapter per FDM (`example " "`__)" msgstr "Serieel-naar-USB adaptor per FDM (`voorbeeld `__)" -#: ../../point_of_sale/belgian_fdm/setup.rst:35 -msgid "A POSBox per POS" -msgstr "Een POSBox per kassa" +#: ../../point_of_sale/belgian_fdm/setup.rst:32 +msgid "A registered POSBox per POS configuration" +msgstr "" -#: ../../point_of_sale/belgian_fdm/setup.rst:38 +#: ../../point_of_sale/belgian_fdm/setup.rst:35 msgid "Setup" msgstr "Opzet" -#: ../../point_of_sale/belgian_fdm/setup.rst:41 +#: ../../point_of_sale/belgian_fdm/setup.rst:38 msgid "POSBox" msgstr "POSBox" -#: ../../point_of_sale/belgian_fdm/setup.rst:43 +#: ../../point_of_sale/belgian_fdm/setup.rst:40 msgid "" -"In order to setup the blackbox, you will first have to ensure that the " -"POSBoxes you're using have a recent image on them (support for the FDM was " -"added to the POSBox image on the 10th of December 2015). See " -":doc:`../overview/setup` on how to upgrade the POSBox. You can verify that " -"the Fiscal Data Module is recognized by the POSBox by going to the *Hardware" -" status page* via the POSBox homepage." -msgstr "Om de zwarte kassa op te zetten moet u er eerst zeker van zijn dat de POSBox(en) die u gebruikt een recente image hebben (ondersteuning voor de FDM was toegevoegd aan de POSBox image op 10 december 2015). Zie :doc:`../overview/setup` voor meer informatie over hoe u de POSBox updatet. U kan verifiëren dat de fiscale data module herkent is door de POSBox door te gaan naar de *Hardware status pagina* van uw POSBox pagina." +"In order to use a Fiscal Data Module, you will need a registered POSBox. " +"These POSBoxes are similar to the regular POSBoxes we sell, but they are " +"registered with the Belgian government. This is required by law. Attempting " +"to use a Fiscal Data Module on a non-registered POSBox will not work. You " +"can verify that the Fiscal Data Module is recognized by the POSBox by going " +"to the *Hardware status page* via the POSBox homepage." +msgstr "" -#: ../../point_of_sale/belgian_fdm/setup.rst:54 +#: ../../point_of_sale/belgian_fdm/setup.rst:52 msgid "Odoo" msgstr "Odoo" -#: ../../point_of_sale/belgian_fdm/setup.rst:56 +#: ../../point_of_sale/belgian_fdm/setup.rst:54 msgid "" -"An Odoo POS is turned into a certified POS by installing the **Belgian " -"Registered Cash Register** app (technical name: ``pos_blackbox_be``). " -"Because of government restrictions imposed on us, this installation cannot " -"be undone. After this, you will have to ensure that each POS configuration " -"has a unique POSBox associated with it (:menuselection:`Point of Sale --> " -"Configuration --> Point of Sale` and ensure Hardware Proxy / POSBox is set)." +"An Odoo POS app can be given certified POS capabilities by installing the " +"**Belgian Registered Cash Register** app (technical name: " +"``pos_blackbox_be``). Because of government restrictions imposed on us, this" +" installation cannot be undone. After this, you will have to ensure that " +"each POS configuration has a unique registered POSBox associated with it " +"(:menuselection:`Point of Sale --> Configuration --> Point of Sale` and " +"ensure Hardware Proxy / POSBox and the serial number of your POSBox is set)." " The first time you open the Point of Sale and attempt to do a transaction, " "you will be asked to input the PIN that you received with your VAT signing " "card." -msgstr "Een Odoo kassa wordt geconverteerd in een gecertificeerde POS door de **Belgische geregistreerde kassaregister** app te installeren (technische naam: ``pos_blackbox_be``). Door de restricties die ons opgelegd zijn door de Belgische staat kan de installatie niet ongedaan worden gemaakt. Hierna moet u zich er van verzekeren dat elke POS configuratie een unique POSBox geassocieerd heeft (:menuselection:`Kassa --> Configuratie --> Kassa` en u er van verzekeren dat de Hardware Proxy / POSBox is ingesteld). De eerste keer dat u de kassa opent en een transactie probeert te doen wordt u gevraagd om een pincode in te geven die u ontvangt samen met uw BTW ondertekende kaart." +msgstr "" -#: ../../point_of_sale/belgian_fdm/setup.rst:70 +#: ../../point_of_sale/belgian_fdm/setup.rst:69 +msgid "On-premise" +msgstr "" + +#: ../../point_of_sale/belgian_fdm/setup.rst:71 +msgid "" +"We do not only support the Fiscal Data Module on our SaaS platform, we also " +"support the Fiscal Data Module in on-premise installations. The main " +"restriction is that this requires an obfuscated version of the " +"``pos_blackbox_be`` module we will provide on request." +msgstr "" + +#: ../../point_of_sale/belgian_fdm/setup.rst:77 msgid "Restrictions" msgstr "Restricties" -#: ../../point_of_sale/belgian_fdm/setup.rst:72 +#: ../../point_of_sale/belgian_fdm/setup.rst:79 msgid "" "As mentioned before, in order to get certified the POS application must " "adhere to strict government guidelines. Because of this, a certified Odoo " "POS has some limitations not present in the non-certified Odoo POS." msgstr "Zoals voordien vermeld moet de POS applicatie, om gecertificeerd te zijn, voldoen aan strenge eisen van de staat. Hierdoor heeft een gecertificeerde Odoo kassa limitaties die niet aanwezig zijn in niet gecertificeerde Odoo kassa's." -#: ../../point_of_sale/belgian_fdm/setup.rst:77 +#: ../../point_of_sale/belgian_fdm/setup.rst:84 msgid "Refunding is disabled" msgstr "Terugbetalen is uitgeschakeld" -#: ../../point_of_sale/belgian_fdm/setup.rst:78 +#: ../../point_of_sale/belgian_fdm/setup.rst:85 msgid "Modifying orderline prices" msgstr "Prijzen van orderlijnen wijzigen" -#: ../../point_of_sale/belgian_fdm/setup.rst:79 +#: ../../point_of_sale/belgian_fdm/setup.rst:86 msgid "Creating/modifying/deleting POS orders" msgstr "Maken/wijzigen/verwijderen van kassa orders" -#: ../../point_of_sale/belgian_fdm/setup.rst:80 +#: ../../point_of_sale/belgian_fdm/setup.rst:87 msgid "Selling products without a valid tax" msgstr "Producten verkopen zonder een valide belasting" -#: ../../point_of_sale/belgian_fdm/setup.rst:81 +#: ../../point_of_sale/belgian_fdm/setup.rst:88 msgid "Multiple Odoo POS configurations per POSBox are not allowed" msgstr "Meerdere Odoo kassa configuraties per POSBox zijn niet toegestaan" -#: ../../point_of_sale/belgian_fdm/setup.rst:82 +#: ../../point_of_sale/belgian_fdm/setup.rst:89 msgid "Using the POS without a connection to the POSBox (and thus FDM)" msgstr "De Kassa gebruiken zonder een connectie naar de POSBox (en dus FDM)" -#: ../../point_of_sale/belgian_fdm/setup.rst:83 +#: ../../point_of_sale/belgian_fdm/setup.rst:90 msgid "Blacklisted modules: pos_discount, pos_reprint, pos_loyalty" msgstr "Zwarte lijst modules: pos_discount, pos_reprint, pos_loyalty" diff --git a/locale/nl/LC_MESSAGES/project.po b/locale/nl/LC_MESSAGES/project.po index 06a16d376..f3a42f574 100644 --- a/locale/nl/LC_MESSAGES/project.po +++ b/locale/nl/LC_MESSAGES/project.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2015, Odoo S.A. +# Copyright (C) 2015-TODAY, Odoo S.A. # This file is distributed under the same license as the Odoo Business package. # # Translators: @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-17 14:30+0100\n" -"PO-Revision-Date: 2016-03-18 08:15+0000\n" -"Last-Translator: Martin Trigaux\n" +"POT-Creation-Date: 2016-04-06 08:44+0200\n" +"PO-Revision-Date: 2016-04-24 13:32+0000\n" +"Last-Translator: Yenthe Van Ginneken \n" "Language-Team: Dutch (http://www.transifex.com/odoo/odoo-9-doc/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -650,13 +650,13 @@ msgstr "Binnen een taak is de urenstaten optie ook beschikbaar." msgid "" "In the task, click on the Edit button. Go on the Timesheet tab and click on " "Add an item." -msgstr "" +msgstr "Klik in de taak op de wijzig knop. Ga naar het Urenstaten tabblad en klik op item toevoegen." #: ../../project/configuration/collaboration.rst:110 msgid "" "A line will appear with the name of the project already selected in the " "Analytic account." -msgstr "" +msgstr "Een lijn verschijnt met de naam van het project al geselecteerd in de analytische rekening." #: ../../project/configuration/collaboration.rst:113 msgid "" @@ -811,74 +811,74 @@ msgstr "" #: ../../project/configuration/collaboration.rst:229 msgid "" "If you just need the pad and not the whole task page, you can click on the " -"icon on the top right to get to the pad directly. This also gives you the " -"direct url of the task description: useful if you want to send it to someone" -" without adding this person as a follower." +"icon on the top right to get to the pad directly in a full screen view. " +"Click on the icon to get the direct URL of the task description: useful " +"if you want to send it to someone without adding this person as a follower." msgstr "" -#: ../../project/configuration/collaboration.rst:238 +#: ../../project/configuration/collaboration.rst:239 msgid "Tasks states" msgstr "Taak fases" -#: ../../project/configuration/collaboration.rst:241 +#: ../../project/configuration/collaboration.rst:242 msgid "Set the state of a task" msgstr "Stel de fase van een taak in" -#: ../../project/configuration/collaboration.rst:243 +#: ../../project/configuration/collaboration.rst:244 msgid "" "The status of the task is the easiest way to inform your colleagues when you" " are working on a task, if the task is ready or if it is blocked. It is a " "visual indicator that is seen in a glance." msgstr "" -#: ../../project/configuration/collaboration.rst:247 +#: ../../project/configuration/collaboration.rst:248 msgid "" "You can change the status of the task from the kanban view or directly from " "the task. Just click on the status ball to get the choices:" msgstr "" -#: ../../project/configuration/collaboration.rst:257 +#: ../../project/configuration/collaboration.rst:258 msgid "Custom states" -msgstr "" +msgstr "Aangepaste fases" -#: ../../project/configuration/collaboration.rst:259 +#: ../../project/configuration/collaboration.rst:260 msgid "" "You can decide what the different status mean for each stage of your " "project. On the kanban view, click on the gear icon on the top of the stage," " then click on edit:" msgstr "" -#: ../../project/configuration/collaboration.rst:266 +#: ../../project/configuration/collaboration.rst:267 msgid "Next to the color ball, write the explanation of the state." msgstr "" -#: ../../project/configuration/collaboration.rst:271 +#: ../../project/configuration/collaboration.rst:272 msgid "Now, the explanation will be displayed instead of the generic text:" -msgstr "" +msgstr "Nu wordt de uitleg getoond in plaats van de generieke tekst:" -#: ../../project/configuration/collaboration.rst:277 +#: ../../project/configuration/collaboration.rst:278 msgid "Color Tags" msgstr "Kleur labels" -#: ../../project/configuration/collaboration.rst:279 +#: ../../project/configuration/collaboration.rst:280 msgid "" "In every task, you can add a tag. Tags are very useful to categorize the " "tasks. It helps you to highlight a task from the Kanban view or better find " "them thanks to the filters." msgstr "" -#: ../../project/configuration/collaboration.rst:283 +#: ../../project/configuration/collaboration.rst:284 msgid "" "If you are always working with a specific type of tag, you can highlight the" " tasks containing the tag with the colors. Each tag can get a specific " "color, it's very visual on the Kanban view." msgstr "" -#: ../../project/configuration/collaboration.rst:290 +#: ../../project/configuration/collaboration.rst:291 msgid "" "In order to make it appear on the kanban view, you have to set a color on " "the tag, directly from the task:" -msgstr "" +msgstr "Om het te doen verschijnen in de kanban weergave moet u een kleur instellen op de tag, direct vanuit de taak:" #: ../../project/configuration/setup.rst:3 msgid "How to set up & configure a project?" @@ -1521,7 +1521,7 @@ msgstr "" #: ../../project/planning/forecast.rst:51 msgid "You'll see the **Forecast** option appearing in the top menu." -msgstr "" +msgstr "U zal de **Forecast** optie zien verschijnen in de bovenste menu." #: ../../project/planning/forecast.rst:56 msgid "" @@ -1688,7 +1688,7 @@ msgstr "wijzig een bestaande prognose" #: ../../project/planning/forecast.rst:167 #: ../../project/planning/forecast.rst:202 msgid "change the length of a task by extending or shortening the rectangle." -msgstr "" +msgstr "wijzig de lengte van een taak door de rechthoek uit te breiden of in te korten." #: ../../project/planning/forecast.rst:170 msgid "By projects: project management" @@ -1719,7 +1719,7 @@ msgstr "" msgid "" "This view won't show your HR time. The colours don't apply. (see **By " "Users** section)" -msgstr "" +msgstr "Deze weergave toont niet uw HR tijd. De kleuren zijn niet van toepassing. (zie **Op gebruikers** sectie)" #: ../../project/reporting.rst:3 msgid "Reporting & Analysis" diff --git a/locale/nl/LC_MESSAGES/sales.po b/locale/nl/LC_MESSAGES/sales.po index d5bac3c0b..a56104247 100644 --- a/locale/nl/LC_MESSAGES/sales.po +++ b/locale/nl/LC_MESSAGES/sales.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-18 16:07+0100\n" -"PO-Revision-Date: 2016-03-19 09:54+0000\n" +"POT-Creation-Date: 2016-04-22 13:58+0200\n" +"PO-Revision-Date: 2016-04-23 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Dutch (http://www.transifex.com/odoo/odoo-9-doc/language/nl/)\n" "MIME-Version: 1.0\n" @@ -313,9 +313,10 @@ msgstr "U kan ook mijlpalen gebruiken om delen van het project te factureren. Bi #: ../../sales/invoicing/services/reinvoice.rst:95 #: ../../sales/invoicing/services/support.rst:17 #: ../../sales/products_prices/prices/B2B_B2C.rst:60 +#: ../../sales/quotation/online/creation.rst:6 #: ../../sales/quotation/setup/different_addresses.rst:14 #: ../../sales/quotation/setup/first_quote.rst:21 -#: ../../sales/quotation/setup/optional.rst:19 +#: ../../sales/quotation/setup/optional.rst:16 #: ../../sales/quotation/setup/terms_conditions.rst:27 msgid "Configuration" msgstr "Configuratie" @@ -1454,8 +1455,85 @@ msgid "Online Quotation" msgstr "Online offerte" #: ../../sales/quotation/online/creation.rst:3 -msgid "How to create/ edit an online quotation?" -msgstr "Hoe een online offerte aan te maken / te wijzigen?" +msgid "How to create and edit an online quotation?" +msgstr "" + +#: ../../sales/quotation/online/creation.rst:9 +msgid "Enable Online Quotations" +msgstr "" + +#: ../../sales/quotation/online/creation.rst:11 +msgid "" +"To send online quotations, you must first enable online quotations in the " +"Sales app from :menuselection:`Configuration --> Settings`. Doing so will " +"prompt you to install the Website app if you haven't already." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:18 +msgid "" +"You can view the online version of each quotation you create after enabling " +"this setting by selecting **Preview** from the top of the quotation." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:25 +msgid "Edit Your Online Quotations" +msgstr "" + +#: ../../sales/quotation/online/creation.rst:27 +msgid "" +"The online quotation page can be edited for each quotation template in the " +"Sales app via :menuselection:`Configuration --> Quotation Templates`. From " +"within any quotation template, select **Edit Template** to be taken to the " +"corresponding page of your website." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:34 +msgid "" +"You can add text, images, and structural elements to the quotation page by " +"dragging and dropping blocks from the pallet on the left sidebar menu. A " +"table of contents will be automatically generated based on the content you " +"add." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:38 +msgid "" +"Advanced descriptions for each product on a quotation are displayed on the " +"online quotation page. These descriptions are inherited from the product " +"page in your eCommerce Shop, and can be edited directly on the page through " +"the inline text editor." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:45 +msgid "" +"You can choose to allow payment immediately after the customer validates the" +" quote by selecting a payment option on the quotation template." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:48 +msgid "" +"You can edit the webpage of an individual quotation as you would for any web" +" page by clicking the **Edit** button. Changes made in this way will only " +"affect the individual quotation." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:52 +msgid "Using Online Quotations" +msgstr "" + +#: ../../sales/quotation/online/creation.rst:54 +msgid "" +"To share an online quotation with your customer, copy the URL of the online " +"quotation, then share it with customer." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:60 +msgid "" +"Alternatively, your customer can access their online quotations by logging " +"into your website through the customer portal. Your customer can accept or " +"reject the quotation, print it, or negotiate the terms in the chat box. You " +"will also receive a notification in the chatter within Odoo whenever the " +"customer views the quotation." +msgstr "" #: ../../sales/quotation/online/followup.rst:3 msgid "How to follow up a quotation sent to a opportunity?" @@ -1704,83 +1782,42 @@ msgid "" "purchase in one of several locations." msgstr "" -#: ../../sales/quotation/setup/optional.rst:15 -msgid "" -"This document covers the configuration and use of suggested products in " -"Odoo." -msgstr "" - -#: ../../sales/quotation/setup/optional.rst:21 +#: ../../sales/quotation/setup/optional.rst:18 msgid "" "Suggested products can be added to quotations directly, or to the ecommerce " "platform via each product form. In order to use suggested products, you will" -" need to have the **Ecommerce** applications installed:" +" need to have the **Ecommerce** app installed:" msgstr "" -#: ../../sales/quotation/setup/optional.rst:26 -msgid "Product" +#: ../../sales/quotation/setup/optional.rst:23 +msgid "Quotations" msgstr "" -#: ../../sales/quotation/setup/optional.rst:28 +#: ../../sales/quotation/setup/optional.rst:25 msgid "" -"On the product form view, under the **Sales** tab, you can set optional " -"products on that will be proposed on an order each time that this product is" -" added in the cart or on the sale order. On the picture below, we set 2 " -"optional products on a computer case." +"To add suggested products to quotations, you must first enable online " +"quotations in the Sales app from :menuselection:`Configuration --> " +"Settings`. Doing so will prompt you to install the Website app if you " +"haven't already." msgstr "" -#: ../../sales/quotation/setup/optional.rst:37 -msgid "Quotation template" +#: ../../sales/quotation/setup/optional.rst:32 +msgid "" +"You will then be able to add suggested products to your individual " +"quotations and quotation templates under the **Suggested Products** tab of a" +" quotation." msgstr "" #: ../../sales/quotation/setup/optional.rst:39 +msgid "Website Sales" +msgstr "" + +#: ../../sales/quotation/setup/optional.rst:41 msgid "" -"We can configure also configure optional products on quotation template like" -" on the picture below." -msgstr "" - -#: ../../sales/quotation/setup/optional.rst:45 -msgid "" -"For online quotation design you can follow following topic: " -":doc:`../online/creation`" -msgstr "" - -#: ../../sales/quotation/setup/optional.rst:48 -msgid "Orders with optional product" -msgstr "" - -#: ../../sales/quotation/setup/optional.rst:51 -msgid "Online order" -msgstr "" - -#: ../../sales/quotation/setup/optional.rst:53 -msgid "" -"Now, if a customer is adding in his cart the Computer Case product on which " -"we set 2 suggested products," -msgstr "" - -#: ../../sales/quotation/setup/optional.rst:59 -msgid "" -"on the same page are displayed these 2 products that they can add to their " -"cart too." -msgstr "" - -#: ../../sales/quotation/setup/optional.rst:64 -msgid "" -"The customer can after that complete the sale process from the checkout to " -"the payment. For more information on sales you can follow another topic: " -":doc:`../../overview/process/from_quote_to_so`" -msgstr "" - -#: ../../sales/quotation/setup/optional.rst:68 -msgid "Quotation backend" -msgstr "" - -#: ../../sales/quotation/setup/optional.rst:70 -msgid "" -"We are creating a quotation in the sales application by using a template. " -"The system will propose on the sale order form under the **Suggested " -"Products** tab the products that were defined on the template." +"You can add suggested products to a product on its product form, under the " +"Website heading in the **Sales** tab. **Suggested products** will appear on " +"the *product* page, and **Accessory Products** will appear on the *cart* " +"page prior to checkout." msgstr "" #: ../../sales/quotation/setup/recurring.rst:3 diff --git a/locale/zh_CN/LC_MESSAGES/accounting.po b/locale/zh_CN/LC_MESSAGES/accounting.po index 3502b9500..d0fe93065 100644 --- a/locale/zh_CN/LC_MESSAGES/accounting.po +++ b/locale/zh_CN/LC_MESSAGES/accounting.po @@ -7,7 +7,7 @@ # fisher szu , 2015 # Gang LIU , 2016 # Gary Wei , 2016 -# jeffery chen fan , 2015-2016 +# Jeffery Chenn , 2015-2016 # lao yi , 2016 # mrshelly , 2015-2016 # Rona Lin , 2016 @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-28 16:42+0530\n" -"PO-Revision-Date: 2016-03-31 08:40+0000\n" +"PO-Revision-Date: 2016-04-14 09:29+0000\n" "Last-Translator: Connie Xiao \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -4029,7 +4029,7 @@ msgid "" "Odoo 9 comes with a powerful and easy-to-use reporting framework. Creating " "new reports (such as a tax report or a balance sheet for a specific country)" " to suit your needs is now easier than ever." -msgstr "" +msgstr "Odoo 9提供了一个有用且便捷的报告框架。创建新报告(如税收报告或资产负债表, 在指定国家),以适应您的需求, 现在比以往更容易。" #: ../../accounting/others/reporting/customize.rst:13 msgid "Activate the developer mode" @@ -4040,7 +4040,7 @@ msgid "" "In order to have access to the financial report creation interface, the " "**developer mode** needs to be activated. To do that, first click the **?** " "at the top right, then **About**." -msgstr "" +msgstr "进入财务报告创建界面, 需激活* * 开发人员模式* *。要做到这一点,首先在右上角点击* * ?* *,然后点击**About* *。" #: ../../accounting/others/reporting/customize.rst:22 msgid "Click on : **Activate the developer mode**." @@ -4054,13 +4054,13 @@ msgstr "创建财务报表" msgid "" "First, you need to create your financial report. To do that, go to " ":menuselection:`Accounting --> Configuration --> Financial Reports`" -msgstr "" +msgstr "首先,您需要创建您的财务报告。要做到这一点,去:menuselection:`Accounting --> Configuration --> Financial Reports`" #: ../../accounting/others/reporting/customize.rst:36 msgid "" "Once the name is filled, there are two other parameters that need to be " "configured:" -msgstr "" +msgstr "一旦命名,还需配置两个参数:" #: ../../accounting/others/reporting/customize.rst:39 msgid "**Show Credit and Debit Columns**" @@ -4082,7 +4082,7 @@ msgstr "基于单个日期(例如余额表)" msgid "" "Based on date ranges with 'older' and 'total' columns and last 3 months (eg." " Aged Partner Balances)" -msgstr "" +msgstr "根据日期范围的“老”和“总计”列, 最后的3个月(如. 业务伙伴账龄余额表)" #: ../../accounting/others/reporting/customize.rst:50 msgid "Bases on date ranges and cash basis method (eg Cash Flow Statement)" @@ -4097,14 +4097,14 @@ msgid "" "After you've created the report, you need to fill it with lines. They all " "need a **name**, a **code** (that is used to refer to the line), a " "**sequence number** and a **level** (Used for the line rendering)." -msgstr "" +msgstr "创建了报告之后,需要填充行。他们都需要一个* *姓名* *,* * 代码* *(用于行),* *序列号* *和* *级* *(用于补充行)。" #: ../../accounting/others/reporting/customize.rst:63 msgid "" "In the **formulas** field you can add one or more formulas to assign a value" " to the balance column (and debit and credit column if applicable – " "separated by ;)" -msgstr "" +msgstr "在* *公式* *字段可以添加一个或多个列公式到余额行 (和借方和贷方列如果适用-隔开;)" #: ../../accounting/others/reporting/customize.rst:67 msgid "You have several objects available in the formula :" @@ -4114,13 +4114,13 @@ msgstr "在公式中有几个可用对象：" msgid "" "``Ndays`` : The number of days in the selected period (for reports with a " "date range)." -msgstr "" +msgstr "``Ndays`` : 选择的期间的天数 (报表的日期范围)。" #: ../../accounting/others/reporting/customize.rst:72 msgid "" "Another report, referenced by its code. Use ``.balance`` to get its balance " "value (also available are ``.credit``, ``.debit`` and ``.amount_residual``)" -msgstr "" +msgstr "另一份报告,引用的代码。使用“。平衡“获得其余额(也可用``.credit``, ``.debit`` and ``.amount_residual``)" #: ../../accounting/others/reporting/customize.rst:76 msgid "" @@ -4130,7 +4130,7 @@ msgid "" "formulas field, namely ``sum``, the sum of the account move lines in the " "domain. You can also use the group by field to group the account move lines " "by one of their columns." -msgstr "" +msgstr "一行也来自所选域的科目的总和。在何种情况下, 需要填写域字段. 然后一个额外的对象可以在公式,即' '和' ',科目的总和。您还可以使用group by字段组合科目行。" #: ../../accounting/others/reporting/customize.rst:83 msgid "Other useful fields :" @@ -4144,20 +4144,20 @@ msgstr "**类型**：公式结果的类型。 " msgid "" "**Is growth good when positive** : Used when computing the comparison " "column. Check if growth is good (displayed in green) or not." -msgstr "" +msgstr "* *正数增长是好的吗* *:在计算比较列时使用。检查增长是否是好事(显示在绿色)。" #: ../../accounting/others/reporting/customize.rst:90 msgid "" "**Special date changer** : If a specific line in a report should not use the" " same dates as the rest of the report." -msgstr "" +msgstr "* *特别日期改变 * *:如果报表中一个特定的行不应使用与其余部分相同的日期。" #: ../../accounting/others/reporting/customize.rst:93 msgid "" "**Show domain** : How the domain of a line is displayed. Can be foldable " "(``default``, hidden at the start but can be unfolded), ``always`` (always " "displayed) or ``never`` (never shown)." -msgstr "" +msgstr "**Show domain** : 显示行的域。可以折叠(“默认”, 藏在开始处, 但可以展开),“总是”(总是显示)或“never”(永远不会)。" #: ../../accounting/others/reporting/customize.rst:98 msgid ":doc:`main_reports`" @@ -4172,7 +4172,7 @@ msgid "" "Besides the reports created specifically in each localisation module, a few " "very useful **generic** and **dynamic reports** are available for all " "countries :" -msgstr "" +msgstr "除了每个本地化模块创建报表, 有一些非常有用的* *generic* * 和**dynamic reports**也非常有用:" #: ../../accounting/others/reporting/main_reports.rst:9 msgid "**Balance Sheet**" diff --git a/locale/zh_CN/LC_MESSAGES/crm.po b/locale/zh_CN/LC_MESSAGES/crm.po index 6fb5a20a3..0161ba40e 100644 --- a/locale/zh_CN/LC_MESSAGES/crm.po +++ b/locale/zh_CN/LC_MESSAGES/crm.po @@ -5,7 +5,7 @@ # Translators: # fausthuang, 2016 # Gary Wei , 2016 -# jeffery chen fan , 2016 +# Jeffery Chenn , 2016 # Joshua Jan , 2016 # Melody , 2015 # mrshelly , 2015-2016 @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-18 14:22+0100\n" -"PO-Revision-Date: 2016-03-27 12:50+0000\n" +"PO-Revision-Date: 2016-04-11 02:36+0000\n" "Last-Translator: fausthuang\n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -904,38 +904,38 @@ msgstr "openssl-devel" #: ../../crm/leads/voip/setup.rst:23 msgid "If libsrtp is not available in the repo install it from source." -msgstr "" +msgstr "如果libsrtp不提供repo从源代码安装它。" #: ../../crm/leads/voip/setup.rst:34 msgid "" "You also need to install PJSIP, you can download the source `here " "`_. Once the source directory is " "extracted:" -msgstr "" +msgstr "你也需要安装PJSIP,你可以从如下链接下载 `_.一旦资源目录被提取。" #: ../../crm/leads/voip/setup.rst:36 msgid "**Change to the pjproject source directory:**" -msgstr "" +msgstr "**更改为pjproject源目录:**" #: ../../crm/leads/voip/setup.rst:42 msgid "**run:**" -msgstr "" +msgstr "**运行:**" #: ../../crm/leads/voip/setup.rst:48 msgid "**Build and install pjproject:**" -msgstr "" +msgstr "**编译并安装pjproject：**" #: ../../crm/leads/voip/setup.rst:56 msgid "**Update shared library links:**" -msgstr "" +msgstr "**更新共享库链接：**" #: ../../crm/leads/voip/setup.rst:62 msgid "**Verify that pjproject is installed:**" -msgstr "" +msgstr "**确保已经安装了pjproject：**" #: ../../crm/leads/voip/setup.rst:68 msgid "**The result should be:**" -msgstr "" +msgstr "**结果应该是：**" #: ../../crm/leads/voip/setup.rst:75 msgid "Asterisk" @@ -946,23 +946,23 @@ msgid "" "In order to install Asterisk 13.7.0, you can download the source directly " "`there `_." -msgstr "" +msgstr "为了安装Asterisk的13.7.0，你可以直接从下面链接下载资源`\n`_." #: ../../crm/leads/voip/setup.rst:79 msgid "Extract Asterisk:" -msgstr "" +msgstr "导出Asterisk" #: ../../crm/leads/voip/setup.rst:85 msgid "Enter the Asterisk directory:" -msgstr "" +msgstr "输入Asterisk 目录" #: ../../crm/leads/voip/setup.rst:91 msgid "Run the Asterisk configure script:" -msgstr "" +msgstr "运行Asterisk 配置脚本" #: ../../crm/leads/voip/setup.rst:97 msgid "Run the Asterisk menuselect tool:" -msgstr "" +msgstr "运行Asterisk 菜单选择 工具" #: ../../crm/leads/voip/setup.rst:103 msgid "" @@ -970,40 +970,40 @@ msgid "" "enabled. If there are 3 x’s next to res_srtp, there is a problem with the " "srtp library and you must reinstall it. Save the configuration (press x). " "You should also see stars in front of the res_pjsip lines." -msgstr "" +msgstr "在菜单，到资源选项确保res_srtp 是激活的。如果是 3 x's 到res_srtp,就说明strp库有问题，你必须重新安装它。保存配置(按 X). 你可以看到在res_pjsip 行前的星星。" #: ../../crm/leads/voip/setup.rst:105 msgid "Compile and install Asterisk:" -msgstr "" +msgstr "编译和安装Asterisk的：" #: ../../crm/leads/voip/setup.rst:111 msgid "" "If you need the sample configs you can run make samples to install the " "sample configs. If you need to install the Asterisk startup script you can " "run make config." -msgstr "" +msgstr "如果您需要配置样例可以运行制作样例并安装样例配置。如果您需要安装Asterisk的启动脚本就可以运行制作配置。" #: ../../crm/leads/voip/setup.rst:114 msgid "DTLS Certificates" -msgstr "" +msgstr "DTLS 认证" #: ../../crm/leads/voip/setup.rst:116 msgid "After you need to setup the DTLS certificates." -msgstr "" +msgstr "然后你要安装DTLS认证" #: ../../crm/leads/voip/setup.rst:122 msgid "Enter the Asterisk scripts directory:" -msgstr "" +msgstr "进入Asterisk脚本目录：" #: ../../crm/leads/voip/setup.rst:128 msgid "" "Create the DTLS certificates (replace pbx.mycompany.com with your ip address" " or dns name, replace My Super Company with your company name):" -msgstr "" +msgstr "创建DTLS认证(用你的IP 地址或dns名字替换pbx.mycompany.com，用你的公司名替换我的超级公司)" #: ../../crm/leads/voip/setup.rst:135 msgid "Configure Asterisk server" -msgstr "" +msgstr "配置Asterisk服务器" #: ../../crm/leads/voip/setup.rst:137 msgid "" @@ -1012,7 +1012,7 @@ msgid "" "well. By default, Asterisk config files are located in /etc/asterisk/. Start" " by editing http.conf and make sure that the following lines are " "uncommented:" -msgstr "" +msgstr "对于WebRTC技术，很多需要的设置必须是对等设置。全局设置不是很好。默认情况下，Asterisk的配置文件位于在/ etc /asterisk/。通过编辑http.conf，并确保下面的行是取消注释的：" #: ../../crm/leads/voip/setup.rst:147 msgid "" @@ -1021,25 +1021,25 @@ msgid "" "Also under the WebRTC client, the transport needs to be listed as ‘ws’ to " "allow websocket connections. All of these config lines should be under the " "peer itself; setting these config lines globally might not work:" -msgstr "" +msgstr "接下来，编辑sip.conf。该WebRTC技术需要加密，AVPF和冰支持是启用的。在大多数情况下，直接媒体应禁用。此外，根据客户WebRTC技术，传输需要被列为“WS”来允许WebSocket连接。所有这些配置行应该在peer自己下面;全局范围内设置这些配置行可能无法正常工作：" #: ../../crm/leads/voip/setup.rst:175 msgid "" "In the sip.conf and rtp.conf files you also need to add or uncomment the " "lines:" -msgstr "" +msgstr "在sip.conf和rtp.conf文件，您还需要添加或取消注释行：" #: ../../crm/leads/voip/setup.rst:182 msgid "Lastly, set up extensions.conf:" -msgstr "" +msgstr "最后，建立extensions.conf文件：" #: ../../crm/leads/voip/setup.rst:191 msgid "Configure Odoo VOIP" -msgstr "" +msgstr "配置Odoo VOIP" #: ../../crm/leads/voip/setup.rst:193 msgid "In Odoo, the configuration should be done in the user's preferences." -msgstr "" +msgstr "在Odoo，配置应该在用户的偏好来实现。" #: ../../crm/leads/voip/setup.rst:195 msgid "" @@ -1048,7 +1048,7 @@ msgid "" " chose in the sip.conf file. The extension of your office's phone is not a " "required field but it is used if you want to transfer your call from Odoo to" " an external phone also configured in the sip.conf file." -msgstr "" +msgstr "该SIP登录/浏览器的分机号是您先前在sip.conf文件中配置的号码。在我们的例子，1060的SIP密码就是您在sip.conf文件中选择的保密号。你的办公室的电话的分机不是必填字段，但如果你想从Odoo转移您的呼叫转移到外部电话就需啊在sip.conf文件还配置它。" #: ../../crm/leads/voip/setup.rst:197 msgid "" @@ -1057,7 +1057,7 @@ msgid "" "file and the WebSocket should be: ws://127.0.0.1:8088/ws. The part " "\"127.0.0.1\" needs to be the same as the IP defined previously and the " "\"8088\" is the port you defined in the http.conf file." -msgstr "" +msgstr "该配置还需要在销售设置的标题为“PBX配置”下来完成。你需要把你的http.conf文件中定义的IP地址和WebSocket的应该是：ws://127.0.0.1:8088/ws. “127.0.0.1”部分需要是前面定义的IP相同，“8088”是你在http.conf文件定义的默认端口。" #: ../../crm/overview.rst:3 msgid "Overview" diff --git a/locale/zh_CN/LC_MESSAGES/discuss.po b/locale/zh_CN/LC_MESSAGES/discuss.po index 07d193312..a6293729b 100644 --- a/locale/zh_CN/LC_MESSAGES/discuss.po +++ b/locale/zh_CN/LC_MESSAGES/discuss.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-11 10:31+0100\n" -"PO-Revision-Date: 2016-03-24 01:19+0000\n" +"PO-Revision-Date: 2016-04-05 08:54+0000\n" "Last-Translator: mrshelly \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -107,7 +107,7 @@ msgstr "" #: ../../discuss/getting_started.rst:77 msgid "Locating a Channel" -msgstr "定位到一个通道" +msgstr "选择一个版块" #: ../../discuss/getting_started.rst:79 msgid "" diff --git a/locale/zh_CN/LC_MESSAGES/getting_started.po b/locale/zh_CN/LC_MESSAGES/getting_started.po index 8ecd4445c..cd700e370 100644 --- a/locale/zh_CN/LC_MESSAGES/getting_started.po +++ b/locale/zh_CN/LC_MESSAGES/getting_started.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-17 14:07+0100\n" -"PO-Revision-Date: 2016-03-24 09:16+0000\n" -"Last-Translator: Ted Wang \n" +"PO-Revision-Date: 2016-04-05 08:50+0000\n" +"Last-Translator: mrshelly \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -274,7 +274,7 @@ msgstr "" #: ../../getting_started/documentation.rst:165 msgid "Get things done" -msgstr "" +msgstr "完成后" #: ../../getting_started/documentation.rst:167 msgid "" diff --git a/locale/zh_CN/LC_MESSAGES/inventory.po b/locale/zh_CN/LC_MESSAGES/inventory.po index 7870b28f6..521659822 100644 --- a/locale/zh_CN/LC_MESSAGES/inventory.po +++ b/locale/zh_CN/LC_MESSAGES/inventory.po @@ -4,16 +4,16 @@ # # Translators: # Gary Wei , 2016 -# jeffery chen fan , 2016 +# Jeffery Chenn , 2016 # mrshelly , 2015-2016 # 宣一敏 , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-17 13:58+0100\n" -"PO-Revision-Date: 2016-03-25 03:04+0000\n" -"Last-Translator: Gary Wei \n" +"POT-Creation-Date: 2016-04-22 13:58+0200\n" +"PO-Revision-Date: 2016-04-23 10:07+0000\n" +"Last-Translator: Martin Trigaux\n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -7260,148 +7260,136 @@ msgid "How to get UPS credentials for integration with Odoo?" msgstr "如何得到用于集成UPS的证书？" #: ../../inventory/shipping/setup/ups_credentials.rst:5 -msgid "" -"Please note that only those customers that are based in the US can open a " -"UPS account number online. If you are located in a country other than the " -"US, you will need to contact Customer Service for your country location to " -"open UPS account number." -msgstr "请注意，只有那些在美国的客户可以打开一个账户号码在线。如果您是在一个国家以外的国家，您需要联系客户服务为您的国家的位置，以开放的帐户号码。" +msgid "In order to use the Odoo UPS API, you will need:" +msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:10 -msgid "" -"In order to use the UPS APIs from Odoo, you will need to have the items " -"listed below:" -msgstr "为了能在Odoo中使用UPS APIs，你需要先有下列清单：" +#: ../../inventory/shipping/setup/ups_credentials.rst:7 +msgid "A UPS.com user ID and password" +msgstr "" + +#: ../../inventory/shipping/setup/ups_credentials.rst:9 +msgid "A UPS account number" +msgstr "" + +#: ../../inventory/shipping/setup/ups_credentials.rst:11 +msgid "An Access Key" +msgstr "" #: ../../inventory/shipping/setup/ups_credentials.rst:13 -msgid "UPS.com user ID and password" -msgstr "UPS.com的用户ID和密码" - -#: ../../inventory/shipping/setup/ups_credentials.rst:15 -msgid "UPS account number" -msgstr "UPS账号" - -#: ../../inventory/shipping/setup/ups_credentials.rst:17 -msgid "Access Key" -msgstr "访问密钥" - -#: ../../inventory/shipping/setup/ups_credentials.rst:19 msgid "" "An Access Key is a 16 character alpha-numeric code that allows access to the" " UPS Developer Kit API Development and Production servers." msgstr "访问密钥是一个16字符的字母数字代码，允许访问的窗口开发工具包的开发和生产服务器。" -#: ../../inventory/shipping/setup/ups_credentials.rst:23 -msgid "Create an UPS Account" -msgstr "创建UPS账户" +#: ../../inventory/shipping/setup/ups_credentials.rst:17 +msgid "Create a UPS Account" +msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:25 -msgid "To register with MyUPS.com, please follow these steps:" -msgstr "要用MyUPS.com注册，请遵循以下步骤：" +#: ../../inventory/shipping/setup/ups_credentials.rst:19 +msgid "" +"Note that only customers located in the US can open a UPS account online. If" +" you are located outside the US, you will need to contact UPS Customer " +"Service in order to to open an account." +msgstr "" + +#: ../../inventory/shipping/setup/ups_credentials.rst:23 +msgid "" +"You can read additional information about opening a UPS account on the their" +" website, on the page, `How to Open a UPS Account Online " +"`_" +msgstr "" #: ../../inventory/shipping/setup/ups_credentials.rst:27 msgid "" +"If you don't already have a UPS account, you can create one along with your " +"online profile by following these steps:" +msgstr "" + +#: ../../inventory/shipping/setup/ups_credentials.rst:30 +msgid "" "1. Access the UPS.com web site at `www.ups.com `__, and" " click the **New User** link at the top of the page." msgstr "1．用`www.ups.com `登入UPS.com网站并在页面上方点击**新用户**。" -#: ../../inventory/shipping/setup/ups_credentials.rst:31 +#: ../../inventory/shipping/setup/ups_credentials.rst:34 msgid "" "2. Click the **Register for MyUPS** button, and follow the prompts to " "complete the registration process." msgstr "2．点击**MyUPS注册**按钮，按照以下流程完成注册过程。" -#: ../../inventory/shipping/setup/ups_credentials.rst:34 -msgid "" -"To open an account with UPS and receive a UPS shipper number, please follow " -"the steps below:" -msgstr "要打开UPS的账户并接收UPS运单号，请参照以下步骤：" - #: ../../inventory/shipping/setup/ups_credentials.rst:37 msgid "" -"`http://www.ups.com/content/de/en/contact/index.html?WT.svl=Footer " -"`__" -msgstr "`http://www.ups.com/content/de/en/contact/index.html?WT.svl=Footer `__" +"If you already have a UPS account, you can add it to your online profile as " +"follows:" +msgstr "" #: ../../inventory/shipping/setup/ups_credentials.rst:39 msgid "" -"Once you have created a UPS.com user ID profile you will need to add your " -"UPS account number to your UPS.com profile, please follow the steps below:" -msgstr "一旦你创建了UPS.com 用户 ID架构，就需要把你的UPS账号添加到你的UPS.com 架构中，请参照如下步骤：" - -#: ../../inventory/shipping/setup/ups_credentials.rst:43 -msgid "" "1. Log in to the UPS.com site (`http://www.ups.com `__)" " using your UPS.com User ID and Password." msgstr "1．使用UPS.com的用户ID和密码登陆UPS.com网站 (`http://www.ups.com `__)" -#: ../../inventory/shipping/setup/ups_credentials.rst:47 +#: ../../inventory/shipping/setup/ups_credentials.rst:43 msgid "Click the **My UPS** tab." msgstr "点击**My UPS**页签。" -#: ../../inventory/shipping/setup/ups_credentials.rst:49 +#: ../../inventory/shipping/setup/ups_credentials.rst:45 msgid "Click the **Account Summary** link." msgstr "点击 **账户汇总**链接。 " -#: ../../inventory/shipping/setup/ups_credentials.rst:51 +#: ../../inventory/shipping/setup/ups_credentials.rst:47 msgid "" "4. Click the **Add an Existing UPS Account** link in the **UPS Account " "Details** section of the page." msgstr "4．在该页的**UPS 账户详情** 部分点击 **添加现有的UPS账户** 链接。" -#: ../../inventory/shipping/setup/ups_credentials.rst:54 +#: ../../inventory/shipping/setup/ups_credentials.rst:50 msgid "" "5. In the **Add New Account** screen, enter the **UPS Account Number**, " -"**Account Name**, and **Postal Code** fields. The country automatically " -"defaults to United States. If desired, select the **Make this my default " -"payment account** link to set the account as the default billing method for " -"the profile." -msgstr "5．在**添加新的账号**页面，输入**UPS 账号**，**账户名**，以及**邮政编码**等字段。默认的国家是美国。如果需要的话，选择**该付款账户作为默认账户**链接来设置该账户作为默认的付款方式。" +"**Account Name**, and **Postal Code** fields. The country defaults to United" +" States.q" +msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:60 +#: ../../inventory/shipping/setup/ups_credentials.rst:54 msgid "Click the **Next** button to continue." msgstr "点击 **下一个**按钮继续。 " -#: ../../inventory/shipping/setup/ups_credentials.rst:63 +#: ../../inventory/shipping/setup/ups_credentials.rst:57 msgid "Get an Access Key" msgstr "获取访问密匙" -#: ../../inventory/shipping/setup/ups_credentials.rst:65 +#: ../../inventory/shipping/setup/ups_credentials.rst:59 msgid "" -"After you have added your UPS account number to your user ID profile you can" -" request an Access Key from UPS using the steps below:" -msgstr "在完成添加UPS 账户到用户ID之后，你可以按照以下步骤从UPS请求一个访问密匙：" +"After you have added your UPS account number to your user profile you can " +"request an Access Key from UPS using the steps below:" +msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:68 -msgid "Log into UPS.com with your user ID and password." -msgstr "使用用户ID和密码登陆UPS.com。" - -#: ../../inventory/shipping/setup/ups_credentials.rst:70 +#: ../../inventory/shipping/setup/ups_credentials.rst:62 msgid "" -"2. Go to the **UPS Developer Kit** web page " +"1. Go to the **UPS Developer Kit** web page " "`https://www.ups.com/upsdeveloperkit?loc=en\\_US " "`__" -msgstr "2. 进入 **UPS Developer Kit** 网站页面 `https://www.ups.com/upsdeveloperkit?loc=en\\_US `__" +msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:73 +#: ../../inventory/shipping/setup/ups_credentials.rst:65 +msgid "Log into UPS.com with your user ID and password" +msgstr "" + +#: ../../inventory/shipping/setup/ups_credentials.rst:67 msgid "Click on the link **Request an access key**." msgstr "点击 ** 请求访问密匙** 。 " -#: ../../inventory/shipping/setup/ups_credentials.rst:75 -msgid "Verify the **Primary Contact Information**" -msgstr "确认 ** 主要联系方式 ** " +#: ../../inventory/shipping/setup/ups_credentials.rst:69 +msgid "Verify your contact information" +msgstr "" -#: ../../inventory/shipping/setup/ups_credentials.rst:77 -msgid "Enter the **Secondary Contact Information**" -msgstr "输入 ** 第二联系方式 ** " - -#: ../../inventory/shipping/setup/ups_credentials.rst:79 +#: ../../inventory/shipping/setup/ups_credentials.rst:71 msgid "Click the **Request Access Key** button." msgstr "点击 ** 请求访问密匙 ** 按钮。" -#: ../../inventory/shipping/setup/ups_credentials.rst:81 +#: ../../inventory/shipping/setup/ups_credentials.rst:73 msgid "" -"Once completed, the **Access Key** will be provided to you on the web page, " -"and an email with the Access Key will be sent to the email address for the " -"primary contact information." -msgstr "一旦完成，你就能在网站页面看到**访问密匙**，带有访问密匙的电子邮件会发到你之前输入的用于联系的电子邮件中。" +"The **Access Key** will be provided to you on the web page, and an email " +"with the Access Key will be sent to the email address of the primary " +"contact." +msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/point_of_sale.po b/locale/zh_CN/LC_MESSAGES/point_of_sale.po index 314401e46..5c9295716 100644 --- a/locale/zh_CN/LC_MESSAGES/point_of_sale.po +++ b/locale/zh_CN/LC_MESSAGES/point_of_sale.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2015, Odoo S.A. +# Copyright (C) 2015-TODAY, Odoo S.A. # This file is distributed under the same license as the Odoo Business package. # # Translators: @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-21 11:00+0100\n" -"PO-Revision-Date: 2016-03-24 10:04+0000\n" -"Last-Translator: Ted Wang \n" +"POT-Creation-Date: 2016-04-04 16:08+0200\n" +"PO-Revision-Date: 2016-04-26 03:50+0000\n" +"Last-Translator: fausthuang\n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -242,19 +242,19 @@ msgstr "**积累**：从这个规则赢得的积分将除了从其他规则赢 msgid "" "**Points per product**: How many points the product will earn per product " "ordered" -msgstr "" +msgstr "**每个产品点数**:每个产品订单赚多少个积分点" #: ../../point_of_sale/advanced/loyalty.rst:46 msgid "" "**Points per currency**: How many points the product will earn per value " "sold" -msgstr "" +msgstr "**按消费的点数**：按销费额计算赚取的积分点" #: ../../point_of_sale/advanced/loyalty.rst:51 msgid "" "Your new rule is now created and rewards can be added by clicking on **Add " "an Item** under **Rewards**." -msgstr "" +msgstr "现在你的新规则创建好了，奖励可以通过点击**添加项目**下的**奖励**。" #: ../../point_of_sale/advanced/loyalty.rst:57 msgid "Three types of reward can be given:" @@ -264,17 +264,17 @@ msgstr "能提供三种类型奖励：" msgid "" "**Resale**: convert your points into money. Set a product that represents " "the value of 1 point." -msgstr "" +msgstr "**转售**:将您的积分转换为金钱。设置表示1个积分点的产品" #: ../../point_of_sale/advanced/loyalty.rst:64 msgid "" "**Discount**: give a discount for an amount of points. Set a product with a " "price of ``0 €`` and without any taxes." -msgstr "" +msgstr "**折扣**：给折扣的积分点数量。设置一个价格为``0 €`` 并且没有税的产品。" #: ../../point_of_sale/advanced/loyalty.rst:69 msgid "**Gift**: give a gift for an amount of points" -msgstr "" +msgstr "**礼品**：赠送礼物的积分点数量" #: ../../point_of_sale/advanced/loyalty.rst:77 msgid "Applying your loyalty program to a point of sale" @@ -286,7 +286,7 @@ msgstr "在 **仪表盘**上，点击：`更多 --> 设置`。" #: ../../point_of_sale/advanced/loyalty.rst:84 msgid "Next to loyalty program, set the program you want to set." -msgstr "" +msgstr "接下来是忠诚度计划，设置你的忠诚度计划。" #: ../../point_of_sale/advanced/loyalty.rst:90 msgid "Gathering and consuming points" @@ -294,7 +294,7 @@ msgstr "收集好消耗点数" #: ../../point_of_sale/advanced/loyalty.rst:92 msgid "To start gathering points you need to set a customer on the order." -msgstr "" +msgstr "为了开始收集积分点，你要在订单上设置一个客户。" #: ../../point_of_sale/advanced/loyalty.rst:94 msgid "Click on **Customer** and select the right one." @@ -308,12 +308,12 @@ msgstr "忠诚点数会显示在屏幕上。" msgid "" "The next time the customer comes to your shop and has enough points to get a" " reward, the **Rewards** button is highlighted and gifts can be given." -msgstr "" +msgstr "下一次客户到你的商店并有足够的点数来获得一个奖励，**奖励**按钮会高亮并能给予礼物。" #: ../../point_of_sale/advanced/loyalty.rst:108 msgid "" "The reward is added and of course points are subtracted from the total." -msgstr "" +msgstr "奖励被加入，当然积分点会从总数里扣除。" #: ../../point_of_sale/advanced/manual_discount.rst:3 msgid "How to apply manual discounts?" @@ -351,14 +351,14 @@ msgid "" "On the right you can see the list of your products with the categories on " "the top. If you click on a product, it will be added in the cart. You can " "directly set the correct quantity or weight by typing it on the keyboard." -msgstr "" +msgstr "在右边你可以看到你的产品清单按顶部的分类。如果你点击一个产品，它会被加到购物车里。你可以直接看到数量或重量通过键盘输入。" #: ../../point_of_sale/advanced/manual_discount.rst:30 msgid "" "The same way you insert a quantity, Click on **Disc** and then type the " "discount (in percent). This is how you insert a manual discount on a " "specific product." -msgstr "" +msgstr "输入数量一样，点击**折扣**，然后键入折扣(百分比)。这是你如何手工输入一个特定的产品折扣的方法。" #: ../../point_of_sale/advanced/manual_discount.rst:38 msgid "Global discount" @@ -379,13 +379,13 @@ msgstr "从工作面板点击 :menuselection:`更多(More) --> 设置(Settings)` msgid "" "You have to activate **Order Discounts** and create a product that will be " "added as a product with a negative price to deduct the discount." -msgstr "" +msgstr "你需要激活**订单折扣**并且创建一个产品，这个产品会被当成一个负数价格的产品来抵扣折扣。" #: ../../point_of_sale/advanced/manual_discount.rst:61 msgid "" "On the product used to create the discount, set the price to ``0`` and do " "not forget to remove all the **taxes**, that can make the calculation wrong." -msgstr "" +msgstr "在用于创建折扣的产品上，设定价格为``0``，不要忘记删除所有**税**，否则可能导致计算错误。" #: ../../point_of_sale/advanced/manual_discount.rst:68 msgid "Set a global discount" @@ -396,13 +396,13 @@ msgid "" "Now when you come back to the **dashboard** and start a **new session**, a " "**Discount** button appears and by clicking on it you can set a " "**discount**." -msgstr "" +msgstr "现在当你回到**仪表盘**开始一个**新会话**，**折扣**按钮会显示并通过点击可以设置一个**折扣**。" #: ../../point_of_sale/advanced/manual_discount.rst:76 msgid "" "When it's validated, the discount line appears on the order and you can now " "process to the payment." -msgstr "" +msgstr "当它被验证后，折扣行出现在订单上，然后你就可以处理付款了。" #: ../../point_of_sale/advanced/mercury.rst:3 msgid "How to accept credit card payments in Odoo POS using Mercury?" @@ -417,7 +417,7 @@ msgid "" "American businesses. An alternative to an integrated card reader is to work " "with a standalone card reader, copy the transaction total from the Odoo POS " "screen into the card reader, and record the transaction in Odoo POS." -msgstr "" +msgstr "**MercuryPay**账户(详见'MercuryPay'网站 `__.)需要一个集成的读卡器才能在Odoo 9 POS 里使用信用卡支付。MercuryPay 仅支持北美地区的业务。切换到读卡器到独立的读卡器，从Odoo POS 界面复制交易额到读卡器，并在Odoo POS里记录交易。" #: ../../point_of_sale/advanced/mercury.rst:18 msgid "Module installation" @@ -436,29 +436,29 @@ msgstr "Mercury配置" msgid "" "In the **Point of Sale** application, click on :menuselection:`Configuration" " --> Mercury Configurations` and then on **Create**." -msgstr "" +msgstr "在**零售**模块，点击菜单:'设置-->Mercury 设置'并点击**创建**。" #: ../../point_of_sale/advanced/mercury.rst:35 msgid "Introduce your **credentials** and then save them." -msgstr "" +msgstr "介绍你的**证书**，然后保存。" #: ../../point_of_sale/advanced/mercury.rst:40 msgid "" "Then go to :menuselection:`Configuration --> Payment methods` and click on " "**Create**. Under the **Point of Sale** tab you can set a **Mercury " "configuration** to the **Payment method**." -msgstr "" +msgstr "然后去：菜单：`配置 - >付款方式`，然后点击**创建**。在**零售**标签，你可以设置一个**Mercury配置**的**付款方式**。" #: ../../point_of_sale/advanced/mercury.rst:47 msgid "" "Finally, go to :menuselection:`Configuration --> Point of Sale` and add a " "new payment method on the point of sale by editing it." -msgstr "" +msgstr "最后，访问菜单选择：`配置 -->零售通'过编辑添加新的付款方式。" #: ../../point_of_sale/advanced/mercury.rst:54 msgid "" "Then select the payment method corresponding to your mercury configuration." -msgstr "" +msgstr "然后选择相应的Mercury配置的付款方式。" #: ../../point_of_sale/advanced/mercury.rst:60 msgid "Save the modifications." @@ -473,7 +473,7 @@ msgstr "登记销售" msgid "" "On the dashboard, you can see your point(s) of sales, click on **New " "Session**:" -msgstr "" +msgstr "在仪表盘上，你可以看到你的零售(s)，点击**新建会话**：" #: ../../point_of_sale/advanced/mercury.rst:71 #: ../../point_of_sale/overview/start.rst:114 @@ -494,7 +494,7 @@ msgstr "一旦订单完成后，点击**付款**。您可以选择信用卡**付 msgid "" "Type in the **Amount** to be paid with the credit card. Now you can swipe " "the card and validate the payment." -msgstr "" +msgstr "键入信用卡要支付**金额**信用卡支付。现在，您可以刷卡和验证付款。" #: ../../point_of_sale/advanced/multi_cashiers.rst:3 msgid "How to manage multiple cashiers?" @@ -515,7 +515,7 @@ msgid "" "As prerequisite, you just need to have a second user with the **Point of " "Sale User** rights (Under the :menuselection:`General Settings --> Users` " "menu). On the **Dashboard** click on **New Session** as the main user." -msgstr "" +msgstr "作为先决条件，您只需要有**销售**权限的第二个用户(在菜单中选择：`常规设置 - > 用户菜单)。在**仪表板**点击**新建会话**为主要用户。" #: ../../point_of_sale/advanced/multi_cashiers.rst:18 #: ../../point_of_sale/advanced/multi_cashiers.rst:64 @@ -530,7 +530,7 @@ msgstr "并且转换到另外一个钱箱。" #: ../../point_of_sale/advanced/multi_cashiers.rst:28 msgid "" "The name on the top has changed which means you have changed the cashier." -msgstr "" +msgstr "上面的名称已更改，这意味着你已经改变了收银员." #: ../../point_of_sale/advanced/multi_cashiers.rst:34 msgid "Switch cashier with pin code" @@ -540,7 +540,7 @@ msgstr "使用pin码转换钱箱" msgid "" "If you want your cashiers to need a pin code to be able to use it, you can " "set it up in by clicking on **Settings**." -msgstr "" +msgstr "如果你希望你的收银员需要PIN码才能使用它，你可以通过点击**设置**。" #: ../../point_of_sale/advanced/multi_cashiers.rst:45 msgid "Then click on **Manage access rights**." @@ -568,7 +568,7 @@ msgstr "选择你的**钱箱**：" #: ../../point_of_sale/advanced/multi_cashiers.rst:74 msgid "" "You will have to insert the user's **pin code** to be able to continue." -msgstr "" +msgstr "你必须插入用户的** PIN码**才能够继续。" #: ../../point_of_sale/advanced/multi_cashiers.rst:79 msgid "Now you can see that the cashier has changed." @@ -576,30 +576,30 @@ msgstr "现在，你可以看到收银员发生了变化。" #: ../../point_of_sale/advanced/multi_cashiers.rst:85 msgid "Switch cashier with cashier barcode badge" -msgstr "" +msgstr "用收银员的条形码切换收银员" #: ../../point_of_sale/advanced/multi_cashiers.rst:90 msgid "" "If you want your cashiers to scan its badge, you can set it up in by " "clicking on **Settings**." -msgstr "" +msgstr "如果你希望你的收银员扫描它的徽章，你可以通过点击**设定**设置它。" #: ../../point_of_sale/advanced/multi_cashiers.rst:96 msgid "Then click on **Manage access rights**" -msgstr "" +msgstr "然后点击**管理访问权限**" #: ../../point_of_sale/advanced/multi_cashiers.rst:101 msgid "" "**Edit** the cashier and add a **security pin code** on the **Point of " "Sale** tab." -msgstr "" +msgstr "**编辑**收银员，并添加一个**安全PIN码**的**零售**标签" #: ../../point_of_sale/advanced/multi_cashiers.rst:108 msgid "" "Be careful of the barcode nomenclature, the default one forced you to use a " "barcode starting with ``041`` for cashier barcodes. To change that go to " ":menuselection:`Point of Sale --> Configuration --> Barcode Nomenclatures`." -msgstr "" +msgstr "小心条形码命名规则，默认会强迫你使用``041``开头的收银员条形码。若要更改，请访问：菜单选择：出售`点 - >配置 - >条码规则`。" #: ../../point_of_sale/advanced/multi_cashiers.rst:116 msgid "Change Cashier" @@ -609,7 +609,7 @@ msgstr "变更前箱" msgid "" "When the cashier scans his own badge, you can see on the top that the " "cashier has changed." -msgstr "" +msgstr "当收银员扫描自己的徽章，你可以看到在顶部的收银员发生了变化。" #: ../../point_of_sale/advanced/multi_cashiers.rst:132 msgid "Assign session to a user" @@ -618,17 +618,17 @@ msgstr "给用户分配一个会话" #: ../../point_of_sale/advanced/multi_cashiers.rst:134 msgid "" "Click on the menu :menuselection:`Point of Sale --> Orders --> Sessions`." -msgstr "" +msgstr "点击菜单：菜单选择：`零售 - >订单 - > 会话`。" #: ../../point_of_sale/advanced/multi_cashiers.rst:139 msgid "" "Then, click on **New** and assign as **Responsible** the correct cashier to " "the point of sale." -msgstr "" +msgstr "然后，点击**新建**并指派**责任人**给正确的零售收银员。" #: ../../point_of_sale/advanced/multi_cashiers.rst:145 msgid "When the cashier logs in he is able to open the session" -msgstr "" +msgstr "当收银员登录时，他能打开这个会话" #: ../../point_of_sale/advanced/multi_cashiers.rst:151 msgid "Assign a default point of sale to a cashier" @@ -638,17 +638,17 @@ msgstr "把默认销售点赋予一个钱箱" msgid "" "If you want your cashiers to be assigned to a point of sale, go to " ":menuselection:`Point of Sales --> Configuration --> Settings`." -msgstr "" +msgstr "如果你要分配你的收银员给零售，去菜单选择：'零售-->配置-->设置‘" #: ../../point_of_sale/advanced/multi_cashiers.rst:159 msgid "Then click on **Manage Access Rights**." -msgstr "" +msgstr "然后点击**管理访问权限**" #: ../../point_of_sale/advanced/multi_cashiers.rst:164 msgid "" "**Edit** the cashier and add a **Default Point of Sale** under the **Point " "of Sale** tab." -msgstr "" +msgstr "**编辑**收银员并添加**默认零售店**在**零售**标签下。" #: ../../point_of_sale/advanced/register.rst:3 msgid "How to register customers?" @@ -659,48 +659,48 @@ msgstr "如何注册客户？" #: ../../point_of_sale/shop/invoice.rst:6 #: ../../point_of_sale/shop/seasonal_discount.rst:78 msgid "Register an order" -msgstr "" +msgstr "注册一个订单" #: ../../point_of_sale/advanced/register.rst:13 msgid "You arrive now on the main view :" -msgstr "" +msgstr "来到主界面" #: ../../point_of_sale/advanced/register.rst:18 msgid "" "On the right you can see the list of your products with the categories on " "the top. If you click on a product, it will be added in the cart. You can " "directly set the quantity or weight by typing it on the keyboard." -msgstr "" +msgstr "在右边你能看到你的产品清单，它会在顶部按品种分类。如果你点击一个产品，它会被加入到购物车中，你能直接在键盘上输入数量和重量。" #: ../../point_of_sale/advanced/register.rst:23 msgid "Record a customer" -msgstr "" +msgstr "记录一个客户。" #: ../../point_of_sale/advanced/register.rst:25 msgid "On the main view, click on **Customer**:" -msgstr "" +msgstr "在主界面上，点击客户。" #: ../../point_of_sale/advanced/register.rst:30 msgid "Register a new customer by clicking on the button." -msgstr "" +msgstr "点击按钮注册一个新客户。" #: ../../point_of_sale/advanced/register.rst:35 msgid "The following form appear. Fill in the relevant information:" -msgstr "" +msgstr "在显示的表单中，填入相关信息：" #: ../../point_of_sale/advanced/register.rst:40 msgid "When it's done click on the **floppy disk** icon" -msgstr "" +msgstr "完成后点击**floppy disk**图标" #: ../../point_of_sale/advanced/register.rst:45 msgid "" "You just registered a new customer. To set this customer to the current " "order, just tap on **Set Customer**." -msgstr "" +msgstr "你刚建完了一个新客户。设置这个客户到现有的订单，点击**设置客户**。" #: ../../point_of_sale/advanced/register.rst:51 msgid "The customer is now set on the order." -msgstr "" +msgstr "在订单上客户设置好了。" #: ../../point_of_sale/advanced/reprint.rst:3 msgid "How to reprint receipts?" @@ -811,120 +811,127 @@ msgid "" "`_. More " "information concerning the Fiscal Data Module can be found on `the official " "website `_." -msgstr "" +msgstr "比利时政府要求某些企业使用由政府认证的被称为**财政数据模块**设备(也称为**黑盒**)。该设备和POS程序协同工作并记录某些交易。最重要的是，所用的POS程序也必须由政府认证，必须坚持由他们指定的严格标准。 `Odoo9是经过认证的应用程序`_。有关财政数据模块的信息可以在`官方网站`_找到。" -#: ../../point_of_sale/belgian_fdm/setup.rst:19 -msgid "" -"**As of December 2015, due to Belgian government restriction, the " -"certification is only valid for Odoo Online instances.**" -msgstr "" - -#: ../../point_of_sale/belgian_fdm/setup.rst:23 +#: ../../point_of_sale/belgian_fdm/setup.rst:20 msgid "Required hardware" -msgstr "" +msgstr "所需的硬件" -#: ../../point_of_sale/belgian_fdm/setup.rst:25 +#: ../../point_of_sale/belgian_fdm/setup.rst:22 msgid "" "A government certified `Fiscal Data Module " "`_ per POS, all of them should work, but the " "Cleancash SC-B is recommended, you will also need:" -msgstr "" +msgstr "政府认证的'财政数据模块`_POS机，都可以工作，但建议使用Cleancash SC-B，你还需要：" -#: ../../point_of_sale/belgian_fdm/setup.rst:30 +#: ../../point_of_sale/belgian_fdm/setup.rst:27 msgid "" "Serial null modem cable per FDM (`example `__)" -msgstr "" +msgstr "FDM串行的调制解调器电缆(例如``__)" -#: ../../point_of_sale/belgian_fdm/setup.rst:32 +#: ../../point_of_sale/belgian_fdm/setup.rst:29 msgid "" "Serial-to-USB adapter per FDM (`example " "`__)" -msgstr "" +msgstr "FDM串口转USB适配器(例如``__)" + +#: ../../point_of_sale/belgian_fdm/setup.rst:32 +msgid "A registered POSBox per POS configuration" +msgstr "一个POS配置已注册的POS盒" #: ../../point_of_sale/belgian_fdm/setup.rst:35 -msgid "A POSBox per POS" -msgstr "" +msgid "Setup" +msgstr "设立" #: ../../point_of_sale/belgian_fdm/setup.rst:38 -msgid "Setup" -msgstr "" - -#: ../../point_of_sale/belgian_fdm/setup.rst:41 msgid "POSBox" -msgstr "" +msgstr "POS盒" -#: ../../point_of_sale/belgian_fdm/setup.rst:43 +#: ../../point_of_sale/belgian_fdm/setup.rst:40 msgid "" -"In order to setup the blackbox, you will first have to ensure that the " -"POSBoxes you're using have a recent image on them (support for the FDM was " -"added to the POSBox image on the 10th of December 2015). See " -":doc:`../overview/setup` on how to upgrade the POSBox. You can verify that " -"the Fiscal Data Module is recognized by the POSBox by going to the *Hardware" -" status page* via the POSBox homepage." -msgstr "" +"In order to use a Fiscal Data Module, you will need a registered POSBox. " +"These POSBoxes are similar to the regular POSBoxes we sell, but they are " +"registered with the Belgian government. This is required by law. Attempting " +"to use a Fiscal Data Module on a non-registered POSBox will not work. You " +"can verify that the Fiscal Data Module is recognized by the POSBox by going " +"to the *Hardware status page* via the POSBox homepage." +msgstr "为了使用财政数据模块，您将需要一个注册过的POSBox。这些POSBoxes类似于我们出售的普通邮筒，但他们与比利时政府登记。这是由法律规定。尝试使用财政数据模块上的非注册POSBox将无法正常工作。您可以通过POSBox主页验证财政数据模块P已经由POSBox认可在*硬件状态页*。" + +#: ../../point_of_sale/belgian_fdm/setup.rst:52 +msgid "Odoo" +msgstr "Odoo" #: ../../point_of_sale/belgian_fdm/setup.rst:54 -msgid "Odoo" -msgstr "" - -#: ../../point_of_sale/belgian_fdm/setup.rst:56 msgid "" -"An Odoo POS is turned into a certified POS by installing the **Belgian " -"Registered Cash Register** app (technical name: ``pos_blackbox_be``). " -"Because of government restrictions imposed on us, this installation cannot " -"be undone. After this, you will have to ensure that each POS configuration " -"has a unique POSBox associated with it (:menuselection:`Point of Sale --> " -"Configuration --> Point of Sale` and ensure Hardware Proxy / POSBox is set)." +"An Odoo POS app can be given certified POS capabilities by installing the " +"**Belgian Registered Cash Register** app (technical name: " +"``pos_blackbox_be``). Because of government restrictions imposed on us, this" +" installation cannot be undone. After this, you will have to ensure that " +"each POS configuration has a unique registered POSBox associated with it " +"(:menuselection:`Point of Sale --> Configuration --> Point of Sale` and " +"ensure Hardware Proxy / POSBox and the serial number of your POSBox is set)." " The first time you open the Point of Sale and attempt to do a transaction, " "you will be asked to input the PIN that you received with your VAT signing " "card." -msgstr "" +msgstr "一个Odoo POS应用程序可以通过安装**比利时注册的收银机**应用程序(：``pos_blackbox be``技术名称)给予认证的POS功能。因为这是政府强加的限制，这种安装不能撤消。在此之后，你必须确保每个POS配置有与它(关联的唯一注册POSBox：菜单选择：`零售 - >配置 - > 零售'，确保硬件代理/ POSBox和序列号您POSBox被设置好了)。第一次你打开零售，并尝试做一个交易，你会被要求输入您与增值税签约卡接收的PIN。" -#: ../../point_of_sale/belgian_fdm/setup.rst:70 +#: ../../point_of_sale/belgian_fdm/setup.rst:69 +msgid "On-premise" +msgstr "预置" + +#: ../../point_of_sale/belgian_fdm/setup.rst:71 +msgid "" +"We do not only support the Fiscal Data Module on our SaaS platform, we also " +"support the Fiscal Data Module in on-premise installations. The main " +"restriction is that this requires an obfuscated version of the " +"``pos_blackbox_be`` module we will provide on request." +msgstr "我们不仅支持财政数据模块在我们的SaaS平台上，我们也支持财政数据模块的预设安装。主要的限制是，这要求``pos_blackbox_be``模块，我们将按要求提供相关版本。" + +#: ../../point_of_sale/belgian_fdm/setup.rst:77 msgid "Restrictions" -msgstr "" +msgstr "限制" -#: ../../point_of_sale/belgian_fdm/setup.rst:72 +#: ../../point_of_sale/belgian_fdm/setup.rst:79 msgid "" "As mentioned before, in order to get certified the POS application must " "adhere to strict government guidelines. Because of this, a certified Odoo " "POS has some limitations not present in the non-certified Odoo POS." -msgstr "" +msgstr "正如前面提到的，为了获得认证的POS应用必须遵守严格的政府指引。由于这个原因，经过认证的Odoo POS不会像非认证Odoo POS存在一定的局限性。" -#: ../../point_of_sale/belgian_fdm/setup.rst:77 +#: ../../point_of_sale/belgian_fdm/setup.rst:84 msgid "Refunding is disabled" -msgstr "" +msgstr "返现被禁用" -#: ../../point_of_sale/belgian_fdm/setup.rst:78 +#: ../../point_of_sale/belgian_fdm/setup.rst:85 msgid "Modifying orderline prices" -msgstr "" +msgstr "修改订单项目价格" -#: ../../point_of_sale/belgian_fdm/setup.rst:79 +#: ../../point_of_sale/belgian_fdm/setup.rst:86 msgid "Creating/modifying/deleting POS orders" -msgstr "" +msgstr "创建/修改/删除POS订单" -#: ../../point_of_sale/belgian_fdm/setup.rst:80 +#: ../../point_of_sale/belgian_fdm/setup.rst:87 msgid "Selling products without a valid tax" -msgstr "" +msgstr "产品销售没有有效的税收" -#: ../../point_of_sale/belgian_fdm/setup.rst:81 +#: ../../point_of_sale/belgian_fdm/setup.rst:88 msgid "Multiple Odoo POS configurations per POSBox are not allowed" -msgstr "" +msgstr "单个POS盒中的多重Odoo POS配置是不允许的。" -#: ../../point_of_sale/belgian_fdm/setup.rst:82 +#: ../../point_of_sale/belgian_fdm/setup.rst:89 msgid "Using the POS without a connection to the POSBox (and thus FDM)" -msgstr "" +msgstr "使用不连POS盒的POS(以及FDM)" -#: ../../point_of_sale/belgian_fdm/setup.rst:83 +#: ../../point_of_sale/belgian_fdm/setup.rst:90 msgid "Blacklisted modules: pos_discount, pos_reprint, pos_loyalty" -msgstr "" +msgstr "列入黑名单的模块：POS_打折，POS_重新打印，POS_忠诚度" #: ../../point_of_sale/overview/setup.rst:3 msgid "Point of Sale Hardware Setup" -msgstr "" +msgstr "零售硬件设置" #: ../../point_of_sale/overview/setup.rst:6 msgid "POSBox Setup Guide" @@ -933,17 +940,17 @@ msgstr "收银台(POSBox) 配置向导" #: ../../point_of_sale/overview/setup.rst:11 #: ../../point_of_sale/overview/setup.rst:210 msgid "Prerequisites" -msgstr "" +msgstr "先决条件" #: ../../point_of_sale/overview/setup.rst:13 msgid "" "Before you start setting up your POSBox make sure you have everything. You " "will need :" -msgstr "" +msgstr "在开始设置您的POSBox之前，确保你准备好了一切。 你会需要 ：" #: ../../point_of_sale/overview/setup.rst:16 msgid "The POSBox" -msgstr "" +msgstr "零售盒" #: ../../point_of_sale/overview/setup.rst:17 msgid "A 2A Power adapter" @@ -951,68 +958,68 @@ msgstr "2A电源适配器" #: ../../point_of_sale/overview/setup.rst:18 msgid "A computer or tablet with an up-to-date web browser" -msgstr "" +msgstr "一台带最新的Web浏览器的计算机或平板电脑。" #: ../../point_of_sale/overview/setup.rst:19 msgid "A running SaaS or Odoo instance with the Point of Sale installed" -msgstr "" +msgstr "可用的的SaaS或已安装零售的Odoo" #: ../../point_of_sale/overview/setup.rst:20 msgid "A local network set up with DHCP (this is the default setting)" -msgstr "" +msgstr "设置了DHCP(这是默认设置)的本地网络" #: ../../point_of_sale/overview/setup.rst:21 msgid "An RJ45 Ethernet Cable or a Linux compatible USB Wi-Fi adapter" -msgstr "" +msgstr "一个RJ45以太网电缆或兼容Linux的USB Wi-Fi适配器" #: ../../point_of_sale/overview/setup.rst:22 msgid "" "An Epson USB TM-T20 Printer or another compatible printer (officially " "supported printers are listed at the `POS Hardware page " "`_)" -msgstr "" +msgstr "爱普生TM USB-T20打印机或其他兼容的打印机(官方支持的打印机在`POS硬件页中列出`_)" #: ../../point_of_sale/overview/setup.rst:25 msgid "A Honeywell Eclipse USB Barcode Scanner or another compatible scanner" -msgstr "" +msgstr "霍尼韦尔的Eclipse USB条码扫描仪或其他兼容的扫描仪" #: ../../point_of_sale/overview/setup.rst:26 msgid "An Epson compatible cash drawer" -msgstr "" +msgstr "爱普生兼容钱箱" #: ../../point_of_sale/overview/setup.rst:29 #: ../../point_of_sale/overview/setup.rst:218 msgid "Step By Step Setup Guide" -msgstr "" +msgstr "一步一步的安装指南" #: ../../point_of_sale/overview/setup.rst:32 msgid "Current version of the POSBox (since 2015)" -msgstr "" +msgstr "POSBox的当前版本(2015年以来)" #: ../../point_of_sale/overview/setup.rst:36 msgid "Old version of the POSBox (before 2015)" -msgstr "" +msgstr "老版本的POSBox的(2015年之前)" #: ../../point_of_sale/overview/setup.rst:40 msgid "Connect peripheral devices" -msgstr "" +msgstr "连接外围设备" #: ../../point_of_sale/overview/setup.rst:42 msgid "" "Officially supported hardware is listed on `the POS Hardware page " "`_, but other hardware " "might work as well." -msgstr "" +msgstr "官方支持的硬件列在POS硬件页上`_，但其他硬件可能也能正常工作。" #: ../../point_of_sale/overview/setup.rst:46 msgid "**Printer**: Connect an ESC/POS printer to a USB port and power it on." -msgstr "" +msgstr "**打印机**：一个ESC/ POS打印机连接到USB端口，并接通电源。" #: ../../point_of_sale/overview/setup.rst:49 msgid "" "**Cash drawer**: The cash drawer should be connected to the printer with an " "RJ25 cable." -msgstr "" +msgstr "**钱箱**：钱箱应连接用RJ25电缆连接打印机。" #: ../../point_of_sale/overview/setup.rst:52 msgid "" @@ -1021,18 +1028,18 @@ msgid "" "configured in **US QWERTY**. It also must end barcodes with an Enter " "character (keycode 28). This is most likely the default configuration of " "your barcode scanner." -msgstr "" +msgstr "**条形码扫描仪**：连接条形码扫描器。为了使您的条形码扫描仪是兼容的，必须表现为键盘，必须配置**US QWERTY**。它还必须一个输入字符(键码28)结束条形码。这很可能是你的条码扫描仪的默认配置。" #: ../../point_of_sale/overview/setup.rst:58 msgid "**Scale**: Connect your scale and power it on." -msgstr "" +msgstr "**电子磅秤**：连接你的电子磅秤和接通电源。" #: ../../point_of_sale/overview/setup.rst:60 msgid "" "**Ethernet**: If you do not wish to use Wi-Fi, plug in the Ethernet cable. " "Make sure this will connect the POSBox to the same network as your POS " "device." -msgstr "" +msgstr "**以太网**：如果你不希望使用Wi-Fi，插上以太网电缆。确保这将POSBOX连接到同一个网络的POS设备。" #: ../../point_of_sale/overview/setup.rst:64 msgid "" @@ -1041,33 +1048,33 @@ msgid "" "compatible. Officially supported are Wi-Fi adapters with a Ralink 5370 " "chipset. Make sure not to plug in an Ethernet cable, because all Wi-Fi " "functionality will be bypassed when a wired network connection is available." -msgstr "" +msgstr "**Wi-Fi**：如果你不希望使用以太网，插上一个Linux兼容的USB Wi-Fi适配器。大多数商用的Wi-Fi适配器的Linux兼容。官方支持的是具有Ralink5370芯片组的Wi-Fi适配器。确保不要插以太网电缆插头，因为当一个有线网络连接可用时所有Wi-Fi功能将被忽略。" #: ../../point_of_sale/overview/setup.rst:72 msgid "Power the POSBox" -msgstr "" +msgstr "POSBox通电" #: ../../point_of_sale/overview/setup.rst:74 msgid "" "Plug the power adapter into the POSBox, a bright red status led should light" " up." -msgstr "" +msgstr "将电源适配器插入POSBox，红色的状态灯应该亮起。" #: ../../point_of_sale/overview/setup.rst:78 msgid "Make sure the POSBox is ready" -msgstr "" +msgstr "确保POSBox已准备就绪" #: ../../point_of_sale/overview/setup.rst:80 msgid "" "Once powered, The POSBox needs a while to boot. Once the POSBox is ready, it" " should print a status receipt with its IP address. Also the status LED, " "just next to the red power LED, should be permanently lit green." -msgstr "" +msgstr "一旦供电，POSBox需要一段时间才能启动。一旦POSBox准备就绪，就应该打印带IP地址的状态条。另外，LED状态指示灯，旁边的红色电源指示灯应常亮绿色。" #: ../../point_of_sale/overview/setup.rst:86 #: ../../point_of_sale/overview/setup.rst:297 msgid "Setup the Point of Sale" -msgstr "" +msgstr "设置零售点" #: ../../point_of_sale/overview/setup.rst:88 msgid "" @@ -1078,36 +1085,36 @@ msgid "" " is recommended (it is printed on the receipt that gets printed after " "booting up the POSBox). When the IP is not specified the Point of Sale will " "attempt to find it on the local network." -msgstr "" +msgstr "要设置在销售点的POSBox，请访问：菜单选择：零售点 - >配置 - > 设置`并选择您的销售点。向下滚动到``硬件代理/ POSBox``部分并激活您想要通过POSBox使用硬件的选项。推荐指定POSBox的IP(印在启动后的POSBox后打印收据上)。如果未指定IP，销售点会试图在本地网络上寻找。" #: ../../point_of_sale/overview/setup.rst:97 msgid "" "If you are running multiple Point of Sales on the same POSBox, make sure " "that only one of them has Remote Scanning/Barcode Scanner activated." -msgstr "" +msgstr "如果您在同一POSBox运行多个销售点，确保只有其中一个零售店了激活远程扫描/条码扫描枪。" #: ../../point_of_sale/overview/setup.rst:100 msgid "" "It might be a good idea to make sure the POSBox IP never changes in your " "network. Refer to your router documentation on how to achieve this." -msgstr "" +msgstr "如果在你的网络中固定POSBox的IP地址，是个比较好的注意。请参阅您的路由器文档就如何实现这一目标。" #: ../../point_of_sale/overview/setup.rst:105 msgid "Launch the Point of Sale" -msgstr "" +msgstr "启动销售点" #: ../../point_of_sale/overview/setup.rst:107 msgid "" "If you didn't specify the POSBox's IP address in the configuration, the POS " "will need some time to perform a network scan to find the POSBox. This is " "only done once." -msgstr "" +msgstr "如果没有在配置指定POSBox的IP地址，POS将需要一些时间来执行网络扫描来寻找POSBox。这种扫描只进行一次。" #: ../../point_of_sale/overview/setup.rst:111 msgid "" "The Point of Sale is now connected to the POSBox and your hardware should be" " ready to use." -msgstr "" +msgstr "销售点已经连接到POSBox，你的硬件应该可以使用。" #: ../../point_of_sale/overview/setup.rst:115 msgid "Wi-Fi configuration" @@ -1119,13 +1126,13 @@ msgid "" "compatible USB Wi-Fi adapter. Most commercially available Wi-Fi adapters are" " Linux compatible. Officially supported are Wi-Fi adapters with a Ralink " "5370 chipset." -msgstr "" +msgstr "POSBox是支持WiFi的。为了使用它，你会需要一个Linux兼容的USB Wi-Fi适配器。大多数商用的Wi-Fi适配器兼容Linux。官方支持的是具有Ralink5370芯片组的Wi-Fi适配器。" #: ../../point_of_sale/overview/setup.rst:122 msgid "" "Make sure not to plug in an Ethernet cable, as all Wi-Fi related " "functionality will be disabled when a wired network connection is available." -msgstr "" +msgstr "确保不要插以太网电缆插头，因为当有线网络连接可用时所有Wi-Fi相关的功能将被禁用。" #: ../../point_of_sale/overview/setup.rst:126 msgid "" @@ -1139,7 +1146,7 @@ msgid "" "network, fill in the password field. The POSBox will attempt to connect to " "the specified network and will print a new POSBox status receipt after it " "has connected." -msgstr "" +msgstr "当POSBox使用Wi-Fi适配器启动时，将以您可以连接到的被称为“Posbox”的自己的Wi-Fi接入点开始。POSBox启动时的收据打印将反映这一点。为了使POSBox连接到已有的Wi-Fi网络，转到POSBox的主页(在收据上已标明)，并进入Wi-Fi配置页面。在那里，你可以选择网络连接。请注意，我们只支持开放式和WPA(2)-PSK网络。当连接到一个WPA保护的网络，填写密码字段。该POSBox将尝试连接到指定的网络，连接后将打印新的POSBox状态条。" #: ../../point_of_sale/overview/setup.rst:137 msgid "" @@ -1148,7 +1155,7 @@ msgid "" "a network. This will make the network choice persist across reboots. This " "means that instead of starting up its own \"Posbox\" network it will always " "attempt to connect to the specified network after it boots." -msgstr "" +msgstr "如果你打算永久设置POSBox 为Wi-Fi连接，你可以在Wi-Fi配置页上选择复选框为“一直”。这将在重新启动时网络选择一直选择WIFI。这意味着，在启动后它将始终尝试连接到指定的网络而不是自己的“Posbox”网络。" #: ../../point_of_sale/overview/setup.rst:144 msgid "" @@ -1156,11 +1163,11 @@ msgid "" "it's own \"Posbox\" Access Point. If connection is lost with a Wi-Fi network" " after connecting to it, the POSBox will attempt to re-establish connection " "automatically." -msgstr "" +msgstr "当POSBox无法连接到网络时，它将退回到开始了自己的“Posbox”接入点。如果与Wi-Fi网络丢失，POSBox会尝试自动重新建立连接。" #: ../../point_of_sale/overview/setup.rst:150 msgid "Multi-POS Configuration" -msgstr "" +msgstr "多POS 设置" #: ../../point_of_sale/overview/setup.rst:152 msgid "" @@ -1169,11 +1176,11 @@ msgid "" "address of each POSBox in each Point of Sale. You must also configure your " "network to make sure the POSBox's IP addresses don't change. Please refer to" " your router documentation." -msgstr "" +msgstr "建议设置多个零售点的商店是每个零售点一个POSBox. 在这个例子中，必须为每个POSBox手动指定IP 地址.你还必须配置你的网络保证每个POSBox 的IP 地址不会改变。请参考你的路由文档。" #: ../../point_of_sale/overview/setup.rst:159 msgid "POSBoxless Guide (advanced)" -msgstr "" +msgstr "没有POSBox的指南(高级)" #: ../../point_of_sale/overview/setup.rst:163 msgid "" @@ -1182,7 +1189,7 @@ msgid "" "installation process is not foolproof. You'll need at least to know how to " "install and run Odoo. You may also run into issues specific to your " "distribution or to your particular setup and hardware configuration." -msgstr "" +msgstr "如果您运行在基于Debian的Linux的销售点，你可以不用POSBox,你可以运行本地软件。然而安装过程并不是万无一失的。你必须知道如何安装和运行Odoo.你也许会遇到关于版本的，或特定设置和硬件配置的问题。" #: ../../point_of_sale/overview/setup.rst:170 msgid "" @@ -1192,17 +1199,17 @@ msgid "" "different from a 'real' Odoo instance however. It does not handle *any* " "business data (eg. POS orders), but only serves as a gateway between the " "Point of Sale and the hardware." -msgstr "" +msgstr "Odoo模块提供了对于不同类型的硬件的驱动支持。事实上，POSBox运行Odoo的销售点通信。在POSBox运行Odoo是一个和“真正的”Odoo有很大的不同的例子。它不处理任何**业务数据(如POS订单)，仅仅是作为销售点和硬件之间的网关。" #: ../../point_of_sale/overview/setup.rst:177 msgid "" "The goal of this section will be to setup a local Odoo instance that behaves" " like the Odoo instance running on the POSBox." -msgstr "" +msgstr "这部分的目的是建立一个像在Odoo上运行POSBox的本地Odoo的例子。" #: ../../point_of_sale/overview/setup.rst:181 msgid "Image building process" -msgstr "" +msgstr "镜像建立过程" #: ../../point_of_sale/overview/setup.rst:183 msgid "" @@ -1212,17 +1219,17 @@ msgid "" "`_." " This builds an image called ``posbox.img``, which we zip and upload to " "`nightly.odoo.com `_ for users to download." -msgstr "" +msgstr "我们生成正规的POSBox 镜像使用如下脚本https://github.com/odoo/odoo/tree/8.0/addons/point_of_sale/tools/posbox. 更加具体的话，运行 `posbox_create_image.sh'.建立一个叫\"posbox.img\"的镜像，我们压缩并上传到'nightly.odoo.com'_供用户下载。" #: ../../point_of_sale/overview/setup.rst:191 msgid "" "The scripts in this directory might be useful as a reference if you get " "stuck or want more detail about something." -msgstr "" +msgstr "在此目录中的脚本对于你碰到问题或想了解更多是很有用的。" #: ../../point_of_sale/overview/setup.rst:195 msgid "Summary of the image creation process" -msgstr "" +msgstr "映像创建过程总结" #: ../../point_of_sale/overview/setup.rst:197 msgid "" @@ -1236,31 +1243,31 @@ msgid "" "then once again locally mount the image, remove the scripts that were used " "to initialize the image at boot and we copy over some extra configuration " "files. The resulting image is then ready to be tested and used." -msgstr "" +msgstr "镜像创建进程通过下载最新`Raspbian`_镜像开始。然后，它在本地挂载这个镜像，复制一些文件和脚本，这将使Raspbian镜像把自己变成一个POSBox在启动时。这些脚本将更新Raspbian，删除非必要的包和安装所需的软件包。为了引导Raspbian我们用QEMU，其能够提供ARM仿真。在此之后，仿真Raspbian操作系统将自行关闭。然后，我们再一次在本地挂载镜像，删除被用来初始化在启动镜像的脚本，我们复制了一些额外的配置文件。所产生的镜像，然后可以被用来进行测试和使用。" #: ../../point_of_sale/overview/setup.rst:212 msgid "A Debian-based Linux distribution (Debian, Ubuntu, Mint, etc.)" -msgstr "" +msgstr "基于Debian内核的Linux 版本(Debian,Ubuntu,Mint,etc)" #: ../../point_of_sale/overview/setup.rst:213 msgid "A running Odoo instance you connect to to load the Point of Sale" -msgstr "" +msgstr "一个运行的Odoo来装载零售点" #: ../../point_of_sale/overview/setup.rst:214 msgid "" "You must uninstall any ESC/POS printer driver as it will conflict with " "Odoo's built-in driver" -msgstr "" +msgstr "你必须卸载任何ESC/POS 打印机驱动，因为它会和Odoo内置的驱动冲突。" #: ../../point_of_sale/overview/setup.rst:221 msgid "Extra dependencies" -msgstr "" +msgstr "额外的依赖" #: ../../point_of_sale/overview/setup.rst:223 msgid "" "Because Odoo runs on Python 2, you need to check which version of pip you " "need to use." -msgstr "" +msgstr "由于Odoo在Python2上运行，你需要检查你需要使用的PIP的版本。" #: ../../point_of_sale/overview/setup.rst:226 msgid "``# pip --version``" @@ -1269,11 +1276,11 @@ msgstr "``# pip --version``" #: ../../point_of_sale/overview/setup.rst:228 #: ../../point_of_sale/overview/setup.rst:234 msgid "If it returns something like::" -msgstr "" +msgstr "如果它返回例如：" #: ../../point_of_sale/overview/setup.rst:232 msgid "You need to try pip2 instead." -msgstr "" +msgstr "你需要PIP2" #: ../../point_of_sale/overview/setup.rst:238 msgid "You can use pip." @@ -1281,7 +1288,7 @@ msgstr "使用 pip 工具." #: ../../point_of_sale/overview/setup.rst:240 msgid "The driver modules requires the installation of new python modules:" -msgstr "" +msgstr "驱动模块需要安装新的python模块" #: ../../point_of_sale/overview/setup.rst:242 msgid "``# pip install pyserial``" @@ -1297,14 +1304,14 @@ msgstr "``# pip install qrcode``" #: ../../point_of_sale/overview/setup.rst:249 msgid "Access Rights" -msgstr "" +msgstr "访问权限" #: ../../point_of_sale/overview/setup.rst:251 msgid "" "The drivers need raw access to the printer and barcode scanner devices. " "Doing so requires a bit system administration. First we are going to create " "a group that has access to USB devices" -msgstr "" +msgstr "驱动需要获得打印机和条码扫描仪设备的原始访问。这样做需要一点系统管理。首先我们要创建一个访问USB设备的组" #: ../../point_of_sale/overview/setup.rst:255 msgid "``# groupadd usbusers``" @@ -1312,7 +1319,7 @@ msgstr "``# groupadd usbusers``" #: ../../point_of_sale/overview/setup.rst:257 msgid "Then we add the user who will run the OpenERP server to ``usbusers``" -msgstr "" +msgstr "然后，我们添加谁将会运行OpenERP的服务器``USB users``用户" #: ../../point_of_sale/overview/setup.rst:259 msgid "``# useradd -G usbusers USERNAME``" @@ -1324,19 +1331,19 @@ msgid "" "``usbusers`` to access raw USB devices. To do so create a file called " "``99-usbusers.rule`` in the ``/etc/udev/rules.d/`` directory with the " "following content::" -msgstr "" +msgstr "然后我们需要生成一个udev 规则，这将自动允许\"usdusers\"成员访问原始的USB设备。为此生成一个带有以下内容的叫\"99-usbusers.rule\"的文件在``/etc/udev/rules.d/`` 目录中。" #: ../../point_of_sale/overview/setup.rst:269 msgid "Then you need to reboot your machine." -msgstr "" +msgstr "然后你需啊重启你的机器。" #: ../../point_of_sale/overview/setup.rst:272 msgid "Start the local Odoo instance" -msgstr "" +msgstr "开始本地Odoo实例。" #: ../../point_of_sale/overview/setup.rst:274 msgid "We must launch the Odoo server with the correct settings" -msgstr "" +msgstr "我们必须用正确的设置启动Odoo服务器" #: ../../point_of_sale/overview/setup.rst:276 msgid "" @@ -1347,7 +1354,7 @@ msgstr "``$ ./odoo.py --load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,h #: ../../point_of_sale/overview/setup.rst:279 msgid "Test the instance" -msgstr "" +msgstr "测试实例。" #: ../../point_of_sale/overview/setup.rst:281 msgid "" @@ -1357,11 +1364,11 @@ msgid "" "errors are: The paths on the distribution differ from the paths expected by " "the drivers, another process has grabbed exclusive access to the devices, " "the udev rules do not apply or a superseded by others." -msgstr "" +msgstr "请将所有的硬件设备插到机器的USB端口，然后转到``http://localhost:8069/hw_proxy/status`` ``刷新页面几次，看看是否所有的设备都显示为*连接*。错误的可能来源是：linux上的路径和驱动所期望的路径不同，另一个进程已经抢到了设备的独占访问时，udev规则不适用或他被人取代。" #: ../../point_of_sale/overview/setup.rst:289 msgid "Automatically start Odoo" -msgstr "" +msgstr "自动启动Odoo" #: ../../point_of_sale/overview/setup.rst:291 msgid "" @@ -1369,22 +1376,22 @@ msgid "" " boot. There are various ways to do so, and how to do it depends on your " "particular setup. Using the init system provided by your distribution is " "probably the easiest way to accomplish this." -msgstr "" +msgstr "你必须确保Odoo 安装是在启动后自动开始。有多种方式可以实现，如何做取决于你的特定设置.使用你的操作系统提供的安装系统可能使最简单的方式。" #: ../../point_of_sale/overview/setup.rst:299 msgid "" "The IP address field in the POS configuration must be either ``127.0.0.1`` " "or ``localhost`` if you're running the created Odoo server on the machine " "that you'll use as the Point of Sale device. You can also leave it empty." -msgstr "" +msgstr "在POS的IP地址字段必须配置``127.0.0.1`` or ``localhost``，如果你将在作为零售点的Odoo 服务器的机器上运行，你也可以留空。" #: ../../point_of_sale/overview/setup.rst:305 msgid "POSBox Technical Documentation" -msgstr "" +msgstr "POSBox 技术文档" #: ../../point_of_sale/overview/setup.rst:308 msgid "Technical Overview" -msgstr "" +msgstr "技术总览" #: ../../point_of_sale/overview/setup.rst:311 msgid "The POSBox Hardware" @@ -1398,17 +1405,17 @@ msgid "" "power adapter. 2A is needed to give enough power to the barcode scanners. " "The Software is installed on a 8Gb Class 10 or Higher SD Card. All this " "hardware is easily available worldwide from independent vendors." -msgstr "" +msgstr "该POSBox的硬件是基于`Raspberry Pi 2`_，一个普遍的单片机。Raspberry PI 2使用2A微型USB电源适配器。需要提供2A的足够电源给条码扫描器。软件安装在8G的10级或更高的SD卡。所有这些硬件都很容易从世界性的独立供应商处获得。" #: ../../point_of_sale/overview/setup.rst:322 msgid "Compatible Peripherals" -msgstr "" +msgstr "兼容外设" #: ../../point_of_sale/overview/setup.rst:324 msgid "" "Officially supported hardware is listed on the `POS Hardware page " "`_." -msgstr "" +msgstr "官方支持的硬件，列在'POS硬件页`_上。" #: ../../point_of_sale/overview/setup.rst:328 msgid "The POSBox Software" @@ -1424,7 +1431,7 @@ msgid "" "used for the framework it provides. No business data is processed or stored " "on the POSBox. The Odoo instance is a shallow git clone of the ``8.0`` " "branch." -msgstr "" +msgstr "该POSBox运行一个重大的修改Raspbian Linux，是Raspberry Debian的衍生物。它还可以运行Odoo的准系统安装，提供网络服务器和驱动程序。硬件驱动被作为为Odoo模块。这些模块都前缀``hw_*``，他们是POSBox运行的唯一模块。 Odoo仅用于所提供的框架。没有业务数据被处理或存储在POSBox。该Odoo实例是``8.0``克隆。" #: ../../point_of_sale/overview/setup.rst:339 msgid "" @@ -1446,7 +1453,7 @@ msgstr "" #: ../../point_of_sale/overview/setup.rst:355 msgid "Logs of the running Odoo server can be found at:" -msgstr "" +msgstr "Odoo服务器的运行Log可以在如下地方找到：" #: ../../point_of_sale/overview/setup.rst:357 msgid "``/var/log/odoo/odoo.log``" @@ -1457,15 +1464,15 @@ msgid "" "Various POSBox related scripts (eg. wifi-related scripts) running on the " "POSBox will log to /var/log/syslog and those messages are tagged with " "``posbox_*``." -msgstr "" +msgstr "各种在POSBox运行的相关的脚本(如无线网络相关的脚本)将记录到/ var / log / syslog上，那些消息都标有``posbox_*``。" #: ../../point_of_sale/overview/setup.rst:364 msgid "Accessing the POSBox" -msgstr "" +msgstr "访问POSBox" #: ../../point_of_sale/overview/setup.rst:367 msgid "Local Access" -msgstr "" +msgstr "本地访问" #: ../../point_of_sale/overview/setup.rst:369 msgid "" @@ -1473,31 +1480,31 @@ msgid "" " you connect a computer monitor to the *HDMI* port of the POSBox, you can " "use it as a small GNU/Linux computer and perform various administration " "tasks, like viewing some logs." -msgstr "" +msgstr "如果你插入一个QWERTY USB的键盘到POSBox的USB端口中，如果你的计算机显示器连接到* HDMI *的POSBox的端口，你可以使用它作为一个小的GNU / Linux计算机并执行各种管理任务，如查看一些日志。" #: ../../point_of_sale/overview/setup.rst:374 msgid "The POSBox will automatically log in as root on the default tty." -msgstr "" +msgstr "POSBox 将自动登入作为默认终端设备。" #: ../../point_of_sale/overview/setup.rst:377 msgid "Remote Access" -msgstr "" +msgstr "远程访问" #: ../../point_of_sale/overview/setup.rst:379 msgid "" "If you have the POSBox's IP address and an SSH client you can access the " "POSBox's system remotely. The login credentials are ``pi``/``raspberry``." -msgstr "" +msgstr "如果你有POSBox的IP地址和SSH客户端，你可以远程访问POSBox的系统。登录凭据``pi``/``raspberry``。" #: ../../point_of_sale/overview/setup.rst:384 msgid "Updating The POSBox Software" -msgstr "" +msgstr "升级POSBox 软件" #: ../../point_of_sale/overview/setup.rst:386 msgid "" "Only upgrade the POSBox if you experience problems or want to use newly " "implemented features." -msgstr "" +msgstr "当你遇到问题或想要使用新实施的功能升级POSBox。" #: ../../point_of_sale/overview/setup.rst:389 msgid "" @@ -1508,7 +1515,7 @@ msgid "" "official POSBox image page `_. This " "method of upgrading will ensure that you're running the latest version of " "the POSBox software." -msgstr "" +msgstr "更新POSBox软件的最好方法是下载镜像的新版本，并更新SD卡。该操作的详细描述在``_，只需用最新一期的'官方POSBox镜像页面找到替换的标准Raspberry Pi 镜像`_。这种升级方法将确保您正在运行最新版本的POSBox软件。" #: ../../point_of_sale/overview/setup.rst:398 msgid "" @@ -1517,29 +1524,29 @@ msgid "" "like this is that you don't have to flash a new image. This upgrade method " "is limited to what it can do however. It can not eg. update installed " "configuration files (like eg. /etc/hostapd.conf). It can only upgrade:" -msgstr "" +msgstr "升级的第二个方法是通过内置的升级界面访问POSBox主页。这样升级的好处是，你不必换一个新镜像。这种升级方法受限于有些不能做。例如不能更新安装配置文件(/etc/hostapd.conf)。它只能升级：" #: ../../point_of_sale/overview/setup.rst:405 msgid "The internal Odoo application" -msgstr "" +msgstr "内部Odoo应用" #: ../../point_of_sale/overview/setup.rst:406 msgid "" "Scripts in the folder " "``odoo/addons/point_of_sale/tools/posbox/configuration/``" -msgstr "" +msgstr "脚本在文件夹``odoo/addons/point_of_sale/tools/posbox/configuration/``" #: ../../point_of_sale/overview/setup.rst:408 msgid "When in doubt, always use the first method of upgrading." -msgstr "" +msgstr "如有疑问，一定要使用升级的第一个方法。" #: ../../point_of_sale/overview/setup.rst:411 msgid "Troubleshoot" -msgstr "" +msgstr "疑难解答" #: ../../point_of_sale/overview/setup.rst:414 msgid "The POS cannot connect to the POSBox" -msgstr "" +msgstr "该POS无法连接到POSBox" #: ../../point_of_sale/overview/setup.rst:416 msgid "" @@ -1547,27 +1554,27 @@ msgid "" "with the printer plugged in as it will print a receipt indicating any error " "if encountered or the POSBox's IP address in case of success. If no receipt " "is printed, check the following steps:" -msgstr "" +msgstr "最简单的方法确保POSBox是正确的设置,是把它与打印机插入，因为它会在POSBox的IP地址设置成功的情况下打印收据显示任何遇到的错误。如果不打印收据，请执行下列步骤：" #: ../../point_of_sale/overview/setup.rst:420 msgid "" "Make sure the POSBox is powered on, indicated by a brightly lit red status " "LED." -msgstr "" +msgstr "确保POSBox是通电的，明亮的红色状态指示灯亮。" #: ../../point_of_sale/overview/setup.rst:422 msgid "" "Make sure the POSBox is ready, this is indicated by a brightly lit green " "status LED just next to the red power status LED. The POSBox should be ready" " ~2 minutes after it is started." -msgstr "" +msgstr "确保POSBox已经准备好，这是由一个红色电源状态指示灯后面的绿色状态指示灯指示。在启动后的POSBox应该准备〜2分钟。" #: ../../point_of_sale/overview/setup.rst:425 msgid "" "Make sure the POSBox is connected to the same network as your POS device. " "Both the device and the POSBox should be visible in the list of connected " "devices on your network router." -msgstr "" +msgstr "确保POSBox连接到POS设备的相同网络。无论是设备和POSBox应该在你的网络中路由器连接的设备的列表中可见。" #: ../../point_of_sale/overview/setup.rst:428 msgid "" diff --git a/locale/zh_CN/LC_MESSAGES/project.po b/locale/zh_CN/LC_MESSAGES/project.po index 02f4788e5..9173d1537 100644 --- a/locale/zh_CN/LC_MESSAGES/project.po +++ b/locale/zh_CN/LC_MESSAGES/project.po @@ -1,11 +1,11 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2015, Odoo S.A. +# Copyright (C) 2015-TODAY, Odoo S.A. # This file is distributed under the same license as the Odoo Business package. # # Translators: # fausthuang, 2016 # Gary Wei , 2015-2016 -# jeffery chen fan , 2016 +# Jeffery Chenn , 2016 # Melody , 2015 # mrshelly , 2015-2016 # zyx , 2016 @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-17 14:30+0100\n" -"PO-Revision-Date: 2016-03-18 15:35+0000\n" -"Last-Translator: mrshelly \n" +"POT-Creation-Date: 2016-04-06 08:44+0200\n" +"PO-Revision-Date: 2016-04-06 09:15+0000\n" +"Last-Translator: Martin Trigaux\n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -815,70 +815,70 @@ msgstr "" #: ../../project/configuration/collaboration.rst:229 msgid "" "If you just need the pad and not the whole task page, you can click on the " -"icon on the top right to get to the pad directly. This also gives you the " -"direct url of the task description: useful if you want to send it to someone" -" without adding this person as a follower." +"icon on the top right to get to the pad directly in a full screen view. " +"Click on the icon to get the direct URL of the task description: useful " +"if you want to send it to someone without adding this person as a follower." msgstr "" -#: ../../project/configuration/collaboration.rst:238 +#: ../../project/configuration/collaboration.rst:239 msgid "Tasks states" msgstr "" -#: ../../project/configuration/collaboration.rst:241 +#: ../../project/configuration/collaboration.rst:242 msgid "Set the state of a task" msgstr "" -#: ../../project/configuration/collaboration.rst:243 +#: ../../project/configuration/collaboration.rst:244 msgid "" "The status of the task is the easiest way to inform your colleagues when you" " are working on a task, if the task is ready or if it is blocked. It is a " "visual indicator that is seen in a glance." msgstr "" -#: ../../project/configuration/collaboration.rst:247 +#: ../../project/configuration/collaboration.rst:248 msgid "" "You can change the status of the task from the kanban view or directly from " "the task. Just click on the status ball to get the choices:" msgstr "" -#: ../../project/configuration/collaboration.rst:257 +#: ../../project/configuration/collaboration.rst:258 msgid "Custom states" msgstr "" -#: ../../project/configuration/collaboration.rst:259 +#: ../../project/configuration/collaboration.rst:260 msgid "" "You can decide what the different status mean for each stage of your " "project. On the kanban view, click on the gear icon on the top of the stage," " then click on edit:" msgstr "" -#: ../../project/configuration/collaboration.rst:266 +#: ../../project/configuration/collaboration.rst:267 msgid "Next to the color ball, write the explanation of the state." msgstr "" -#: ../../project/configuration/collaboration.rst:271 +#: ../../project/configuration/collaboration.rst:272 msgid "Now, the explanation will be displayed instead of the generic text:" msgstr "" -#: ../../project/configuration/collaboration.rst:277 +#: ../../project/configuration/collaboration.rst:278 msgid "Color Tags" msgstr "" -#: ../../project/configuration/collaboration.rst:279 +#: ../../project/configuration/collaboration.rst:280 msgid "" "In every task, you can add a tag. Tags are very useful to categorize the " "tasks. It helps you to highlight a task from the Kanban view or better find " "them thanks to the filters." msgstr "" -#: ../../project/configuration/collaboration.rst:283 +#: ../../project/configuration/collaboration.rst:284 msgid "" "If you are always working with a specific type of tag, you can highlight the" " tasks containing the tag with the colors. Each tag can get a specific " "color, it's very visual on the Kanban view." msgstr "" -#: ../../project/configuration/collaboration.rst:290 +#: ../../project/configuration/collaboration.rst:291 msgid "" "In order to make it appear on the kanban view, you have to set a color on " "the tag, directly from the task:" diff --git a/locale/zh_CN/LC_MESSAGES/purchase.po b/locale/zh_CN/LC_MESSAGES/purchase.po index e78abdc1a..c532f744e 100644 --- a/locale/zh_CN/LC_MESSAGES/purchase.po +++ b/locale/zh_CN/LC_MESSAGES/purchase.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-03 16:14+0100\n" -"PO-Revision-Date: 2016-04-01 07:46+0000\n" +"PO-Revision-Date: 2016-04-08 04:17+0000\n" "Last-Translator: fausthuang\n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -2656,52 +2656,52 @@ msgstr "**订购数量** 是每次采购的最低数量。比如，有些产品 msgid "" "In the Misc section, the **Active** box allows you to activate or deactivate" " the rule." -msgstr "" +msgstr "在杂项部分，**激活**选项允许你激活或关闭这个规则。" #: ../../purchase/replenishment/flows/setup_stock_rule.rst:116 msgid "In the **Lead Time** section, you can enter:" -msgstr "" +msgstr "在**提前期**部分，你可以输入：" #: ../../purchase/replenishment/flows/setup_stock_rule.rst:118 msgid "" "the number of Day(s) to purchase: correspond to the number of days for the " "supplier to receive the order" -msgstr "" +msgstr "采购的天数(s)：是指供应商收到订单的天数" #: ../../purchase/replenishment/flows/setup_stock_rule.rst:120 msgid "the number of Day(s) to get the products" -msgstr "" +msgstr "拿到产品的天数(s)" #: ../../purchase/replenishment/flows/setup_stock_rule.rst:122 msgid "" "By default, the lead times are in calendar days. You can change that in " ":menuselection:`Inventory --> Configuration --> Settings --> Minimum Stock " "Rules`" -msgstr "" +msgstr "默认，提前期是日历天数。你可在：菜单项：'库存-->配置-->设置-->最小库存规则' 处更改它。" #: ../../purchase/replenishment/flows/setup_stock_rule.rst:125 msgid "When you have entered all the info, click on Save." -msgstr "" +msgstr "当你输入了所有的信息后，点击保存。" #: ../../purchase/replenishment/flows/setup_stock_rule.rst:127 msgid "" "From now on, every time a product with a reordering rule reaches the minimum" " stock, the system will automatically send a RfQ to your supplier based on " "your maximum quantity to replenish your stock." -msgstr "" +msgstr "从现在起，每次一个有重订货规则的产品达到最小库存时，系统会自动发送一个基于你的最大补货数量的请购单给你的供应商。" #: ../../purchase/replenishment/flows/setup_stock_rule.rst:131 msgid "" "The replenishments will take place when the scheduler in the Inventory " "module runs. By default in Odoo, the schedulers will run every night at " "12:00PM." -msgstr "" +msgstr "补货会在库存模块的排程器运行时发生。默认情况下，排程器会在每天晚上12:00运行。" #: ../../purchase/replenishment/flows/setup_stock_rule.rst:135 msgid "" "To know how to configure and run the schedulers manually, read the document " "on :doc:`../../../inventory/management/misc/schedulers`" -msgstr "" +msgstr "知道如何配置并手动运行排程器，请阅读如下文档:doc:`../../../inventory/management/misc/schedulers`" #: ../../purchase/replenishment/flows/setup_stock_rule.rst:142 msgid ":doc:`../../../inventory/management/misc/schedulers`" @@ -2710,45 +2710,45 @@ msgstr ":doc:`../../../inventory/management/misc/schedulers`" #: ../../purchase/replenishment/flows/warning_triggering.rst:3 #: ../../purchase/replenishment/flows/warning_triggering.rst:69 msgid "How to trigger a warning when purchasing at a specific vendor?" -msgstr "" +msgstr "如何触发一个警告当在一个指定的供应商采购时？" #: ../../purchase/replenishment/flows/warning_triggering.rst:8 msgid "" "The **Warning Messages and Alerts** module allow you to configure alerts on " "the customers and vendors or products." -msgstr "" +msgstr "**警告信息和提醒**模块允许你在客户，供应商或者产品处配置提醒。" #: ../../purchase/replenishment/flows/warning_triggering.rst:11 msgid "" "You can select the following types of warnings and create different warnings" " for purchases and sales:" -msgstr "" +msgstr "你可以选择如下类型的警告并对采购和销售创建不同的警告。" #: ../../purchase/replenishment/flows/warning_triggering.rst:14 msgid "" "Warning: This option displays the warning message during the process, but " "allows the user to continue." -msgstr "" +msgstr "警告：这个选项在处理过程中显示警告信息，但允许用户继续执行。" #: ../../purchase/replenishment/flows/warning_triggering.rst:17 msgid "" "Blocking Message: The message displays a warning message, but the user " "cannot continue the process further." -msgstr "" +msgstr "锁定信息：这个信息会显示一个警告，用户将不能继续操作。" #: ../../purchase/replenishment/flows/warning_triggering.rst:24 msgid "Module Installation" -msgstr "" +msgstr "模块安装" #: ../../purchase/replenishment/flows/warning_triggering.rst:26 msgid "" "First, you need to install the **Warning Messages and Alerts** module. Go to" " **Apps** and look for it (don't forget to remove the **Apps** filter)." -msgstr "" +msgstr "首先，你需要安装**警告信息和提醒**模块。在**Apps**中查找(别忘了移走**Apps**的过滤)。" #: ../../purchase/replenishment/flows/warning_triggering.rst:33 msgid "Vendor or Customer warnings" -msgstr "" +msgstr "供应商或客户警告" #: ../../purchase/replenishment/flows/warning_triggering.rst:35 msgid "" @@ -2763,74 +2763,74 @@ msgstr "打开供应商或客户，并且点击 **警告**页面。" #: ../../purchase/replenishment/flows/warning_triggering.rst:42 #: ../../purchase/replenishment/flows/warning_triggering.rst:62 msgid "The available warnings are:" -msgstr "" +msgstr "有效的警告是：" #: ../../purchase/replenishment/flows/warning_triggering.rst:44 msgid "Warning on the **Sales Order**" -msgstr "" +msgstr "在**销售订单**上的警告" #: ../../purchase/replenishment/flows/warning_triggering.rst:46 msgid "Warning on the **Purchase Order**" -msgstr "" +msgstr "在**采购订单**上的警告" #: ../../purchase/replenishment/flows/warning_triggering.rst:48 msgid "Warning on the **Picking**" -msgstr "" +msgstr "**拣货**上的警告" #: ../../purchase/replenishment/flows/warning_triggering.rst:50 msgid "Warning on the **Invoice**" -msgstr "" +msgstr "**发票**上的警告" #: ../../purchase/replenishment/flows/warning_triggering.rst:53 msgid "Product Warnings" -msgstr "" +msgstr "产品警告" #: ../../purchase/replenishment/flows/warning_triggering.rst:55 msgid "" "Go to :menuselection:`Purchases --> Products` or to :menuselection:`Sales " "--> Products`." -msgstr "" +msgstr "在:菜单:'采购-->产品'或在:菜单:销售-->产品'." #: ../../purchase/replenishment/flows/warning_triggering.rst:57 msgid "Open the product and click on the **Notes** tab." -msgstr "" +msgstr "打开产品并点击**便签**标签。" #: ../../purchase/replenishment/flows/warning_triggering.rst:64 msgid "Warning when selling this product." -msgstr "" +msgstr "当销售产品时的警告。" #: ../../purchase/replenishment/flows/warning_triggering.rst:66 msgid "Warning when Purchasing this product." -msgstr "" +msgstr "当采购产品时的警告。" #: ../../purchase/replenishment/flows/warning_triggering.rst:71 msgid "" "Go to the Purchases application, click on :menuselection:`Purchase --> " "Vendors`. Go to the **Warnings** tab." -msgstr "" +msgstr "在采购应用下，点击:菜单:采购-->供应商'.进入**警告**标签。" #: ../../purchase/replenishment/flows/warning_triggering.rst:74 msgid "" "Under **Warning on the Purchase Order**, choose **Warning** and write your " "warning." -msgstr "" +msgstr "在**采购订单的警告**，选择**警告**并写你的警告信息。" #: ../../purchase/replenishment/flows/warning_triggering.rst:80 msgid "" "Create a **Request for Quotation**. Go to :menuselection:`Purchase --> " "Request for Quotation` and click on **Create**. Choose the vendor on which a" " warning was set." -msgstr "" +msgstr "创建一个**询价单**。在：菜单：'采购-->询价'并点击**创建**。选择一个设置了警告的供应商。" #: ../../purchase/replenishment/flows/warning_triggering.rst:84 msgid "When choosing the vendor, the warning will appear." -msgstr "" +msgstr "当选择供应商时，警告会显示。" #: ../../purchase/replenishment/flows/warning_triggering.rst:90 msgid "" "If you set a blocking message instead of a warning message, you won't be " "able to choose the vendor." -msgstr "" +msgstr "如果你设置了锁定信息而不是警告信息，你将不能选择这个供应商。" #: ../../purchase/replenishment/multicompany.rst:3 msgid "Multi-Companies" @@ -2838,7 +2838,7 @@ msgstr "多公司" #: ../../purchase/replenishment/multicompany/setup.rst:3 msgid "How to setup a multi-company sale/purchase flow?" -msgstr "" +msgstr "如何设置多公司销售/采购 流程。" #: ../../purchase/replenishment/multicompany/setup.rst:8 msgid "" @@ -2846,7 +2846,7 @@ msgid "" "business. But it also perfectly meets the needs of multinational " "companies.The inter-company feature helps you to buy and/or sell products " "and services between different branches within your conglomerate." -msgstr "" +msgstr "Odoo 不但提供帮助小公司增长业务的优秀的解决方案。而且适用于跨国公司的需求.内部公司功能帮你在不同的子公司内买/卖产品和服务" #: ../../purchase/replenishment/multicompany/setup.rst:17 msgid "" @@ -2855,119 +2855,119 @@ msgid "" "automatically created for your company. All you have to do is check that " "everything is correct and confirm the sale. You can automate the validation " "on your sales and purchase orders." -msgstr "" +msgstr "采购订单和销售订单能够被关联。如果你的集团下的子公司创建了一个采购订单或销售订单，相关的文档会自动生成。你要做的只是检查正确性并确认销售。你可以在你的销售或采购单上自动校验。" #: ../../purchase/replenishment/multicompany/setup.rst:24 msgid "It is also possible to only handle invoices and refunds." -msgstr "" +msgstr "你也可能只是处理发票和退款。" #: ../../purchase/replenishment/multicompany/setup.rst:27 msgid "Manage intercompany rules" -msgstr "" +msgstr "管理内部公司规则。" #: ../../purchase/replenishment/multicompany/setup.rst:29 msgid "" "Go to :menuselection:`Settings --> General Settings`. Flag **Manage multiple" " companies** and then **Manage Inter Company**." -msgstr "" +msgstr "在:菜单:'设置-->常规设置‘。选择**管理多公司**和**管理内部公司**。" #: ../../purchase/replenishment/multicompany/setup.rst:32 msgid "Click on **Apply**." -msgstr "" +msgstr "点击**应用**" #: ../../purchase/replenishment/multicompany/setup.rst:37 msgid "New options will appear." -msgstr "" +msgstr "新的选项会显示。" #: ../../purchase/replenishment/multicompany/setup.rst:42 msgid "" "In the drop-down list, choose the company on which you want to add rules." -msgstr "" +msgstr "在下拉菜单中，选择你要加规则的公司。" #: ../../purchase/replenishment/multicompany/setup.rst:45 msgid "" "If you click on **SO and PO setting for inter company**, you will get extra " "options." -msgstr "" +msgstr "如果点击**为内部公司的SO 和 PO 设置**，你能得到额外的选项。" #: ../../purchase/replenishment/multicompany/setup.rst:51 msgid "" "When you are done, click on **Apply**, then you can repeat the same steps " "for the other companies." -msgstr "" +msgstr "当你完成后，点击**应用**，然后你可以对其他重复一样的步骤。" #: ../../purchase/replenishment/multicompany/setup.rst:55 msgid "" "In order to be able to manage the inter-company rules, be sure that your " "user has the rights to manage the companies." -msgstr "" +msgstr "为了能管理内部公司规则，确认你的用户有权限管理公司。" #: ../../purchase/replenishment/trouble_shooting.rst:3 msgid "Trouble-Shooting" -msgstr "" +msgstr "解决问题" #: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:3 msgid "How to check that everything is working fine?" -msgstr "" +msgstr "如果检查所有的事情都运行正常。" #: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:6 msgid "Vendor Bills" -msgstr "" +msgstr "供应商账单" #: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:8 msgid "" "Even if you don't have the rights to the accounting application, you can " "still control the vendor bills." -msgstr "" +msgstr "即使你没有财务的权限，你仍然可以控制供应商账单。" #: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:11 msgid "" "Go to the **Purchases** application: :menuselection:`Control --> Vendor " "Bills`." -msgstr "" +msgstr "在**采购**模块：菜单'控制-->供应商 账单’。" #: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:17 msgid "Incoming Products" -msgstr "" +msgstr "入库产品" #: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:19 msgid "" "Even if you don't have the rights to the inventory application, you can " "still control the incoming products." -msgstr "" +msgstr "即使你没有库存模块的权限，你仍然可以控制入库产品。" #: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:22 msgid "" "Go to the **Purchases** application: :menuselection:`Control --> Incoming " "Products`." -msgstr "" +msgstr "在**采购**模块：菜单：'控制-->入库产品'." #: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:28 msgid "Procurements exceptions" -msgstr "" +msgstr "采购异常" #: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:30 msgid "Here, you need the **Inventory Manager** access rights." -msgstr "" +msgstr "这里你需要有**采购经理**的权限。" #: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:32 msgid "" "Go to the **Inventory** application: :menuselection:`Control --> Procurement" " Exceptions`." -msgstr "" +msgstr "在**库存**模块：菜单：‘控制-->采购异常’。" #: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:37 msgid "" "To understand why the procurement is not running, open the exception and " "check the message in the chatter." -msgstr "" +msgstr "知道为什么采购没有运行，打开异常并检查信息。" #: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:43 msgid "" "Usually, the problem is located on the procurement rules. Either there are " "no stock rules, or there are no vendor associated to a product." -msgstr "" +msgstr "通常，问题在于采购规则，没有库存规则，或没有供应商关联到产品。" #: ../../purchase/replenishment/trouble_shooting/not_generated.rst:3 msgid "My purchase orders have not been generated, why?" -msgstr "" +msgstr "我的采购订单没有生产，为什么？" diff --git a/locale/zh_CN/LC_MESSAGES/sales.po b/locale/zh_CN/LC_MESSAGES/sales.po index e54194b91..8b79848fc 100644 --- a/locale/zh_CN/LC_MESSAGES/sales.po +++ b/locale/zh_CN/LC_MESSAGES/sales.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-18 16:07+0100\n" -"PO-Revision-Date: 2016-03-25 06:09+0000\n" -"Last-Translator: Gary Wei \n" +"POT-Creation-Date: 2016-04-22 13:58+0200\n" +"PO-Revision-Date: 2016-04-23 08:46+0000\n" +"Last-Translator: Martin Trigaux\n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,7 +80,7 @@ msgstr "从主菜单中点击 **联系人** ， 如果该联系人在系统中 msgid "" "Choose a contact, click on the **Action** menu in the top-center of the " "interface and from the drop down." -msgstr "要选择联系人，点击页面上方的**动作**下拉列表按钮。" +msgstr "要选择联系人，点击页面上方的 **动作** 下拉列表按钮。" #: ../../sales/advanced/portal.rst:38 msgid "Select **Portal Access Management**. A pop up window appears." @@ -318,9 +318,10 @@ msgstr "你也可以使用里程碑的方式按项目的百分比开票。比如 #: ../../sales/invoicing/services/reinvoice.rst:95 #: ../../sales/invoicing/services/support.rst:17 #: ../../sales/products_prices/prices/B2B_B2C.rst:60 +#: ../../sales/quotation/online/creation.rst:6 #: ../../sales/quotation/setup/different_addresses.rst:14 #: ../../sales/quotation/setup/first_quote.rst:21 -#: ../../sales/quotation/setup/optional.rst:19 +#: ../../sales/quotation/setup/optional.rst:16 #: ../../sales/quotation/setup/terms_conditions.rst:27 msgid "Configuration" msgstr "配置" @@ -1459,8 +1460,85 @@ msgid "Online Quotation" msgstr "网上报价" #: ../../sales/quotation/online/creation.rst:3 -msgid "How to create/ edit an online quotation?" -msgstr "如何创建/编辑在线报价？" +msgid "How to create and edit an online quotation?" +msgstr "" + +#: ../../sales/quotation/online/creation.rst:9 +msgid "Enable Online Quotations" +msgstr "" + +#: ../../sales/quotation/online/creation.rst:11 +msgid "" +"To send online quotations, you must first enable online quotations in the " +"Sales app from :menuselection:`Configuration --> Settings`. Doing so will " +"prompt you to install the Website app if you haven't already." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:18 +msgid "" +"You can view the online version of each quotation you create after enabling " +"this setting by selecting **Preview** from the top of the quotation." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:25 +msgid "Edit Your Online Quotations" +msgstr "" + +#: ../../sales/quotation/online/creation.rst:27 +msgid "" +"The online quotation page can be edited for each quotation template in the " +"Sales app via :menuselection:`Configuration --> Quotation Templates`. From " +"within any quotation template, select **Edit Template** to be taken to the " +"corresponding page of your website." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:34 +msgid "" +"You can add text, images, and structural elements to the quotation page by " +"dragging and dropping blocks from the pallet on the left sidebar menu. A " +"table of contents will be automatically generated based on the content you " +"add." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:38 +msgid "" +"Advanced descriptions for each product on a quotation are displayed on the " +"online quotation page. These descriptions are inherited from the product " +"page in your eCommerce Shop, and can be edited directly on the page through " +"the inline text editor." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:45 +msgid "" +"You can choose to allow payment immediately after the customer validates the" +" quote by selecting a payment option on the quotation template." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:48 +msgid "" +"You can edit the webpage of an individual quotation as you would for any web" +" page by clicking the **Edit** button. Changes made in this way will only " +"affect the individual quotation." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:52 +msgid "Using Online Quotations" +msgstr "" + +#: ../../sales/quotation/online/creation.rst:54 +msgid "" +"To share an online quotation with your customer, copy the URL of the online " +"quotation, then share it with customer." +msgstr "" + +#: ../../sales/quotation/online/creation.rst:60 +msgid "" +"Alternatively, your customer can access their online quotations by logging " +"into your website through the customer portal. Your customer can accept or " +"reject the quotation, print it, or negotiate the terms in the chat box. You " +"will also receive a notification in the chatter within Odoo whenever the " +"customer views the quotation." +msgstr "" #: ../../sales/quotation/online/followup.rst:3 msgid "How to follow up a quotation sent to a opportunity?" @@ -1709,84 +1787,43 @@ msgid "" "purchase in one of several locations." msgstr "建议产品的使用是一种营销策略，能够吸引客户在购买过程中花费更多。例如，当客户购买手机的时候，一些配件，例如保护盖，保护屏，耳机等可以作为配套出现。在Odoo中，客户可以和额外的产品一并呈现出来。" -#: ../../sales/quotation/setup/optional.rst:15 -msgid "" -"This document covers the configuration and use of suggested products in " -"Odoo." -msgstr "在Odoo中该文档涵盖了建议产品的配置和使用。" - -#: ../../sales/quotation/setup/optional.rst:21 +#: ../../sales/quotation/setup/optional.rst:18 msgid "" "Suggested products can be added to quotations directly, or to the ecommerce " "platform via each product form. In order to use suggested products, you will" -" need to have the **Ecommerce** applications installed:" -msgstr "建议的产品能被直接添加到报价单，或者在电商平台的产品页面中。如果要使用建议产品，你需要安装**电商**模块：" +" need to have the **Ecommerce** app installed:" +msgstr "" -#: ../../sales/quotation/setup/optional.rst:26 -msgid "Product" -msgstr "产品" +#: ../../sales/quotation/setup/optional.rst:23 +msgid "Quotations" +msgstr "" -#: ../../sales/quotation/setup/optional.rst:28 +#: ../../sales/quotation/setup/optional.rst:25 msgid "" -"On the product form view, under the **Sales** tab, you can set optional " -"products on that will be proposed on an order each time that this product is" -" added in the cart or on the sale order. On the picture below, we set 2 " -"optional products on a computer case." -msgstr "在产品的表单视图，在**销售**页签下方，你可以设置可选的产品到另外一个产品上，当另外一个产品被加入购物车时，该产品也会被自动加入购物车或者出现在购物页面的下方。在下面的图片中，我们在一个电脑上设置2个可选产品。" +"To add suggested products to quotations, you must first enable online " +"quotations in the Sales app from :menuselection:`Configuration --> " +"Settings`. Doing so will prompt you to install the Website app if you " +"haven't already." +msgstr "" -#: ../../sales/quotation/setup/optional.rst:37 -msgid "Quotation template" -msgstr "报价单模板" +#: ../../sales/quotation/setup/optional.rst:32 +msgid "" +"You will then be able to add suggested products to your individual " +"quotations and quotation templates under the **Suggested Products** tab of a" +" quotation." +msgstr "" #: ../../sales/quotation/setup/optional.rst:39 +msgid "Website Sales" +msgstr "" + +#: ../../sales/quotation/setup/optional.rst:41 msgid "" -"We can configure also configure optional products on quotation template like" -" on the picture below." -msgstr "我们还可以配置诸如下页的在报价单中的可选产品。" - -#: ../../sales/quotation/setup/optional.rst:45 -msgid "" -"For online quotation design you can follow following topic: " -":doc:`../online/creation`" -msgstr "你可以参照以下说明设置在线报价单：\n:doc:`../在线/创建`" - -#: ../../sales/quotation/setup/optional.rst:48 -msgid "Orders with optional product" -msgstr "带有可选产品的订单" - -#: ../../sales/quotation/setup/optional.rst:51 -msgid "Online order" -msgstr "在线订单" - -#: ../../sales/quotation/setup/optional.rst:53 -msgid "" -"Now, if a customer is adding in his cart the Computer Case product on which " -"we set 2 suggested products," -msgstr "现在，如果客户添加电脑产品到他的购物车，同时我们推荐的2个产品也会添加在他的购物页面中，" - -#: ../../sales/quotation/setup/optional.rst:59 -msgid "" -"on the same page are displayed these 2 products that they can add to their " -"cart too." -msgstr "在同页面中显示的2个产品也会被加入到购物车中。" - -#: ../../sales/quotation/setup/optional.rst:64 -msgid "" -"The customer can after that complete the sale process from the checkout to " -"the payment. For more information on sales you can follow another topic: " -":doc:`../../overview/process/from_quote_to_so`" -msgstr "客户可以在之后从完成结账到付款的过程。更多信息参照其余信息：\n:doc:`../../查看/过程/from_quote_to_so`" - -#: ../../sales/quotation/setup/optional.rst:68 -msgid "Quotation backend" -msgstr "报价单后台" - -#: ../../sales/quotation/setup/optional.rst:70 -msgid "" -"We are creating a quotation in the sales application by using a template. " -"The system will propose on the sale order form under the **Suggested " -"Products** tab the products that were defined on the template." -msgstr "我们在销售模块下使用模板创建一个报价单。系统会根据销售订单模板中**建议产品**页面的产品把该产品自动添加到订单中。" +"You can add suggested products to a product on its product form, under the " +"Website heading in the **Sales** tab. **Suggested products** will appear on " +"the *product* page, and **Accessory Products** will appear on the *cart* " +"page prior to checkout." +msgstr "" #: ../../sales/quotation/setup/recurring.rst:3 msgid "How to create recurring quotations?" diff --git a/locale/zh_CN/LC_MESSAGES/website.po b/locale/zh_CN/LC_MESSAGES/website.po index c8f14ad1f..d4923b3dc 100644 --- a/locale/zh_CN/LC_MESSAGES/website.po +++ b/locale/zh_CN/LC_MESSAGES/website.po @@ -4,7 +4,7 @@ # # Translators: # Gary Wei , 2016 -# jeffery chen fan , 2016 +# Jeffery Chenn , 2016 # mrshelly , 2016 # wxb , 2016 msgid "" @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0 Documentation\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-24 13:44+0100\n" -"PO-Revision-Date: 2016-03-18 15:31+0000\n" +"PO-Revision-Date: 2016-04-05 08:54+0000\n" "Last-Translator: mrshelly \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9-doc/language/zh_CN/)\n" "MIME-Version: 1.0\n"