Skip to content

Commit 44a50ed

Browse files
committedJun 7, 2017
[I18N] export source terms
1 parent 379877f commit 44a50ed

13 files changed

+226
-84
lines changed
 

‎locale/sources/accounting.pot

+88-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Odoo Business 10.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2017-05-09 14:24+0200\n"
11+
"POT-Creation-Date: 2017-06-07 09:30+0200\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2160,13 +2160,19 @@ msgstr ""
21602160

21612161
#: ../../accounting/others/analytic/usage.rst:64
21622162
#: ../../accounting/others/analytic/usage.rst:157
2163+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:48
2164+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:62
2165+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:74
21632166
#: ../../accounting/overview/process_overview/customer_invoice.rst:107
21642167
#: ../../accounting/overview/process_overview/customer_invoice.rst:128
21652168
msgid "**Debit**"
21662169
msgstr ""
21672170

21682171
#: ../../accounting/others/analytic/usage.rst:64
21692172
#: ../../accounting/others/analytic/usage.rst:157
2173+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:48
2174+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:62
2175+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:74
21702176
#: ../../accounting/overview/process_overview/customer_invoice.rst:107
21712177
#: ../../accounting/overview/process_overview/customer_invoice.rst:128
21722178
msgid "**Credit**"
@@ -3875,6 +3881,86 @@ msgstr ""
38753881
msgid ":doc:`B2B_B2C`"
38763882
msgstr ""
38773883

3884+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:3
3885+
msgid "How to manage cash basis taxes"
3886+
msgstr ""
3887+
3888+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:5
3889+
msgid "The cash basis taxes are due when the payment has been done and not at the validation of the invoice (as it is the case with standard taxes). Reporting your income and expenses to the administration based on the cash basis method is legal in some countries and under some conditions."
3890+
msgstr ""
3891+
3892+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:10
3893+
msgid "Example : You sell a product in the 1st quarter of your fiscal year and receive the payment the 2nd quarter of your fiscal year. Based on the cash basis method, the tax you have to pay to the administration is due for the 2nd quarter."
3894+
msgstr ""
3895+
3896+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:16
3897+
msgid "How to configure cash basis taxes ?"
3898+
msgstr ""
3899+
3900+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:18
3901+
msgid "You first have to activate the setting in :menuselection:`Accounting --> Configuration --> Settings --> Allow Tax Cash Basis`. You will be asked to define the Tax Cash Basis Journal."
3902+
msgstr ""
3903+
3904+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:27
3905+
msgid "Once this is done, you can configure your taxes in :menuselection:`Accounting --> Configuration --> Taxes`. You can open a tax and in the *Advanced Options* tab you will see the checkbox *Use Cash Basis*. You will then have to define the *Tax Received Account*."
3906+
msgstr ""
3907+
3908+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:39
3909+
msgid "What is the impact of cash basis taxes in my accounting ?"
3910+
msgstr ""
3911+
3912+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:41
3913+
msgid "Let’s take an example. You make a sale of $100 with a 15% cash basis tax. When you validate the customer invoice, the following entry is created in your accounting:"
3914+
msgstr ""
3915+
3916+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:46
3917+
msgid "Customer Invoices Journal"
3918+
msgstr ""
3919+
3920+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:50
3921+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:66
3922+
msgid "Receivables $115"
3923+
msgstr ""
3924+
3925+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:52
3926+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:76
3927+
msgid "Tax Account $15"
3928+
msgstr ""
3929+
3930+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:54
3931+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:80
3932+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:82
3933+
msgid "Income Account $100"
3934+
msgstr ""
3935+
3936+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:57
3937+
msgid "A few days later, you receive the payment:"
3938+
msgstr ""
3939+
3940+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:60
3941+
msgid "Bank Journal"
3942+
msgstr ""
3943+
3944+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:64
3945+
msgid "Bank $115"
3946+
msgstr ""
3947+
3948+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:69
3949+
msgid "When you reconcile the invoice and the payment, this entry is generated:"
3950+
msgstr ""
3951+
3952+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:72
3953+
msgid "Tax Cash Basis Journal"
3954+
msgstr ""
3955+
3956+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:78
3957+
msgid "Tax Received Account $15"
3958+
msgstr ""
3959+
3960+
#: ../../accounting/others/taxes/cash_basis_taxes.rst:86
3961+
msgid "The two journal items created in the Income Account are neutral but they are needed to insure correct tax reports in Odoo."
3962+
msgstr ""
3963+
38783964
#: ../../accounting/others/taxes/create.rst:3
38793965
msgid "How to create new taxes"
38803966
msgstr ""
@@ -7265,7 +7351,7 @@ msgid "**Default credit account**: Credit cards"
72657351
msgstr ""
72667352

72677353
#: ../../accounting/receivables/customer_payments/credit_cards.rst:50
7268-
msgid "Once it's done, don't forget to set the \"Credit cards\" account as \"Allow Reconciliation\"."
7354+
msgid "The account type should be \"Credit Card\". Once it's done, don't forget to set the \"Credit cards\" account as \"Allow Reconciliation\"."
72697355
msgstr ""
72707356

72717357
#: ../../accounting/receivables/customer_payments/credit_cards.rst:57

‎locale/sources/applications.pot

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Odoo Business 9.0\n"
9+
"Project-Id-Version: Odoo Business 10.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2017-03-23 15:39+0100\n"
11+
"POT-Creation-Date: 2017-06-07 09:30+0200\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"

‎locale/sources/crm.pot

+56-20
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Odoo Business 9.0\n"
9+
"Project-Id-Version: Odoo Business 10.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2017-03-23 15:39+0100\n"
11+
"POT-Creation-Date: 2017-06-07 09:30+0200\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,35 +25,71 @@ msgid "Calendar"
2525
msgstr ""
2626

2727
#: ../../crm/calendar/google_calendar_credentials.rst:3
28-
msgid "How to synchronize your calendar with Google Calendar"
28+
msgid "How to synchronize your Odoo Calendar with Google Calendar"
2929
msgstr ""
3030

3131
#: ../../crm/calendar/google_calendar_credentials.rst:5
32-
msgid "Connect on your google account and go to `https://console.developers.google.com/ <https://console.developers.google.com/>`_."
32+
msgid "Odoo is perfectly integrated with Google Calendar so that you can see & manage your meetings from both platforms (updates go through both directions)."
3333
msgstr ""
3434

35-
#: ../../crm/calendar/google_calendar_credentials.rst:7
36-
msgid "Click on **Create a project...** and enter a project name and change your id if you want. Don't forget to accept the Terms of Services"
35+
#: ../../crm/calendar/google_calendar_credentials.rst:10
36+
msgid "Setup in Google"
3737
msgstr ""
3838

39-
#: ../../crm/calendar/google_calendar_credentials.rst:13
40-
msgid "In the menu on left side, select the sub menu APIs (from menu APIs and auth) and click on 'Calendar API'. Activate the Calendar API by clicking on the blue button 'Enable API'. When it's done, the Calendar API overview will be available"
39+
#: ../../crm/calendar/google_calendar_credentials.rst:11
40+
msgid "Go to `Google APIs platform <https://console.developers.google.com>`__ to generate Google Calendar API credentials. Log in with your Google account."
4141
msgstr ""
4242

43-
#: ../../crm/calendar/google_calendar_credentials.rst:26
44-
msgid "In the menu on left side, select the sub menu 'Credentials' (from menu APIs and auth) and click on button 'Create new Client ID'"
43+
#: ../../crm/calendar/google_calendar_credentials.rst:14
44+
msgid "Choose *Calendar API*."
4545
msgstr ""
4646

47-
#: ../../crm/calendar/google_calendar_credentials.rst:32
48-
msgid "Check that the Application type is set on 'Web Application', then click on 'Configure consent screen'. Specify an email address and a product name, then save."
47+
#: ../../crm/calendar/google_calendar_credentials.rst:19
48+
msgid "Create a new project and give it a name (e.g. Odoo). This project is needed to store your API credentials."
49+
msgstr ""
50+
51+
#: ../../crm/calendar/google_calendar_credentials.rst:25
52+
msgid "Enable the API."
53+
msgstr ""
54+
55+
#: ../../crm/calendar/google_calendar_credentials.rst:30
56+
msgid "Create credentials to use in Odoo."
57+
msgstr ""
58+
59+
#: ../../crm/calendar/google_calendar_credentials.rst:35
60+
msgid "Select *Web browser (Javascript)* as calling source and *User data* as kind of data."
4961
msgstr ""
5062

5163
#: ../../crm/calendar/google_calendar_credentials.rst:41
52-
msgid "You should now configure the allowed pages on which you will be redirected. To do it, you need to complete the field \"Authorized redirect URI\" and set as value (your own domain followed by '/google_account/authentication'): ==> http://mydomain.odoo.com/google_account/authentication You can now click on 'Create Client ID'"
64+
msgid "Then you can create a Client ID. Enter the name of the application (e.g. Odoo) and the allowed pages on which you will be redirected. The *Authorized JavaScript origin* is your Odoo's instance URL. The *Authorized redirect URI* is your Odoo's instance URL followed by '/google_account/authentication'."
65+
msgstr ""
66+
67+
#: ../../crm/calendar/google_calendar_credentials.rst:50
68+
msgid "Go through the Consent Screen step by entering a product name (e.g. Odoo). Feel free to check the customizations options but this is not mandatory. The Consent Screen will only show up when you enter the Client ID in Odoo for the first time."
69+
msgstr ""
70+
71+
#: ../../crm/calendar/google_calendar_credentials.rst:55
72+
msgid "Finally you are provided with your **Client ID**. Go to *Credentials* to get the **Client secret** as well. You will need both of them in Odoo."
5373
msgstr ""
5474

55-
#: ../../crm/calendar/google_calendar_credentials.rst:48
56-
msgid "Once done, you will have the both informations (Client ID and Client Secret) that you need to insert in the 2 fields below!"
75+
#: ../../crm/calendar/google_calendar_credentials.rst:62
76+
msgid "Setup in Odoo"
77+
msgstr ""
78+
79+
#: ../../crm/calendar/google_calendar_credentials.rst:64
80+
msgid "Install **Google Calendar** app."
81+
msgstr ""
82+
83+
#: ../../crm/calendar/google_calendar_credentials.rst:69
84+
msgid "Go to :menuselection:`Settings --> General Settings` and enter your credentials in Google Calendar option."
85+
msgstr ""
86+
87+
#: ../../crm/calendar/google_calendar_credentials.rst:75
88+
msgid "The setup is now ready. Open your Odoo Calendar and sync with Google. The first time you do it you are redirected to Google to authorize the connection. Once back in Odoo, click the sync button again. You can click it whenever you want to synchronize your calendar."
89+
msgstr ""
90+
91+
#: ../../crm/calendar/google_calendar_credentials.rst:83
92+
msgid "As of now you no longer have excuses to miss a meeting!"
5793
msgstr ""
5894

5995
#: ../../crm/leads.rst:3
@@ -230,22 +266,22 @@ msgid "Go to :menuselection:`Sales --> Leads` and click the **Create** button."
230266
msgstr ""
231267

232268
#: ../../crm/leads/generate/manual.rst:33
233-
msgid "From the contact form, provide all the details in your possession (contact name, email, phone, address, etc.) as well as some additional information in the **Internal notes** field. You can also link the lead to an existing company by editing the**Customer** field. Click on save and the contact will be visible as a lead in your pipeline ."
269+
msgid "From the contact form, provide all the details in your possession (contact name, email, phone, address, etc.) as well as some additional information in the **Internal notes** field."
234270
msgstr ""
235271

236-
#: ../../crm/leads/generate/manual.rst:41
272+
#: ../../crm/leads/generate/manual.rst:39
237273
msgid "your lead can be directly handed over to specific sales team and salesperson by clicking on **Convert to Opportunity** on the upper left corner of the screen."
238274
msgstr ""
239275

240-
#: ../../crm/leads/generate/manual.rst:45
276+
#: ../../crm/leads/generate/manual.rst:43
241277
msgid "Create a new opportunity"
242278
msgstr ""
243279

244-
#: ../../crm/leads/generate/manual.rst:47
280+
#: ../../crm/leads/generate/manual.rst:45
245281
msgid "You can also directly add a contact into a specific sales team without having to convert the lead first. On the Sales module, go to your dashboard and click on the **Pipeline** button of the desired sales team. If you don't have any sales team yet, :doc:`you need to create one first <../../salesteam/setup/create_team>`. Then, click on **Create** and fill in the contact details as shown here above. By default, the newly created opportunity will appear on the first stage of your sales pipeline."
246282
msgstr ""
247283

248-
#: ../../crm/leads/generate/manual.rst:55
284+
#: ../../crm/leads/generate/manual.rst:53
249285
msgid "Another way to create an opportunity is by adding it directly on a specific stage. For example, if you have have spoken to Mr. Smith at a meeting and you want to send him a quotation right away, you can add his contact details on the fly directly into the **Proposition** stage. From the Kanban view of your sales team, just click on the **+** icon at the right of your stage to create the contact. The new opportunity will then pop up into the corresponding stage and you can then fill in the contact details by clicking on it."
250286
msgstr ""
251287

‎locale/sources/db_management.pot

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Odoo Business 9.0\n"
9+
"Project-Id-Version: Odoo Business 10.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2017-03-23 15:39+0100\n"
11+
"POT-Creation-Date: 2017-06-07 09:30+0200\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -313,7 +313,7 @@ msgid "Uninstalling Apps"
313313
msgstr ""
314314

315315
#: ../../db_management/documentation.rst:73
316-
msgid "Make sure you first test what you are about to do on a :ref:`duplicate <duplicate>` of your database before making any changes (*especially* installing/uninstalling apps)."
316+
msgid "Make sure you first test what you are about to do on a :ref:`duplicate <duplicate_online>` of your database before making any changes (*especially* installing/uninstalling apps)."
317317
msgstr ""
318318

319319
#: ../../db_management/documentation.rst:77

‎locale/sources/ecommerce.pot

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Odoo Business 10.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2017-05-16 15:55+0200\n"
11+
"POT-Creation-Date: 2017-06-07 09:30+0200\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -760,7 +760,7 @@ msgid "How to get paid with Paypal"
760760
msgstr ""
761761

762762
#: ../../ecommerce/shopper_experience/paypal.rst:5
763-
msgid "Paypal is the easiest online payment method to configure. It is also the only one without any subscription free. We definitely advise it to any starter."
763+
msgid "Paypal is the easiest online payment method to configure. It is also the only one without any subscription fee. We definitely advise it to any starter."
764764
msgstr ""
765765

766766
#: ../../ecommerce/shopper_experience/paypal.rst:11

‎locale/sources/expense.pot

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Odoo Business 9.0\n"
9+
"Project-Id-Version: Odoo Business 10.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2017-03-23 15:39+0100\n"
11+
"POT-Creation-Date: 2017-06-07 09:30+0200\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"

0 commit comments

Comments
 (0)
Please sign in to comment.