8000 [I18N] export 11.0 source terms · nibodoo/documentation-user@485a571 · GitHub
[go: up one dir, main page]

Skip to content

Commit 485a571

Browse files
committed
[I18N] export 11.0 source terms
1 parent c5b0639 commit 485a571

File tree

3 files changed

+54
-54
lines changed

3 files changed

+54
-54
lines changed

locale/sources/accounting.pot

+12-12
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Odoo 11.0\n"
1010
"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"
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"
@@ -2897,7 +2897,7 @@ msgid "if you put the asset on the product, the asset category will automaticall
28972897
msgstr ""
28982898

28992899
#: ../../accounting/others/adviser/assets.rst:111
2900-
msgid "How to deprecate an asset?"
2900+
msgid "How to depreciate an asset?"
29012901
msgstr ""
29022902

29032903
#: ../../accounting/others/adviser/assets.rst:113
@@ -5091,19 +5091,19 @@ msgid "For the purpose of this documentation, we will use the above use case:"
50915091
msgstr ""
50925092

50935093
#: ../../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"
50955095
msgstr ""
50965096

50975097
#: ../../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"
50995099
msgstr ""
51005100

51015101
#: ../../accounting/others/taxes/B2B_B2C.rst:97
51025102
msgid "Setting your products"
51035103
msgstr ""
51045104

51055105
#: ../../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."
51075107
msgstr ""
51085108

51095109
#: ../../accounting/others/taxes/B2B_B2C.rst:107
@@ -5147,7 +5147,7 @@ msgid "Avoid changing every sale order"
51475147
msgstr ""
51485148

51495149
#: ../../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."
51515151
msgstr ""
51525152

51535153
#: ../../accounting/others/taxes/B2B_B2C.rst:163
@@ -5727,15 +5727,15 @@ msgid "Accrual and Cash Basis Methods"
57275727
msgstr ""
57285728

57295729
#: ../../accounting/overview/main_concepts/in_odoo.rst:25
5730-
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)."
57315731
msgstr ""
57325732

57335733
#: ../../accounting/overview/main_concepts/in_odoo.rst:30
57345734
msgid "Multi-companies"
57355735
msgstr ""
57365736

57375737
#: ../../accounting/overview/main_concepts/in_odoo.rst:32
5738-
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."
57395739
msgstr ""
57405740

57415741
#: ../../accounting/overview/main_concepts/in_odoo.rst:36
@@ -5759,15 +5759,15 @@ msgid "International Standards"
57595759
msgstr ""
57605760

57615761
#: ../../accounting/overview/main_concepts/in_odoo.rst:54
5762-
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."
57635763
msgstr ""
57645764

57655765
#: ../../accounting/overview/main_concepts/in_odoo.rst:60
57665766
msgid "In particular, Odoo's core accounting engine supports:"
57675767
msgstr ""
57685768

57695769
#: ../../accounting/overview/main_concepts/in_odoo.rst:62
5770-
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."
57715771
msgstr ""
57725772

57735773
#: ../../accounting/overview/main_concepts/in_odoo.rst:66
@@ -5839,7 +5839,7 @@ msgid "Odoo speeds up bank reconciliation by matching most of your imported bank
58395839
msgstr ""
58405840

58415841
#: ../../accounting/overview/main_concepts/in_odoo.rst:119
5842-
msgid "Calculates the tax you owe your tax authority"
5842+
msgid "Calculate the tax you owe your tax authority"
58435843
msgstr ""
58445844

58455845
#: ../../accounting/overview/main_concepts/in_odoo.rst:121
@@ -5863,7 +5863,7 @@ msgid "Easy retained earnings"
58635863
msgstr ""
58645864

58655865
#: ../../accounting/overview/main_concepts/in_odoo.rst:139
5866-
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."
58675867
msgstr ""
58685868

58695869
#: ../../accounting/overview/main_concepts/intro.rst:3

locale/sources/db_management.pot

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Odoo 11.0\n"
1010
"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"
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"
@@ -239,7 +239,7 @@ msgid "Do you have a valid Enterprise subscription?"
239239
msgstr ""
240240

241241
#: ../../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"
243243
msgstr ""
244244

245245
#: ../../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
251251
msgstr ""
252252

253253
#: ../../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\""
255255
msgstr ""
256256

257257
#: ../../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
268268
msgstr ""
269269

270270
#: ../../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:"
272272
msgstr ""
273273

274274
#: ../../db_management/db_premise.rst:73

locale/sources/discuss.pot

+38-38
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Odoo 11.0\n"
1010
"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"
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"
@@ -33,150 +33,150 @@ msgid "If no one in your company is used to manage email servers, we strongly re
3333
msgstr ""
3434

3535
#: ../../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::"
3737
msgstr ""
3838

39-
#: ../../discuss/email_servers.rst:19
39+
#: ../../discuss/email_servers.rst:24
4040
msgid "How to manage outbound messages"
4141
msgstr ""
4242

43-
#: ../../discuss/email_servers.rst:21
43+
#: ../../discuss/email_servers.rst:26
4444
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*."
4545
msgstr ""
4646

47-
#: ../../discuss/email_servers.rst:26
47+
#: ../../discuss/email_servers.rst:31
4848
msgid "Here is a typical configuration for a G Suite server."
4949
msgstr ""
5050

51-
#: ../../discuss/email_servers.rst:31
51+
#: ../../discuss/email_servers.rst:36
5252
msgid "Then set your email domain name in the General Settings."
5353
msgstr ""
5454

55-
#: ../../discuss/email_servers.rst:34
55+
#: ../../discuss/email_servers.rst:39
5656
msgid "Can I use an Office 365 server"
5757
msgstr ""
5858

59-
#: ../../discuss/email_servers.rst:35
59+
#: ../../discuss/email_servers.rst:40
6060
msgid "You can use an Office 365 server if you run Odoo on-premise. Office 365 SMTP relays are not compatible with Odoo Online."
6161
msgstr ""
6262

63-
#: ../../discuss/email_servers.rst:38
63+
#: ../../discuss/email_servers.rst:43
6464
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."
6565
msgstr ""
6666

67-
#: ../../discuss/email_servers.rst:42
67+
#: ../../discuss/email_servers.rst:47
6868
msgid "How to use a G Suite server"
6969
msgstr ""
7070

71-
#: ../../discuss/email_servers.rst:43
71+
#: ../../discuss/email_servers.rst:48
7272
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>`__."
7373
msgstr ""
7474

75-
#: ../../discuss/email_servers.rst:51
75+
#: ../../discuss/email_servers.rst:56
7676
msgid "Be SPF-compliant"
7777
msgstr ""
7878

79-
#: ../../discuss/email_servers.rst:52
79+
#: ../../discuss/email_servers.rst:57
8080
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:"
8181
msgstr ""
8282

83-
#: ../../discuss/email_servers.rst:56
83+
#: ../../discuss/email_servers.rst:61
8484
msgid "If no TXT record is set for SPF, create one with following definition: v=spf1 include:_spf.odoo.com ~all"
8585
msgstr ""
8686

87-
#: ../../discuss/email_servers.rst:58
87+
#: ../../discuss/email_servers.rst:63
8888
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"
8989
msgstr ""
9090

91-
#: ../../discuss/email_servers.rst:62
91+
#: ../../discuss/email_servers.rst:67
9292
msgid "Find `here <https://www.mail-tester.com/spf/>`__ the exact procedure to create or modify TXT records in your own domain registrar."
9393
msgstr ""
9494

95-
#: ../../discuss/email_servers.rst:65
95+
#: ../../discuss/email_servers.rst:70
9696
msgid "Your new SPF record can take up to 48 hours to go into effect, but this usually happens more quickly."
9797
msgstr ""
9898

99-
#: ../../discuss/email_servers.rst:68
99+
#: ../../discuss/email_servers.rst:73
100100
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."
101101
msgstr ""
102102

103-
#: ../../discuss/email_servers.rst:73
103+
#: ../../discuss/email_servers.rst:78
104104
msgid "Allow DKIM"
105105
msgstr ""
106106

107-
#: ../../discuss/email_servers.rst:74
107+
#: ../../discuss/email_servers.rst:79
108108
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\"."
109109
msgstr ""
110110

111-
#: ../../discuss/email_servers.rst:82
111+
#: ../../discuss/email_servers.rst:87
112112
msgid "How to manage inbound messages"
113113
msgstr ""
114114

115-
#: ../../discuss/email_servers.rst:84
115+
#: ../../discuss/email_servers.rst:89
116116
msgid "Odoo relies on generic email aliases to fetch incoming messages."
117117
msgstr ""
118118

119-
#: ../../discuss/email_servers.rst:86
119+
#: ../../discuss/email_servers.rst:91
120120
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@**)."
121121
msgstr ""
122122

123-
#: ../../discuss/email_servers.rst:90
123+
#: ../../discuss/email_servers.rst:95
124124
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."
125125
msgstr ""
126126

127-
#: ../../discuss/email_servers.rst:94
127+
#: ../../discuss/email_servers.rst:99
128128
msgid "**Original messages**: Several business objects have their own alias to create new records in Odoo from incoming emails:"
129129
msgstr ""
130130

131-
#: ../../discuss/email_servers.rst:97
131+
#: ../../discuss/email_servers.rst:102
132132
msgid "Sales Channel (to create Leads or Opportunities in `Odoo CRM <https://www.odoo.com/page/crm>`__),"
133133
msgstr ""
134134

135-
#: ../../discuss/email_servers.rst:99
135+
#: ../../discuss/email_servers.rst:104
136136
msgid "Support Channel (to create Tickets in `Odoo Helpdesk <https://www.odoo.com/page/helpdesk>`__),"
137137
msgstr ""
138138

139-
#: ../../discuss/email_servers.rst:101
139+
#: ../../discuss/email_servers.rst:106
140140
msgid "Projects (to create new Tasks in `Odoo Project <https://www.odoo.com/page/project-management>`__),"
141141
msgstr ""
142142

143-
#: ../../discuss/email_servers.rst:103
143+
#: ../../discuss/email_servers.rst:108
144144
msgid "Job Positions (to create Applicants in `Odoo Recruitment <https://www.odoo.com/page/recruitment>`__),"
145145
msgstr ""
146146

147-
#: ../../discuss/email_servers.rst:105
147+
#: ../../discuss/email_servers.rst:110
148148
msgid "etc."
149149
msgstr ""
150150

151-
#: ../../discuss/email_servers.rst:107
151+
#: ../../discuss/email_servers.rst:112
152152
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."
153153
msgstr ""
154154

155-
#: ../../discuss/email_servers.rst:111
155+
#: ../../discuss/email_servers.rst:116
156156
msgid "Create the corresponding email addresses in your mail server (catchall@, bounce@, sales@, etc.)."
157157
msgstr ""
158158

159-
#: ../../discuss/email_servers.rst:113
159+
#: ../../discuss/email_servers.rst:118
160160
msgid "Set your domain name in the General Settings."
161161
msgstr ""
162162

163-
#: ../../discuss/email_servers.rst:118
163+
#: ../../discuss/email_servers.rst:123
164164
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*."
165165
msgstr ""
166166

167-
#: ../../discuss/email_servers.rst:127
167+
#: ../../discuss/email_servers.rst:132
168168
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*)."
169169
msgstr ""
170170

171-
#: ../../discuss/email_servers.rst:134
171+
#: ../../discuss/email_servers.rst:139
172172
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."
173173
msgstr ""
174174

175-
#: ../../discuss/email_servers.rst:142
175+
#: ../../discuss/email_servers.rst:147
176176
msgid "Then refresh your screen and go to :menuselection:`Settings --> Technical --> Parameters --> System Parameters` to customize the aliases (*mail.catchall.alias* & * mail.bounce.alias*)."
177177
msgstr ""
178178

179-
#: ../../discuss/email_servers.rst:149
179+
#: ../../discuss/email_servers.rst:154
180180
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*."
181181
msgstr ""
182182

0 commit comments

Comments
 (0)
0