8000 [I18N] export 10.0 source terms · nibodoo/documentation-user@74d6ec7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 74d6ec7

Browse files
mart-emart-e
committed
[I18N] export 10.0 source terms
1 parent 64b33ad commit 74d6ec7

File tree

2 files changed

+54
-54
lines changed

2 files changed

+54
-54
lines changed

‎locale/sources/accounting.pot

Lines changed: 14 additions & 14 deletions
3830
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# SOME DESCRIPTIVE TITLE.
22
# Copyright (C) 2015-TODAY, Odoo S.A.
3-
# This file is distributed under the same license as the Odoo Business package.
3+
# This file is distributed under the same license as the Odoo package.
44
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
55
#
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Odoo Business 10.0\n"
9+
"Project-Id-Version: Odoo 10.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-03-09 09:44+0100\n"
11+
"POT-Creation-Date: 2018-07-26 15:12+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"
@@ -1576,7 +1576,7 @@ msgid "if you put the asset on the product, the asset category will automaticall
15761576
msgstr ""
15771577

15781578
#: ../../accounting/others/adviser/assets.rst:111
1579-
msgid "How to deprecate an asset?"
1579+
msgid "How to depreciate an asset?"
15801580
msgstr ""
15811581

15821582
#: ../../accounting/others/adviser/assets.rst:113
@@ -3774,19 +3774,19 @@ msgid "For the purpose of this documentation, we will use the above use case:"
37743774
msgstr ""
37753775

37763776
#: ../../accounting/others/taxes/B2B_B2C.rst:91
3777-
msgid "your product default sale price is 8.26€ price excluded"
3777+
msgid "your product default sale price is 8.26€ tax excluded"
37783778
msgstr ""
37793779

37803780
#: ../../accounting/others/taxes/B2B_B2C.rst:93
3781-
msgid "but we want to sell it at 10€, price included, in our shops or eCommerce website"
3781+
msgid "but we want to sell it at 10€, tax included, in our shops or eCommerce website"
37823782
msgstr ""
37833783

37843784
#: ../../accounting/others/taxes/B2B_B2C.rst:97
37853785
msgid "Setting your products"
37863786
msgstr ""
37873787

37883788
#: ../../accounting/others/taxes/B2B_B2C.rst:99
3789-
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."
3789+
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."
37903790
msgstr ""
37913791

37923792
#: ../../accounting/others/taxes/B2B_B2C.rst:107
@@ -3830,7 +3830,7 @@ msgid "Avoid changing every sale order"
3830
msgstr ""
38313831

38323832
#: ../../accounting/others/taxes/B2B_B2C.rst:158
3833-
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."
3833+
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."
38343834
msgstr ""
38353835

38363836
#: ../../accounting/others/taxes/B2B_B2C.rst:163
@@ -4406,15 +4406,15 @@ msgid "Accrual and Cash Basis Methods"
44064406
msgstr ""
44074407

44084408
#: ../../accounting/overview/main_concepts/in_odoo.rst:25
4409-
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)."
4409+
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)."
44104410
msgstr ""
44114411

44124412
#: ../../accounting/overview/main_concepts/in_odoo.rst:30
44134413
msgid "Multi-companies"
44144414
msgstr ""
44154415

44164416
#: ../../accounting/overview/main_concepts/in_odoo.rst:32
4417-
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."
4417+
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."
44184418
msgstr ""
44194419

44204420
#: ../../accounting/overview/main_concepts/in_odoo.rst:36
@@ -4438,15 +4438,15 @@ msgid "International Standards"
44384438
msgstr ""
44394439

44404440
#: ../../accounting/overview/main_concepts/in_odoo.rst:54
4441-
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."
4441+
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."
44424442
msgstr ""
44434443

44444444
#: ../../accounting/overview/main_concepts/in_odoo.rst:60
44454445
msgid "In particular, Odoo's core accounting engine supports:"
44464446
msgstr ""
44474447

44484448
#: ../../accounting/overview/main_concepts/in_odoo.rst:62
4449-
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."
4449+
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."
44504450
msgstr ""
44514451

44524452
#: ../../accounting/overview/main_concepts/in_odoo.rst:66
@@ -4518,7 +4518,7 @@ msgid "Odoo speeds up bank reconciliation by matching most of your imported bank
45184518
msgstr ""
45194519

45204520
#: ../../accounting/overview/main_concepts/in_odoo.rst:119
4521-
msgid "Calculates the tax you owe your tax authority"
4521+
msgid "Calculate the tax you owe your tax authority"
45224522
msgstr ""
45234523

45244524
#: ../../accounting/overview/main_concepts/in_odoo.rst:121
@@ -4542,7 +4542,7 @@ msgid "Easy retained earnings"
45424542
msgstr ""
45434543

45444544
#: ../../accounting/overview/main_concepts/in_odoo.rst:139
4545-
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."
4545+
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."
45464546
msgstr ""
45474547

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

‎locale/sources/discuss.pot

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# SOME DESCRIPTIVE TITLE.
22
# Copyright (C) 2015-TODAY, Odoo S.A.
3-
# This file is distributed under the same license as the Odoo Business package.
3+
# This file is distributed under the same license as the Odoo package.
44
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
55
#
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Odoo Business 10.0\n"
9+
"Project-Id-Version: Odoo 10.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2017-10-10 09:08+0200\n"
11+
"POT-Creation-Date: 2018-07-26 15:12+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"
@@ -41,150 +41,150 @@ msgid "As a system admin, go to :menuselection:`Settings --> General Settings` a
4141
msgstr ""
4242

4343
#: ../../discuss/email_servers.rst:21
44-
msgid "Office 365 email servers don't allow to send external emails from hosts like Odoo. Consequently you can only use such email servers for incoming messages."
44+
msgid "Office 365 email servers don't allow easiliy to send external emails from hosts like Odoo. Refer to the `Office 365 documentation`_ to make it working."
4545
msgstr ""
4646

47-
#: ../../discuss/email_servers.rst:26
47+
#: ../../discuss/email_servers.rst:27
4848
msgid "Set an outgoing email server for outbound messages"
4949
msgstr ""
5050

51-
#: ../../discuss/email_servers.rst:27
51+
#: ../../discuss/email_servers.rst:28
5252
msgid "You need the SMTP data of your email provider (Gmail, Outlook, Yahoo, AOL, etc.) as well as your admin credentials. Once all the information has been filled out, click on *Test Connection*."
5353
msgstr ""
5454

55-
#: ../../discuss/email_servers.rst:35
55+
#: ../../discuss/email_servers.rst:36
5656
msgid "Set an incoming email server for inbound messages"
5757
msgstr ""
5858

59-
#: ../../discuss/email_servers.rst:36
59+
#: ../../discuss/email_servers.rst:37
6060
msgid "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*."
6161
msgstr ""
6262

63-
#: ../../discuss/email_servers.rst:43
63+
#: ../../discuss/email_servers.rst:44
6464
msgid "By default inbound messages are fetched every 5 minutes. You can change this value in developer mode. Go to :menuselection:`Settings --> Technical --> Automation --> Scheduled Actions` and look for *Mail: Fetchmail Service*."
6565
msgstr ""
6666

67-
#: ../../discuss/email_servers.rst:49
67+
#: ../../discuss/email_servers.rst:50
6868
msgid "Set the domain name"
6969
msgstr ""
7070

71-
#: ../../discuss/email_servers.rst:50
71+
#: ../../discuss/email_servers.rst:51
7272
msgid "Enter the domain name of your email servers (e.g. mycompany.com) in General Settings."
7373
msgstr ""
7474

75-
#: ../../discuss/email_servers.rst:57
75+
#: ../../discuss/email_servers.rst:58
7676
msgid "Create a catchall address"
7777
msgstr ""
7878

79-
#: ../../discuss/email_servers.rst:58
79+
#: ../../discuss/email_servers.rst:59
8080
msgid "When a contact replies to an email sent from Odoo, the *reply-to* address is a generic address used to route the reply to the right discussion thread in Odoo (opportunity, order, task, etc.) and to the inbox of all its followers. By default this address is \"catchall@\" but it can be changed."
8181
msgstr ""
8282

83-
#: ../../discuss/email_servers.rst:63
83+
#: ../../discuss/email_servers.rst:64
8484
msgid "Create a catchall address in your email server settings. We advise you to use \"catchall@\" so that everything works out straight away. If you want to use another alias, you have extra steps in Odoo:"
8585
msgstr ""
8686

87-
#: ../../discuss/email_servers.rst:67
87+
#: ../../discuss/email_servers.rst:68
8888
msgid "Activate the developer mode from your Settings Dashboard."
8989
msgstr ""
9090

91-
#: ../../discuss/email_servers.rst:72
91+
#: ../../discuss/email_servers.rst:73
9292
msgid "Refresh your screen. Then go to :menuselection:`Settings --> Technical --> Parameters --> System Parameters` and enter your custom catchall alias in *mail.catchall.alias*."
9393
msgstr ""
9494

95-
#: ../../discuss/email_servers.rst:79
95+
#: ../../discuss/email_servers.rst:80
9696
msgid "You can edit the email alias used for bounced messages the same way."
9797
msgstr ""
9898

99-
#: ../../discuss/email_servers.rst:82
99+
#: ../../discuss/email_servers.rst:83
100100
msgid "How to use my own email servers with Odoo Online"
101101
msgstr ""
102102

103-
#: ../../discuss/email_servers.rst:83
103+
#: ../../discuss/email_servers.rst:84
104104
msgid "Odoo Online comes up with an embedded and ready-to-use email solution with *@yourcompany.odoo.com* as domain. We recommend to keep this default setup as it is really convenient."
105105
msgstr ""
106106

107-
#: ../../discuss/email_servers.rst:87
107+
#: ../../discuss/email_servers.rst:88
108108
msgid "Nevertheless you can still use your own email servers if you want to manage your email server's reputation (blacklisting, etc). The configuration for both incoming and outgoing mail servers is given here above."
109109
msgstr ""
110110

111-
#: ../../discuss/email_servers.rst:92
111+
#: ../../discuss/email_servers.rst:93
112112
msgid "However when it comes to incoming messages, we don't recommend to exclusively use your own email server. Indeed, Odoo Online is fetching incoming messages from the email server once every hour only. To receive emails in real time, you should rather use a **catchall redirection** (your server -> Odoo server). To do so:"
113113
msgstr ""
114114

115-
#: ../../discuss/email_servers.rst:98
115+
#: ../../discuss/email_servers.rst:99
116116
msgid "Create a catchall address in your email server settings (e.g. catchall)."
117117
msgstr ""
118118

119-
#: ../../discuss/email_servers.rst:99
119+
#: ../../discuss/email_servers.rst:100
120120
msgid "Still from such settings, set a redirection from this catchall address to Odoo's one: catchall@yourdomain.ext -> catchall@yourcompany.odoo.com."
121121
msgstr ""
122122

123-
#: ../../discuss/email_servers.rst:102
123+
#: ../../discuss/email_servers.rst:103
124124
msgid "In Odoo check *External Email Servers* in :menuselection:`Settings --> General Settings` and enter your email domain name (i.e. yourdomain.ext)."
125125
msgstr ""
126126

127-
#: ../../discuss/email_servers.rst:104
127+
#: ../../discuss/email_servers.rst:105
128128
msgid "No need to set up an incoming email server in such a case."
129129
msgstr ""
130130

131-
#: ../../discuss/email_servers.rst:108
131+
#: ../../discuss/email_servers.rst:109
132132
msgid "How to be SPF-compliant when using external email servers in Odoo"
133133
msgstr ""
134134

135-
#: ../../discuss/email_servers.rst:109
135+
#: ../../discuss/email_servers.rst:110
136136
msgid "Sender Policy Framework (SPF) is an email-validation system that checks that incoming mail from a domain comes from a host authorized by that domain's administrator. Such a security system is used in most email servers. If you don't comply with it, your emails sent from Odoo will be likely flagged as spam."
137137
msgstr ""
138138

139-
#: ../../discuss/email_servers.rst:115
139+
#: ../../discuss/email_servers.rst:116
140140
msgid "To be SPF-compliant, you need to authorize Odoo as a sending host in your domain name settings:"
141141
msgstr ""
142142

143-
#: ../../discuss/email_servers.rst:118
143+
#: ../../discuss/email_servers.rst:119
144144
msgid "Sign in to your domain’s account at your domain host."
145145
msgstr ""
146146

147-
#: ../../discuss/email_servers.rst:119
147+
#: ../../discuss/email_servers.rst:120
148148
msgid "Locate the page for updating your domain’s DNS records."
149149
msgstr ""
150150

151-
#: ../../discuss/email_servers.rst:120
151+
#: ../../discuss/email_servers.rst:121
152152
msgid "If no TXT record is set, create one with following definition: v=spf1 include:_spf.odoo.com ~all"
153153
msgstr ""
154154

155-
#: ../../discuss/email_servers.rst:122
155+
#: ../../discuss/email_servers.rst:123
156156
msgid "In case a TXT record is already set, add \"include:_spf.odoo.com\"."
157157
msgstr ""
158158

159-
#: ../../discuss/email_servers.rst:124
159+
#: ../../discuss/email_servers.rst:125
160160
msgid "e.g. for a Gmail server it should be:"
161161
msgstr ""
162162

163-
#: ../../discuss/email_servers.rst:126
163+
#: ../../discuss/email_servers.rst:127
164164
msgid "v=spf1 include:_spf.odoo.com include:_spf.google.com ~all"
165165
msgstr ""
166166

167-
#: ../../discuss/email_servers.rst:128
167+
#: ../../discuss/email_servers.rst:129
168168
msgid "Find `here <https://www.mail-tester.com/spf/>`__ the exact procedure to create or modify TXT records in your own domain registrar."
169169
msgstr ""
170170

171-
#: ../../discuss/email_servers.rst:131
171+
#: ../../discuss/email_servers.rst:132
172172
msgid "Your new SPF record can take up to 48 hours to go into effect, but this usually happens more quickly."
173173
msgstr ""
174174

175-
#: ../../discuss/email_servers.rst:134
175+
#: ../../discuss/email_servers.rst:135
176176
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."
177177
msgstr ""
178178

179-
#: ../../discuss/email_servers.rst:139
179+
#: ../../discuss/email_servers.rst:140
180180
msgid "How to choose between Odoo and my traditional email box"
181181
msgstr ""
182182

183-
#: ../../discuss/email_servers.rst:140
183+
#: ../../discuss/email_servers.rst:141
184184
msgid "Odoo Discuss is a perfect tool to send and read messages related to business documents. However it doesn't aim to replace a full-featured email solution (Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of both systems without mingling them: What is related to Odoo business objects or applications goes into Odoo; What is not can be managed into your external email box."
185185
msgstr ""
186186

187-
#: ../../discuss/email_servers.rst:147
187+
#: ../../discuss/email_servers.rst:148
188188
msgid "To do so, create specific email aliases to use in Odoo (to generate leads or opportunities, helpdesk tickets, etc.). If you take an email alias already used for messaging outside of Odoo, incoming messages will land into both systems. This will negatively impact your productivity."
189189
msgstr ""
190190

0 commit comments

Comments
 (0)
0