From 55169c0bc60781cc03d09f41a68cbd25574ef1f1 Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 25 Jun 2017 09:30:57 +0200 Subject: [PATCH 1/5] [I18N] Update translation terms from Transifex --- locale/fr/LC_MESSAGES/general.po | 7 ++++--- locale/tr/LC_MESSAGES/inventory.po | 11 +++++++++-- locale/tr/LC_MESSAGES/purchase.po | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/locale/fr/LC_MESSAGES/general.po b/locale/fr/LC_MESSAGES/general.po index a52e32cf0..a178e839d 100644 --- a/locale/fr/LC_MESSAGES/general.po +++ b/locale/fr/LC_MESSAGES/general.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Olivier Lenoir , 2017\n" +"Last-Translator: Bertrand LATOUR , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,6 +29,7 @@ msgstr "Authentification" #: ../../general/auth/google.rst:3 msgid "How to allow users to sign in with their Google account" msgstr "" +"Comment autoriser les utilisateurs à se connecter avec leur compte Google" #: ../../general/auth/google.rst:5 msgid "" @@ -85,7 +86,7 @@ msgstr "" #: ../../general/base_import.rst:3 msgid "Data Import" -msgstr "" +msgstr "Importation de données" #: ../../general/base_import/adapt_template.rst:3 msgid "How to adapt an import template" @@ -180,7 +181,7 @@ msgstr "" #: ../../general/base_import/import_faq.rst:6 msgid "How to start" -msgstr "" +msgstr "Comment démarrer" #: ../../general/base_import/import_faq.rst:7 msgid "" diff --git a/locale/tr/LC_MESSAGES/inventory.po b/locale/tr/LC_MESSAGES/inventory.po index e05ab8b5e..bf4ada2d7 100644 --- a/locale/tr/LC_MESSAGES/inventory.po +++ b/locale/tr/LC_MESSAGES/inventory.po @@ -734,6 +734,9 @@ msgid "" " If none is given, the moves generated by procurement rules will be grouped " "into one big picking." msgstr "" +"Bu sipariş noktası üzerinden yaratılan hareketler bu satın alma grubuna " +"konacaktır. Hiçbir şey verilmezse, satın alma kuralları tarafından üretilen " +"hareketler büyük bir toplama olarak gruplandırılacaktır." #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "Minimum Quantity" @@ -776,6 +779,8 @@ msgid "" "Number of days after the orderpoint is triggered to receive the products or " "to order to the vendor" msgstr "" +"Sipariş noktasının ürünleri almak veya tedarikçiye sipariş vermek için " +"tetiklenen gün sayısı" #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:45 msgid "" @@ -5289,11 +5294,11 @@ msgstr "" #: ../../inventory/routes/concepts/use_routes.rst:11 msgid "Manage product manufacturing chains" -msgstr "" +msgstr "Ürün üretim zincirlerini yönetin" #: ../../inventory/routes/concepts/use_routes.rst:13 msgid "Manage default locations per product" -msgstr "" +msgstr "Ürün tek tek varsayılan konumları yönetin" #: ../../inventory/routes/concepts/use_routes.rst:15 msgid "" @@ -5306,6 +5311,8 @@ msgid "" "Help rental management, by generating automated return moves for rented " "products" msgstr "" +"Kiralanan ürünler için otomatik iade hareketleri oluşturarak kiralama " +"yönetimine yardımcı olun" #: ../../inventory/routes/concepts/use_routes.rst:24 msgid "" diff --git a/locale/tr/LC_MESSAGES/purchase.po b/locale/tr/LC_MESSAGES/purchase.po index a254ca72c..4ae797c36 100644 --- a/locale/tr/LC_MESSAGES/purchase.po +++ b/locale/tr/LC_MESSAGES/purchase.po @@ -1657,7 +1657,7 @@ msgstr "" #: ../../purchase/purchases/rfq/create.rst:0 msgid "Incoterm" -msgstr "" +msgstr "Teslimat Koşulu" #: ../../purchase/purchases/rfq/create.rst:0 msgid "" From c27a6c377a64c3b16d3c32b6cee52f552d963180 Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 2 Jul 2017 09:30:29 +0200 Subject: [PATCH 2/5] [I18N] Update translation terms from Transifex --- locale/nl/LC_MESSAGES/accounting.po | 57 ++++++++++++++++++++++---- locale/nl/LC_MESSAGES/crm.po | 21 ++++++---- locale/nl/LC_MESSAGES/db_management.po | 6 ++- locale/nl/LC_MESSAGES/discuss.po | 5 +++ locale/nl/LC_MESSAGES/ecommerce.po | 4 ++ locale/nl/LC_MESSAGES/general.po | 6 +++ locale/nl/LC_MESSAGES/inventory.po | 6 +-- locale/nl/LC_MESSAGES/manufacturing.po | 3 ++ locale/nl/LC_MESSAGES/sales.po | 6 +++ locale/nl/LC_MESSAGES/website.po | 10 ++++- locale/ru/LC_MESSAGES/accounting.po | 4 +- locale/ru/LC_MESSAGES/website.po | 3 +- locale/tr/LC_MESSAGES/accounting.po | 12 ++++-- locale/tr/LC_MESSAGES/inventory.po | 5 ++- locale/tr/LC_MESSAGES/point_of_sale.po | 38 +++++++++++------ 15 files changed, 144 insertions(+), 42 deletions(-) diff --git a/locale/nl/LC_MESSAGES/accounting.po b/locale/nl/LC_MESSAGES/accounting.po index 9857e591e..e6dbc6b92 100644 --- a/locale/nl/LC_MESSAGES/accounting.po +++ b/locale/nl/LC_MESSAGES/accounting.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Gunther Clauwaert , 2017\n" +"Last-Translator: Julia van Orsouw , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -141,6 +141,11 @@ msgid "" "**Dashboard**, and click on the button **More** on the bank account card. " "Then, click on **Import Statement** to load your first CODA file." msgstr "" +"Wanneer je deze module hebt geïnstalleerd, kun je je bankrekening inrichten " +"om bankafschriften te importeren. Om dit te doen, ga naar het boekhoud " +"**dashboard**, en klik op de link **Meer** op de kaart van de bankrekening. " +"Klik daarna op **afschrift importeren** om je eerste CODA bestand in te " +"laden." #: ../../accounting/bank/feeds/coda.rst:43 msgid "" @@ -171,6 +176,10 @@ msgid "" "import, you don't need to go to the **More** button anymore, you can " "directly click on the link **Import Statement**." msgstr "" +"Na het importeren van je eerste bestand zal het Odoo boekhoud dashboard " +"automatisch voorstellen om meer bestanden van je bank te importeren. Voor de" +" volgende import hoef je niet meer naar **Meer** te gaan, maar kun je direct" +" op de kaart klikken op **Afschrift importeren**." #: ../../accounting/bank/feeds/coda.rst:65 msgid "" @@ -180,6 +189,11 @@ msgid "" " you get or make to these contacts. This will speed up a lot the " "reconciliation process." msgstr "" +"Elke keer als je een afschriftregel hebt die gekoppeld is aan een nieuwe " +"klant of leverancier zal Odoo je vragen om de juiste relatie te selecteren " +"om de transactie af te letteren. Odoo leert daarvan en zal de volgende " +"betalingen automatisch koppelen aan deze relaties. Dit zal het " +"afletterproces danig versnellen." #: ../../accounting/bank/feeds/coda.rst:72 msgid "" @@ -188,6 +202,10 @@ msgid "" " times the same file: Odoo will check everything for you before creating new" " bank statements." msgstr "" +"Odoo is in staat om automatisch te constateren dat sommige bestanden of " +"regels reeds zijn geïmporteerd. Dus je kunt gerust meerdere bestanden " +"tegelijk importeren: Odoo controleert alles voor je voordat je een nieuw " +"bankafschrift aanmaakt. " #: ../../accounting/bank/feeds/coda.rst:78 #: ../../accounting/bank/feeds/qif.rst:65 @@ -370,6 +388,9 @@ msgid "" "exchange of financial data between financial institutions, businesses and " "consumers via the Internet." msgstr "" +"Open Financial Exchange (OFX) is een gestandaardiseerde specificatie voor " +"electronische uitwisseling van financiële gegevens tussen bancaire " +"instellingen, bedrijven en consumenten over het internet." #: ../../accounting/bank/feeds/ofx.rst:9 msgid "" @@ -396,6 +417,8 @@ msgid "" " --> Settings`. From the accounting settings, check the bank statements " "option **Import in .OFX Format** and apply." msgstr "" +"Om OFX afschriften te importeren, moet je deze functionaliteit activeren in " +"Odoo. Ga in de boekhoud module naar het menu " #: ../../accounting/bank/feeds/ofx.rst:28 msgid "" @@ -404,6 +427,11 @@ msgid "" "Dashboard, and click on the **More** button of the bank account. Then, click" " on **Import Statement** to load your first OFX file." msgstr "" +"Wanneer je deze module hebt geïnstalleerd, kun je je bankrekening inrichten " +"om bankafschriften te importeren. Om dit te doen, ga naar het boekhoud " +"**dashboard**, en klik op de link **Meer** op de kaart van de bankrekening. " +"Klik daarna op **afschrift importeren** om je eerste OFX bestand in te " +"laden." #: ../../accounting/bank/feeds/ofx.rst:36 msgid "" @@ -425,6 +453,10 @@ msgid "" "import, you don't need to go to the **More** menu anymore, you can directly " "click on the link **Import Statement**." msgstr "" +"Na het importeren van je eerste bestand zal het Odoo boekhoud dashboard " +"automatisch voorstellen om meer bestanden van je bank te importeren. Voor de" +" volgende import hoef je niet meer naar **Meer** te gaan, maar kun je direct" +" op de kaart klikken op **Afschrift importeren**." #: ../../accounting/bank/feeds/ofx.rst:56 #: ../../accounting/bank/feeds/qif.rst:57 @@ -435,6 +467,11 @@ msgid "" " you get or do to these contacts. This will speed up a lot the " "reconciliation process." msgstr "" +"Elke keer als je een afschriftregel hebt die gekoppeld is aan een nieuwe " +"klant of leverancier zal Odoo je vragen om de juiste relatie te selecteren " +"om de transactie af te letteren. Odoo leert daarvan en zal volgende " +"betalingen automatisch koppelen aan deze relaties. Dit zal het " +"afletterproces danig versnellen." #: ../../accounting/bank/feeds/ofx.rst:65 #: ../../accounting/bank/feeds/qif.rst:66 @@ -5612,13 +5649,15 @@ msgstr ":doc:`application`" #: ../../accounting/others/taxes/default_taxes.rst:3 msgid "How to set default taxes" -msgstr "" +msgstr "Hoe standaard belastingen instellen" #: ../../accounting/others/taxes/default_taxes.rst:5 msgid "" "Taxes applied in your country are installed automatically for most " "localizations." msgstr "" +"Belastingen toegepast in uw land zijn automatisch geïnstalleerd voor de " +"meeste lokaliseringen." #: ../../accounting/others/taxes/default_taxes.rst:7 msgid "" @@ -5792,7 +5831,7 @@ msgstr "" #: ../../accounting/others/taxes/taxcloud.rst:3 msgid "How to get correct tax rates in the US thanks to TaxCloud" -msgstr "" +msgstr "Hoe de juiste belastingen krijgen in de VS dankzij TaxCloud" #: ../../accounting/others/taxes/taxcloud.rst:5 msgid "" @@ -5805,7 +5844,7 @@ msgstr "" #: ../../accounting/others/taxes/taxcloud.rst:15 msgid "In Tax Cloud" -msgstr "" +msgstr "In Tax Cloud" #: ../../accounting/others/taxes/taxcloud.rst:16 msgid "" @@ -5819,7 +5858,7 @@ msgstr "" #: ../../accounting/others/taxes/taxcloud.rst:24 msgid "In Odoo" -msgstr "" +msgstr "In Odoo" #: ../../accounting/others/taxes/taxcloud.rst:25 msgid "" @@ -5829,7 +5868,7 @@ msgstr "" #: ../../accounting/others/taxes/taxcloud.rst:31 msgid "Still in those settings, enter your TaxCloud credentials." -msgstr "" +msgstr "Nog steeds in deze instellingen geeft u uw TaxCloud logingegevens in." #: ../../accounting/others/taxes/taxcloud.rst:32 msgid "" @@ -5859,7 +5898,7 @@ msgstr "" #: ../../accounting/others/taxes/taxcloud.rst:51 msgid "How it works" -msgstr "" +msgstr "Hoe het werkt" #: ../../accounting/others/taxes/taxcloud.rst:53 msgid "" @@ -5897,7 +5936,7 @@ msgstr "" #: ../../accounting/others/taxes/taxcloud.rst:86 msgid ":doc:`default_taxes`" -msgstr "" +msgstr ":doc:`default_taxes`" #: ../../accounting/overview/getting_started.rst:3 msgid "Getting Started" @@ -10982,4 +11021,4 @@ msgstr "" #: ../../accounting/receivables/getting_paid/automated_followups.rst:168 msgid "If you click on **History**, you can see all follow ups actions." -msgstr "" +msgstr "Als u klikt op **Geschiedenis** kan u alle opvolg acties zien." diff --git a/locale/nl/LC_MESSAGES/crm.po b/locale/nl/LC_MESSAGES/crm.po index 436be6047..4293e7ab1 100644 --- a/locale/nl/LC_MESSAGES/crm.po +++ b/locale/nl/LC_MESSAGES/crm.po @@ -28,7 +28,7 @@ msgstr "Agenda" #: ../../crm/calendar/google_calendar_credentials.rst:3 msgid "How to synchronize your Odoo Calendar with Google Calendar" -msgstr "" +msgstr "Hoe uw Odoo agenda synchroniseren met Google Kalender" #: ../../crm/calendar/google_calendar_credentials.rst:5 msgid "" @@ -36,26 +36,33 @@ msgid "" "manage your meetings from both platforms (updates go through both " "directions)." msgstr "" +"Odoo is perfect geïntegreerd met Google Kalender zodat u meetings kan zien &" +" beheren vanuit beide platformen (updates werken in beide richtingen)." #: ../../crm/calendar/google_calendar_credentials.rst:10 msgid "Setup in Google" -msgstr "" +msgstr "Opzet in Google" #: ../../crm/calendar/google_calendar_credentials.rst:11 msgid "" "Go to `Google APIs platform `__ to " "generate Google Calendar API credentials. Log in with your Google account." msgstr "" +"Ga naar het `Google API platform `__ " +"om Google Kalender API login gegevens te genereren. Login met uw Google " +"account." #: ../../crm/calendar/google_calendar_credentials.rst:14 msgid "Choose *Calendar API*." -msgstr "" +msgstr "Kies *Kalender API*." #: ../../crm/calendar/google_calendar_credentials.rst:19 msgid "" "Create a new project and give it a name (e.g. Odoo). This project is needed " "to store your API credentials." msgstr "" +"Maak een nieuw project aan en geef het een naam (bijvoorbeeld Odoo). Dit " +"project is nodig om uw API logingegevens te bewaren." #: ../../crm/calendar/google_calendar_credentials.rst:25 msgid "Enable the API." @@ -63,7 +70,7 @@ msgstr "Schakel de API in." #: ../../crm/calendar/google_calendar_credentials.rst:30 msgid "Create credentials to use in Odoo." -msgstr "" +msgstr "Maak inloggegevens aan om te gebruiken in Odoo." #: ../../crm/calendar/google_calendar_credentials.rst:35 msgid "" @@ -96,11 +103,11 @@ msgstr "" #: ../../crm/calendar/google_calendar_credentials.rst:62 msgid "Setup in Odoo" -msgstr "" +msgstr "Opzet in Odoo" #: ../../crm/calendar/google_calendar_credentials.rst:64 msgid "Install **Google Calendar** app." -msgstr "" +msgstr "Installeer de **Google kalender** app." #: ../../crm/calendar/google_calendar_credentials.rst:69 msgid "" @@ -118,7 +125,7 @@ msgstr "" #: ../../crm/calendar/google_calendar_credentials.rst:83 msgid "As of now you no longer have excuses to miss a meeting!" -msgstr "" +msgstr "Vanaf nu heeft u geen excuses meer om een meeting te missen!" #: ../../crm/leads.rst:3 msgid "Leads" diff --git a/locale/nl/LC_MESSAGES/db_management.po b/locale/nl/LC_MESSAGES/db_management.po index 00bf6b85e..b77b3d6d3 100644 --- a/locale/nl/LC_MESSAGES/db_management.po +++ b/locale/nl/LC_MESSAGES/db_management.po @@ -81,6 +81,8 @@ msgid "" "After a few seconds, you will be logged in your duplicated database. Notice " "that the url uses the name you chose for your duplicated database." msgstr "" +"Na een paar seconden wordt u ingelogd in uw gedupliceerde database. Merk op " +"dat de URL de naam van uw gedupliceerde database gebruikt." #: ../../db_management/db_online.rst:54 msgid "Duplicate databases expire automatically after 15 days." @@ -88,7 +90,7 @@ msgstr "Gedupliceerde databases verlopen automatisch na 15 dagen." #: ../../db_management/db_premise.rst:7 msgid "On-premise Database management" -msgstr "" +msgstr "On site database beheer" #: ../../db_management/db_premise.rst:10 msgid "Register a database" @@ -113,6 +115,8 @@ msgid "" "If you are unable to register your database, you will likely encounter this " "message:" msgstr "" +"Indien u uw database niet kan registreren krijgt u waarschijnlijk de " +"volgende melding:" #: ../../db_management/db_premise.rst:31 ../../db_management/db_premise.rst:97 #: ../../db_management/db_premise.rst:130 diff --git a/locale/nl/LC_MESSAGES/discuss.po b/locale/nl/LC_MESSAGES/discuss.po index da1eeb6df..2341962e8 100644 --- a/locale/nl/LC_MESSAGES/discuss.po +++ b/locale/nl/LC_MESSAGES/discuss.po @@ -56,6 +56,9 @@ msgid "" "Office 365 doesn't allow external hosts like Odoo. Consequently you can't " "use Office 365 email servers to send or receive messages in Odoo." msgstr "" +"Office 365 staat geen externe hosts zoals Odoo toe. Hierdoor kan u office " +"365 e-mail servers niet gebruiken om e-mails te verzenden of ontvangen in " +"Odoo." #: ../../discuss/email_servers.rst:26 msgid "Set an outgoing email server for outbound messages" @@ -95,6 +98,8 @@ msgid "" "Enter the domain name of your email servers (e.g. mycompany.com) in General " "Settings." msgstr "" +"Geef de domeinnaam van uw email server in (bijvoorbeeld mijnbedrijf.com) in " +"de algemene instellingen." #: ../../discuss/email_servers.rst:57 msgid "Create a catchall address" diff --git a/locale/nl/LC_MESSAGES/ecommerce.po b/locale/nl/LC_MESSAGES/ecommerce.po index cde93a7b0..bed6bd832 100644 --- a/locale/nl/LC_MESSAGES/ecommerce.po +++ b/locale/nl/LC_MESSAGES/ecommerce.po @@ -38,12 +38,16 @@ msgstr "Product catalogus" msgid "" "All your published items show up in your catalog page (or *Shop* page)." msgstr "" +"Al uw gepubliceerde items worden getoond in uw catalogus pagina (of *Shop* " +"pagina)." #: ../../ecommerce/getting_started/catalog.rst:13 msgid "" "Most options are available in the *Customize* menu: display attributes, " "website categories, etc." msgstr "" +"De meeste opties zijn beschikbaar in het *Personaliseerd* menu: toon " +"attributen, website categorieën, enz." #: ../../ecommerce/getting_started/catalog.rst:20 msgid "Highlight a product" diff --git a/locale/nl/LC_MESSAGES/general.po b/locale/nl/LC_MESSAGES/general.po index 25568b0b6..f718b18cd 100644 --- a/locale/nl/LC_MESSAGES/general.po +++ b/locale/nl/LC_MESSAGES/general.po @@ -67,6 +67,8 @@ msgid "" "Then click on **Add Credentials** and select the second option (OAuth 2.0 " "Client ID)." msgstr "" +"Klik vervolgens op **Aanmeldgegevens toevoegen** en selecteer de tweede " +"optie (OAuth 2.0 client ID)." #: ../../general/auth/google.rst:38 msgid "" @@ -112,12 +114,16 @@ msgid "" "Remove columns you don't need. We advise to not remove the *ID* one (see why" " here below)." msgstr "" +"Verwijder kolommen die u niet nodig heeft. We raden u aan om het veld *ID* " +"niet te verwijderen (zie hieronder waarom)." #: ../../general/base_import/adapt_template.rst:15 #: ../../general/base_import/import_faq.rst:26 msgid "" "Set a unique ID to every single record by dragging down the ID sequencing." msgstr "" +"Stel een unieke ID in voor elke record door de ID sequentie naar beneden te " +"slepen." #: ../../general/base_import/adapt_template.rst:20 msgid "" diff --git a/locale/nl/LC_MESSAGES/inventory.po b/locale/nl/LC_MESSAGES/inventory.po index c02f807e4..db66223a0 100644 --- a/locale/nl/LC_MESSAGES/inventory.po +++ b/locale/nl/LC_MESSAGES/inventory.po @@ -5582,7 +5582,7 @@ msgstr "" #: ../../inventory/routes/costing.rst:3 msgid "Product Costing" -msgstr "" +msgstr "Product kosten" #: ../../inventory/routes/costing/landed_costs.rst:3 msgid "How to integrate landed costs in the cost of the product?" @@ -6067,11 +6067,11 @@ msgstr "" #: ../../inventory/routes/strategies/removal.rst:192 msgid ":doc:`../../management/reporting/valuation_methods_continental`" -msgstr "" +msgstr ":doc:`../../management/reporting/valuation_methods_continental`" #: ../../inventory/routes/strategies/removal.rst:193 msgid ":doc:`../../management/reporting/valuation_methods_anglo_saxon`" -msgstr "" +msgstr ":doc:`../../management/reporting/valuation_methods_anglo_saxon`" #: ../../inventory/settings.rst:3 msgid "Settings" diff --git a/locale/nl/LC_MESSAGES/manufacturing.po b/locale/nl/LC_MESSAGES/manufacturing.po index 0d2bb0863..0d16a54bb 100644 --- a/locale/nl/LC_MESSAGES/manufacturing.po +++ b/locale/nl/LC_MESSAGES/manufacturing.po @@ -119,6 +119,9 @@ msgid "" "Don't forget to select the right product type. A consumable can not be " "stocked and will thus not be accounted for in the stock valuation." msgstr "" +"Vergeet niet het juiste soort product te selecteren. Een verbruik product " +"kan niet gestockeerd worden en wordt dus niet gebruikt in de stock " +"berekening." #: ../../manufacturing/operations/replenishment/strategies.rst:60 msgid "" diff --git a/locale/nl/LC_MESSAGES/sales.po b/locale/nl/LC_MESSAGES/sales.po index 58564ed0d..a5b0d27f9 100644 --- a/locale/nl/LC_MESSAGES/sales.po +++ b/locale/nl/LC_MESSAGES/sales.po @@ -51,6 +51,8 @@ msgid "" "A portal user has only read/view access. He or she will not be able to edit " "any document in the system." msgstr "" +"Een portaalgebruiker heeft alleen lees / kijkrechten. Hij of zij kan geen " +"document wijzigen in het systeem." #: ../../sales/advanced/portal.rst:20 msgid "How to give portal access to customers?" @@ -1661,11 +1663,15 @@ msgid "" "Remove columns you don't need. We advise to not remove the *ID* one (see why" " here below)." msgstr "" +"Verwijder kolommen die u niet nodig heeft. We raden u aan om het veld *ID* " +"niet te verwijderen (zie hieronder waarom)." #: ../../sales/products_prices/products/import.rst:15 msgid "" "Set a unique ID to every single record by dragging down the ID sequencing." msgstr "" +"Stel een unieke ID in voor elke record door de ID sequentie naar beneden te " +"slepen." #: ../../sales/products_prices/products/import.rst:16 msgid "" diff --git a/locale/nl/LC_MESSAGES/website.po b/locale/nl/LC_MESSAGES/website.po index 27ee35036..03a00e621 100644 --- a/locale/nl/LC_MESSAGES/website.po +++ b/locale/nl/LC_MESSAGES/website.po @@ -47,6 +47,8 @@ msgid "" "Go through the creation form and accept the conditions to get the tracking " "ID." msgstr "" +"Ga door het aanmaak formulier en accepteer de voorwaarden om de tracking id " +"te krijgen." #: ../../website/optimize/google_analytics.rst:15 msgid "Copy the tracking ID to insert it in Odoo." @@ -76,13 +78,15 @@ msgstr ":doc:`google_analytics_dashboard`" #: ../../website/optimize/google_analytics_dashboard.rst:3 msgid "How to track your website traffic from your Odoo Dashboard" -msgstr "" +msgstr "Hoe uw website trafiek opvolgen vanuit uw Odoo dashboard" #: ../../website/optimize/google_analytics_dashboard.rst:5 msgid "" "You can follow your traffic statistics straight from your Odoo Website " "Dashboard thanks to Google Analytics." msgstr "" +"U kan uw website trafiek opvolgen vanuit uw Odoo website dashboard dankzij " +"Google Analytics." #: ../../website/optimize/google_analytics_dashboard.rst:8 msgid "" @@ -105,6 +109,8 @@ msgid "" "Create a new project and give it a name (e.g. Odoo). This project is needed " "to store your API credentials." msgstr "" +"Maak een nieuw project aan en geef het een naam (bijvoorbeeld Odoo). Dit " +"project is nodig om uw API logingegevens te bewaren." #: ../../website/optimize/google_analytics_dashboard.rst:25 msgid "Enable the API." @@ -112,7 +118,7 @@ msgstr "Schakel de API in." #: ../../website/optimize/google_analytics_dashboard.rst:30 msgid "Create credentials to use in Odoo." -msgstr "" +msgstr "Maak inloggegevens aan om te gebruiken in Odoo." #: ../../website/optimize/google_analytics_dashboard.rst:35 msgid "" diff --git a/locale/ru/LC_MESSAGES/accounting.po b/locale/ru/LC_MESSAGES/accounting.po index bf2a1fc9b..5c29a86a5 100644 --- a/locale/ru/LC_MESSAGES/accounting.po +++ b/locale/ru/LC_MESSAGES/accounting.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Sergey Vilizhanin , 2017\n" +"Last-Translator: Эдуард Манятовский , 2017\n" "Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3034,7 +3034,7 @@ msgstr "" #: ../../accounting/others/analytic/usage.rst:74 #: ../../accounting/others/analytic/usage.rst:84 msgid "Marketing" -msgstr "" +msgstr "Маркетинг" #: ../../accounting/others/analytic/usage.rst:74 #: ../../accounting/others/analytic/usage.rst:80 diff --git a/locale/ru/LC_MESSAGES/website.po b/locale/ru/LC_MESSAGES/website.po index 2cce4b6e8..90e9fd7d5 100644 --- a/locale/ru/LC_MESSAGES/website.po +++ b/locale/ru/LC_MESSAGES/website.po @@ -10,6 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Эдуард Манятовский , 2017\n" "Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: ../../website.rst:5 msgid "Website" -msgstr "" +msgstr "Веб-сайт" #: ../../website/optimize.rst:3 msgid "Optimize" diff --git a/locale/tr/LC_MESSAGES/accounting.po b/locale/tr/LC_MESSAGES/accounting.po index 6b791f539..805ddf136 100644 --- a/locale/tr/LC_MESSAGES/accounting.po +++ b/locale/tr/LC_MESSAGES/accounting.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-07 09:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Ali Zeynel AĞCA , 2017\n" +"Last-Translator: Levent Karakaş , 2017\n" "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1689,10 +1689,12 @@ msgid "" "Check this box if this journal define a payment method that can be used in a" " point of sale." msgstr "" +"Bu yevmiye satış noktasında ödeme yöntemi olarak kullanılacaksa bu kutuyu " +"işaretleyiniz." #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Amount Authorized Difference" -msgstr "" +msgstr "İzin Verilen Fark Tutarı" #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" @@ -1701,6 +1703,10 @@ msgid "" "this maximum is reached, the user will have an error message at the closing " "of his session saying that he needs to contact his manager." msgstr "" +"Bu alan oturum kapatılırken satış noktası yöneticisi olmayanlar için bitiş " +"bakiyesi ile teorik nakit arasında izin verilen en fazla farktır. Eğer bu " +"değer aşılırsa kullanıcı oturumu kapatırken yöneticisiyle iletişime geçmesi " +"gerektiğini söyleyen bir hata mesajı alacaktır." #: ../../accounting/bank/setup/manage_cash_register.rst:25 msgid "Usage" @@ -3405,7 +3411,7 @@ msgstr "" #: ../../accounting/others/configuration/account_type.rst:29 msgid "Payable" -msgstr "" +msgstr "Borç" #: ../../accounting/others/configuration/account_type.rst:31 msgid "Bank and Cash" diff --git a/locale/tr/LC_MESSAGES/inventory.po b/locale/tr/LC_MESSAGES/inventory.po index bf4ada2d7..2d42b6640 100644 --- a/locale/tr/LC_MESSAGES/inventory.po +++ b/locale/tr/LC_MESSAGES/inventory.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-05-16 15:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Güven YILMAZ , 2017\n" +"Last-Translator: Levent Karakaş , 2017\n" "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -769,6 +769,7 @@ msgid "" "The procurement quantity will be rounded up to this multiple. If it is 0, " "the exact quantity will be used." msgstr "" +"Tedarik miktarı bu çoklu sayıya yuvarlanacak. 0 ise, tam miktar kullanılır." #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "Lead Time" @@ -4300,7 +4301,7 @@ msgstr "" #: ../../inventory/overview/concepts/double-entry.rst:252 msgid "Picking" -msgstr "" +msgstr "Toplama Listesi" #: ../../inventory/overview/concepts/double-entry.rst:253 msgid "Packing" diff --git a/locale/tr/LC_MESSAGES/point_of_sale.po b/locale/tr/LC_MESSAGES/point_of_sale.po index 55396a410..f0359c3d0 100644 --- a/locale/tr/LC_MESSAGES/point_of_sale.po +++ b/locale/tr/LC_MESSAGES/point_of_sale.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Güven YILMAZ , 2017\n" +"Last-Translator: Levent Karakaş , 2017\n" "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1906,25 +1906,27 @@ msgstr "" #: ../../point_of_sale/overview/start.rst:0 msgid "Accounting journal used to post sales entries." -msgstr "" +msgstr "Satış fişleri için kullanılacak muhasebe yevmiyesi" #: ../../point_of_sale/overview/start.rst:0 msgid "Invoice Journal" -msgstr "" +msgstr "Fatura Yevmiyesi" #: ../../point_of_sale/overview/start.rst:0 msgid "Accounting journal used to create invoices." -msgstr "" +msgstr "Faturalar oluşurken kullanılacak muhasebe yevmiyesi" #: ../../point_of_sale/overview/start.rst:0 msgid "Group Journal Items" -msgstr "" +msgstr "Yevmiye Kalemlerini Grupla" #: ../../point_of_sale/overview/start.rst:0 msgid "" "Check this if you want to group the Journal Items by Product while closing a" " Session" msgstr "" +"Bir Oturum kapatırken yevmiye öğelerini ürüne göre gruplandırmak " +"istiyorsanız bunu işaretleyiniz" #: ../../point_of_sale/overview/start.rst:0 msgid "Barcodes" @@ -1935,6 +1937,8 @@ msgid "" "Defines what kind of barcodes are available and how they are assigned to " "products, customers and cashiers" msgstr "" +"Hangi barkodların kullanılabileceğini ve ürün, müşteri ve kasiyerlere nasıl " +"ilişkilendirieceğini tanımlar" #: ../../point_of_sale/overview/start.rst:0 msgid "Order IDs Sequence" @@ -1960,7 +1964,7 @@ msgstr "" #: ../../point_of_sale/overview/start.rst:0 msgid "Enables an integrated Virtual Keyboard" -msgstr "" +msgstr "Entegre Sanal Klavye Etkinleştirir" #: ../../point_of_sale/overview/start.rst:0 msgid "Invoicing" @@ -1968,7 +1972,7 @@ msgstr "" #: ../../point_of_sale/overview/start.rst:0 msgid "Enables invoice generation from the Point of Sale" -msgstr "" +msgstr "Satış Noktasında fatura oluşturmayı etkinleştir" #: ../../point_of_sale/overview/start.rst:0 msgid "Prefill Cash Payment" @@ -1979,16 +1983,20 @@ msgid "" "The payment input will behave similarily to bank payment input, and will be " "prefilled with the exact due amount" msgstr "" +"Ödeme girişi banka ödeme girişine benzer davranır ve geri ödenecek tutar " +"otomatik doldurulur" #: ../../point_of_sale/overview/start.rst:0 msgid "Start Category" -msgstr "" +msgstr "Başlangıç Kategorisi" #: ../../point_of_sale/overview/start.rst:0 msgid "" "The point of sale will display this product category by default. If no " "category is specified, all available products will be shown" msgstr "" +"Varsayılan olarak bu ürün kategorisi gösterilecek. Eğer ürün kategorisi " +"seçilmemişse tüm ürünler gösterilecektir." #: ../../point_of_sale/overview/start.rst:0 msgid "Tip Product" @@ -1999,6 +2007,8 @@ msgid "" "The product used to encode the customer tip. Leave empty if you do not " "accept tips." msgstr "" +"Müşteri Tarafından bahşiş bırakıldığında kullanılmak için açılmış bir " +"üründür. Eğer kasada bahşiş kabul etmek istemiyorsanız boş bırakın." #: ../../point_of_sale/overview/start.rst:0 msgid "Include Taxes in Prices" @@ -2009,6 +2019,8 @@ msgid "" "The displayed prices will always include all taxes, even if the taxes have " "been setup differently" msgstr "" +"Gösterilen fiyatlar vergiler farklı ayarlanmış olsa bile her zaman KDV dahil" +" fiyat olacaktır" #: ../../point_of_sale/overview/start.rst:0 msgid "Large Scrollbars" @@ -2024,7 +2036,7 @@ msgstr "" #: ../../point_of_sale/overview/start.rst:0 msgid "The product categories will be displayed with pictures." -msgstr "" +msgstr "Ürün kategorileri görsellerle beraber görünecektir." #: ../../point_of_sale/overview/start.rst:0 msgid "IP Address" @@ -2035,6 +2047,8 @@ msgid "" "The hostname or ip address of the hardware proxy, Will be autodetected if " "left empty" msgstr "" +"Donanım proxy veya sunucu adı veya IP adresi. Boş bırakılırsa otomatik " +"algılanacaktır" #: ../../point_of_sale/overview/start.rst:0 msgid "Barcode Scanner" @@ -2050,7 +2064,7 @@ msgstr "" #: ../../point_of_sale/overview/start.rst:0 msgid "Enables Electronic Scale integration" -msgstr "" +msgstr "Elektronik Tartı Entegrasyonu Etkinleştirir" #: ../../point_of_sale/overview/start.rst:0 msgid "Cashdrawer" @@ -2058,7 +2072,7 @@ msgstr "" #: ../../point_of_sale/overview/start.rst:0 msgid "Automatically open the cashdrawer" -msgstr "" +msgstr "Nakit kasasını otomatik aç" #: ../../point_of_sale/overview/start.rst:0 msgid "Receipt Printer" @@ -2074,7 +2088,7 @@ msgstr "" #: ../../point_of_sale/overview/start.rst:0 msgid "The receipt will automatically be printed at the end of each order" -msgstr "" +msgstr "Sipariş sonunda fiş otomatik yazdırılacaktır." #: ../../point_of_sale/overview/start.rst:0 msgid "Skip Receipt Screen" From 892de251e3c83d18d1763cb9118e63614f3c045b Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 12 Jul 2017 17:42:04 +0200 Subject: [PATCH 3/5] [IMP] legal: add Odoo Online terms and SLA --- legal/terms/online.rst | 605 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 605 insertions(+) diff --git a/legal/terms/online.rst b/legal/terms/online.rst index 2e9c62bfd..13db514a4 100644 --- a/legal/terms/online.rst +++ b/legal/terms/online.rst @@ -2,4 +2,609 @@ Odoo Online Terms & Conditions ============================== +.. note:: Version 1 - Last revision: July 12, 2017. +By subscribing to the Odoo Online services (the "Services") provided by Odoo SA and its +affiliates (collectively, "Odoo SA") in relation with Odoo Enterprise Edition or +Odoo Community Edition (the "Software"), you (the "Customer") are agreeing to be bound by the +following terms and conditions (the "Agreement"). + +.. _term: + +1 Term of the Agreement +======================= + +The duration of this Agreement (the “Term”) shall be minimally one month and as +specified in writing at the signature of this Agreement, beginning on the date +of the signature. It is automatically renewed for an equal Term, unless either +party provides a written notice of termination minimum 30 days before the end +of the Term by registered mail to the other party. + + +.. _definitions: + +2 Definitions +============= + +User + Any active user account with access to the Software in creation and/or edition mode. + Deactivated user accounts and accounts used by external people (or systems) who only have + limited access to the Software through the portal facilities (known as "portal Users") are not + counted as Users. + +Bug + Is considered a Bug any failure of the Software that results in a complete stop, error + traceback or security breach, and is not directly caused by a defective installation or + configuration. Non-compliance with specifications or requirements will be considered as Bugs at + the discretion of Odoo SA (typically, when the Software does not produce the results or + performance it was designed to produce, or when a country-specific feature does not meet legal + accounting requirements anymore). + +.. _enterprise_access: + +3 Access to source code +======================= + +For the duration of this Agreement, Odoo SA gives the Customer a non-exclusive, +non-transferable license to use (execute, modify, execute after modification) +the Odoo software, under the terms set forth in :ref:`appendix_a`. + +The Customer agrees to take all necessary measures to guarantee the unmodified +execution of the part of the Software that verifies the validity of the usage +and collects statistics for that purpose, including but not limited to the +running of an instance, the applications installed and the number of Users. + +Odoo SA commits not to disclose individual or named figures to third parties without the consent +of the Customer, and to deal with all collected data in compliance with its official Privacy +Policy, as published on `Odoo SA's website `_. + +Upon expiration or termination of this Agreement, this license is revoked immediately and the +Customer agrees to stop using the software. + +Should the Customer breach the terms of this section, the Customer agrees to +pay Odoo SA an extra fee equal to 300% of the applicable list price for the +actual number of Users for one year. + + +.. _services: + +4 Service Level +=============== + +4.1 Bug Fixing Service +---------------------- + +For the duration of this Agreement, Odoo SA commits to making all reasonable efforts to remedy any +Bug of the Software submitted by the Customer through the appropriate channel (typically, Odoo SA's +service desk email address or website form), and to start handling such Customer submissions +within 2 business days. + +The Customer understands that Bugs caused by a modification or extension that is not part of the +official Software will not be covered by this service. + +Both parties acknowledge that as specified in the license of the Software and in the :ref:`liability` +section of this Agreement, Odoo SA cannot be held liable for Bugs in the Software. + +4.2 Support Service +------------------- + +Support Scope ++++++++++++++ + +For the duration of this Agreement, Odoo SA offer a support service, with an +unlimited number of tickets for bugs and functional questions: how to use and +configure Odoo for your specific needs. + +This support service does not include support to customize Odoo, develop new +modules, or perform specific actions on your own database on your behalf. (e.g. +recording data for you) Those services can be offered in extra through our +Success Pack service offer. + +Support Service ++++++++++++++++ + +Support issues should be submited online on https://odoo.com/help In case of +emergency, you can call our support teams directly for a real time answer. + +Our support teams are split across 3 continents in India (Ahmedabad), Belgium +(Brussels) and United States (San Francisco) in order to cover 20 hours per +open day. (monday to friday, excluding legal holidays in the respective +countries) + +No guarantees are provided on the time to qualify or close a support ticket, +it's based on our best efforts. But 95% of the tickets are qualified within 2 +open days, and 90% of the critical bugs (when a user can not work on the system +anymore) are processed within 2 hours. + +The Odoo portal allows you to track you support tickets. + + +4.3 Service Availability +------------------------ + +Customer databases are hosted in the closest Odoo data center (EMEA: France, +Americas: Canada, APAC: Hong Kong or Taiwan). Each customer instance is replicated +in real-time on a hot-standby system located in the same data center. + +We work with different hosting providers worldwide (and we can switch at anytime), +but they always deliver at least 99.9% uptime guarantee. These metrics refer to +the availability of the platform itself for all customers. Individual databases +may be temporarily unavailable for specific reasons, typically related to the +customer's actions, customizations or upgrades. + +Our data centers are Tier-III certified or equivalent, with N+1 redundancy for +power, network and cooling. + +4.4 Backups & Recovery +---------------------- + +Every database has 14 full snapshot backups for up to 3 months: 1/day for 7 +days, 1/week for 4 weeks, 1/month for 3 months. Every backup is replicated on +at least 3 different machines in different data centers. + +Users can download manual backups of their live data at any time. + +For a permanent disaster impacting one server only, our Disaster Recovery Plan +has the following metrics: +- RPO (Recovery Point Objective) = 5 minutes, i.e. can lose maximum 5 minutes of work +- RTO (Recovery Time Objective) = 30 minutes, i.e the service will be back online after maximum 30 minutes (Standby promotion time + DNS propagation time included) + +For data center disasters (one entire data center is completely and permanently +down), Disaster Recovery Plan has these metrics: +- RPO (Recovery Point Objective) = 24h, i.e. you can lose maximum 24h of work if the data cannot be recovered and we need to restore the last daily backup +- RTO (Recovery Time Objective) = 24h, i.e. the service will be restored from the backup within 24 hours in a different data center + +4.5 Security +------------ + +Database Security ++++++++++++++++++ + +Customer data is stored in a dedicated database - no sharing of data between +clients. Data access control rules implement complete isolation between customer +databases running on the same cluster, no access is possible from one database +to another. + +Password Security ++++++++++++++++++ + +Customer passwords are protected with industry-standard PBKDF2+SHA512 +encryption (salted + stretched for thousands of rounds). + +Odoo staff does not have access to your password, and cannot retrieve it for +you, the only option if you lose it is to reset it Login credentials are always +transmitted securely over HTTPS. + +System Security ++++++++++++++++ + +All web connections to client instances are protected with state-of-the-art +256-bit SSL encryption. All our SSL certificates use robust 2048-bit modulus +with full SHA-2 certificates chains. Our servers are kept under a strict +security watch, and always patched against the latest SSL vulnerabilities, +enjoying Grade A SSL ratings at all times. + +All Odoo online servers are running hardened Linux distributions with +up-to-date security patches. Installations are ad-hoc and minimal to limit the +number of services that could contain vulnerabilities (no PHP/MySQL stack for +example) + +Only a few trusted Odoo engineers have clearance to remotely manage the servers +- and access is only possible using SSH key pairs (password authentication +disallowed) + +Firewalls and intrusion counter-measures help prevent unauthorized access. +Automatic Distributed Denial of Service (DDoS) mitigation is implemented in EU +and US data centers, and coming soon in Asia. + +Staff Access +++++++++++++ + +Odoo helpdesk staff may sign into your account to access settings related to +your support issue. For this they use their own special staff credentials, not +your password (which they have no way to know). + +This special staff access improves efficiency and security: they can +immediately reproduce the problem you are seeing, you never need to share your +password, and we can audit and control staff actions separately! + +Our Helpdesk staff strives to respect your privacy as much as possible, and +only access files and settings needed to diagnose and resolve your issue + +Physical Security ++++++++++++++++++ + +The Odoo Online servers are hosted in several data centers worldwide, that must +all satisfy with our minimum physical security criterions: +- Physical access to the data center area where Odoo servers are located is restricted to data center technicians only +- Security cameras are monitoring the data center locations + +Credit Cards Safety ++++++++++++++++++++ + +When you sign up for a paid Odoo Online subscription, we do not store your +credit card information. Your credit card information is only transmitted +securely between you and our PCI-Compliant payment acquirers: Ingenico and +Paypal (even for recurring subscriptions) + +Software Security ++++++++++++++++++ + +The codebase of Odoo is laregely distributed and, thus, is continuously under +examination by Odoo users and contributors worldwide. Community bug reports are +therefore one important source of feedback regarding security. We encourage +developers to audit the code and report security issues. + +Odoo SA commits to sending a "Security Advisory" to the Customer for any +security Bug that are discovered in the Software, at least 2 weeks before +making the Security Advisory public, unless the Bug has already been disclosed +publicly by a third party. + +Security Advisories include a complete description of the Bug, its cause, its +possible impacts on the Customer's systems, and the corresponding remedy for +each Covered Version. + +The Customer understands that the Bug and the information in the Security +Advisory must be treated are Confidential Information as described in +:ref:`confidentiality` during the embargo period prior to the public +disclosure. + +The Odoo R&D processes have code review steps that include security aspects, +for new and contributed pieces of code. Odoo is designed in a way that prevents +introducing most common security vulnerabilities: + +- SQL injections are prevented by the use of a higher-level API that does not require manual SQL queries +- XSS attacks are prevented by the use of a high-level templating system that automatically escapes injected data +- The framework prevents RPC access to private methods, making it harder to introduce exploitable vulnerabilities +- See also the OWASP Top Vulnerabilities section to see how Odoo is designed from the ground up to prevent such vulnerabilities from appearing. + +Odoo is regularly audited by independent companies that are hired by our +customers and prospects to perform audits and penetration tests. The Odoo +Security Team receives the results and takes appropriate corrective measures +whenever it is necessary. We can't however disclose any of those results, +because they are confidential and belong to the commissioners. + +Odoo also has a very active community of independent security researchers, who +continuously monitor the source code and work with us to improve and harden the +security of Odoo. Our Security Program is described on our Responsible +Disclosure page: https://www.odoo.com/page/responsible-disclosure. + +.. _upgrade: + +4.6 Upgrade Services +-------------------- + +.. _upgrade_odoo: + +Upgrade Service for the Software +++++++++++++++++++++++++++++++++ + +For the duration of this Agreement, the Customer can submit upgrade requests, +in order to convert a database of the Software from one Covered Version of the +Software to a more recent Covered Version (the "Target Version"). + +This service provided through an automated platform in order to allow the Customer to perform +unattended upgrades once a previous version of the Customer's database has been successfully +upgraded for a Covered Version. +The Customer may submit successive upgrade requests for a database, and agrees to submit at least +1 upgrade request for testing purposes before submitting the final upgrade request. + +It is the sole responsibility of the Customer to verify and validate the upgraded database in order +to detect Bugs, to analyze the impact of changes and new features implemented in the Target Version, +and to convert and adapt for the Target Version any third-party extensions of the Software that +were installed in the database before the upgrade (except where applicable as foreseen in section +:ref:`upgrade_extra`). + +The Customer may submit multiple upgrade requests for a database, until an +acceptable result is achieved. + +.. _upgrade_extra: + +Upgrade Service for customizations +++++++++++++++++++++++++++++++++++ + +For the duration of this Agreement, the Customer may request optional upgrade +services for third-party extension modules of the Software, in addition to the +regular Upgrade Services. + +This optional service is subject to additional fees +(as described in charges_) and includes the technical adaptation of third-party +modules installed in the Customer's database and their corresponding data in +order to be compatible with the Target Version. The Customer will receive an +upgraded version of all installed third-party modules along with the upgraded +database. + +.. _charges: + +5 Charges and Fees +================== + +.. _charges_standard: + +5.1 Standard charges +-------------------- + +The standard charges for the Odoo Online subscription, the Bug Fixing Service, Security Advisories +Service and the Upgrade Service are based on the number of Users and applications used by +the Customer, and specified in writing at the signature of the Agreement. + +When during the Term, the Customer has more Users or applications than +specified at the time of signature of this Agreement, the Customer agrees to +pay an extra fee equivalent to the applicable list price (at the beginning of +the Term) for the additional Users and applications, for the remainder of the +Term. + +.. _charges_renewal: + +5.2 Renewal charges +------------------- + +Upon renewal as covered in section :ref:`term`, if the per-User charges applied +during the previous Term are lower than the most current applicable per-User +list price, the per-User charges will increase by up to 7% per year. + + +.. _charges_thirdparty: + +5.3 Charges for custom features or third-party modules +------------------------------------------------------ + +.. FIXME: should we really fix the price in the contract? + +The additional charge for the Upgrade, Support and Bugfix Service for custom +modules developed by Odoo SA is 4 EUR (€) / month per hour of development of +these custom features. + +In case the modules are not developed by Odoo SA, Odoo SA reserves the right to +reject an upgrade request for third-party modules under the above conditions if +the quality of the source code of those modules is too low, or if these modules +constitute an interface with third-party software or systems. The upgrade of +such modules will subject to a separate offer, outside of this Agreement. + +.. _taxes: + +5.4 Taxes +--------- + +.. FIXME : extra section, not sure we need it? + +All fees and charges are exclusive of all applicable federal, provincial, state, local or other +governmental taxes, fees or charges (collectively, "Taxes"). The Customer is responsible for paying +all Taxes associated with purchases made by the Customer under this Agreement, except when Odoo SA +is legally obliged to pay or collect Taxes for which the Customer is responsible. + + +.. _conditions: + +6 Conditions of Services +======================== + +6.1 Customer Obligations +------------------------ + +.. FIXME: removed the clause about + +The Customer agrees to: + +- pay Odoo SA any applicable charges for the Services of the present Agreement, in accordance with + the payment conditions specified in the corresponding invoice ; +- appoint 1 dedicated Customer contact person for the entire duration of the Agreement; + + +.. _no_soliciting: + +6.2 No Soliciting or Hiring +--------------------------- + +Except where the other party gives its consent in writing, each party, its affiliates and +representatives agree not to solicit or offer employment to any employee of the other party who is +involved in performing or using the Services under this Agreement, for the duration of the Agreement +and for a period of 12 months from the date of termination or expiration of this Agreement. +In case of any breach of the conditions of this section that leads to the termination of said +employee toward that end, the breaching party agrees to pay to the other party an amount of +EUR (€) 30 000.00 (thirty thousand euros). + + +.. _publicity: + +6.3 Publicity +------------- + +Except where notified otherwise in writing, each party grants the other a non-transferable, +non-exclusive, royalty free, worldwide license to reproduce and display the other party’s name, +logos and trademarks, solely for the purpose of referring to the other party as a customer or +supplier, on websites, press releases and other marketing materials. + + +.. _confidentiality: + +6.4 Confidentiality +------------------- + +Definition of "Confidential Information": + All information disclosed by a party (the "Disclosing Party") to the other party + (the "Receiving Party"), whether orally or in writing, that is designated as confidential or + that reasonably should be understood to be confidential given the nature of the information and + the circumstances of disclosure. In particular any information related to the business, + affairs, products, developments, trade secrets, know-how, personnel, customers and suppliers of + either party should be regarded as confidential. + +For all Confidential Information received during the Term of this Agreement, the Receiving Party +will use the same degree of care that it uses to protect the confidentiality of its own similar +Confidential Information, but not less than reasonable care. + +The Receiving Party may disclose Confidential Information of the Disclosing Party to the extent +compelled by law to do so, provided the Receiving Party gives the Disclosing Party prior notice of +the compelled disclosure, to the extent permitted by law. + +.. _termination: + +6.5 Termination +--------------- + +In the event that either Party fails to fulfill any of its obligations arising herein, and if such +breach has not been remedied within 30 calendar days from the written notice of such +breach, this Agreement may be terminated immediately by the non-breaching Party. + +Further, Odoo SA may terminate the Agreement immediately in the event the Customer fails to pay +the applicable fees for the Services within the due date specified on the corresponding invoice. + +Surviving Provisions: + The sections ":ref:`confidentiality`”, “:ref:`disclaimers`”, + “:ref:`liability`”, and “:ref:`general_provisions`” will survive any termination or expiration of + this Agreement. + + +.. _warranties_disclaimers: + +7 Warranties, Disclaimers, Liability +==================================== + +.. _warranties: + +7.1 Warranties +-------------- + +.. industry-standard warranties regarding our Services while Agreement in effect + +For the duration of this Agreement, Odoo SA commits to using commercially reasonable efforts to +execute the Services in accordance with the generally accepted industry standards provided that: + +- the Customer’s computing systems are in good operational order and the Software is installed in a + suitable operating environment; +- the Customer provides adequate troubleshooting information and access so that Odoo SA can + identify, reproduce and address problems; +- all amounts due to Odoo SA have been paid. + +The Customer's sole and exclusive remedy and Odoo SA's only obligation for any breach of this warranty +is for Odoo SA to resume the execution of the Services at no additional charge. + +.. _disclaimers: + +7.2 Disclaimers +--------------- + +.. no other warranties than explicitly provided + +Except as expressly provided herein, neither party makes any warranty of any kind, whether express, +implied, statutory or otherwise, and each party specifically disclaims all implied warranties, +including any implied warranty of merchantability, fitness for a particular purpose or +non-infringement, to the maximum extent permitted by applicable law. + +Odoo SA does not warrant that the Software complies with any local or international law or regulations. + +.. _liability: + +7.3 Limitation of Liability +--------------------------- + +To the maximum extent permitted by law, the aggregate liability of each party together with its +affiliates arising out of or related to this Agreement will not exceed 50% of the total amount +paid by the Customer under this Agreement during the 12 months immediately preceding the date of the event +giving rise to such claim. Multiple claims shall not enlarge this limitation. + +In no event will either party or its affiliates be liable for any indirect, special, exemplary, +incidental or consequential damages of any kind, including but not limited to loss of revenue, +profits, savings, loss of business or other financial loss, costs of standstill or delay, lost or +corrupted data, arising out of or in connection with this Agreement regardless of the form of +action, whether in contract, tort (including strict negligence) or any other legal or equitable +theory, even if a party or its affiliates have been advised of the possibility of such damages, +or if a party or its affiliates' remedy otherwise fails of its essential purpose. + +.. _force_majeure: + +7.4 Force Majeure +----------------- + +Neither party shall be liable to the other party for the delay in any performance or failure to +render any performance under this Agreement when such failure or delay is caused by governmental +regulations, fire, strike, war, flood, accident, epidemic, embargo, appropriation of plant or +product in whole or in part by any government or public authority, or any other cause or causes, +whether of like or different nature, beyond the reasonable control of such party as long as such +cause or causes exist. + + +.. _general_provisions: + +8 General Provisions +==================== + +.. _governing_law: + +8.1 Governing Law +----------------- + +Both parties agree that the laws of Belgium will apply, should any dispute arise out of or +in connection with this Agreement, without regard to choice or conflict of law principles. +To the extent that any lawsuit or court proceeding is permitted hereinabove, both +parties agree to submit to the sole jurisdiction of the Nivelles (Belgium) court for the purpose of +litigating all disputes. + +.. _severability: + +8.2 Severability +---------------- + +In case any one or more of the provisions of this Agreement or any application thereof shall be +invalid, illegal or unenforceable in any respect, the validity, legality and enforceability of the +remaining provisions of this Agreement and any application thereof shall be in no way thereby +affected or impaired. Both parties undertake to replace any invalid, illegal or +unenforceable provision of this Agreement by a valid provision having the same effects and +objectives. + + +.. _appendix_a: + +9 Appendix A: Odoo Enterprise Edition License +============================================= + +.. only:: latex + + Odoo Enterprise Edition is licensed under the Odoo Enterprise Edition License v1.0, + defined as follows: + + .. include:: ../licenses/enterprise_license.txt + :literal: + +.. only:: html + + See :ref:`odoo_enterprise_license`. + + + + + +.. FIXME: move this is to appendix or somewhere else? + +.. only:: disabled + + Agreement Registration + ====================== + + Customer contact information + ---------------------------- + + Company name: + Company address: + VAT number (if applicable): + Contact name: + Email: + Phone: + + Technical contact information (can be an Odoo partner): + ------------------------------------------------------- + Company name: + Contact name: + Email: + Phone: + + + By signing this Agreement I confirm I am a legal representative of Customer as stated in the + resent section and approve all provisions and conditions of the present Agreement: + + For and on behalf of (company name): + Last name, first name: + Title: + Date: + + Signature: From 3930a62b1b9ca3369c639d50a800ff72af09bb55 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 13 Jul 2017 09:45:11 +0200 Subject: [PATCH 4/5] [IMP] legal: cost of 4/5 USD --- legal/terms/online.rst | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/legal/terms/online.rst b/legal/terms/online.rst index 13db514a4..952fc5b99 100644 --- a/legal/terms/online.rst +++ b/legal/terms/online.rst @@ -96,9 +96,9 @@ unlimited number of tickets for bugs and functional questions: how to use and configure Odoo for your specific needs. This support service does not include support to customize Odoo, develop new -modules, or perform specific actions on your own database on your behalf. (e.g. -recording data for you) Those services can be offered in extra through our -Success Pack service offer. +modules, or perform specific actions on your database on your behalf. (e.g. +recording data, or configuring the system for you) Those services can be +offered in extra through our Success Pack service offer. Support Service +++++++++++++++ @@ -352,8 +352,10 @@ list price, the per-User charges will increase by up to 7% per year. .. FIXME: should we really fix the price in the contract? The additional charge for the Upgrade, Support and Bugfix Service for custom -modules developed by Odoo SA is 4 EUR (€) / month per hour of development of -these custom features. +modules developed by Odoo SA is a recurring price depending on the number of +hours done to develop these custom features: +- 4 EUR / month per hour of development in European contries +- 5 USD / month per hour of development in other countries In case the modules are not developed by Odoo SA, Odoo SA reserves the right to reject an upgrade request for third-party modules under the above conditions if From b972ab1e7c9c6236eed9b1730743429c14ca7533 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 13 Jul 2017 11:29:53 +0200 Subject: [PATCH 5/5] [IMP] add online terms of sale to legal TOC --- legal.rst | 2 ++ legal/terms/online.rst | 2 ++ 2 files changed, 4 insertions(+) diff --git a/legal.rst b/legal.rst index fffe103d0..6baa134c2 100644 --- a/legal.rst +++ b/legal.rst @@ -50,6 +50,8 @@ Terms and Conditions - :ref:`terms_of_sale` |nbsp| |nbsp| |download_terms_of_sale| - :ref:`terms_of_sale_fr` |nbsp| |nbsp| |download_terms_of_sale_fr| +- :ref:`online_terms_of_sale` + .. - :ref:`partnership_agreement` |nbsp| |nbsp| |download_partnership| diff --git a/legal/terms/online.rst b/legal/terms/online.rst index 952fc5b99..634fdc605 100644 --- a/legal/terms/online.rst +++ b/legal/terms/online.rst @@ -1,3 +1,5 @@ +.. _online_terms_of_sale: + ============================== Odoo Online Terms & Conditions ==============================