You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: locale/sources/accounting.pot
+12-12
Original file line number
Diff line number
Diff line change
@@ -8,7 +8,7 @@ msgid ""
8
8
msgstr ""
9
9
"Project-Id-Version: Odoo 11.0\n"
10
10
"Report-Msgid-Bugs-To: \n"
11
-
"POT-Creation-Date: 2018-07-23 12:10+0200\n"
11
+
"POT-Creation-Date: 2018-07-27 11:08+0200\n"
12
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2897,7 +2897,7 @@ msgid "if you put the asset on the product, the asset category will automaticall
2897
2897
msgstr""
2898
2898
2899
2899
#:../../accounting/others/adviser/assets.rst:111
2900
-
msgid"How to deprecate an asset?"
2900
+
msgid"How to depreciate an asset?"
2901
2901
msgstr""
2902
2902
2903
2903
#:../../accounting/others/adviser/assets.rst:113
@@ -5091,19 +5091,19 @@ msgid "For the purpose of this documentation, we will use the above use case:"
5091
5091
msgstr""
5092
5092
5093
5093
#:../../accounting/others/taxes/B2B_B2C.rst:91
5094
-
msgid"your product default sale price is 8.26€ price excluded"
5094
+
msgid"your product default sale price is 8.26€ tax excluded"
5095
5095
msgstr""
5096
5096
5097
5097
#:../../accounting/others/taxes/B2B_B2C.rst:93
5098
-
msgid"but we want to sell it at 10€, price included, in our shops or eCommerce website"
5098
+
msgid"but we want to sell it at 10€, tax included, in our shops or eCommerce website"
5099
5099
msgstr""
5100
5100
5101
5101
#:../../accounting/others/taxes/B2B_B2C.rst:97
5102
5102
msgid"Setting your products"
5103
5103
msgstr""
5104
5104
5105
5105
#:../../accounting/others/taxes/B2B_B2C.rst:99
5106
-
msgid"Your company must be configured with price excluded by default. This is usually the default configuration, but you can check your **Default Sale Tax** from the menu :menuselection:`Configuration --> Settings` of the Accounting application."
5106
+
msgid"Your company must be configured with tax excluded by default. This is usually the default configuration, but you can check your **Default Sale Tax** from the menu :menuselection:`Configuration --> Settings` of the Accounting application."
5107
5107
msgstr""
5108
5108
5109
5109
#:../../accounting/others/taxes/B2B_B2C.rst:107
@@ -5147,7 +5147,7 @@ msgid "Avoid changing every sale order"
5147
5147
msgstr""
5148
5148
5149
5149
#:../../accounting/others/taxes/B2B_B2C.rst:158
5150
-
msgid"If you negotiate a contract with a customer, whether you negotiate price included or price excluded, you can set the pricelist and the fiscal position on the customer form so that it will be applied automatically at every sale of this customer."
5150
+
msgid"If you negotiate a contract with a customer, whether you negotiate tax included or tax excluded, you can set the pricelist and the fiscal position on the customer form so that it will be applied automatically at every sale of this customer."
5151
5151
msgstr""
5152
5152
5153
5153
#:../../accounting/others/taxes/B2B_B2C.rst:163
@@ -5727,15 +5727,15 @@ msgid "Accrual and Cash Basis Methods"
msgid"Odoo support both accrual and cash basis reporting. This allows you to report income / expense at the time transactions occur (i.e., accrual basis), or when payment is made or received (i.e., cash basis)."
5730
+
msgid"Odoo supports both accrual and cash basis reporting. This allows you to report income / expense at the time transactions occur (i.e., accrual basis), or when payment is made or received (i.e., cash basis)."
msgid"Odoo allows to manage several companies within the same database. Each company has its own chart of accounts and rules. You can get consolidation reports following your consolidation rules."
5738
+
msgid"Odoo allows one to manage several companies within the same database. Each company has its own chart of accounts and rules. You can get consolidation reports following your consolidation rules."
msgid"Odoo accounting support more than 50 countries. The Odoo core accounting implement accounting standards that is common to all countries and specific modules exists per country for the specificities of the country like the chart of accounts, taxes, or bank interfaces."
5762
+
msgid"Odoo accounting supports more than 50 countries. The Odoo core accounting implements accounting standards that are common to all countries. Specific modules exist per country for the specificities of the country like the chart of accounts, taxes, or bank interfaces."
msgid"Anglo-Saxon Accounting (U.S., U.K.,, and other English-speaking countries including Ireland, Canada, Australia, and New Zealand) where cost of good sold are reported when products are sold/delivered."
5770
+
msgid"Anglo-Saxon Accounting (U.S., U.K.,, and other English-speaking countries including Ireland, Canada, Australia, and New Zealand) where costs of good sold are reported when products are sold/delivered."
msgid"Retained earnings is the portion of income retained by your business. Odoo automatically calculates your current year earnings in real time so no year-end journal or rollover is required. This is calculated by reporting the profit and loss balance to your balance sheet report automatically."
5866
+
msgid"Retained earnings are the portion of income retained by your business. Odoo automatically calculates your current year earnings in real time so no year-end journal or rollover is required. This is calculated by reporting the profit and loss balance to your balance sheet report automatically."
Copy file name to clipboardExpand all lines: locale/sources/db_management.pot
+4-4
Original file line number
Diff line number
Diff line change
@@ -8,7 +8,7 @@ msgid ""
8
8
msgstr ""
9
9
"Project-Id-Version: Odoo 11.0\n"
10
10
"Report-Msgid-Bugs-To: \n"
11
-
"POT-Creation-Date: 2018-07-23 12:10+0200\n"
11
+
"POT-Creation-Date: 2018-07-27 11:08+0200\n"
12
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -239,7 +239,7 @@ msgid "Do you have a valid Enterprise subscription?"
239
239
msgstr""
240
240
241
241
#:../../db_management/db_premise.rst:35
242
-
msgid"Check if your subscription details get the tag \"In Progress\" on your `Odoo Account <https://accounts.odoo.com/my/contract>`__ or with your Account Manager"
242
+
msgid"Check if your subscription details get the tag \"In Progress\" on your `Odoo Account <https://accounts.odoo.com/my/subscription>`__ or with your Account Manager"
243
243
msgstr""
244
244
245
245
#:../../db_management/db_premise.rst:39
@@ -251,7 +251,7 @@ msgid "You can link only one database per subscription. (Need a test or a develo
251
251
msgstr""
252
252
253
253
#:../../db_management/db_premise.rst:45
254
-
msgid"You can unlink the old database yourself on your `Odoo Contract <https://accounts.odoo.com/my/contract>`__ with the button \"Unlink database\""
254
+
msgid"You can unlink the old database yourself on your `Odoo Contract <https://accounts.odoo.com/my/subscription>`__ with the button \"Unlink database\""
255
255
msgstr""
256
256
257
257
#:../../db_management/db_premise.rst:52
@@ -268,7 +268,7 @@ msgid "From July 2016 onward, Odoo 9 now automatically change the uuid of a dupl
268
268
msgstr""
269
269
270
270
#:../../db_management/db_premise.rst:64
271
-
msgid"If it's not the case, you may have multiple databases sharing the same UUID. Please check on your `Odoo Contract <https://accounts.odoo.com/my/contract>`__, a short message will appear specifying which database is problematic:"
271
+
msgid"If it's not the case, you may have multiple databases sharing the same UUID. Please check on your `Odoo Contract <https://accounts.odoo.com/my/subscription>`__, a short message will appear specifying which database is problematic:"
Copy file name to clipboardExpand all lines: locale/sources/discuss.pot
+38-38
Original file line number
Diff line number
Diff line change
@@ -8,7 +8,7 @@ msgid ""
8
8
msgstr ""
9
9
"Project-Id-Version: Odoo 11.0\n"
10
10
"Report-Msgid-Bugs-To: \n"
11
-
"POT-Creation-Date: 2018-07-23 12:10+0200\n"
11
+
"POT-Creation-Date: 2018-07-27 11:08+0200\n"
12
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,150 +33,150 @@ msgid "If no one in your company is used to manage email servers, we strongly re
33
33
msgstr""
34
34
35
35
#:../../discuss/email_servers.rst:15
36
-
msgid"You will find here below some useful information to do so by integrating your own email solution with Odoo."
36
+
msgid"You will find here below some useful information to do so by integrating your own email solution with Odoo. .. note::"
37
37
msgstr""
38
38
39
-
#:../../discuss/email_servers.rst:19
39
+
#:../../discuss/email_servers.rst:24
40
40
msgid"How to manage outbound messages"
41
41
msgstr""
42
42
43
-
#:../../discuss/email_servers.rst:21
43
+
#:../../discuss/email_servers.rst:26
44
44
msgid"As a system admin, go to :menuselection:`Settings --> General Settings` and check *External Email Servers*. Then, click *Outgoing Mail Servers* to create one and reference the SMTP data of your email server. Once all the information has been filled out, click on *Test Connection*."
45
45
msgstr""
46
46
47
-
#:../../discuss/email_servers.rst:26
47
+
#:../../discuss/email_servers.rst:31
48
48
msgid"Here is a typical configuration for a G Suite server."
49
49
msgstr""
50
50
51
-
#:../../discuss/email_servers.rst:31
51
+
#:../../discuss/email_servers.rst:36
52
52
msgid"Then set your email domain name in the General Settings."
53
53
msgstr""
54
54
55
-
#:../../discuss/email_servers.rst:34
55
+
#:../../discuss/email_servers.rst:39
56
56
msgid"Can I use an Office 365 server"
57
57
msgstr""
58
58
59
-
#:../../discuss/email_servers.rst:35
59
+
#:../../discuss/email_servers.rst:40
60
60
msgid"You can use an Office 365 server if you run Odoo on-premise. Office 365 SMTP relays are not compatible with Odoo Online."
61
61
msgstr""
62
62
63
-
#:../../discuss/email_servers.rst:38
63
+
#:../../discuss/email_servers.rst:43
64
64
msgid"Please refer to `Microsoft's documentation <https://support.office.com/en-us/article/How-to-set-up-a-multifunction-device-or-application-to-send-email-using-Office-365-69f58e99-c550-4274-ad18-c805d654b4c4>`__ to configure a SMTP relay for your Odoo's IP address."
65
65
msgstr""
66
66
67
-
#:../../discuss/email_servers.rst:42
67
+
#:../../discuss/email_servers.rst:47
68
68
msgid"How to use a G Suite server"
69
69
msgstr""
70
70
71
-
#:../../discuss/email_servers.rst:43
71
+
#:../../discuss/email_servers.rst:48
72
72
msgid"You can use an G Suite server for any Odoo hosting type. To do so you need to enable a SMTP relay and to allow *Any addresses* in the *Allowed senders* section. The configuration steps are explained in `Google documentation <https://support.google.com/a/answer/2956491?hl=en>`__."
73
73
msgstr""
74
74
75
-
#:../../discuss/email_servers.rst:51
75
+
#:../../discuss/email_servers.rst:56
76
76
msgid"Be SPF-compliant"
77
77
msgstr""
78
78
79
-
#:../../discuss/email_servers.rst:52
79
+
#:../../discuss/email_servers.rst:57
80
80
msgid"In case you use SPF (Sender Policy Framework) to increase the deliverability of your outgoing emails, don't forget to authorize Odoo as a sending host in your domain name settings. Here is the configuration for Odoo Online:"
81
81
msgstr""
82
82
83
-
#:../../discuss/email_servers.rst:56
83
+
#:../../discuss/email_servers.rst:61
84
84
msgid"If no TXT record is set for SPF, create one with following definition: v=spf1 include:_spf.odoo.com ~all"
85
85
msgstr""
86
86
87
-
#:../../discuss/email_servers.rst:58
87
+
#:../../discuss/email_servers.rst:63
88
88
msgid"In case a SPF TXT record is already set, add \"include:_spf.odoo.com\". e.g. for a domain name that sends emails via Odoo Online and via G Suite it could be: v=spf1 include:_spf.odoo.com include:_spf.google.com ~all"
89
89
msgstr""
90
90
91
-
#:../../discuss/email_servers.rst:62
91
+
#:../../discuss/email_servers.rst:67
92
92
msgid"Find `here <https://www.mail-tester.com/spf/>`__ the exact procedure to create or modify TXT records in your own domain registrar."
93
93
msgstr""
94
94
95
-
#:../../discuss/email_servers.rst:65
95
+
#:../../discuss/email_servers.rst:70
96
96
msgid"Your new SPF record can take up to 48 hours to go into effect, but this usually happens more quickly."
97
97
msgstr""
98
98
99
-
#:../../discuss/email_servers.rst:68
99
+
#:../../discuss/email_servers.rst:73
100
100
msgid"Adding more than one SPF record for a domain can cause problems with mail delivery and spam classification. Instead, we recommend using only one SPF record by modifying it to authorize Odoo."
101
101
msgstr""
102
102
103
-
#:../../discuss/email_servers.rst:73
103
+
#:../../discuss/email_servers.rst:78
104
104
msgid"Allow DKIM"
105
105
msgstr""
106
106
107
-
#:../../discuss/email_servers.rst:74
107
+
#:../../discuss/email_servers.rst:79
108
108
msgid"You should do the same thing if DKIM (Domain Keys Identified Mail) is enabled on your email server. In the case of Odoo Online & Odoo.sh, you should add a DNS \"odoo._domainkey\" CNAME record to \"odoo._domainkey.odoo.com\". For example, for \"foo.com\" they should have a record \"odoo._domainkey.foo.com\" that is a CNAME with the value \"odoo._domainkey.odoo.com\"."
109
109
msgstr""
110
110
111
-
#:../../discuss/email_servers.rst:82
111
+
#:../../discuss/email_servers.rst:87
112
112
msgid"How to manage inbound messages"
113
113
msgstr""
114
114
115
-
#:../../discuss/email_servers.rst:84
115
+
#:../../discuss/email_servers.rst:89
116
116
msgid"Odoo relies on generic email aliases to fetch incoming messages."
117
117
msgstr""
118
118
119
-
#:../../discuss/email_servers.rst:86
119
+
#:../../discuss/email_servers.rst:91
120
120
msgid"**Reply messages** of messages sent from Odoo are routed to their original discussion thread (and to the inbox of all its followers) by the catchall alias (**catchall@**)."
121
121
msgstr""
122
122
123
-
#:../../discuss/email_servers.rst:90
123
+
#:../../discuss/email_servers.rst:95
124
124
msgid"**Bounced messages** are routed to **bounce@** in order to track them in Odoo. This is especially used in `Odoo Email Marketing <https://www.odoo.com/page/email-marketing>`__ to opt-out invalid recipients."
125
125
msgstr""
126
126
127
-
#:../../discuss/email_servers.rst:94
127
+
#:../../discuss/email_servers.rst:99
128
128
msgid"**Original messages**: Several business objects have their own alias to create new records in Odoo from incoming emails:"
129
129
msgstr""
130
130
131
-
#:../../discuss/email_servers.rst:97
131
+
#:../../discuss/email_servers.rst:102
132
132
msgid"Sales Channel (to create Leads or Opportunities in `Odoo CRM <https://www.odoo.com/page/crm>`__),"
133
133
msgstr""
134
134
135
-
#:../../discuss/email_servers.rst:99
135
+
#:../../discuss/email_servers.rst:104
136
136
msgid"Support Channel (to create Tickets in `Odoo Helpdesk <https://www.odoo.com/page/helpdesk>`__),"
137
137
msgstr""
138
138
139
-
#:../../discuss/email_servers.rst:101
139
+
#:../../discuss/email_servers.rst:106
140
140
msgid"Projects (to create new Tasks in `Odoo Project <https://www.odoo.com/page/project-management>`__),"
141
141
msgstr""
142
142
143
-
#:../../discuss/email_servers.rst:103
143
+
#:../../discuss/email_servers.rst:108
144
144
msgid"Job Positions (to create Applicants in `Odoo Recruitment <https://www.odoo.com/page/recruitment>`__),"
145
145
msgstr""
146
146
147
-
#:../../discuss/email_servers.rst:105
147
+
#:../../discuss/email_servers.rst:110
148
148
msgid"etc."
149
149
msgstr""
150
150
151
-
#:../../discuss/email_servers.rst:107
151
+
#:../../discuss/email_servers.rst:112
152
152
msgid"Depending on your mail server, there might be several methods to fetch emails. The easiest and most recommended method is to manage one email address per Odoo alias in your mail server."
153
153
msgstr""
154
154
155
-
#:../../discuss/email_servers.rst:111
155
+
#:../../discuss/email_servers.rst:116
156
156
msgid"Create the corresponding email addresses in your mail server (catchall@, bounce@, sales@, etc.)."
157
157
msgstr""
158
158
159
-
#:../../discuss/email_servers.rst:113
159
+
#:../../discuss/email_servers.rst:118
160
160
msgid"Set your domain name in the General Settings."
161
161
msgstr""
162
162
163
-
#:../../discuss/email_servers.rst:118
163
+
#:../../discuss/email_servers.rst:123
164
164
msgid"If you use Odoo on-premise, create an *Incoming Mail Server* in Odoo for each alias. You can do it from the General Settings as well. Fill out the form according to your email provider’s settings. Leave the *Actions to Perform on Incoming Mails* blank. Once all the information has been filled out, click on *TEST & CONFIRM*."
165
165
msgstr""
166
166
167
-
#:../../discuss/email_servers.rst:127
167
+
#:../../discuss/email_servers.rst:132
168
168
msgid"If you use Odoo Online or Odoo.sh, We do recommend to redirect incoming messages to Odoo's domain name rather than exclusively use your own email server. That way you will receive incoming messages without delay. Indeed, Odoo Online is fetching incoming messages of external servers once per hour only. You should set redirections for all the email addresses to Odoo's domain name in your email server (e.g. *catchall@mydomain.ext* to *catchall@mycompany.odoo.com*)."
169
169
msgstr""
170
170
171
-
#:../../discuss/email_servers.rst:134
171
+
#:../../discuss/email_servers.rst:139
172
172
msgid"All the aliases are customizable in Odoo. Object aliases can be edited from their respective configuration view. To edit catchall and bounce aliases, you first need to activate the developer mode from the Settings Dashboard."
173
173
msgstr""
174
174
175
-
#:../../discuss/email_servers.rst:142
175
+
#:../../discuss/email_servers.rst:147
176
176
msgid"Then refresh your screen and go to :menuselection:`Settings --> Technical --> Parameters --> System Parameters` to customize the aliases (*mail.catchall.alias* & * mail.bounce.alias*)."
177
177
msgstr""
178
178
179
-
#:../../discuss/email_servers.rst:149
179
+
#:../../discuss/email_servers.rst:154
180
180
msgid"By default inbound messages are fetched every 5 minutes in Odoo on-premise. You can change this value in developer mode. Go to :menuselection:`Settings --> Technical --> Automation --> Scheduled Actions` and look for *Mail: Fetchmail Service*."
0 commit comments