Merge lp:~camptocamp/openobject-addons/7.0-fix-lp-1192195-RDE into lp:openobject-addons
- 7.0-fix-lp-1192195-RDE
- Merge into trunk
Proposed by
Romain Deheele - Camptocamp
Status: | Rejected |
---|---|
Rejected by: | Martin Trigaux (OpenERP) |
Proposed branch: | lp:~camptocamp/openobject-addons/7.0-fix-lp-1192195-RDE |
Merge into: | lp:openobject-addons |
Diff against target: |
62726 lines (+24589/-649) (has conflicts) 151 files modified
account/i18n/account.pot (+232/-0) account/i18n/ar.po (+241/-2) account/i18n/bg.po (+241/-2) account/i18n/br.po (+237/-2) account/i18n/bs.po (+241/-2) account/i18n/ca.po (+241/-2) account/i18n/cs.po (+240/-2) account/i18n/da.po (+238/-2) account/i18n/de.po (+246/-2) account/i18n/el.po (+238/-2) account/i18n/en_GB.po (+238/-2) account/i18n/en_US.po (+237/-2) account/i18n/es.po (+241/-2) account/i18n/es_AR.po (+241/-2) account/i18n/es_CL.po (+237/-2) account/i18n/es_CR.po (+241/-2) account/i18n/es_DO.po (+237/-2) account/i18n/es_EC.po (+238/-2) account/i18n/es_MX.po (+238/-2) account/i18n/es_PY.po (+237/-2) account/i18n/es_UY.po (+237/-2) account/i18n/es_VE.po (+237/-2) account/i18n/et.po (+241/-2) account/i18n/eu.po (+237/-2) account/i18n/fa.po (+237/-2) account/i18n/fa_AF.po (+236/-2) account/i18n/fi.po (+238/-2) account/i18n/fr.po (+244/-2) account/i18n/fr_BE.po (+237/-2) account/i18n/gl.po (+238/-2) account/i18n/gu.po (+238/-2) account/i18n/he.po (+237/-2) account/i18n/hi.po (+237/-2) account/i18n/hr.po (+239/-2) account/i18n/hu.po (+241/-2) account/i18n/id.po (+238/-2) account/i18n/it.po (+242/-2) account/i18n/ja.po (+238/-2) account/i18n/kab.po (+237/-2) account/i18n/kk.po (+237/-2) account/i18n/ko.po (+238/-2) account/i18n/lo.po (+237/-2) account/i18n/lt.po (+244/-2) account/i18n/lv.po (+238/-2) account/i18n/mk.po (+245/-2) account/i18n/mn.po (+244/-2) account/i18n/nb.po (+238/-2) account/i18n/nl.po (+245/-2) account/i18n/nl_BE.po (+241/-2) account/i18n/oc.po (+238/-2) account/i18n/pl.po (+241/-2) account/i18n/pt.po (+241/-2) account/i18n/pt_BR.po (+244/-2) account/i18n/ro.po (+414/-2) account/i18n/ru.po (+58/-0) account/i18n/si.po (+237/-2) account/i18n/sk.po (+236/-2) account/i18n/sl.po (+240/-2) account/i18n/sq.po (+238/-2) account/i18n/sr.po (+238/-2) account/i18n/sr@latin.po (+239/-2) account/i18n/sv.po (+241/-2) account/i18n/ta.po (+237/-2) account/i18n/te.po (+238/-2) account/i18n/th.po (+238/-2) account/i18n/tlh.po (+240/-2) account/i18n/tr.po (+617/-208) account/i18n/ug.po (+237/-2) account/i18n/uk.po (+240/-2) account/i18n/ur.po (+236/-2) account/i18n/vi.po (+239/-2) account/i18n/zh_CN.po (+117/-45) account/i18n/zh_HK.po (+237/-2) account/i18n/zh_TW.po (+241/-2) account/report/account_aged_partner_balance.py (+4/-3) account/report/account_aged_partner_balance.rml (+5/-2) account/report/account_balance.rml (+9/-3) account/report/account_general_journal.rml (+2/-2) account/report/account_general_ledger_landscape.rml (+5/-4) account/report/account_journal.py (+4/-3) account/report/account_journal.rml (+6/-4) account/report/account_partner_ledger.py (+4/-3) account/report/account_partner_ledger.rml (+3/-1) account/wizard/account_report_common.py (+1/-1) account_accountant/i18n/th.po (+15/-0) account_analytic_analysis/i18n/nl.po (+20/-0) account_analytic_analysis/i18n/tr.po (+46/-10) account_analytic_default/i18n/tr.po (+16/-2) account_asset/i18n/es.po (+37/-0) account_asset/i18n/th.po (+758/-0) account_budget/i18n/es.po (+66/-0) account_cancel/i18n/es.po (+19/-0) account_check_writing/i18n/tr.po (+18/-5) account_followup/i18n/es.po (+167/-0) account_payment/i18n/es.po (+39/-0) account_report_company/i18n/es.po (+64/-0) account_voucher/i18n/es.po (+96/-0) account_voucher/i18n/tr.po (+42/-8) analytic/i18n/es.po (+54/-0) analytic_contract_hr_expense/i18n/es.po (+38/-0) auth_signup/i18n/it.po (+144/-1) base_action_rule/i18n/es.po (+24/-0) base_calendar/i18n/es.po (+19/-0) base_gengo/i18n/es.po (+49/-0) base_import/i18n/fr.po (+45/-10) base_vat/i18n/es.po (+22/-0) contacts/i18n/th.po (+37/-0) crm/i18n/lt.po (+18/-0) crm/i18n/th.po (+17/-6) crm_claim/i18n/es.po (+34/-0) crm_helpdesk/i18n/es.po (+27/-0) email_template/i18n/tr.po (+36/-3) google_base_account/i18n/es.po (+19/-0) hr/i18n/th.po (+170/-99) hr_contract/i18n/es.po (+23/-1) hr_contract/i18n/th.po (+237/-0) hr_holidays/i18n/es.po (+51/-0) hr_payroll/i18n/es.po (+27/-0) hr_recruitment/i18n/es.po (+42/-0) hr_recruitment/i18n/fr.po (+97/-25) hr_timesheet/i18n/nl.po (+13/-1) hr_timesheet/i18n/th.po (+669/-0) hr_timesheet_invoice/i18n/es.po (+30/-0) hr_timesheet_sheet/i18n/th.po (+1151/-0) idea/i18n/tr.po (+168/-0) l10n_th/i18n/th.po (+12/-2) lunch/i18n/es.po (+35/-0) mail/i18n/fr.po (+94/-1) mail/i18n/it.po (+12/-1) mail/i18n/tr.po (+249/-12) marketing_campaign/i18n/es.po (+32/-0) membership/i18n/es.po (+30/-0) mrp/i18n/es.po (+26/-4) mrp_repair/i18n/es.po (+30/-0) note/i18n/es.po (+19/-0) pad/i18n/es.po (+19/-0) plugin/i18n/es.po (+38/-0) portal_sale/i18n/es.po (+19/-0) procurement/i18n/es.po (+87/-6) product/i18n/es.po (+98/-1) project_gtd/i18n/es.po (+22/-0) project_gtd/i18n/lt.po (+18/-0) project_long_term/i18n/es.po (+17/-0) project_mrp/project_mrp_view.xml (+2/-2) purchase/i18n/fr.po (+174/-0) purchase/i18n/th.po (+29/-10) purchase/i18n/tr.po (+233/-15) share/i18n/lt.po (+619/-0) stock/report/picking.rml (+3/-3) stock/stock_view.xml (+2/-2) web_shortcuts/i18n/th.po (+25/-0) Text conflict in account/i18n/account.pot Text conflict in account/i18n/ar.po Text conflict in account/i18n/bg.po Text conflict in account/i18n/br.po Text conflict in account/i18n/bs.po Text conflict in account/i18n/ca.po Text conflict in account/i18n/cs.po Text conflict in account/i18n/da.po Text conflict in account/i18n/de.po Text conflict in account/i18n/el.po Text conflict in account/i18n/en_GB.po Text conflict in account/i18n/en_US.po Text conflict in account/i18n/es.po Text conflict in account/i18n/es_AR.po Text conflict in account/i18n/es_CL.po Text conflict in account/i18n/es_CR.po Text conflict in account/i18n/es_DO.po Text conflict in account/i18n/es_EC.po Text conflict in account/i18n/es_MX.po Text conflict in account/i18n/es_PY.po Text conflict in account/i18n/es_UY.po Text conflict in account/i18n/es_VE.po Text conflict in account/i18n/et.po Text conflict in account/i18n/eu.po Text conflict in account/i18n/fa.po Text conflict in account/i18n/fa_AF.po Text conflict in account/i18n/fi.po Text conflict in account/i18n/fr.po Text conflict in account/i18n/fr_BE.po Text conflict in account/i18n/gl.po Text conflict in account/i18n/gu.po Text conflict in account/i18n/he.po Text conflict in account/i18n/hi.po Text conflict in account/i18n/hr.po Text conflict in account/i18n/hu.po Text conflict in account/i18n/id.po Text conflict in account/i18n/it.po Text conflict in account/i18n/ja.po Text conflict in account/i18n/kab.po Text conflict in account/i18n/kk.po Text conflict in account/i18n/ko.po Text conflict in account/i18n/lo.po Text conflict in account/i18n/lt.po Text conflict in account/i18n/lv.po Text conflict in account/i18n/mk.po Text conflict in account/i18n/mn.po Text conflict in account/i18n/nb.po Text conflict in account/i18n/nl.po Text conflict in account/i18n/nl_BE.po Text conflict in account/i18n/oc.po Text conflict in account/i18n/pl.po Text conflict in account/i18n/pt.po Text conflict in account/i18n/pt_BR.po Text conflict in account/i18n/ro.po Text conflict in account/i18n/ru.po Text conflict in account/i18n/si.po Text conflict in account/i18n/sk.po Text conflict in account/i18n/sl.po Text conflict in account/i18n/sq.po Text conflict in account/i18n/sr.po Text conflict in account/i18n/sr@latin.po Text conflict in account/i18n/sv.po Text conflict in account/i18n/ta.po Text conflict in account/i18n/te.po Text conflict in account/i18n/th.po Text conflict in account/i18n/tlh.po Text conflict in account/i18n/tr.po Text conflict in account/i18n/ug.po Text conflict in account/i18n/uk.po Text conflict in account/i18n/ur.po Text conflict in account/i18n/vi.po Text conflict in account/i18n/zh_CN.po Text conflict in account/i18n/zh_HK.po Text conflict in account/i18n/zh_TW.po Text conflict in account_accountant/i18n/th.po Text conflict in account_analytic_analysis/i18n/nl.po Text conflict in account_analytic_analysis/i18n/tr.po Text conflict in account_analytic_default/i18n/tr.po Text conflict in account_asset/i18n/es.po Conflict adding file account_asset/i18n/th.po. Moved existing file to account_asset/i18n/th.po.moved. Text conflict in account_budget/i18n/es.po Text conflict in account_cancel/i18n/es.po Text conflict in account_check_writing/i18n/tr.po Text conflict in account_followup/i18n/es.po Text conflict in account_payment/i18n/es.po Conflict adding files to account_report_company. Created directory. Conflict because account_report_company is not versioned, but has versioned children. Versioned directory. Conflict adding files to account_report_company/i18n. Created directory. Conflict because account_report_company/i18n is not versioned, but has versioned children. Versioned directory. Text conflict in account_voucher/i18n/es.po Text conflict in account_voucher/i18n/tr.po Text conflict in analytic/i18n/es.po Text conflict in analytic_contract_hr_expense/i18n/es.po Text conflict in auth_signup/i18n/it.po Text conflict in base_action_rule/i18n/es.po Text conflict in base_calendar/i18n/es.po Text conflict in base_gengo/i18n/es.po Text conflict in base_import/i18n/fr.po Text conflict in base_vat/i18n/es.po Conflict adding file contacts/i18n/th.po. Moved existing file to contacts/i18n/th.po.moved. Text conflict in crm/i18n/lt.po Text conflict in crm/i18n/th.po Text conflict in crm_claim/i18n/es.po Text conflict in crm_helpdesk/i18n/es.po Text conflict in email_template/i18n/tr.po Text conflict in google_base_account/i18n/es.po Text conflict in hr/i18n/th.po Text conflict in hr_contract/i18n/es.po Conflict adding file hr_contract/i18n/th.po. Moved existing file to hr_contract/i18n/th.po.moved. Text conflict in hr_holidays/i18n/es.po Text conflict in hr_payroll/i18n/es.po Text conflict in hr_recruitment/i18n/es.po Text conflict in hr_recruitment/i18n/fr.po Text conflict in hr_timesheet/i18n/nl.po Conflict adding file hr_timesheet/i18n/th.po. Moved existing file to hr_timesheet/i18n/th.po.moved. Text conflict in hr_timesheet_invoice/i18n/es.po Conflict adding file hr_timesheet_sheet/i18n/th.po. Moved existing file to hr_timesheet_sheet/i18n/th.po.moved. Text conflict in idea/i18n/tr.po Text conflict in l10n_th/i18n/th.po Text conflict in lunch/i18n/es.po Text conflict in mail/i18n/fr.po Text conflict in mail/i18n/it.po Text conflict in mail/i18n/tr.po Text conflict in marketing_campaign/i18n/es.po Text conflict in membership/i18n/es.po Text conflict in mrp/i18n/es.po Text conflict in mrp_repair/i18n/es.po Text conflict in note/i18n/es.po Text conflict in pad/i18n/es.po Text conflict in plugin/i18n/es.po Text conflict in portal_sale/i18n/es.po Text conflict in procurement/i18n/es.po Text conflict in product/i18n/es.po Text conflict in project_gtd/i18n/es.po Text conflict in project_gtd/i18n/lt.po Text conflict in project_long_term/i18n/es.po Text conflict in purchase/i18n/fr.po Text conflict in purchase/i18n/th.po Text conflict in purchase/i18n/tr.po Conflict adding file share/i18n/lt.po. Moved existing file to share/i18n/lt.po.moved. Conflict adding file web_shortcuts/i18n/th.po. Moved existing file to web_shortcuts/i18n/th.po.moved. |
To merge this branch: | bzr merge lp:~camptocamp/openobject-addons/7.0-fix-lp-1192195-RDE |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
afayolle | Pending | ||
Review via email:
|
Commit message
Description of the change
This branch fixes bug #1192195.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'account/i18n/account.pot' |
2 | --- account/i18n/account.pot 2013-06-13 18:15:03 +0000 |
3 | +++ account/i18n/account.pot 2013-06-19 09:20:00 +0000 |
4 | @@ -6,8 +6,13 @@ |
5 | msgstr "" |
6 | "Project-Id-Version: OpenERP Server 7.0alpha\n" |
7 | "Report-Msgid-Bugs-To: \n" |
8 | +<<<<<<< TREE |
9 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
10 | "PO-Revision-Date: 2012-12-21 17:04+0000\n" |
11 | +======= |
12 | +"POT-Creation-Date: 2013-06-14 22:29+0000\n" |
13 | +"PO-Revision-Date: 2013-06-14 22:29+0000\n" |
14 | +>>>>>>> MERGE-SOURCE |
15 | "Last-Translator: <>\n" |
16 | "Language-Team: \n" |
17 | "MIME-Version: 1.0\n" |
18 | @@ -120,11 +125,19 @@ |
19 | #: code:addons/account/account.py:641 |
20 | #: code:addons/account/account.py:686 |
21 | #: code:addons/account/account.py:781 |
22 | +<<<<<<< TREE |
23 | #: code:addons/account/account.py:1049 |
24 | #: code:addons/account/account_invoice.py:792 |
25 | #: code:addons/account/account_invoice.py:795 |
26 | #: code:addons/account/account_invoice.py:798 |
27 | #: code:addons/account/account_invoice.py:1509 |
28 | +======= |
29 | +#: code:addons/account/account.py:1058 |
30 | +#: code:addons/account/account_invoice.py:820 |
31 | +#: code:addons/account/account_invoice.py:823 |
32 | +#: code:addons/account/account_invoice.py:826 |
33 | +#: code:addons/account/account_invoice.py:1545 |
34 | +>>>>>>> MERGE-SOURCE |
35 | #: code:addons/account/account_move_line.py:98 |
36 | #: code:addons/account/account_move_line.py:774 |
37 | #: code:addons/account/account_move_line.py:783 |
38 | @@ -301,7 +314,11 @@ |
39 | msgstr "" |
40 | |
41 | #. module: account |
42 | +<<<<<<< TREE |
43 | #: code:addons/account/account_invoice.py:73 |
44 | +======= |
45 | +#: code:addons/account/account_invoice.py:77 |
46 | +>>>>>>> MERGE-SOURCE |
47 | #, python-format |
48 | msgid "You must define an analytic journal of type '%s'!" |
49 | msgstr "" |
50 | @@ -546,10 +563,21 @@ |
51 | msgstr "" |
52 | |
53 | #. module: account |
54 | +<<<<<<< TREE |
55 | #. openerp-web |
56 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 |
57 | #, python-format |
58 | msgid "Nothing to reconcile" |
59 | +======= |
60 | +#: report:account.account.balance:0 |
61 | +#: selection:account.balance.report,display_account:0 |
62 | +#: selection:account.common.account.report,display_account:0 |
63 | +#: report:account.general.ledger_landscape:0 |
64 | +#: selection:account.report.general.ledger,display_account:0 |
65 | +#: selection:account.tax,type_tax_use:0 |
66 | +#: selection:account.tax.template,type_tax_use:0 |
67 | +msgid "All" |
68 | +>>>>>>> MERGE-SOURCE |
69 | msgstr "" |
70 | |
71 | #. module: account |
72 | @@ -673,7 +701,9 @@ |
73 | #: selection:account.common.partner.report,result_selection:0 |
74 | #: selection:account.partner.balance,result_selection:0 |
75 | #: selection:account.partner.ledger,result_selection:0 |
76 | +#: report:account.third_party_ledger:0 |
77 | #: code:addons/account/report/account_partner_balance.py:297 |
78 | +#: code:addons/account/report/account_partner_ledger.py:272 |
79 | #, python-format |
80 | msgid "Receivable Accounts" |
81 | msgstr "" |
82 | @@ -709,7 +739,11 @@ |
83 | msgstr "" |
84 | |
85 | #. module: account |
86 | +<<<<<<< TREE |
87 | #: code:addons/account/account_invoice.py:1329 |
88 | +======= |
89 | +#: code:addons/account/account_invoice.py:1361 |
90 | +>>>>>>> MERGE-SOURCE |
91 | #, python-format |
92 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." |
93 | msgstr "" |
94 | @@ -775,7 +809,11 @@ |
95 | msgstr "" |
96 | |
97 | #. module: account |
98 | +<<<<<<< TREE |
99 | #: code:addons/account/account_invoice.py:798 |
100 | +======= |
101 | +#: code:addons/account/account_invoice.py:826 |
102 | +>>>>>>> MERGE-SOURCE |
103 | #, python-format |
104 | msgid "Taxes are missing!\n" |
105 | "Click on compute button." |
106 | @@ -946,7 +984,11 @@ |
107 | msgstr "" |
108 | |
109 | #. module: account |
110 | +<<<<<<< TREE |
111 | #: code:addons/account/account_invoice.py:871 |
112 | +======= |
113 | +#: code:addons/account/account_invoice.py:899 |
114 | +>>>>>>> MERGE-SOURCE |
115 | #, python-format |
116 | msgid "Please define sequence on the journal related to this invoice." |
117 | msgstr "" |
118 | @@ -1014,10 +1056,17 @@ |
119 | msgstr "" |
120 | |
121 | #. module: account |
122 | +<<<<<<< TREE |
123 | #: code:addons/account/account.py:2298 |
124 | #: code:addons/account/account_bank_statement.py:423 |
125 | #: code:addons/account/account_invoice.py:73 |
126 | #: code:addons/account/account_invoice.py:748 |
127 | +======= |
128 | +#: code:addons/account/account.py:2346 |
129 | +#: code:addons/account/account_bank_statement.py:424 |
130 | +#: code:addons/account/account_invoice.py:77 |
131 | +#: code:addons/account/account_invoice.py:775 |
132 | +>>>>>>> MERGE-SOURCE |
133 | #: code:addons/account/account_move_line.py:195 |
134 | #, python-format |
135 | msgid "No Analytic Journal !" |
136 | @@ -1428,8 +1477,10 @@ |
137 | msgstr "" |
138 | |
139 | #. module: account |
140 | +#: report:account.account.balance:0 |
141 | #: selection:account.balance.report,display_account:0 |
142 | #: selection:account.common.account.report,display_account:0 |
143 | +#: report:account.general.ledger_landscape:0 |
144 | #: selection:account.partner.balance,display_partner:0 |
145 | #: selection:account.report.general.ledger,display_account:0 |
146 | msgid "With balance is not equal to 0" |
147 | @@ -1651,6 +1702,10 @@ |
148 | #: view:account.invoice:0 |
149 | #: view:account.invoice.report:0 |
150 | #: field:account.move.line,invoice:0 |
151 | +<<<<<<< TREE |
152 | +======= |
153 | +#: code:addons/account/account_invoice.py:1157 |
154 | +>>>>>>> MERGE-SOURCE |
155 | #: model:ir.model,name:account.model_account_invoice |
156 | #: model:res.request.link,name:account.req_link_invoice |
157 | msgid "Invoice" |
158 | @@ -1880,11 +1935,20 @@ |
159 | #: code:addons/account/account_bank_statement.py:418 |
160 | #: code:addons/account/account_cash_statement.py:256 |
161 | #: code:addons/account/account_cash_statement.py:300 |
162 | +<<<<<<< TREE |
163 | #: code:addons/account/account_invoice.py:871 |
164 | #: code:addons/account/account_invoice.py:905 |
165 | #: code:addons/account/account_invoice.py:1095 |
166 | #: code:addons/account/account_move_line.py:578 |
167 | #: code:addons/account/account_move_line.py:831 |
168 | +======= |
169 | +#: code:addons/account/account_invoice.py:899 |
170 | +#: code:addons/account/account_invoice.py:933 |
171 | +#: code:addons/account/account_invoice.py:1124 |
172 | +#: code:addons/account/account_move_line.py:579 |
173 | +#: code:addons/account/account_move_line.py:828 |
174 | +#: code:addons/account/account_move_line.py:851 |
175 | +>>>>>>> MERGE-SOURCE |
176 | #: code:addons/account/account_move_line.py:854 |
177 | #: code:addons/account/account_move_line.py:857 |
178 | #: code:addons/account/account_move_line.py:1122 |
179 | @@ -2107,7 +2171,9 @@ |
180 | #: selection:account.common.partner.report,result_selection:0 |
181 | #: selection:account.partner.balance,result_selection:0 |
182 | #: selection:account.partner.ledger,result_selection:0 |
183 | +#: report:account.third_party_ledger:0 |
184 | #: code:addons/account/report/account_partner_balance.py:299 |
185 | +#: code:addons/account/report/account_partner_ledger.py:274 |
186 | #, python-format |
187 | msgid "Payable Accounts" |
188 | msgstr "" |
189 | @@ -2398,7 +2464,11 @@ |
190 | msgstr "" |
191 | |
192 | #. module: account |
193 | +<<<<<<< TREE |
194 | #: code:addons/account/account_invoice.py:905 |
195 | +======= |
196 | +#: code:addons/account/account_invoice.py:933 |
197 | +>>>>>>> MERGE-SOURCE |
198 | #, python-format |
199 | msgid "Cannot create the invoice.\n" |
200 | "The related payment term is probably misconfigured as it gives a computed amount greater than the total invoiced amount. In order to avoid rounding issues, the latest line of your payment term must be of type 'balance'." |
201 | @@ -2650,6 +2720,7 @@ |
202 | msgstr "" |
203 | |
204 | #. module: account |
205 | +<<<<<<< TREE |
206 | #: code:addons/account/account.py:3493 |
207 | #: code:addons/account/account_bank_statement.py:404 |
208 | #: code:addons/account/account_invoice.py:386 |
209 | @@ -2659,6 +2730,16 @@ |
210 | #: code:addons/account/account_invoice.py:609 |
211 | #: code:addons/account/account_invoice.py:631 |
212 | #: code:addons/account/account_move_line.py:535 |
213 | +======= |
214 | +#: code:addons/account/account.py:3541 |
215 | +#: code:addons/account/account_bank_statement.py:405 |
216 | +#: code:addons/account/account_invoice.py:507 |
217 | +#: code:addons/account/account_invoice.py:609 |
218 | +#: code:addons/account/account_invoice.py:624 |
219 | +#: code:addons/account/account_invoice.py:632 |
220 | +#: code:addons/account/account_invoice.py:657 |
221 | +#: code:addons/account/account_move_line.py:536 |
222 | +>>>>>>> MERGE-SOURCE |
223 | #, python-format |
224 | msgid "Configuration Error!" |
225 | msgstr "" |
226 | @@ -2871,8 +2952,13 @@ |
227 | msgstr "" |
228 | |
229 | #. module: account |
230 | +<<<<<<< TREE |
231 | #: code:addons/account/account.py:2298 |
232 | #: code:addons/account/account_invoice.py:748 |
233 | +======= |
234 | +#: code:addons/account/account.py:2346 |
235 | +#: code:addons/account/account_invoice.py:775 |
236 | +>>>>>>> MERGE-SOURCE |
237 | #: code:addons/account/account_move_line.py:195 |
238 | #, python-format |
239 | msgid "You have to define an analytic journal on the '%s' journal!" |
240 | @@ -2929,6 +3015,11 @@ |
241 | msgstr "" |
242 | |
243 | #. module: account |
244 | +#: report:account.journal.period.print:0 |
245 | +msgid "Reference Number" |
246 | +msgstr "" |
247 | + |
248 | +#. module: account |
249 | #: selection:account.entries.report,month:0 |
250 | #: selection:account.invoice.report,month:0 |
251 | #: selection:analytic.entries.report,month:0 |
252 | @@ -3021,7 +3112,11 @@ |
253 | msgstr "" |
254 | |
255 | #. module: account |
256 | +<<<<<<< TREE |
257 | #: code:addons/account/account_invoice.py:795 |
258 | +======= |
259 | +#: code:addons/account/account_invoice.py:823 |
260 | +>>>>>>> MERGE-SOURCE |
261 | #, python-format |
262 | msgid "Tax base different!\n" |
263 | "Click on compute to update the tax base." |
264 | @@ -3170,8 +3265,13 @@ |
265 | msgstr "" |
266 | |
267 | #. module: account |
268 | +<<<<<<< TREE |
269 | #: code:addons/account/account.py:3412 |
270 | #: code:addons/account/account_bank.py:95 |
271 | +======= |
272 | +#: code:addons/account/account.py:3460 |
273 | +#: code:addons/account/account_bank.py:94 |
274 | +>>>>>>> MERGE-SOURCE |
275 | #, python-format |
276 | msgid "BNK" |
277 | msgstr "" |
278 | @@ -3403,7 +3503,11 @@ |
279 | msgstr "" |
280 | |
281 | #. module: account |
282 | +<<<<<<< TREE |
283 | #: code:addons/account/account_invoice.py:988 |
284 | +======= |
285 | +#: code:addons/account/account_invoice.py:1016 |
286 | +>>>>>>> MERGE-SOURCE |
287 | #, python-format |
288 | msgid "You cannot create an invoice on a centralized journal. Uncheck the centralized counterpart box in the related journal from the configuration menu." |
289 | msgstr "" |
290 | @@ -3415,7 +3519,11 @@ |
291 | msgstr "" |
292 | |
293 | #. module: account |
294 | +<<<<<<< TREE |
295 | #: code:addons/account/account_invoice.py:1428 |
296 | +======= |
297 | +#: code:addons/account/account_invoice.py:1465 |
298 | +>>>>>>> MERGE-SOURCE |
299 | #, python-format |
300 | msgid "No Partner Defined !" |
301 | msgstr "" |
302 | @@ -3659,14 +3767,21 @@ |
303 | msgstr "" |
304 | |
305 | #. module: account |
306 | +<<<<<<< TREE |
307 | #: report:account.invoice:0 |
308 | msgid "VAT :" |
309 | msgstr "" |
310 | |
311 | #. module: account |
312 | +======= |
313 | +#: report:account.account.balance:0 |
314 | +>>>>>>> MERGE-SOURCE |
315 | #: report:account.central.journal:0 |
316 | #: view:account.config.settings:0 |
317 | +#: report:account.general.journal:0 |
318 | #: report:account.general.ledger:0 |
319 | +#: report:account.general.ledger_landscape:0 |
320 | +#: report:account.journal.period.print:0 |
321 | #: report:account.partner.balance:0 |
322 | #: report:account.third_party_ledger:0 |
323 | #: report:account.third_party_ledger_other:0 |
324 | @@ -4006,7 +4121,11 @@ |
325 | msgstr "" |
326 | |
327 | #. module: account |
328 | +<<<<<<< TREE |
329 | #: code:addons/account/account_invoice.py:554 |
330 | +======= |
331 | +#: code:addons/account/account_invoice.py:573 |
332 | +>>>>>>> MERGE-SOURCE |
333 | #: code:addons/account/wizard/account_invoice_refund.py:146 |
334 | #, python-format |
335 | msgid "Insufficient Data!" |
336 | @@ -4253,8 +4372,13 @@ |
337 | msgstr "" |
338 | |
339 | #. module: account |
340 | +<<<<<<< TREE |
341 | #: code:addons/account/account_invoice.py:587 |
342 | #: code:addons/account/account_invoice.py:602 |
343 | +======= |
344 | +#: code:addons/account/account_invoice.py:610 |
345 | +#: code:addons/account/account_invoice.py:625 |
346 | +>>>>>>> MERGE-SOURCE |
347 | #, python-format |
348 | msgid "Cannot find a chart of account, you should create one from Settings\\Configuration\\Accounting menu." |
349 | msgstr "" |
350 | @@ -4517,7 +4641,11 @@ |
351 | msgstr "" |
352 | |
353 | #. module: account |
354 | +<<<<<<< TREE |
355 | #: code:addons/account/account_invoice.py:631 |
356 | +======= |
357 | +#: code:addons/account/account_invoice.py:658 |
358 | +>>>>>>> MERGE-SOURCE |
359 | #, python-format |
360 | msgid "Cannot find any account journal of %s type for this company.\n" |
361 | "\n" |
362 | @@ -4830,7 +4958,11 @@ |
363 | msgstr "" |
364 | |
365 | #. module: account |
366 | +<<<<<<< TREE |
367 | #: code:addons/account/account_invoice.py:894 |
368 | +======= |
369 | +#: code:addons/account/account_invoice.py:922 |
370 | +>>>>>>> MERGE-SOURCE |
371 | #, python-format |
372 | msgid "Please verify the price of the invoice !\n" |
373 | "The encoded total does not match the computed total." |
374 | @@ -5142,7 +5274,11 @@ |
375 | msgstr "" |
376 | |
377 | #. module: account |
378 | +<<<<<<< TREE |
379 | #: code:addons/account/account_invoice.py:489 |
380 | +======= |
381 | +#: code:addons/account/account_invoice.py:508 |
382 | +>>>>>>> MERGE-SOURCE |
383 | #, python-format |
384 | msgid "Cannot find a chart of accounts for this company, you should create one." |
385 | msgstr "" |
386 | @@ -5504,6 +5640,15 @@ |
387 | msgstr "" |
388 | |
389 | #. module: account |
390 | +<<<<<<< TREE |
391 | +======= |
392 | +#: code:addons/account/account_invoice.py:474 |
393 | +#, python-format |
394 | +msgid "You cannot delete an invoice after it has been validated (and received a number). You can set it back to \"Draft\" state and modify its content, then re-confirm it." |
395 | +msgstr "" |
396 | + |
397 | +#. module: account |
398 | +>>>>>>> MERGE-SOURCE |
399 | #: help:account.automatic.reconcile,power:0 |
400 | msgid "Number of partial amounts that can be combined to find a balance point can be chosen as the power of the automatic reconciliation" |
401 | msgstr "" |
402 | @@ -5653,7 +5798,11 @@ |
403 | #: view:account.config.settings:0 |
404 | #: view:account.invoice:0 |
405 | #: view:account.invoice.report:0 |
406 | +<<<<<<< TREE |
407 | #: code:addons/account/account_invoice.py:363 |
408 | +======= |
409 | +#: code:addons/account/account_invoice.py:390 |
410 | +>>>>>>> MERGE-SOURCE |
411 | #, python-format |
412 | msgid "Supplier" |
413 | msgstr "" |
414 | @@ -5673,7 +5822,11 @@ |
415 | msgstr "" |
416 | |
417 | #. module: account |
418 | +<<<<<<< TREE |
419 | #: code:addons/account/account_invoice.py:91 |
420 | +======= |
421 | +#: code:addons/account/account_invoice.py:95 |
422 | +>>>>>>> MERGE-SOURCE |
423 | #, python-format |
424 | msgid "Free Reference" |
425 | msgstr "" |
426 | @@ -5683,7 +5836,9 @@ |
427 | #: selection:account.common.partner.report,result_selection:0 |
428 | #: selection:account.partner.balance,result_selection:0 |
429 | #: selection:account.partner.ledger,result_selection:0 |
430 | +#: report:account.third_party_ledger:0 |
431 | #: code:addons/account/report/account_partner_balance.py:301 |
432 | +#: code:addons/account/report/account_partner_ledger.py:276 |
433 | #, python-format |
434 | msgid "Receivable and Payable Accounts" |
435 | msgstr "" |
436 | @@ -5963,7 +6118,11 @@ |
437 | msgstr "" |
438 | |
439 | #. module: account |
440 | +<<<<<<< TREE |
441 | #: code:addons/account/account_invoice.py:1095 |
442 | +======= |
443 | +#: code:addons/account/account_invoice.py:1124 |
444 | +>>>>>>> MERGE-SOURCE |
445 | #, python-format |
446 | msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first." |
447 | msgstr "" |
448 | @@ -6129,7 +6288,11 @@ |
449 | msgstr "" |
450 | |
451 | #. module: account |
452 | +<<<<<<< TREE |
453 | #: code:addons/account/account_invoice.py:610 |
454 | +======= |
455 | +#: code:addons/account/account_invoice.py:633 |
456 | +>>>>>>> MERGE-SOURCE |
457 | #, python-format |
458 | msgid "Invoice line account's company and invoice's compnay does not match." |
459 | msgstr "" |
460 | @@ -6262,12 +6425,21 @@ |
461 | msgstr "" |
462 | |
463 | #. module: account |
464 | +<<<<<<< TREE |
465 | #: code:addons/account/account.py:1410 |
466 | #: code:addons/account/account.py:1415 |
467 | #: code:addons/account/account.py:1444 |
468 | #: code:addons/account/account.py:1451 |
469 | #: code:addons/account/account_invoice.py:987 |
470 | #: code:addons/account/account_move_line.py:1008 |
471 | +======= |
472 | +#: code:addons/account/account.py:1448 |
473 | +#: code:addons/account/account.py:1453 |
474 | +#: code:addons/account/account.py:1482 |
475 | +#: code:addons/account/account.py:1489 |
476 | +#: code:addons/account/account_invoice.py:1015 |
477 | +#: code:addons/account/account_move_line.py:1005 |
478 | +>>>>>>> MERGE-SOURCE |
479 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 |
480 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 |
481 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 |
482 | @@ -6336,6 +6508,10 @@ |
483 | #: report:account.invoice:0 |
484 | #: selection:account.invoice,type:0 |
485 | #: selection:account.invoice.report,type:0 |
486 | +<<<<<<< TREE |
487 | +======= |
488 | +#: code:addons/account/account_invoice.py:1160 |
489 | +>>>>>>> MERGE-SOURCE |
490 | #: selection:report.invoice.created,type:0 |
491 | msgid "Supplier Refund" |
492 | msgstr "" |
493 | @@ -7386,7 +7562,11 @@ |
494 | msgstr "" |
495 | |
496 | #. module: account |
497 | +<<<<<<< TREE |
498 | #: code:addons/account/account_invoice.py:792 |
499 | +======= |
500 | +#: code:addons/account/account_invoice.py:820 |
501 | +>>>>>>> MERGE-SOURCE |
502 | #, python-format |
503 | msgid "Global taxes defined, but they are not in invoice lines !" |
504 | msgstr "" |
505 | @@ -7425,7 +7605,11 @@ |
506 | #: view:account.config.settings:0 |
507 | #: view:account.invoice:0 |
508 | #: view:account.invoice.report:0 |
509 | +<<<<<<< TREE |
510 | #: code:addons/account/account_invoice.py:361 |
511 | +======= |
512 | +#: code:addons/account/account_invoice.py:388 |
513 | +>>>>>>> MERGE-SOURCE |
514 | #, python-format |
515 | msgid "Customer" |
516 | msgstr "" |
517 | @@ -7553,6 +7737,15 @@ |
518 | msgstr "" |
519 | |
520 | #. module: account |
521 | +<<<<<<< TREE |
522 | +======= |
523 | +#: code:addons/account/account_invoice.py:472 |
524 | +#, python-format |
525 | +msgid "You cannot delete an invoice which is not draft or cancelled. You should refund it instead." |
526 | +msgstr "" |
527 | + |
528 | +#. module: account |
529 | +>>>>>>> MERGE-SOURCE |
530 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement |
531 | msgid "Legal Reports" |
532 | msgstr "" |
533 | @@ -7662,7 +7855,11 @@ |
534 | msgstr "" |
535 | |
536 | #. module: account |
537 | +<<<<<<< TREE |
538 | #: code:addons/account/account_invoice.py:873 |
539 | +======= |
540 | +#: code:addons/account/account_invoice.py:901 |
541 | +>>>>>>> MERGE-SOURCE |
542 | #, python-format |
543 | msgid "No Invoice Lines !" |
544 | msgstr "" |
545 | @@ -7732,7 +7929,11 @@ |
546 | msgstr "" |
547 | |
548 | #. module: account |
549 | +<<<<<<< TREE |
550 | #: code:addons/account/account_invoice.py:1428 |
551 | +======= |
552 | +#: code:addons/account/account_invoice.py:1465 |
553 | +>>>>>>> MERGE-SOURCE |
554 | #, python-format |
555 | msgid "You must first select a partner !" |
556 | msgstr "" |
557 | @@ -8618,7 +8819,11 @@ |
558 | msgstr "" |
559 | |
560 | #. module: account |
561 | +<<<<<<< TREE |
562 | #: code:addons/account/account_invoice.py:873 |
563 | +======= |
564 | +#: code:addons/account/account_invoice.py:901 |
565 | +>>>>>>> MERGE-SOURCE |
566 | #, python-format |
567 | msgid "Please create some invoice lines." |
568 | msgstr "" |
569 | @@ -9146,7 +9351,11 @@ |
570 | msgstr "" |
571 | |
572 | #. module: account |
573 | +<<<<<<< TREE |
574 | #: code:addons/account/account_invoice.py:894 |
575 | +======= |
576 | +#: code:addons/account/account_invoice.py:922 |
577 | +>>>>>>> MERGE-SOURCE |
578 | #, python-format |
579 | msgid "Bad total !" |
580 | msgstr "" |
581 | @@ -9598,6 +9807,7 @@ |
582 | |
583 | #. module: account |
584 | #: field:account.account,company_id:0 |
585 | +#: report:account.account.balance:0 |
586 | #: field:account.aged.trial.balance,company_id:0 |
587 | #: field:account.analytic.journal,company_id:0 |
588 | #: field:account.balance.report,company_id:0 |
589 | @@ -9613,7 +9823,9 @@ |
590 | #: field:account.entries.report,company_id:0 |
591 | #: field:account.fiscal.position,company_id:0 |
592 | #: field:account.fiscalyear,company_id:0 |
593 | +#: report:account.general.journal:0 |
594 | #: field:account.general.journal,company_id:0 |
595 | +#: report:account.general.ledger_landscape:0 |
596 | #: field:account.installer,company_id:0 |
597 | #: field:account.invoice,company_id:0 |
598 | #: field:account.invoice.line,company_id:0 |
599 | @@ -9622,6 +9834,7 @@ |
600 | #: field:account.invoice.tax,company_id:0 |
601 | #: field:account.journal,company_id:0 |
602 | #: field:account.journal.period,company_id:0 |
603 | +#: report:account.journal.period.print:0 |
604 | #: field:account.model,company_id:0 |
605 | #: field:account.move,company_id:0 |
606 | #: field:account.move.line,company_id:0 |
607 | @@ -9773,6 +9986,10 @@ |
608 | #: view:account.invoice:0 |
609 | #: selection:account.invoice,type:0 |
610 | #: selection:account.invoice.report,type:0 |
611 | +<<<<<<< TREE |
612 | +======= |
613 | +#: code:addons/account/account_invoice.py:1158 |
614 | +>>>>>>> MERGE-SOURCE |
615 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 |
616 | #: selection:report.invoice.created,type:0 |
617 | msgid "Supplier Invoice" |
618 | @@ -9855,8 +10072,10 @@ |
619 | msgstr "" |
620 | |
621 | #. module: account |
622 | +#: report:account.account.balance:0 |
623 | #: selection:account.balance.report,display_account:0 |
624 | #: selection:account.common.account.report,display_account:0 |
625 | +#: report:account.general.ledger_landscape:0 |
626 | #: selection:account.report.general.ledger,display_account:0 |
627 | msgid "With movements" |
628 | msgstr "" |
629 | @@ -9949,7 +10168,11 @@ |
630 | msgstr "" |
631 | |
632 | #. module: account |
633 | +<<<<<<< TREE |
634 | #: code:addons/account/account_invoice.py:1510 |
635 | +======= |
636 | +#: code:addons/account/account_invoice.py:1546 |
637 | +>>>>>>> MERGE-SOURCE |
638 | #, python-format |
639 | msgid "The selected unit of measure is not compatible with the unit of measure of the product." |
640 | msgstr "" |
641 | @@ -10021,6 +10244,11 @@ |
642 | #: report:account.invoice:0 |
643 | #: view:account.invoice:0 |
644 | #: view:account.invoice.report:0 |
645 | +<<<<<<< TREE |
646 | +======= |
647 | +#: code:addons/account/account_invoice.py:1159 |
648 | +#, python-format |
649 | +>>>>>>> MERGE-SOURCE |
650 | msgid "Refund" |
651 | msgstr "" |
652 | |
653 | @@ -10088,7 +10316,11 @@ |
654 | msgstr "" |
655 | |
656 | #. module: account |
657 | +<<<<<<< TREE |
658 | #: code:addons/account/account_invoice.py:554 |
659 | +======= |
660 | +#: code:addons/account/account_invoice.py:573 |
661 | +>>>>>>> MERGE-SOURCE |
662 | #, python-format |
663 | msgid "The payment term of supplier does not have a payment term line." |
664 | msgstr "" |
665 | |
666 | === modified file 'account/i18n/ar.po' |
667 | --- account/i18n/ar.po 2013-06-13 18:15:03 +0000 |
668 | +++ account/i18n/ar.po 2013-06-19 09:20:00 +0000 |
669 | @@ -4,17 +4,31 @@ |
670 | # |
671 | msgid "" |
672 | msgstr "" |
673 | +<<<<<<< TREE |
674 | "Project-Id-Version: OpenERP Server 6.0dev\n" |
675 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
676 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
677 | "PO-Revision-Date: 2012-12-15 22:53+0000\n" |
678 | "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n" |
679 | "Language-Team: \n" |
680 | +======= |
681 | +"Project-Id-Version: openobject-addons\n" |
682 | +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
683 | +"POT-Creation-Date: 2013-06-14 22:29+0000\n" |
684 | +"PO-Revision-Date: 2013-02-17 03:05+0000\n" |
685 | +"Last-Translator: Ahmad Khayyat <Unknown>\n" |
686 | +"Language-Team: Arabic <ar@li.org>\n" |
687 | +>>>>>>> MERGE-SOURCE |
688 | "MIME-Version: 1.0\n" |
689 | "Content-Type: text/plain; charset=UTF-8\n" |
690 | "Content-Transfer-Encoding: 8bit\n" |
691 | +<<<<<<< TREE |
692 | "X-Launchpad-Export-Date: 2013-03-16 05:12+0000\n" |
693 | "X-Generator: Launchpad (build 16532)\n" |
694 | +======= |
695 | +"X-Launchpad-Export-Date: 2013-06-15 06:13+0000\n" |
696 | +"X-Generator: Launchpad (build 16667)\n" |
697 | +>>>>>>> MERGE-SOURCE |
698 | |
699 | #. module: account |
700 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 |
701 | @@ -133,11 +147,19 @@ |
702 | #: code:addons/account/account.py:641 |
703 | #: code:addons/account/account.py:686 |
704 | #: code:addons/account/account.py:781 |
705 | +<<<<<<< TREE |
706 | #: code:addons/account/account.py:1049 |
707 | #: code:addons/account/account_invoice.py:788 |
708 | #: code:addons/account/account_invoice.py:791 |
709 | #: code:addons/account/account_invoice.py:794 |
710 | #: code:addons/account/account_invoice.py:1514 |
711 | +======= |
712 | +#: code:addons/account/account.py:1058 |
713 | +#: code:addons/account/account_invoice.py:820 |
714 | +#: code:addons/account/account_invoice.py:823 |
715 | +#: code:addons/account/account_invoice.py:826 |
716 | +#: code:addons/account/account_invoice.py:1545 |
717 | +>>>>>>> MERGE-SOURCE |
718 | #: code:addons/account/account_move_line.py:98 |
719 | #: code:addons/account/account_move_line.py:774 |
720 | #: code:addons/account/account_move_line.py:827 |
721 | @@ -342,7 +364,7 @@ |
722 | msgstr "السماح لأكثر من عملة" |
723 | |
724 | #. module: account |
725 | -#: code:addons/account/account_invoice.py:74 |
726 | +#: code:addons/account/account_invoice.py:77 |
727 | #, python-format |
728 | msgid "You must define an analytic journal of type '%s'!" |
729 | msgstr "يجب تعريف دفتر يومية تحليلي من نوع '%s'!" |
730 | @@ -598,11 +620,23 @@ |
731 | msgstr "الحساب يؤكد الكشف" |
732 | |
733 | #. module: account |
734 | +<<<<<<< TREE |
735 | #. openerp-web |
736 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 |
737 | #, python-format |
738 | msgid "Nothing to reconcile" |
739 | msgstr "لا يوجد شيء لتسويته" |
740 | +======= |
741 | +#: report:account.account.balance:0 |
742 | +#: selection:account.balance.report,display_account:0 |
743 | +#: selection:account.common.account.report,display_account:0 |
744 | +#: report:account.general.ledger_landscape:0 |
745 | +#: selection:account.report.general.ledger,display_account:0 |
746 | +#: selection:account.tax,type_tax_use:0 |
747 | +#: selection:account.tax.template,type_tax_use:0 |
748 | +msgid "All" |
749 | +msgstr "الكل" |
750 | +>>>>>>> MERGE-SOURCE |
751 | |
752 | #. module: account |
753 | #: field:account.config.settings,decimal_precision:0 |
754 | @@ -733,7 +767,9 @@ |
755 | #: selection:account.common.partner.report,result_selection:0 |
756 | #: selection:account.partner.balance,result_selection:0 |
757 | #: selection:account.partner.ledger,result_selection:0 |
758 | +#: report:account.third_party_ledger:0 |
759 | #: code:addons/account/report/account_partner_balance.py:297 |
760 | +#: code:addons/account/report/account_partner_ledger.py:272 |
761 | #, python-format |
762 | msgid "Receivable Accounts" |
763 | msgstr "حسابات مدينة" |
764 | @@ -773,7 +809,11 @@ |
765 | msgstr "هل أنت متأكد من إنشاء القيد؟" |
766 | |
767 | #. module: account |
768 | +<<<<<<< TREE |
769 | #: code:addons/account/account_invoice.py:1330 |
770 | +======= |
771 | +#: code:addons/account/account_invoice.py:1361 |
772 | +>>>>>>> MERGE-SOURCE |
773 | #, python-format |
774 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." |
775 | msgstr "" |
776 | @@ -844,7 +884,11 @@ |
777 | msgstr "نوع" |
778 | |
779 | #. module: account |
780 | +<<<<<<< TREE |
781 | #: code:addons/account/account_invoice.py:794 |
782 | +======= |
783 | +#: code:addons/account/account_invoice.py:826 |
784 | +>>>>>>> MERGE-SOURCE |
785 | #, python-format |
786 | msgid "" |
787 | "Taxes are missing!\n" |
788 | @@ -1026,7 +1070,11 @@ |
789 | msgstr "الخصوم" |
790 | |
791 | #. module: account |
792 | +<<<<<<< TREE |
793 | #: code:addons/account/account_invoice.py:867 |
794 | +======= |
795 | +#: code:addons/account/account_invoice.py:899 |
796 | +>>>>>>> MERGE-SOURCE |
797 | #, python-format |
798 | msgid "Please define sequence on the journal related to this invoice." |
799 | msgstr "من فضلك حدد تسلسل دفاتير اليومية التي لها علاقة بهذه الفاتورة" |
800 | @@ -1100,10 +1148,17 @@ |
801 | msgstr "مزايا" |
802 | |
803 | #. module: account |
804 | +<<<<<<< TREE |
805 | #: code:addons/account/account.py:2308 |
806 | #: code:addons/account/account_bank_statement.py:423 |
807 | #: code:addons/account/account_invoice.py:74 |
808 | #: code:addons/account/account_invoice.py:744 |
809 | +======= |
810 | +#: code:addons/account/account.py:2346 |
811 | +#: code:addons/account/account_bank_statement.py:424 |
812 | +#: code:addons/account/account_invoice.py:77 |
813 | +#: code:addons/account/account_invoice.py:775 |
814 | +>>>>>>> MERGE-SOURCE |
815 | #: code:addons/account/account_move_line.py:195 |
816 | #, python-format |
817 | msgid "No Analytic Journal !" |
818 | @@ -1540,8 +1595,10 @@ |
819 | msgstr "" |
820 | |
821 | #. module: account |
822 | +#: report:account.account.balance:0 |
823 | #: selection:account.balance.report,display_account:0 |
824 | #: selection:account.common.account.report,display_account:0 |
825 | +#: report:account.general.ledger_landscape:0 |
826 | #: selection:account.partner.balance,display_partner:0 |
827 | #: selection:account.report.general.ledger,display_account:0 |
828 | msgid "With balance is not equal to 0" |
829 | @@ -1775,6 +1832,10 @@ |
830 | #: view:account.invoice:0 |
831 | #: view:account.invoice.report:0 |
832 | #: field:account.move.line,invoice:0 |
833 | +<<<<<<< TREE |
834 | +======= |
835 | +#: code:addons/account/account_invoice.py:1157 |
836 | +>>>>>>> MERGE-SOURCE |
837 | #: model:ir.model,name:account.model_account_invoice |
838 | #: model:res.request.link,name:account.req_link_invoice |
839 | msgid "Invoice" |
840 | @@ -2023,11 +2084,20 @@ |
841 | #: code:addons/account/account_bank_statement.py:418 |
842 | #: code:addons/account/account_cash_statement.py:256 |
843 | #: code:addons/account/account_cash_statement.py:300 |
844 | +<<<<<<< TREE |
845 | #: code:addons/account/account_invoice.py:867 |
846 | #: code:addons/account/account_invoice.py:901 |
847 | #: code:addons/account/account_invoice.py:1091 |
848 | #: code:addons/account/account_move_line.py:578 |
849 | #: code:addons/account/account_move_line.py:831 |
850 | +======= |
851 | +#: code:addons/account/account_invoice.py:899 |
852 | +#: code:addons/account/account_invoice.py:933 |
853 | +#: code:addons/account/account_invoice.py:1124 |
854 | +#: code:addons/account/account_move_line.py:579 |
855 | +#: code:addons/account/account_move_line.py:828 |
856 | +#: code:addons/account/account_move_line.py:851 |
857 | +>>>>>>> MERGE-SOURCE |
858 | #: code:addons/account/account_move_line.py:854 |
859 | #: code:addons/account/account_move_line.py:857 |
860 | #: code:addons/account/account_move_line.py:1122 |
861 | @@ -2263,7 +2333,9 @@ |
862 | #: selection:account.common.partner.report,result_selection:0 |
863 | #: selection:account.partner.balance,result_selection:0 |
864 | #: selection:account.partner.ledger,result_selection:0 |
865 | +#: report:account.third_party_ledger:0 |
866 | #: code:addons/account/report/account_partner_balance.py:299 |
867 | +#: code:addons/account/report/account_partner_ledger.py:274 |
868 | #, python-format |
869 | msgid "Payable Accounts" |
870 | msgstr "حسابات الدائنون" |
871 | @@ -2575,7 +2647,11 @@ |
872 | msgstr "انشأ حساب مبنيًا على هذا القالب" |
873 | |
874 | #. module: account |
875 | +<<<<<<< TREE |
876 | #: code:addons/account/account_invoice.py:901 |
877 | +======= |
878 | +#: code:addons/account/account_invoice.py:933 |
879 | +>>>>>>> MERGE-SOURCE |
880 | #, python-format |
881 | msgid "" |
882 | "Cannot create the invoice.\n" |
883 | @@ -2849,6 +2925,7 @@ |
884 | msgstr "حسابات" |
885 | |
886 | #. module: account |
887 | +<<<<<<< TREE |
888 | #: code:addons/account/account.py:3503 |
889 | #: code:addons/account/account_bank_statement.py:404 |
890 | #: code:addons/account/account_invoice.py:378 |
891 | @@ -2858,6 +2935,16 @@ |
892 | #: code:addons/account/account_invoice.py:605 |
893 | #: code:addons/account/account_invoice.py:627 |
894 | #: code:addons/account/account_move_line.py:535 |
895 | +======= |
896 | +#: code:addons/account/account.py:3541 |
897 | +#: code:addons/account/account_bank_statement.py:405 |
898 | +#: code:addons/account/account_invoice.py:507 |
899 | +#: code:addons/account/account_invoice.py:609 |
900 | +#: code:addons/account/account_invoice.py:624 |
901 | +#: code:addons/account/account_invoice.py:632 |
902 | +#: code:addons/account/account_invoice.py:657 |
903 | +#: code:addons/account/account_move_line.py:536 |
904 | +>>>>>>> MERGE-SOURCE |
905 | #, python-format |
906 | msgid "Configuration Error!" |
907 | msgstr "خطأ في الإعدادات!" |
908 | @@ -3085,8 +3172,13 @@ |
909 | msgstr "يومية البيع" |
910 | |
911 | #. module: account |
912 | +<<<<<<< TREE |
913 | #: code:addons/account/account.py:2308 |
914 | #: code:addons/account/account_invoice.py:744 |
915 | +======= |
916 | +#: code:addons/account/account.py:2346 |
917 | +#: code:addons/account/account_invoice.py:775 |
918 | +>>>>>>> MERGE-SOURCE |
919 | #: code:addons/account/account_move_line.py:195 |
920 | #, python-format |
921 | msgid "You have to define an analytic journal on the '%s' journal!" |
922 | @@ -3147,6 +3239,11 @@ |
923 | msgstr "عرض خانة الدائن/المدين" |
924 | |
925 | #. module: account |
926 | +#: report:account.journal.period.print:0 |
927 | +msgid "Reference Number" |
928 | +msgstr "رقم المرجع" |
929 | + |
930 | +#. module: account |
931 | #: selection:account.entries.report,month:0 |
932 | #: selection:account.invoice.report,month:0 |
933 | #: selection:analytic.entries.report,month:0 |
934 | @@ -3249,7 +3346,11 @@ |
935 | msgstr "الوضع المالي" |
936 | |
937 | #. module: account |
938 | +<<<<<<< TREE |
939 | #: code:addons/account/account_invoice.py:791 |
940 | +======= |
941 | +#: code:addons/account/account_invoice.py:823 |
942 | +>>>>>>> MERGE-SOURCE |
943 | #, python-format |
944 | msgid "" |
945 | "Tax base different!\n" |
946 | @@ -3412,8 +3513,13 @@ |
947 | msgstr "عرض" |
948 | |
949 | #. module: account |
950 | +<<<<<<< TREE |
951 | #: code:addons/account/account.py:3422 |
952 | #: code:addons/account/account_bank.py:95 |
953 | +======= |
954 | +#: code:addons/account/account.py:3460 |
955 | +#: code:addons/account/account_bank.py:94 |
956 | +>>>>>>> MERGE-SOURCE |
957 | #, python-format |
958 | msgid "BNK" |
959 | msgstr "بنك" |
960 | @@ -3682,7 +3788,11 @@ |
961 | "كإسم البيان. وهي تسمح لمدخلات البيان ان يكون لها نفس المراجع عن البيان نفسه." |
962 | |
963 | #. module: account |
964 | +<<<<<<< TREE |
965 | #: code:addons/account/account_invoice.py:984 |
966 | +======= |
967 | +#: code:addons/account/account_invoice.py:1016 |
968 | +>>>>>>> MERGE-SOURCE |
969 | #, python-format |
970 | msgid "" |
971 | "You cannot create an invoice on a centralized journal. Uncheck the " |
972 | @@ -3697,7 +3807,11 @@ |
973 | msgstr "رصيد أول المدة" |
974 | |
975 | #. module: account |
976 | +<<<<<<< TREE |
977 | #: code:addons/account/account_invoice.py:1434 |
978 | +======= |
979 | +#: code:addons/account/account_invoice.py:1465 |
980 | +>>>>>>> MERGE-SOURCE |
981 | #, python-format |
982 | msgid "No Partner Defined !" |
983 | msgstr "لا يوجد شريك معرف !" |
984 | @@ -3967,14 +4081,21 @@ |
985 | msgstr "ضريبة الشراء هذه سيتم استخدامها افتراضيا للمنتجات الجديدة." |
986 | |
987 | #. module: account |
988 | +<<<<<<< TREE |
989 | #: report:account.invoice:0 |
990 | msgid "VAT :" |
991 | msgstr "ضريبة القيمة المضافة:" |
992 | |
993 | #. module: account |
994 | +======= |
995 | +#: report:account.account.balance:0 |
996 | +>>>>>>> MERGE-SOURCE |
997 | #: report:account.central.journal:0 |
998 | #: view:account.config.settings:0 |
999 | +#: report:account.general.journal:0 |
1000 | #: report:account.general.ledger:0 |
1001 | +#: report:account.general.ledger_landscape:0 |
1002 | +#: report:account.journal.period.print:0 |
1003 | #: report:account.partner.balance:0 |
1004 | #: report:account.third_party_ledger:0 |
1005 | #: report:account.third_party_ledger_other:0 |
1006 | @@ -4340,7 +4461,11 @@ |
1007 | msgstr "فرعي موحد" |
1008 | |
1009 | #. module: account |
1010 | +<<<<<<< TREE |
1011 | #: code:addons/account/account_invoice.py:550 |
1012 | +======= |
1013 | +#: code:addons/account/account_invoice.py:573 |
1014 | +>>>>>>> MERGE-SOURCE |
1015 | #: code:addons/account/wizard/account_invoice_refund.py:146 |
1016 | #, python-format |
1017 | msgid "Insufficient Data!" |
1018 | @@ -4618,8 +4743,13 @@ |
1019 | msgstr "تسلسل فاتورة المورد/الشريك" |
1020 | |
1021 | #. module: account |
1022 | +<<<<<<< TREE |
1023 | #: code:addons/account/account_invoice.py:583 |
1024 | #: code:addons/account/account_invoice.py:598 |
1025 | +======= |
1026 | +#: code:addons/account/account_invoice.py:610 |
1027 | +#: code:addons/account/account_invoice.py:625 |
1028 | +>>>>>>> MERGE-SOURCE |
1029 | #, python-format |
1030 | msgid "" |
1031 | "Cannot find a chart of account, you should create one from Settings\\" |
1032 | @@ -4897,7 +5027,11 @@ |
1033 | msgstr "" |
1034 | |
1035 | #. module: account |
1036 | +<<<<<<< TREE |
1037 | #: code:addons/account/account_invoice.py:627 |
1038 | +======= |
1039 | +#: code:addons/account/account_invoice.py:658 |
1040 | +>>>>>>> MERGE-SOURCE |
1041 | #, python-format |
1042 | msgid "" |
1043 | "Cannot find any account journal of %s type for this company.\n" |
1044 | @@ -5227,7 +5361,11 @@ |
1045 | msgstr "التطبيق الضريبي" |
1046 | |
1047 | #. module: account |
1048 | +<<<<<<< TREE |
1049 | #: code:addons/account/account_invoice.py:890 |
1050 | +======= |
1051 | +#: code:addons/account/account_invoice.py:922 |
1052 | +>>>>>>> MERGE-SOURCE |
1053 | #, python-format |
1054 | msgid "" |
1055 | "Please verify the price of the invoice !\n" |
1056 | @@ -5563,7 +5701,11 @@ |
1057 | msgstr "رمز الحساب (إذا كان النوع = الرمز)" |
1058 | |
1059 | #. module: account |
1060 | +<<<<<<< TREE |
1061 | #: code:addons/account/account_invoice.py:485 |
1062 | +======= |
1063 | +#: code:addons/account/account_invoice.py:508 |
1064 | +>>>>>>> MERGE-SOURCE |
1065 | #, python-format |
1066 | msgid "" |
1067 | "Cannot find a chart of accounts for this company, you should create one." |
1068 | @@ -5955,6 +6097,18 @@ |
1069 | msgstr "" |
1070 | |
1071 | #. module: account |
1072 | +<<<<<<< TREE |
1073 | +======= |
1074 | +#: code:addons/account/account_invoice.py:474 |
1075 | +#, python-format |
1076 | +msgid "" |
1077 | +"You cannot delete an invoice after it has been validated (and received a " |
1078 | +"number). You can set it back to \"Draft\" state and modify its content, " |
1079 | +"then re-confirm it." |
1080 | +msgstr "" |
1081 | + |
1082 | +#. module: account |
1083 | +>>>>>>> MERGE-SOURCE |
1084 | #: help:account.automatic.reconcile,power:0 |
1085 | msgid "" |
1086 | "Number of partial amounts that can be combined to find a balance point can " |
1087 | @@ -6108,7 +6262,11 @@ |
1088 | #: view:account.config.settings:0 |
1089 | #: view:account.invoice:0 |
1090 | #: view:account.invoice.report:0 |
1091 | +<<<<<<< TREE |
1092 | #: code:addons/account/account_invoice.py:355 |
1093 | +======= |
1094 | +#: code:addons/account/account_invoice.py:390 |
1095 | +>>>>>>> MERGE-SOURCE |
1096 | #, python-format |
1097 | msgid "Supplier" |
1098 | msgstr "مورِّد" |
1099 | @@ -6128,7 +6286,7 @@ |
1100 | msgstr "الحساب" |
1101 | |
1102 | #. module: account |
1103 | -#: code:addons/account/account_invoice.py:92 |
1104 | +#: code:addons/account/account_invoice.py:95 |
1105 | #, python-format |
1106 | msgid "Free Reference" |
1107 | msgstr "مرجع حر" |
1108 | @@ -6138,7 +6296,9 @@ |
1109 | #: selection:account.common.partner.report,result_selection:0 |
1110 | #: selection:account.partner.balance,result_selection:0 |
1111 | #: selection:account.partner.ledger,result_selection:0 |
1112 | +#: report:account.third_party_ledger:0 |
1113 | #: code:addons/account/report/account_partner_balance.py:301 |
1114 | +#: code:addons/account/report/account_partner_ledger.py:276 |
1115 | #, python-format |
1116 | msgid "Receivable and Payable Accounts" |
1117 | msgstr "حسابات الدائنون و المدينون" |
1118 | @@ -6442,7 +6602,11 @@ |
1119 | msgstr "" |
1120 | |
1121 | #. module: account |
1122 | +<<<<<<< TREE |
1123 | #: code:addons/account/account_invoice.py:1091 |
1124 | +======= |
1125 | +#: code:addons/account/account_invoice.py:1124 |
1126 | +>>>>>>> MERGE-SOURCE |
1127 | #, python-format |
1128 | msgid "" |
1129 | "You cannot cancel an invoice which is partially paid. You need to " |
1130 | @@ -6619,7 +6783,11 @@ |
1131 | msgstr "لا يمكنك إنشاء يومية أصناف لحساب مغلق." |
1132 | |
1133 | #. module: account |
1134 | +<<<<<<< TREE |
1135 | #: code:addons/account/account_invoice.py:606 |
1136 | +======= |
1137 | +#: code:addons/account/account_invoice.py:633 |
1138 | +>>>>>>> MERGE-SOURCE |
1139 | #, python-format |
1140 | msgid "Invoice line account's company and invoice's compnay does not match." |
1141 | msgstr "" |
1142 | @@ -6769,12 +6937,21 @@ |
1143 | "الحالة، ترتيب التقييم يصبح مهمًا." |
1144 | |
1145 | #. module: account |
1146 | +<<<<<<< TREE |
1147 | #: code:addons/account/account.py:1410 |
1148 | #: code:addons/account/account.py:1415 |
1149 | #: code:addons/account/account.py:1444 |
1150 | #: code:addons/account/account.py:1451 |
1151 | #: code:addons/account/account_invoice.py:983 |
1152 | #: code:addons/account/account_move_line.py:1008 |
1153 | +======= |
1154 | +#: code:addons/account/account.py:1448 |
1155 | +#: code:addons/account/account.py:1453 |
1156 | +#: code:addons/account/account.py:1482 |
1157 | +#: code:addons/account/account.py:1489 |
1158 | +#: code:addons/account/account_invoice.py:1015 |
1159 | +#: code:addons/account/account_move_line.py:1005 |
1160 | +>>>>>>> MERGE-SOURCE |
1161 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 |
1162 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 |
1163 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 |
1164 | @@ -6858,6 +7035,10 @@ |
1165 | #: report:account.invoice:0 |
1166 | #: selection:account.invoice,type:0 |
1167 | #: selection:account.invoice.report,type:0 |
1168 | +<<<<<<< TREE |
1169 | +======= |
1170 | +#: code:addons/account/account_invoice.py:1160 |
1171 | +>>>>>>> MERGE-SOURCE |
1172 | #: selection:report.invoice.created,type:0 |
1173 | msgid "Supplier Refund" |
1174 | msgstr "رد للمورد" |
1175 | @@ -8012,7 +8193,11 @@ |
1176 | msgstr "مايو" |
1177 | |
1178 | #. module: account |
1179 | +<<<<<<< TREE |
1180 | #: code:addons/account/account_invoice.py:788 |
1181 | +======= |
1182 | +#: code:addons/account/account_invoice.py:820 |
1183 | +>>>>>>> MERGE-SOURCE |
1184 | #, python-format |
1185 | msgid "Global taxes defined, but they are not in invoice lines !" |
1186 | msgstr "الضرائب العلميه المحدده لكنها لا تكون في اسطر الفاتوره" |
1187 | @@ -8053,7 +8238,11 @@ |
1188 | #: view:account.config.settings:0 |
1189 | #: view:account.invoice:0 |
1190 | #: view:account.invoice.report:0 |
1191 | +<<<<<<< TREE |
1192 | #: code:addons/account/account_invoice.py:353 |
1193 | +======= |
1194 | +#: code:addons/account/account_invoice.py:388 |
1195 | +>>>>>>> MERGE-SOURCE |
1196 | #, python-format |
1197 | msgid "Customer" |
1198 | msgstr "العميل" |
1199 | @@ -8192,6 +8381,17 @@ |
1200 | msgstr "معاملات التسوية" |
1201 | |
1202 | #. module: account |
1203 | +<<<<<<< TREE |
1204 | +======= |
1205 | +#: code:addons/account/account_invoice.py:472 |
1206 | +#, python-format |
1207 | +msgid "" |
1208 | +"You cannot delete an invoice which is not draft or cancelled. You should " |
1209 | +"refund it instead." |
1210 | +msgstr "" |
1211 | + |
1212 | +#. module: account |
1213 | +>>>>>>> MERGE-SOURCE |
1214 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement |
1215 | msgid "Legal Reports" |
1216 | msgstr "تقارير قانونية" |
1217 | @@ -8308,7 +8508,11 @@ |
1218 | msgstr "اختر عملة للفاتورة" |
1219 | |
1220 | #. module: account |
1221 | +<<<<<<< TREE |
1222 | #: code:addons/account/account_invoice.py:869 |
1223 | +======= |
1224 | +#: code:addons/account/account_invoice.py:901 |
1225 | +>>>>>>> MERGE-SOURCE |
1226 | #, python-format |
1227 | msgid "No Invoice Lines !" |
1228 | msgstr "لا سطور للفاتورة !" |
1229 | @@ -8384,7 +8588,11 @@ |
1230 | msgstr "شريك متحد" |
1231 | |
1232 | #. module: account |
1233 | +<<<<<<< TREE |
1234 | #: code:addons/account/account_invoice.py:1434 |
1235 | +======= |
1236 | +#: code:addons/account/account_invoice.py:1465 |
1237 | +>>>>>>> MERGE-SOURCE |
1238 | #, python-format |
1239 | msgid "You must first select a partner !" |
1240 | msgstr "يجب عليك اولاً اختيار شريك !" |
1241 | @@ -9342,7 +9550,11 @@ |
1242 | msgstr "ضريبة المشتريات (%)" |
1243 | |
1244 | #. module: account |
1245 | +<<<<<<< TREE |
1246 | #: code:addons/account/account_invoice.py:869 |
1247 | +======= |
1248 | +#: code:addons/account/account_invoice.py:901 |
1249 | +>>>>>>> MERGE-SOURCE |
1250 | #, python-format |
1251 | msgid "Please create some invoice lines." |
1252 | msgstr "قم بإنشاء سطور للفاتورة." |
1253 | @@ -9906,7 +10118,11 @@ |
1254 | msgstr "غير مسوي" |
1255 | |
1256 | #. module: account |
1257 | +<<<<<<< TREE |
1258 | #: code:addons/account/account_invoice.py:890 |
1259 | +======= |
1260 | +#: code:addons/account/account_invoice.py:922 |
1261 | +>>>>>>> MERGE-SOURCE |
1262 | #, python-format |
1263 | msgid "Bad total !" |
1264 | msgstr "إجمالي سئ!" |
1265 | @@ -10386,6 +10602,7 @@ |
1266 | |
1267 | #. module: account |
1268 | #: field:account.account,company_id:0 |
1269 | +#: report:account.account.balance:0 |
1270 | #: field:account.aged.trial.balance,company_id:0 |
1271 | #: field:account.analytic.journal,company_id:0 |
1272 | #: field:account.balance.report,company_id:0 |
1273 | @@ -10401,7 +10618,9 @@ |
1274 | #: field:account.entries.report,company_id:0 |
1275 | #: field:account.fiscal.position,company_id:0 |
1276 | #: field:account.fiscalyear,company_id:0 |
1277 | +#: report:account.general.journal:0 |
1278 | #: field:account.general.journal,company_id:0 |
1279 | +#: report:account.general.ledger_landscape:0 |
1280 | #: field:account.installer,company_id:0 |
1281 | #: field:account.invoice,company_id:0 |
1282 | #: field:account.invoice.line,company_id:0 |
1283 | @@ -10410,6 +10629,7 @@ |
1284 | #: field:account.invoice.tax,company_id:0 |
1285 | #: field:account.journal,company_id:0 |
1286 | #: field:account.journal.period,company_id:0 |
1287 | +#: report:account.journal.period.print:0 |
1288 | #: field:account.model,company_id:0 |
1289 | #: field:account.move,company_id:0 |
1290 | #: field:account.move.line,company_id:0 |
1291 | @@ -10572,6 +10792,10 @@ |
1292 | #: view:account.invoice:0 |
1293 | #: selection:account.invoice,type:0 |
1294 | #: selection:account.invoice.report,type:0 |
1295 | +<<<<<<< TREE |
1296 | +======= |
1297 | +#: code:addons/account/account_invoice.py:1158 |
1298 | +>>>>>>> MERGE-SOURCE |
1299 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 |
1300 | #: selection:report.invoice.created,type:0 |
1301 | msgid "Supplier Invoice" |
1302 | @@ -10659,8 +10883,10 @@ |
1303 | msgstr "" |
1304 | |
1305 | #. module: account |
1306 | +#: report:account.account.balance:0 |
1307 | #: selection:account.balance.report,display_account:0 |
1308 | #: selection:account.common.account.report,display_account:0 |
1309 | +#: report:account.general.ledger_landscape:0 |
1310 | #: selection:account.report.general.ledger,display_account:0 |
1311 | msgid "With movements" |
1312 | msgstr "مع حركات" |
1313 | @@ -10755,7 +10981,11 @@ |
1314 | msgstr "قيود يوميه مصنفه حسب" |
1315 | |
1316 | #. module: account |
1317 | +<<<<<<< TREE |
1318 | #: code:addons/account/account_invoice.py:1515 |
1319 | +======= |
1320 | +#: code:addons/account/account_invoice.py:1546 |
1321 | +>>>>>>> MERGE-SOURCE |
1322 | #, python-format |
1323 | msgid "" |
1324 | "The selected unit of measure is not compatible with the unit of measure of " |
1325 | @@ -10836,6 +11066,11 @@ |
1326 | #: report:account.invoice:0 |
1327 | #: view:account.invoice:0 |
1328 | #: view:account.invoice.report:0 |
1329 | +<<<<<<< TREE |
1330 | +======= |
1331 | +#: code:addons/account/account_invoice.py:1159 |
1332 | +#, python-format |
1333 | +>>>>>>> MERGE-SOURCE |
1334 | msgid "Refund" |
1335 | msgstr "رد" |
1336 | |
1337 | @@ -10906,7 +11141,11 @@ |
1338 | msgstr "ضرائب الفاتورة يدوياً" |
1339 | |
1340 | #. module: account |
1341 | +<<<<<<< TREE |
1342 | #: code:addons/account/account_invoice.py:550 |
1343 | +======= |
1344 | +#: code:addons/account/account_invoice.py:573 |
1345 | +>>>>>>> MERGE-SOURCE |
1346 | #, python-format |
1347 | msgid "The payment term of supplier does not have a payment term line." |
1348 | msgstr "لا يوجد شروط دفع للمورد في خانة شروط الدفع" |
1349 | |
1350 | === modified file 'account/i18n/bg.po' |
1351 | --- account/i18n/bg.po 2013-06-13 18:15:03 +0000 |
1352 | +++ account/i18n/bg.po 2013-06-19 09:20:00 +0000 |
1353 | @@ -4,17 +4,31 @@ |
1354 | # |
1355 | msgid "" |
1356 | msgstr "" |
1357 | +<<<<<<< TREE |
1358 | "Project-Id-Version: OpenERP Server 6.0dev\n" |
1359 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
1360 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
1361 | "PO-Revision-Date: 2012-05-10 17:28+0000\n" |
1362 | "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n" |
1363 | "Language-Team: \n" |
1364 | +======= |
1365 | +"Project-Id-Version: openobject-addons\n" |
1366 | +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1367 | +"POT-Creation-Date: 2013-06-14 22:29+0000\n" |
1368 | +"PO-Revision-Date: 2012-12-21 23:00+0000\n" |
1369 | +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
1370 | +"Language-Team: Bulgarian <bg@li.org>\n" |
1371 | +>>>>>>> MERGE-SOURCE |
1372 | "MIME-Version: 1.0\n" |
1373 | "Content-Type: text/plain; charset=UTF-8\n" |
1374 | "Content-Transfer-Encoding: 8bit\n" |
1375 | +<<<<<<< TREE |
1376 | "X-Launchpad-Export-Date: 2013-03-16 05:12+0000\n" |
1377 | "X-Generator: Launchpad (build 16532)\n" |
1378 | +======= |
1379 | +"X-Launchpad-Export-Date: 2013-06-15 06:14+0000\n" |
1380 | +"X-Generator: Launchpad (build 16667)\n" |
1381 | +>>>>>>> MERGE-SOURCE |
1382 | |
1383 | #. module: account |
1384 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 |
1385 | @@ -131,11 +145,19 @@ |
1386 | #: code:addons/account/account.py:641 |
1387 | #: code:addons/account/account.py:686 |
1388 | #: code:addons/account/account.py:781 |
1389 | +<<<<<<< TREE |
1390 | #: code:addons/account/account.py:1049 |
1391 | #: code:addons/account/account_invoice.py:788 |
1392 | #: code:addons/account/account_invoice.py:791 |
1393 | #: code:addons/account/account_invoice.py:794 |
1394 | #: code:addons/account/account_invoice.py:1514 |
1395 | +======= |
1396 | +#: code:addons/account/account.py:1058 |
1397 | +#: code:addons/account/account_invoice.py:820 |
1398 | +#: code:addons/account/account_invoice.py:823 |
1399 | +#: code:addons/account/account_invoice.py:826 |
1400 | +#: code:addons/account/account_invoice.py:1545 |
1401 | +>>>>>>> MERGE-SOURCE |
1402 | #: code:addons/account/account_move_line.py:98 |
1403 | #: code:addons/account/account_move_line.py:774 |
1404 | #: code:addons/account/account_move_line.py:827 |
1405 | @@ -345,7 +367,7 @@ |
1406 | msgstr "" |
1407 | |
1408 | #. module: account |
1409 | -#: code:addons/account/account_invoice.py:74 |
1410 | +#: code:addons/account/account_invoice.py:77 |
1411 | #, python-format |
1412 | msgid "You must define an analytic journal of type '%s'!" |
1413 | msgstr "" |
1414 | @@ -601,11 +623,23 @@ |
1415 | msgstr "Счетоводителят потвърждава декларацията." |
1416 | |
1417 | #. module: account |
1418 | +<<<<<<< TREE |
1419 | #. openerp-web |
1420 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 |
1421 | #, python-format |
1422 | msgid "Nothing to reconcile" |
1423 | msgstr "" |
1424 | +======= |
1425 | +#: report:account.account.balance:0 |
1426 | +#: selection:account.balance.report,display_account:0 |
1427 | +#: selection:account.common.account.report,display_account:0 |
1428 | +#: report:account.general.ledger_landscape:0 |
1429 | +#: selection:account.report.general.ledger,display_account:0 |
1430 | +#: selection:account.tax,type_tax_use:0 |
1431 | +#: selection:account.tax.template,type_tax_use:0 |
1432 | +msgid "All" |
1433 | +msgstr "Всички" |
1434 | +>>>>>>> MERGE-SOURCE |
1435 | |
1436 | #. module: account |
1437 | #: field:account.config.settings,decimal_precision:0 |
1438 | @@ -736,7 +770,9 @@ |
1439 | #: selection:account.common.partner.report,result_selection:0 |
1440 | #: selection:account.partner.balance,result_selection:0 |
1441 | #: selection:account.partner.ledger,result_selection:0 |
1442 | +#: report:account.third_party_ledger:0 |
1443 | #: code:addons/account/report/account_partner_balance.py:297 |
1444 | +#: code:addons/account/report/account_partner_ledger.py:272 |
1445 | #, python-format |
1446 | msgid "Receivable Accounts" |
1447 | msgstr "Приходни сметки" |
1448 | @@ -776,7 +812,11 @@ |
1449 | msgstr "Сигурни ли сте че искате да създадете записи?" |
1450 | |
1451 | #. module: account |
1452 | +<<<<<<< TREE |
1453 | #: code:addons/account/account_invoice.py:1330 |
1454 | +======= |
1455 | +#: code:addons/account/account_invoice.py:1361 |
1456 | +>>>>>>> MERGE-SOURCE |
1457 | #, python-format |
1458 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." |
1459 | msgstr "" |
1460 | @@ -845,7 +885,11 @@ |
1461 | msgstr "Тип" |
1462 | |
1463 | #. module: account |
1464 | +<<<<<<< TREE |
1465 | #: code:addons/account/account_invoice.py:794 |
1466 | +======= |
1467 | +#: code:addons/account/account_invoice.py:826 |
1468 | +>>>>>>> MERGE-SOURCE |
1469 | #, python-format |
1470 | msgid "" |
1471 | "Taxes are missing!\n" |
1472 | @@ -1027,7 +1071,11 @@ |
1473 | msgstr "Пасив" |
1474 | |
1475 | #. module: account |
1476 | +<<<<<<< TREE |
1477 | #: code:addons/account/account_invoice.py:867 |
1478 | +======= |
1479 | +#: code:addons/account/account_invoice.py:899 |
1480 | +>>>>>>> MERGE-SOURCE |
1481 | #, python-format |
1482 | msgid "Please define sequence on the journal related to this invoice." |
1483 | msgstr "" |
1484 | @@ -1098,10 +1146,17 @@ |
1485 | msgstr "" |
1486 | |
1487 | #. module: account |
1488 | +<<<<<<< TREE |
1489 | #: code:addons/account/account.py:2308 |
1490 | #: code:addons/account/account_bank_statement.py:423 |
1491 | #: code:addons/account/account_invoice.py:74 |
1492 | #: code:addons/account/account_invoice.py:744 |
1493 | +======= |
1494 | +#: code:addons/account/account.py:2346 |
1495 | +#: code:addons/account/account_bank_statement.py:424 |
1496 | +#: code:addons/account/account_invoice.py:77 |
1497 | +#: code:addons/account/account_invoice.py:775 |
1498 | +>>>>>>> MERGE-SOURCE |
1499 | #: code:addons/account/account_move_line.py:195 |
1500 | #, python-format |
1501 | msgid "No Analytic Journal !" |
1502 | @@ -1533,8 +1588,10 @@ |
1503 | msgstr "" |
1504 | |
1505 | #. module: account |
1506 | +#: report:account.account.balance:0 |
1507 | #: selection:account.balance.report,display_account:0 |
1508 | #: selection:account.common.account.report,display_account:0 |
1509 | +#: report:account.general.ledger_landscape:0 |
1510 | #: selection:account.partner.balance,display_partner:0 |
1511 | #: selection:account.report.general.ledger,display_account:0 |
1512 | msgid "With balance is not equal to 0" |
1513 | @@ -1764,6 +1821,10 @@ |
1514 | #: view:account.invoice:0 |
1515 | #: view:account.invoice.report:0 |
1516 | #: field:account.move.line,invoice:0 |
1517 | +<<<<<<< TREE |
1518 | +======= |
1519 | +#: code:addons/account/account_invoice.py:1157 |
1520 | +>>>>>>> MERGE-SOURCE |
1521 | #: model:ir.model,name:account.model_account_invoice |
1522 | #: model:res.request.link,name:account.req_link_invoice |
1523 | msgid "Invoice" |
1524 | @@ -2012,11 +2073,20 @@ |
1525 | #: code:addons/account/account_bank_statement.py:418 |
1526 | #: code:addons/account/account_cash_statement.py:256 |
1527 | #: code:addons/account/account_cash_statement.py:300 |
1528 | +<<<<<<< TREE |
1529 | #: code:addons/account/account_invoice.py:867 |
1530 | #: code:addons/account/account_invoice.py:901 |
1531 | #: code:addons/account/account_invoice.py:1091 |
1532 | #: code:addons/account/account_move_line.py:578 |
1533 | #: code:addons/account/account_move_line.py:831 |
1534 | +======= |
1535 | +#: code:addons/account/account_invoice.py:899 |
1536 | +#: code:addons/account/account_invoice.py:933 |
1537 | +#: code:addons/account/account_invoice.py:1124 |
1538 | +#: code:addons/account/account_move_line.py:579 |
1539 | +#: code:addons/account/account_move_line.py:828 |
1540 | +#: code:addons/account/account_move_line.py:851 |
1541 | +>>>>>>> MERGE-SOURCE |
1542 | #: code:addons/account/account_move_line.py:854 |
1543 | #: code:addons/account/account_move_line.py:857 |
1544 | #: code:addons/account/account_move_line.py:1122 |
1545 | @@ -2250,7 +2320,9 @@ |
1546 | #: selection:account.common.partner.report,result_selection:0 |
1547 | #: selection:account.partner.balance,result_selection:0 |
1548 | #: selection:account.partner.ledger,result_selection:0 |
1549 | +#: report:account.third_party_ledger:0 |
1550 | #: code:addons/account/report/account_partner_balance.py:299 |
1551 | +#: code:addons/account/report/account_partner_ledger.py:274 |
1552 | #, python-format |
1553 | msgid "Payable Accounts" |
1554 | msgstr "Разплащателни сметки" |
1555 | @@ -2555,7 +2627,11 @@ |
1556 | msgstr "Създаване на сметка според този шаблон" |
1557 | |
1558 | #. module: account |
1559 | +<<<<<<< TREE |
1560 | #: code:addons/account/account_invoice.py:901 |
1561 | +======= |
1562 | +#: code:addons/account/account_invoice.py:933 |
1563 | +>>>>>>> MERGE-SOURCE |
1564 | #, python-format |
1565 | msgid "" |
1566 | "Cannot create the invoice.\n" |
1567 | @@ -2825,6 +2901,7 @@ |
1568 | msgstr "Сметки" |
1569 | |
1570 | #. module: account |
1571 | +<<<<<<< TREE |
1572 | #: code:addons/account/account.py:3503 |
1573 | #: code:addons/account/account_bank_statement.py:404 |
1574 | #: code:addons/account/account_invoice.py:378 |
1575 | @@ -2834,6 +2911,16 @@ |
1576 | #: code:addons/account/account_invoice.py:605 |
1577 | #: code:addons/account/account_invoice.py:627 |
1578 | #: code:addons/account/account_move_line.py:535 |
1579 | +======= |
1580 | +#: code:addons/account/account.py:3541 |
1581 | +#: code:addons/account/account_bank_statement.py:405 |
1582 | +#: code:addons/account/account_invoice.py:507 |
1583 | +#: code:addons/account/account_invoice.py:609 |
1584 | +#: code:addons/account/account_invoice.py:624 |
1585 | +#: code:addons/account/account_invoice.py:632 |
1586 | +#: code:addons/account/account_invoice.py:657 |
1587 | +#: code:addons/account/account_move_line.py:536 |
1588 | +>>>>>>> MERGE-SOURCE |
1589 | #, python-format |
1590 | msgid "Configuration Error!" |
1591 | msgstr "Грешка при настройване!" |
1592 | @@ -3057,8 +3144,13 @@ |
1593 | msgstr "" |
1594 | |
1595 | #. module: account |
1596 | +<<<<<<< TREE |
1597 | #: code:addons/account/account.py:2308 |
1598 | #: code:addons/account/account_invoice.py:744 |
1599 | +======= |
1600 | +#: code:addons/account/account.py:2346 |
1601 | +#: code:addons/account/account_invoice.py:775 |
1602 | +>>>>>>> MERGE-SOURCE |
1603 | #: code:addons/account/account_move_line.py:195 |
1604 | #, python-format |
1605 | msgid "You have to define an analytic journal on the '%s' journal!" |
1606 | @@ -3119,6 +3211,11 @@ |
1607 | msgstr "" |
1608 | |
1609 | #. module: account |
1610 | +#: report:account.journal.period.print:0 |
1611 | +msgid "Reference Number" |
1612 | +msgstr "Референтен номер" |
1613 | + |
1614 | +#. module: account |
1615 | #: selection:account.entries.report,month:0 |
1616 | #: selection:account.invoice.report,month:0 |
1617 | #: selection:analytic.entries.report,month:0 |
1618 | @@ -3220,7 +3317,11 @@ |
1619 | msgstr "Фискална позиция" |
1620 | |
1621 | #. module: account |
1622 | +<<<<<<< TREE |
1623 | #: code:addons/account/account_invoice.py:791 |
1624 | +======= |
1625 | +#: code:addons/account/account_invoice.py:823 |
1626 | +>>>>>>> MERGE-SOURCE |
1627 | #, python-format |
1628 | msgid "" |
1629 | "Tax base different!\n" |
1630 | @@ -3381,8 +3482,13 @@ |
1631 | msgstr "Изглед" |
1632 | |
1633 | #. module: account |
1634 | +<<<<<<< TREE |
1635 | #: code:addons/account/account.py:3422 |
1636 | #: code:addons/account/account_bank.py:95 |
1637 | +======= |
1638 | +#: code:addons/account/account.py:3460 |
1639 | +#: code:addons/account/account_bank.py:94 |
1640 | +>>>>>>> MERGE-SOURCE |
1641 | #, python-format |
1642 | msgid "BNK" |
1643 | msgstr "" |
1644 | @@ -3638,7 +3744,11 @@ |
1645 | msgstr "" |
1646 | |
1647 | #. module: account |
1648 | +<<<<<<< TREE |
1649 | #: code:addons/account/account_invoice.py:984 |
1650 | +======= |
1651 | +#: code:addons/account/account_invoice.py:1016 |
1652 | +>>>>>>> MERGE-SOURCE |
1653 | #, python-format |
1654 | msgid "" |
1655 | "You cannot create an invoice on a centralized journal. Uncheck the " |
1656 | @@ -3653,7 +3763,11 @@ |
1657 | msgstr "Начален баланс" |
1658 | |
1659 | #. module: account |
1660 | +<<<<<<< TREE |
1661 | #: code:addons/account/account_invoice.py:1434 |
1662 | +======= |
1663 | +#: code:addons/account/account_invoice.py:1465 |
1664 | +>>>>>>> MERGE-SOURCE |
1665 | #, python-format |
1666 | msgid "No Partner Defined !" |
1667 | msgstr "Не е зададен партньор !" |
1668 | @@ -3917,14 +4031,21 @@ |
1669 | msgstr "" |
1670 | |
1671 | #. module: account |
1672 | +<<<<<<< TREE |
1673 | #: report:account.invoice:0 |
1674 | msgid "VAT :" |
1675 | msgstr "ДДС :" |
1676 | |
1677 | #. module: account |
1678 | +======= |
1679 | +#: report:account.account.balance:0 |
1680 | +>>>>>>> MERGE-SOURCE |
1681 | #: report:account.central.journal:0 |
1682 | #: view:account.config.settings:0 |
1683 | +#: report:account.general.journal:0 |
1684 | #: report:account.general.ledger:0 |
1685 | +#: report:account.general.ledger_landscape:0 |
1686 | +#: report:account.journal.period.print:0 |
1687 | #: report:account.partner.balance:0 |
1688 | #: report:account.third_party_ledger:0 |
1689 | #: report:account.third_party_ledger_other:0 |
1690 | @@ -4283,7 +4404,11 @@ |
1691 | msgstr "Косолидирани подчинени сметки" |
1692 | |
1693 | #. module: account |
1694 | +<<<<<<< TREE |
1695 | #: code:addons/account/account_invoice.py:550 |
1696 | +======= |
1697 | +#: code:addons/account/account_invoice.py:573 |
1698 | +>>>>>>> MERGE-SOURCE |
1699 | #: code:addons/account/wizard/account_invoice_refund.py:146 |
1700 | #, python-format |
1701 | msgid "Insufficient Data!" |
1702 | @@ -4550,8 +4675,13 @@ |
1703 | msgstr "" |
1704 | |
1705 | #. module: account |
1706 | +<<<<<<< TREE |
1707 | #: code:addons/account/account_invoice.py:583 |
1708 | #: code:addons/account/account_invoice.py:598 |
1709 | +======= |
1710 | +#: code:addons/account/account_invoice.py:610 |
1711 | +#: code:addons/account/account_invoice.py:625 |
1712 | +>>>>>>> MERGE-SOURCE |
1713 | #, python-format |
1714 | msgid "" |
1715 | "Cannot find a chart of account, you should create one from Settings\\" |
1716 | @@ -4824,7 +4954,11 @@ |
1717 | msgstr "" |
1718 | |
1719 | #. module: account |
1720 | +<<<<<<< TREE |
1721 | #: code:addons/account/account_invoice.py:627 |
1722 | +======= |
1723 | +#: code:addons/account/account_invoice.py:658 |
1724 | +>>>>>>> MERGE-SOURCE |
1725 | #, python-format |
1726 | msgid "" |
1727 | "Cannot find any account journal of %s type for this company.\n" |
1728 | @@ -5148,7 +5282,11 @@ |
1729 | msgstr "Бланка за данък" |
1730 | |
1731 | #. module: account |
1732 | +<<<<<<< TREE |
1733 | #: code:addons/account/account_invoice.py:890 |
1734 | +======= |
1735 | +#: code:addons/account/account_invoice.py:922 |
1736 | +>>>>>>> MERGE-SOURCE |
1737 | #, python-format |
1738 | msgid "" |
1739 | "Please verify the price of the invoice !\n" |
1740 | @@ -5475,7 +5613,11 @@ |
1741 | msgstr "Изчисли кода (if type=code)" |
1742 | |
1743 | #. module: account |
1744 | +<<<<<<< TREE |
1745 | #: code:addons/account/account_invoice.py:485 |
1746 | +======= |
1747 | +#: code:addons/account/account_invoice.py:508 |
1748 | +>>>>>>> MERGE-SOURCE |
1749 | #, python-format |
1750 | msgid "" |
1751 | "Cannot find a chart of accounts for this company, you should create one." |
1752 | @@ -5861,6 +6003,18 @@ |
1753 | msgstr "" |
1754 | |
1755 | #. module: account |
1756 | +<<<<<<< TREE |
1757 | +======= |
1758 | +#: code:addons/account/account_invoice.py:474 |
1759 | +#, python-format |
1760 | +msgid "" |
1761 | +"You cannot delete an invoice after it has been validated (and received a " |
1762 | +"number). You can set it back to \"Draft\" state and modify its content, " |
1763 | +"then re-confirm it." |
1764 | +msgstr "" |
1765 | + |
1766 | +#. module: account |
1767 | +>>>>>>> MERGE-SOURCE |
1768 | #: help:account.automatic.reconcile,power:0 |
1769 | msgid "" |
1770 | "Number of partial amounts that can be combined to find a balance point can " |
1771 | @@ -6012,7 +6166,11 @@ |
1772 | #: view:account.config.settings:0 |
1773 | #: view:account.invoice:0 |
1774 | #: view:account.invoice.report:0 |
1775 | +<<<<<<< TREE |
1776 | #: code:addons/account/account_invoice.py:355 |
1777 | +======= |
1778 | +#: code:addons/account/account_invoice.py:390 |
1779 | +>>>>>>> MERGE-SOURCE |
1780 | #, python-format |
1781 | msgid "Supplier" |
1782 | msgstr "Доставчик" |
1783 | @@ -6032,7 +6190,7 @@ |
1784 | msgstr "Сметка n°" |
1785 | |
1786 | #. module: account |
1787 | -#: code:addons/account/account_invoice.py:92 |
1788 | +#: code:addons/account/account_invoice.py:95 |
1789 | #, python-format |
1790 | msgid "Free Reference" |
1791 | msgstr "Свободна отпратка" |
1792 | @@ -6042,7 +6200,9 @@ |
1793 | #: selection:account.common.partner.report,result_selection:0 |
1794 | #: selection:account.partner.balance,result_selection:0 |
1795 | #: selection:account.partner.ledger,result_selection:0 |
1796 | +#: report:account.third_party_ledger:0 |
1797 | #: code:addons/account/report/account_partner_balance.py:301 |
1798 | +#: code:addons/account/report/account_partner_ledger.py:276 |
1799 | #, python-format |
1800 | msgid "Receivable and Payable Accounts" |
1801 | msgstr "Сметки за получаване и плащане" |
1802 | @@ -6340,7 +6500,11 @@ |
1803 | msgstr "" |
1804 | |
1805 | #. module: account |
1806 | +<<<<<<< TREE |
1807 | #: code:addons/account/account_invoice.py:1091 |
1808 | +======= |
1809 | +#: code:addons/account/account_invoice.py:1124 |
1810 | +>>>>>>> MERGE-SOURCE |
1811 | #, python-format |
1812 | msgid "" |
1813 | "You cannot cancel an invoice which is partially paid. You need to " |
1814 | @@ -6513,7 +6677,11 @@ |
1815 | msgstr "" |
1816 | |
1817 | #. module: account |
1818 | +<<<<<<< TREE |
1819 | #: code:addons/account/account_invoice.py:606 |
1820 | +======= |
1821 | +#: code:addons/account/account_invoice.py:633 |
1822 | +>>>>>>> MERGE-SOURCE |
1823 | #, python-format |
1824 | msgid "Invoice line account's company and invoice's compnay does not match." |
1825 | msgstr "" |
1826 | @@ -6663,12 +6831,21 @@ |
1827 | "В този случай реда на изчисление е важен." |
1828 | |
1829 | #. module: account |
1830 | +<<<<<<< TREE |
1831 | #: code:addons/account/account.py:1410 |
1832 | #: code:addons/account/account.py:1415 |
1833 | #: code:addons/account/account.py:1444 |
1834 | #: code:addons/account/account.py:1451 |
1835 | #: code:addons/account/account_invoice.py:983 |
1836 | #: code:addons/account/account_move_line.py:1008 |
1837 | +======= |
1838 | +#: code:addons/account/account.py:1448 |
1839 | +#: code:addons/account/account.py:1453 |
1840 | +#: code:addons/account/account.py:1482 |
1841 | +#: code:addons/account/account.py:1489 |
1842 | +#: code:addons/account/account_invoice.py:1015 |
1843 | +#: code:addons/account/account_move_line.py:1005 |
1844 | +>>>>>>> MERGE-SOURCE |
1845 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 |
1846 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 |
1847 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 |
1848 | @@ -6746,6 +6923,10 @@ |
1849 | #: report:account.invoice:0 |
1850 | #: selection:account.invoice,type:0 |
1851 | #: selection:account.invoice.report,type:0 |
1852 | +<<<<<<< TREE |
1853 | +======= |
1854 | +#: code:addons/account/account_invoice.py:1160 |
1855 | +>>>>>>> MERGE-SOURCE |
1856 | #: selection:report.invoice.created,type:0 |
1857 | msgid "Supplier Refund" |
1858 | msgstr "Обезщетение на доставчик" |
1859 | @@ -7882,7 +8063,11 @@ |
1860 | msgstr "Май" |
1861 | |
1862 | #. module: account |
1863 | +<<<<<<< TREE |
1864 | #: code:addons/account/account_invoice.py:788 |
1865 | +======= |
1866 | +#: code:addons/account/account_invoice.py:820 |
1867 | +>>>>>>> MERGE-SOURCE |
1868 | #, python-format |
1869 | msgid "Global taxes defined, but they are not in invoice lines !" |
1870 | msgstr "" |
1871 | @@ -7923,7 +8108,11 @@ |
1872 | #: view:account.config.settings:0 |
1873 | #: view:account.invoice:0 |
1874 | #: view:account.invoice.report:0 |
1875 | +<<<<<<< TREE |
1876 | #: code:addons/account/account_invoice.py:353 |
1877 | +======= |
1878 | +#: code:addons/account/account_invoice.py:388 |
1879 | +>>>>>>> MERGE-SOURCE |
1880 | #, python-format |
1881 | msgid "Customer" |
1882 | msgstr "Клиент" |
1883 | @@ -8060,6 +8249,17 @@ |
1884 | msgstr "Приравняване на транзакции" |
1885 | |
1886 | #. module: account |
1887 | +<<<<<<< TREE |
1888 | +======= |
1889 | +#: code:addons/account/account_invoice.py:472 |
1890 | +#, python-format |
1891 | +msgid "" |
1892 | +"You cannot delete an invoice which is not draft or cancelled. You should " |
1893 | +"refund it instead." |
1894 | +msgstr "" |
1895 | + |
1896 | +#. module: account |
1897 | +>>>>>>> MERGE-SOURCE |
1898 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement |
1899 | msgid "Legal Reports" |
1900 | msgstr "" |
1901 | @@ -8176,7 +8376,11 @@ |
1902 | msgstr "Изберете валута за фактурата" |
1903 | |
1904 | #. module: account |
1905 | +<<<<<<< TREE |
1906 | #: code:addons/account/account_invoice.py:869 |
1907 | +======= |
1908 | +#: code:addons/account/account_invoice.py:901 |
1909 | +>>>>>>> MERGE-SOURCE |
1910 | #, python-format |
1911 | msgid "No Invoice Lines !" |
1912 | msgstr "Няма фактурни редове!" |
1913 | @@ -8251,7 +8455,11 @@ |
1914 | msgstr "Асоцииран партньор" |
1915 | |
1916 | #. module: account |
1917 | +<<<<<<< TREE |
1918 | #: code:addons/account/account_invoice.py:1434 |
1919 | +======= |
1920 | +#: code:addons/account/account_invoice.py:1465 |
1921 | +>>>>>>> MERGE-SOURCE |
1922 | #, python-format |
1923 | msgid "You must first select a partner !" |
1924 | msgstr "Първо трябва да изберете партньор !" |
1925 | @@ -9201,7 +9409,11 @@ |
1926 | msgstr "Данък покупка (%)" |
1927 | |
1928 | #. module: account |
1929 | +<<<<<<< TREE |
1930 | #: code:addons/account/account_invoice.py:869 |
1931 | +======= |
1932 | +#: code:addons/account/account_invoice.py:901 |
1933 | +>>>>>>> MERGE-SOURCE |
1934 | #, python-format |
1935 | msgid "Please create some invoice lines." |
1936 | msgstr "" |
1937 | @@ -9757,7 +9969,11 @@ |
1938 | msgstr "Неприравнен" |
1939 | |
1940 | #. module: account |
1941 | +<<<<<<< TREE |
1942 | #: code:addons/account/account_invoice.py:890 |
1943 | +======= |
1944 | +#: code:addons/account/account_invoice.py:922 |
1945 | +>>>>>>> MERGE-SOURCE |
1946 | #, python-format |
1947 | msgid "Bad total !" |
1948 | msgstr "Грешна обща сума !" |
1949 | @@ -10230,6 +10446,7 @@ |
1950 | |
1951 | #. module: account |
1952 | #: field:account.account,company_id:0 |
1953 | +#: report:account.account.balance:0 |
1954 | #: field:account.aged.trial.balance,company_id:0 |
1955 | #: field:account.analytic.journal,company_id:0 |
1956 | #: field:account.balance.report,company_id:0 |
1957 | @@ -10245,7 +10462,9 @@ |
1958 | #: field:account.entries.report,company_id:0 |
1959 | #: field:account.fiscal.position,company_id:0 |
1960 | #: field:account.fiscalyear,company_id:0 |
1961 | +#: report:account.general.journal:0 |
1962 | #: field:account.general.journal,company_id:0 |
1963 | +#: report:account.general.ledger_landscape:0 |
1964 | #: field:account.installer,company_id:0 |
1965 | #: field:account.invoice,company_id:0 |
1966 | #: field:account.invoice.line,company_id:0 |
1967 | @@ -10254,6 +10473,7 @@ |
1968 | #: field:account.invoice.tax,company_id:0 |
1969 | #: field:account.journal,company_id:0 |
1970 | #: field:account.journal.period,company_id:0 |
1971 | +#: report:account.journal.period.print:0 |
1972 | #: field:account.model,company_id:0 |
1973 | #: field:account.move,company_id:0 |
1974 | #: field:account.move.line,company_id:0 |
1975 | @@ -10414,6 +10634,10 @@ |
1976 | #: view:account.invoice:0 |
1977 | #: selection:account.invoice,type:0 |
1978 | #: selection:account.invoice.report,type:0 |
1979 | +<<<<<<< TREE |
1980 | +======= |
1981 | +#: code:addons/account/account_invoice.py:1158 |
1982 | +>>>>>>> MERGE-SOURCE |
1983 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 |
1984 | #: selection:report.invoice.created,type:0 |
1985 | msgid "Supplier Invoice" |
1986 | @@ -10501,8 +10725,10 @@ |
1987 | msgstr "" |
1988 | |
1989 | #. module: account |
1990 | +#: report:account.account.balance:0 |
1991 | #: selection:account.balance.report,display_account:0 |
1992 | #: selection:account.common.account.report,display_account:0 |
1993 | +#: report:account.general.ledger_landscape:0 |
1994 | #: selection:account.report.general.ledger,display_account:0 |
1995 | msgid "With movements" |
1996 | msgstr "С движения" |
1997 | @@ -10597,7 +10823,11 @@ |
1998 | msgstr "" |
1999 | |
2000 | #. module: account |
2001 | +<<<<<<< TREE |
2002 | #: code:addons/account/account_invoice.py:1515 |
2003 | +======= |
2004 | +#: code:addons/account/account_invoice.py:1546 |
2005 | +>>>>>>> MERGE-SOURCE |
2006 | #, python-format |
2007 | msgid "" |
2008 | "The selected unit of measure is not compatible with the unit of measure of " |
2009 | @@ -10678,6 +10908,11 @@ |
2010 | #: report:account.invoice:0 |
2011 | #: view:account.invoice:0 |
2012 | #: view:account.invoice.report:0 |
2013 | +<<<<<<< TREE |
2014 | +======= |
2015 | +#: code:addons/account/account_invoice.py:1159 |
2016 | +#, python-format |
2017 | +>>>>>>> MERGE-SOURCE |
2018 | msgid "Refund" |
2019 | msgstr "Обезщетение" |
2020 | |
2021 | @@ -10748,7 +10983,11 @@ |
2022 | msgstr "Ръчно фактуриране на данъци" |
2023 | |
2024 | #. module: account |
2025 | +<<<<<<< TREE |
2026 | #: code:addons/account/account_invoice.py:550 |
2027 | +======= |
2028 | +#: code:addons/account/account_invoice.py:573 |
2029 | +>>>>>>> MERGE-SOURCE |
2030 | #, python-format |
2031 | msgid "The payment term of supplier does not have a payment term line." |
2032 | msgstr "" |
2033 | |
2034 | === modified file 'account/i18n/br.po' |
2035 | --- account/i18n/br.po 2013-06-13 18:15:03 +0000 |
2036 | +++ account/i18n/br.po 2013-06-19 09:20:00 +0000 |
2037 | @@ -7,15 +7,26 @@ |
2038 | msgstr "" |
2039 | "Project-Id-Version: openobject-addons\n" |
2040 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2041 | +<<<<<<< TREE |
2042 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
2043 | "PO-Revision-Date: 2010-12-12 09:25+0000\n" |
2044 | "Last-Translator: OpenERP Administrators <Unknown>\n" |
2045 | +======= |
2046 | +"POT-Creation-Date: 2013-06-14 22:29+0000\n" |
2047 | +"PO-Revision-Date: 2012-12-21 23:00+0000\n" |
2048 | +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
2049 | +>>>>>>> MERGE-SOURCE |
2050 | "Language-Team: Breton <br@li.org>\n" |
2051 | "MIME-Version: 1.0\n" |
2052 | "Content-Type: text/plain; charset=UTF-8\n" |
2053 | "Content-Transfer-Encoding: 8bit\n" |
2054 | +<<<<<<< TREE |
2055 | "X-Launchpad-Export-Date: 2013-03-16 05:12+0000\n" |
2056 | "X-Generator: Launchpad (build 16532)\n" |
2057 | +======= |
2058 | +"X-Launchpad-Export-Date: 2013-06-15 06:13+0000\n" |
2059 | +"X-Generator: Launchpad (build 16667)\n" |
2060 | +>>>>>>> MERGE-SOURCE |
2061 | |
2062 | #. module: account |
2063 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 |
2064 | @@ -128,11 +139,19 @@ |
2065 | #: code:addons/account/account.py:641 |
2066 | #: code:addons/account/account.py:686 |
2067 | #: code:addons/account/account.py:781 |
2068 | +<<<<<<< TREE |
2069 | #: code:addons/account/account.py:1049 |
2070 | #: code:addons/account/account_invoice.py:788 |
2071 | #: code:addons/account/account_invoice.py:791 |
2072 | #: code:addons/account/account_invoice.py:794 |
2073 | #: code:addons/account/account_invoice.py:1514 |
2074 | +======= |
2075 | +#: code:addons/account/account.py:1058 |
2076 | +#: code:addons/account/account_invoice.py:820 |
2077 | +#: code:addons/account/account_invoice.py:823 |
2078 | +#: code:addons/account/account_invoice.py:826 |
2079 | +#: code:addons/account/account_invoice.py:1545 |
2080 | +>>>>>>> MERGE-SOURCE |
2081 | #: code:addons/account/account_move_line.py:98 |
2082 | #: code:addons/account/account_move_line.py:774 |
2083 | #: code:addons/account/account_move_line.py:827 |
2084 | @@ -330,7 +349,7 @@ |
2085 | msgstr "" |
2086 | |
2087 | #. module: account |
2088 | -#: code:addons/account/account_invoice.py:74 |
2089 | +#: code:addons/account/account_invoice.py:77 |
2090 | #, python-format |
2091 | msgid "You must define an analytic journal of type '%s'!" |
2092 | msgstr "" |
2093 | @@ -586,10 +605,21 @@ |
2094 | msgstr "" |
2095 | |
2096 | #. module: account |
2097 | +<<<<<<< TREE |
2098 | #. openerp-web |
2099 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 |
2100 | #, python-format |
2101 | msgid "Nothing to reconcile" |
2102 | +======= |
2103 | +#: report:account.account.balance:0 |
2104 | +#: selection:account.balance.report,display_account:0 |
2105 | +#: selection:account.common.account.report,display_account:0 |
2106 | +#: report:account.general.ledger_landscape:0 |
2107 | +#: selection:account.report.general.ledger,display_account:0 |
2108 | +#: selection:account.tax,type_tax_use:0 |
2109 | +#: selection:account.tax.template,type_tax_use:0 |
2110 | +msgid "All" |
2111 | +>>>>>>> MERGE-SOURCE |
2112 | msgstr "" |
2113 | |
2114 | #. module: account |
2115 | @@ -721,7 +751,9 @@ |
2116 | #: selection:account.common.partner.report,result_selection:0 |
2117 | #: selection:account.partner.balance,result_selection:0 |
2118 | #: selection:account.partner.ledger,result_selection:0 |
2119 | +#: report:account.third_party_ledger:0 |
2120 | #: code:addons/account/report/account_partner_balance.py:297 |
2121 | +#: code:addons/account/report/account_partner_ledger.py:272 |
2122 | #, python-format |
2123 | msgid "Receivable Accounts" |
2124 | msgstr "" |
2125 | @@ -759,7 +791,11 @@ |
2126 | msgstr "" |
2127 | |
2128 | #. module: account |
2129 | +<<<<<<< TREE |
2130 | #: code:addons/account/account_invoice.py:1330 |
2131 | +======= |
2132 | +#: code:addons/account/account_invoice.py:1361 |
2133 | +>>>>>>> MERGE-SOURCE |
2134 | #, python-format |
2135 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." |
2136 | msgstr "" |
2137 | @@ -828,7 +864,11 @@ |
2138 | msgstr "" |
2139 | |
2140 | #. module: account |
2141 | +<<<<<<< TREE |
2142 | #: code:addons/account/account_invoice.py:794 |
2143 | +======= |
2144 | +#: code:addons/account/account_invoice.py:826 |
2145 | +>>>>>>> MERGE-SOURCE |
2146 | #, python-format |
2147 | msgid "" |
2148 | "Taxes are missing!\n" |
2149 | @@ -1007,7 +1047,11 @@ |
2150 | msgstr "" |
2151 | |
2152 | #. module: account |
2153 | +<<<<<<< TREE |
2154 | #: code:addons/account/account_invoice.py:867 |
2155 | +======= |
2156 | +#: code:addons/account/account_invoice.py:899 |
2157 | +>>>>>>> MERGE-SOURCE |
2158 | #, python-format |
2159 | msgid "Please define sequence on the journal related to this invoice." |
2160 | msgstr "" |
2161 | @@ -1078,10 +1122,17 @@ |
2162 | msgstr "" |
2163 | |
2164 | #. module: account |
2165 | +<<<<<<< TREE |
2166 | #: code:addons/account/account.py:2308 |
2167 | #: code:addons/account/account_bank_statement.py:423 |
2168 | #: code:addons/account/account_invoice.py:74 |
2169 | #: code:addons/account/account_invoice.py:744 |
2170 | +======= |
2171 | +#: code:addons/account/account.py:2346 |
2172 | +#: code:addons/account/account_bank_statement.py:424 |
2173 | +#: code:addons/account/account_invoice.py:77 |
2174 | +#: code:addons/account/account_invoice.py:775 |
2175 | +>>>>>>> MERGE-SOURCE |
2176 | #: code:addons/account/account_move_line.py:195 |
2177 | #, python-format |
2178 | msgid "No Analytic Journal !" |
2179 | @@ -1510,8 +1561,10 @@ |
2180 | msgstr "" |
2181 | |
2182 | #. module: account |
2183 | +#: report:account.account.balance:0 |
2184 | #: selection:account.balance.report,display_account:0 |
2185 | #: selection:account.common.account.report,display_account:0 |
2186 | +#: report:account.general.ledger_landscape:0 |
2187 | #: selection:account.partner.balance,display_partner:0 |
2188 | #: selection:account.report.general.ledger,display_account:0 |
2189 | msgid "With balance is not equal to 0" |
2190 | @@ -1741,6 +1794,10 @@ |
2191 | #: view:account.invoice:0 |
2192 | #: view:account.invoice.report:0 |
2193 | #: field:account.move.line,invoice:0 |
2194 | +<<<<<<< TREE |
2195 | +======= |
2196 | +#: code:addons/account/account_invoice.py:1157 |
2197 | +>>>>>>> MERGE-SOURCE |
2198 | #: model:ir.model,name:account.model_account_invoice |
2199 | #: model:res.request.link,name:account.req_link_invoice |
2200 | msgid "Invoice" |
2201 | @@ -1989,11 +2046,20 @@ |
2202 | #: code:addons/account/account_bank_statement.py:418 |
2203 | #: code:addons/account/account_cash_statement.py:256 |
2204 | #: code:addons/account/account_cash_statement.py:300 |
2205 | +<<<<<<< TREE |
2206 | #: code:addons/account/account_invoice.py:867 |
2207 | #: code:addons/account/account_invoice.py:901 |
2208 | #: code:addons/account/account_invoice.py:1091 |
2209 | #: code:addons/account/account_move_line.py:578 |
2210 | #: code:addons/account/account_move_line.py:831 |
2211 | +======= |
2212 | +#: code:addons/account/account_invoice.py:899 |
2213 | +#: code:addons/account/account_invoice.py:933 |
2214 | +#: code:addons/account/account_invoice.py:1124 |
2215 | +#: code:addons/account/account_move_line.py:579 |
2216 | +#: code:addons/account/account_move_line.py:828 |
2217 | +#: code:addons/account/account_move_line.py:851 |
2218 | +>>>>>>> MERGE-SOURCE |
2219 | #: code:addons/account/account_move_line.py:854 |
2220 | #: code:addons/account/account_move_line.py:857 |
2221 | #: code:addons/account/account_move_line.py:1122 |
2222 | @@ -2227,7 +2293,9 @@ |
2223 | #: selection:account.common.partner.report,result_selection:0 |
2224 | #: selection:account.partner.balance,result_selection:0 |
2225 | #: selection:account.partner.ledger,result_selection:0 |
2226 | +#: report:account.third_party_ledger:0 |
2227 | #: code:addons/account/report/account_partner_balance.py:299 |
2228 | +#: code:addons/account/report/account_partner_ledger.py:274 |
2229 | #, python-format |
2230 | msgid "Payable Accounts" |
2231 | msgstr "" |
2232 | @@ -2532,7 +2600,11 @@ |
2233 | msgstr "" |
2234 | |
2235 | #. module: account |
2236 | +<<<<<<< TREE |
2237 | #: code:addons/account/account_invoice.py:901 |
2238 | +======= |
2239 | +#: code:addons/account/account_invoice.py:933 |
2240 | +>>>>>>> MERGE-SOURCE |
2241 | #, python-format |
2242 | msgid "" |
2243 | "Cannot create the invoice.\n" |
2244 | @@ -2797,6 +2869,7 @@ |
2245 | msgstr "" |
2246 | |
2247 | #. module: account |
2248 | +<<<<<<< TREE |
2249 | #: code:addons/account/account.py:3503 |
2250 | #: code:addons/account/account_bank_statement.py:404 |
2251 | #: code:addons/account/account_invoice.py:378 |
2252 | @@ -2806,6 +2879,16 @@ |
2253 | #: code:addons/account/account_invoice.py:605 |
2254 | #: code:addons/account/account_invoice.py:627 |
2255 | #: code:addons/account/account_move_line.py:535 |
2256 | +======= |
2257 | +#: code:addons/account/account.py:3541 |
2258 | +#: code:addons/account/account_bank_statement.py:405 |
2259 | +#: code:addons/account/account_invoice.py:507 |
2260 | +#: code:addons/account/account_invoice.py:609 |
2261 | +#: code:addons/account/account_invoice.py:624 |
2262 | +#: code:addons/account/account_invoice.py:632 |
2263 | +#: code:addons/account/account_invoice.py:657 |
2264 | +#: code:addons/account/account_move_line.py:536 |
2265 | +>>>>>>> MERGE-SOURCE |
2266 | #, python-format |
2267 | msgid "Configuration Error!" |
2268 | msgstr "" |
2269 | @@ -3028,8 +3111,13 @@ |
2270 | msgstr "" |
2271 | |
2272 | #. module: account |
2273 | +<<<<<<< TREE |
2274 | #: code:addons/account/account.py:2308 |
2275 | #: code:addons/account/account_invoice.py:744 |
2276 | +======= |
2277 | +#: code:addons/account/account.py:2346 |
2278 | +#: code:addons/account/account_invoice.py:775 |
2279 | +>>>>>>> MERGE-SOURCE |
2280 | #: code:addons/account/account_move_line.py:195 |
2281 | #, python-format |
2282 | msgid "You have to define an analytic journal on the '%s' journal!" |
2283 | @@ -3090,6 +3178,11 @@ |
2284 | msgstr "" |
2285 | |
2286 | #. module: account |
2287 | +#: report:account.journal.period.print:0 |
2288 | +msgid "Reference Number" |
2289 | +msgstr "" |
2290 | + |
2291 | +#. module: account |
2292 | #: selection:account.entries.report,month:0 |
2293 | #: selection:account.invoice.report,month:0 |
2294 | #: selection:analytic.entries.report,month:0 |
2295 | @@ -3188,7 +3281,11 @@ |
2296 | msgstr "" |
2297 | |
2298 | #. module: account |
2299 | +<<<<<<< TREE |
2300 | #: code:addons/account/account_invoice.py:791 |
2301 | +======= |
2302 | +#: code:addons/account/account_invoice.py:823 |
2303 | +>>>>>>> MERGE-SOURCE |
2304 | #, python-format |
2305 | msgid "" |
2306 | "Tax base different!\n" |
2307 | @@ -3344,8 +3441,13 @@ |
2308 | msgstr "" |
2309 | |
2310 | #. module: account |
2311 | +<<<<<<< TREE |
2312 | #: code:addons/account/account.py:3422 |
2313 | #: code:addons/account/account_bank.py:95 |
2314 | +======= |
2315 | +#: code:addons/account/account.py:3460 |
2316 | +#: code:addons/account/account_bank.py:94 |
2317 | +>>>>>>> MERGE-SOURCE |
2318 | #, python-format |
2319 | msgid "BNK" |
2320 | msgstr "" |
2321 | @@ -3601,7 +3703,11 @@ |
2322 | msgstr "" |
2323 | |
2324 | #. module: account |
2325 | +<<<<<<< TREE |
2326 | #: code:addons/account/account_invoice.py:984 |
2327 | +======= |
2328 | +#: code:addons/account/account_invoice.py:1016 |
2329 | +>>>>>>> MERGE-SOURCE |
2330 | #, python-format |
2331 | msgid "" |
2332 | "You cannot create an invoice on a centralized journal. Uncheck the " |
2333 | @@ -3616,7 +3722,11 @@ |
2334 | msgstr "" |
2335 | |
2336 | #. module: account |
2337 | +<<<<<<< TREE |
2338 | #: code:addons/account/account_invoice.py:1434 |
2339 | +======= |
2340 | +#: code:addons/account/account_invoice.py:1465 |
2341 | +>>>>>>> MERGE-SOURCE |
2342 | #, python-format |
2343 | msgid "No Partner Defined !" |
2344 | msgstr "" |
2345 | @@ -3880,14 +3990,21 @@ |
2346 | msgstr "" |
2347 | |
2348 | #. module: account |
2349 | +<<<<<<< TREE |
2350 | #: report:account.invoice:0 |
2351 | msgid "VAT :" |
2352 | msgstr "" |
2353 | |
2354 | #. module: account |
2355 | +======= |
2356 | +#: report:account.account.balance:0 |
2357 | +>>>>>>> MERGE-SOURCE |
2358 | #: report:account.central.journal:0 |
2359 | #: view:account.config.settings:0 |
2360 | +#: report:account.general.journal:0 |
2361 | #: report:account.general.ledger:0 |
2362 | +#: report:account.general.ledger_landscape:0 |
2363 | +#: report:account.journal.period.print:0 |
2364 | #: report:account.partner.balance:0 |
2365 | #: report:account.third_party_ledger:0 |
2366 | #: report:account.third_party_ledger_other:0 |
2367 | @@ -4241,7 +4358,11 @@ |
2368 | msgstr "" |
2369 | |
2370 | #. module: account |
2371 | +<<<<<<< TREE |
2372 | #: code:addons/account/account_invoice.py:550 |
2373 | +======= |
2374 | +#: code:addons/account/account_invoice.py:573 |
2375 | +>>>>>>> MERGE-SOURCE |
2376 | #: code:addons/account/wizard/account_invoice_refund.py:146 |
2377 | #, python-format |
2378 | msgid "Insufficient Data!" |
2379 | @@ -4508,8 +4629,13 @@ |
2380 | msgstr "" |
2381 | |
2382 | #. module: account |
2383 | +<<<<<<< TREE |
2384 | #: code:addons/account/account_invoice.py:583 |
2385 | #: code:addons/account/account_invoice.py:598 |
2386 | +======= |
2387 | +#: code:addons/account/account_invoice.py:610 |
2388 | +#: code:addons/account/account_invoice.py:625 |
2389 | +>>>>>>> MERGE-SOURCE |
2390 | #, python-format |
2391 | msgid "" |
2392 | "Cannot find a chart of account, you should create one from Settings\\" |
2393 | @@ -4782,7 +4908,11 @@ |
2394 | msgstr "" |
2395 | |
2396 | #. module: account |
2397 | +<<<<<<< TREE |
2398 | #: code:addons/account/account_invoice.py:627 |
2399 | +======= |
2400 | +#: code:addons/account/account_invoice.py:658 |
2401 | +>>>>>>> MERGE-SOURCE |
2402 | #, python-format |
2403 | msgid "" |
2404 | "Cannot find any account journal of %s type for this company.\n" |
2405 | @@ -5106,7 +5236,11 @@ |
2406 | msgstr "" |
2407 | |
2408 | #. module: account |
2409 | +<<<<<<< TREE |
2410 | #: code:addons/account/account_invoice.py:890 |
2411 | +======= |
2412 | +#: code:addons/account/account_invoice.py:922 |
2413 | +>>>>>>> MERGE-SOURCE |
2414 | #, python-format |
2415 | msgid "" |
2416 | "Please verify the price of the invoice !\n" |
2417 | @@ -5431,7 +5565,11 @@ |
2418 | msgstr "" |
2419 | |
2420 | #. module: account |
2421 | +<<<<<<< TREE |
2422 | #: code:addons/account/account_invoice.py:485 |
2423 | +======= |
2424 | +#: code:addons/account/account_invoice.py:508 |
2425 | +>>>>>>> MERGE-SOURCE |
2426 | #, python-format |
2427 | msgid "" |
2428 | "Cannot find a chart of accounts for this company, you should create one." |
2429 | @@ -5815,6 +5953,18 @@ |
2430 | msgstr "" |
2431 | |
2432 | #. module: account |
2433 | +<<<<<<< TREE |
2434 | +======= |
2435 | +#: code:addons/account/account_invoice.py:474 |
2436 | +#, python-format |
2437 | +msgid "" |
2438 | +"You cannot delete an invoice after it has been validated (and received a " |
2439 | +"number). You can set it back to \"Draft\" state and modify its content, " |
2440 | +"then re-confirm it." |
2441 | +msgstr "" |
2442 | + |
2443 | +#. module: account |
2444 | +>>>>>>> MERGE-SOURCE |
2445 | #: help:account.automatic.reconcile,power:0 |
2446 | msgid "" |
2447 | "Number of partial amounts that can be combined to find a balance point can " |
2448 | @@ -5966,7 +6116,11 @@ |
2449 | #: view:account.config.settings:0 |
2450 | #: view:account.invoice:0 |
2451 | #: view:account.invoice.report:0 |
2452 | +<<<<<<< TREE |
2453 | #: code:addons/account/account_invoice.py:355 |
2454 | +======= |
2455 | +#: code:addons/account/account_invoice.py:390 |
2456 | +>>>>>>> MERGE-SOURCE |
2457 | #, python-format |
2458 | msgid "Supplier" |
2459 | msgstr "" |
2460 | @@ -5986,7 +6140,7 @@ |
2461 | msgstr "" |
2462 | |
2463 | #. module: account |
2464 | -#: code:addons/account/account_invoice.py:92 |
2465 | +#: code:addons/account/account_invoice.py:95 |
2466 | #, python-format |
2467 | msgid "Free Reference" |
2468 | msgstr "" |
2469 | @@ -5996,7 +6150,9 @@ |
2470 | #: selection:account.common.partner.report,result_selection:0 |
2471 | #: selection:account.partner.balance,result_selection:0 |
2472 | #: selection:account.partner.ledger,result_selection:0 |
2473 | +#: report:account.third_party_ledger:0 |
2474 | #: code:addons/account/report/account_partner_balance.py:301 |
2475 | +#: code:addons/account/report/account_partner_ledger.py:276 |
2476 | #, python-format |
2477 | msgid "Receivable and Payable Accounts" |
2478 | msgstr "" |
2479 | @@ -6294,7 +6450,11 @@ |
2480 | msgstr "" |
2481 | |
2482 | #. module: account |
2483 | +<<<<<<< TREE |
2484 | #: code:addons/account/account_invoice.py:1091 |
2485 | +======= |
2486 | +#: code:addons/account/account_invoice.py:1124 |
2487 | +>>>>>>> MERGE-SOURCE |
2488 | #, python-format |
2489 | msgid "" |
2490 | "You cannot cancel an invoice which is partially paid. You need to " |
2491 | @@ -6466,7 +6626,11 @@ |
2492 | msgstr "" |
2493 | |
2494 | #. module: account |
2495 | +<<<<<<< TREE |
2496 | #: code:addons/account/account_invoice.py:606 |
2497 | +======= |
2498 | +#: code:addons/account/account_invoice.py:633 |
2499 | +>>>>>>> MERGE-SOURCE |
2500 | #, python-format |
2501 | msgid "Invoice line account's company and invoice's compnay does not match." |
2502 | msgstr "" |
2503 | @@ -6611,12 +6775,21 @@ |
2504 | msgstr "" |
2505 | |
2506 | #. module: account |
2507 | +<<<<<<< TREE |
2508 | #: code:addons/account/account.py:1410 |
2509 | #: code:addons/account/account.py:1415 |
2510 | #: code:addons/account/account.py:1444 |
2511 | #: code:addons/account/account.py:1451 |
2512 | #: code:addons/account/account_invoice.py:983 |
2513 | #: code:addons/account/account_move_line.py:1008 |
2514 | +======= |
2515 | +#: code:addons/account/account.py:1448 |
2516 | +#: code:addons/account/account.py:1453 |
2517 | +#: code:addons/account/account.py:1482 |
2518 | +#: code:addons/account/account.py:1489 |
2519 | +#: code:addons/account/account_invoice.py:1015 |
2520 | +#: code:addons/account/account_move_line.py:1005 |
2521 | +>>>>>>> MERGE-SOURCE |
2522 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 |
2523 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 |
2524 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 |
2525 | @@ -6694,6 +6867,10 @@ |
2526 | #: report:account.invoice:0 |
2527 | #: selection:account.invoice,type:0 |
2528 | #: selection:account.invoice.report,type:0 |
2529 | +<<<<<<< TREE |
2530 | +======= |
2531 | +#: code:addons/account/account_invoice.py:1160 |
2532 | +>>>>>>> MERGE-SOURCE |
2533 | #: selection:report.invoice.created,type:0 |
2534 | msgid "Supplier Refund" |
2535 | msgstr "" |
2536 | @@ -7811,7 +7988,11 @@ |
2537 | msgstr "" |
2538 | |
2539 | #. module: account |
2540 | +<<<<<<< TREE |
2541 | #: code:addons/account/account_invoice.py:788 |
2542 | +======= |
2543 | +#: code:addons/account/account_invoice.py:820 |
2544 | +>>>>>>> MERGE-SOURCE |
2545 | #, python-format |
2546 | msgid "Global taxes defined, but they are not in invoice lines !" |
2547 | msgstr "" |
2548 | @@ -7852,7 +8033,11 @@ |
2549 | #: view:account.config.settings:0 |
2550 | #: view:account.invoice:0 |
2551 | #: view:account.invoice.report:0 |
2552 | +<<<<<<< TREE |
2553 | #: code:addons/account/account_invoice.py:353 |
2554 | +======= |
2555 | +#: code:addons/account/account_invoice.py:388 |
2556 | +>>>>>>> MERGE-SOURCE |
2557 | #, python-format |
2558 | msgid "Customer" |
2559 | msgstr "" |
2560 | @@ -7986,6 +8171,17 @@ |
2561 | msgstr "" |
2562 | |
2563 | #. module: account |
2564 | +<<<<<<< TREE |
2565 | +======= |
2566 | +#: code:addons/account/account_invoice.py:472 |
2567 | +#, python-format |
2568 | +msgid "" |
2569 | +"You cannot delete an invoice which is not draft or cancelled. You should " |
2570 | +"refund it instead." |
2571 | +msgstr "" |
2572 | + |
2573 | +#. module: account |
2574 | +>>>>>>> MERGE-SOURCE |
2575 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement |
2576 | msgid "Legal Reports" |
2577 | msgstr "" |
2578 | @@ -8099,7 +8295,11 @@ |
2579 | msgstr "" |
2580 | |
2581 | #. module: account |
2582 | +<<<<<<< TREE |
2583 | #: code:addons/account/account_invoice.py:869 |
2584 | +======= |
2585 | +#: code:addons/account/account_invoice.py:901 |
2586 | +>>>>>>> MERGE-SOURCE |
2587 | #, python-format |
2588 | msgid "No Invoice Lines !" |
2589 | msgstr "" |
2590 | @@ -8174,7 +8374,11 @@ |
2591 | msgstr "" |
2592 | |
2593 | #. module: account |
2594 | +<<<<<<< TREE |
2595 | #: code:addons/account/account_invoice.py:1434 |
2596 | +======= |
2597 | +#: code:addons/account/account_invoice.py:1465 |
2598 | +>>>>>>> MERGE-SOURCE |
2599 | #, python-format |
2600 | msgid "You must first select a partner !" |
2601 | msgstr "" |
2602 | @@ -9116,7 +9320,11 @@ |
2603 | msgstr "" |
2604 | |
2605 | #. module: account |
2606 | +<<<<<<< TREE |
2607 | #: code:addons/account/account_invoice.py:869 |
2608 | +======= |
2609 | +#: code:addons/account/account_invoice.py:901 |
2610 | +>>>>>>> MERGE-SOURCE |
2611 | #, python-format |
2612 | msgid "Please create some invoice lines." |
2613 | msgstr "" |
2614 | @@ -9670,7 +9878,11 @@ |
2615 | msgstr "" |
2616 | |
2617 | #. module: account |
2618 | +<<<<<<< TREE |
2619 | #: code:addons/account/account_invoice.py:890 |
2620 | +======= |
2621 | +#: code:addons/account/account_invoice.py:922 |
2622 | +>>>>>>> MERGE-SOURCE |
2623 | #, python-format |
2624 | msgid "Bad total !" |
2625 | msgstr "" |
2626 | @@ -10141,6 +10353,7 @@ |
2627 | |
2628 | #. module: account |
2629 | #: field:account.account,company_id:0 |
2630 | +#: report:account.account.balance:0 |
2631 | #: field:account.aged.trial.balance,company_id:0 |
2632 | #: field:account.analytic.journal,company_id:0 |
2633 | #: field:account.balance.report,company_id:0 |
2634 | @@ -10156,7 +10369,9 @@ |
2635 | #: field:account.entries.report,company_id:0 |
2636 | #: field:account.fiscal.position,company_id:0 |
2637 | #: field:account.fiscalyear,company_id:0 |
2638 | +#: report:account.general.journal:0 |
2639 | #: field:account.general.journal,company_id:0 |
2640 | +#: report:account.general.ledger_landscape:0 |
2641 | #: field:account.installer,company_id:0 |
2642 | #: field:account.invoice,company_id:0 |
2643 | #: field:account.invoice.line,company_id:0 |
2644 | @@ -10165,6 +10380,7 @@ |
2645 | #: field:account.invoice.tax,company_id:0 |
2646 | #: field:account.journal,company_id:0 |
2647 | #: field:account.journal.period,company_id:0 |
2648 | +#: report:account.journal.period.print:0 |
2649 | #: field:account.model,company_id:0 |
2650 | #: field:account.move,company_id:0 |
2651 | #: field:account.move.line,company_id:0 |
2652 | @@ -10325,6 +10541,10 @@ |
2653 | #: view:account.invoice:0 |
2654 | #: selection:account.invoice,type:0 |
2655 | #: selection:account.invoice.report,type:0 |
2656 | +<<<<<<< TREE |
2657 | +======= |
2658 | +#: code:addons/account/account_invoice.py:1158 |
2659 | +>>>>>>> MERGE-SOURCE |
2660 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 |
2661 | #: selection:report.invoice.created,type:0 |
2662 | msgid "Supplier Invoice" |
2663 | @@ -10412,8 +10632,10 @@ |
2664 | msgstr "" |
2665 | |
2666 | #. module: account |
2667 | +#: report:account.account.balance:0 |
2668 | #: selection:account.balance.report,display_account:0 |
2669 | #: selection:account.common.account.report,display_account:0 |
2670 | +#: report:account.general.ledger_landscape:0 |
2671 | #: selection:account.report.general.ledger,display_account:0 |
2672 | msgid "With movements" |
2673 | msgstr "" |
2674 | @@ -10508,7 +10730,11 @@ |
2675 | msgstr "" |
2676 | |
2677 | #. module: account |
2678 | +<<<<<<< TREE |
2679 | #: code:addons/account/account_invoice.py:1515 |
2680 | +======= |
2681 | +#: code:addons/account/account_invoice.py:1546 |
2682 | +>>>>>>> MERGE-SOURCE |
2683 | #, python-format |
2684 | msgid "" |
2685 | "The selected unit of measure is not compatible with the unit of measure of " |
2686 | @@ -10589,6 +10815,11 @@ |
2687 | #: report:account.invoice:0 |
2688 | #: view:account.invoice:0 |
2689 | #: view:account.invoice.report:0 |
2690 | +<<<<<<< TREE |
2691 | +======= |
2692 | +#: code:addons/account/account_invoice.py:1159 |
2693 | +#, python-format |
2694 | +>>>>>>> MERGE-SOURCE |
2695 | msgid "Refund" |
2696 | msgstr "" |
2697 | |
2698 | @@ -10659,7 +10890,11 @@ |
2699 | msgstr "" |
2700 | |
2701 | #. module: account |
2702 | +<<<<<<< TREE |
2703 | #: code:addons/account/account_invoice.py:550 |
2704 | +======= |
2705 | +#: code:addons/account/account_invoice.py:573 |
2706 | +>>>>>>> MERGE-SOURCE |
2707 | #, python-format |
2708 | msgid "The payment term of supplier does not have a payment term line." |
2709 | msgstr "" |
2710 | |
2711 | === modified file 'account/i18n/bs.po' |
2712 | --- account/i18n/bs.po 2013-06-13 18:15:03 +0000 |
2713 | +++ account/i18n/bs.po 2013-06-19 09:20:00 +0000 |
2714 | @@ -4,17 +4,31 @@ |
2715 | # |
2716 | msgid "" |
2717 | msgstr "" |
2718 | +<<<<<<< TREE |
2719 | "Project-Id-Version: OpenERP Server 6.0dev\n" |
2720 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
2721 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
2722 | "PO-Revision-Date: 2012-05-10 18:18+0000\n" |
2723 | "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" |
2724 | "Language-Team: \n" |
2725 | +======= |
2726 | +"Project-Id-Version: openobject-addons\n" |
2727 | +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2728 | +"POT-Creation-Date: 2013-06-14 22:29+0000\n" |
2729 | +"PO-Revision-Date: 2012-12-21 23:00+0000\n" |
2730 | +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
2731 | +"Language-Team: Bosnian <bs@li.org>\n" |
2732 | +>>>>>>> MERGE-SOURCE |
2733 | "MIME-Version: 1.0\n" |
2734 | "Content-Type: text/plain; charset=UTF-8\n" |
2735 | "Content-Transfer-Encoding: 8bit\n" |
2736 | +<<<<<<< TREE |
2737 | "X-Launchpad-Export-Date: 2013-03-16 05:12+0000\n" |
2738 | "X-Generator: Launchpad (build 16532)\n" |
2739 | +======= |
2740 | +"X-Launchpad-Export-Date: 2013-06-15 06:13+0000\n" |
2741 | +"X-Generator: Launchpad (build 16667)\n" |
2742 | +>>>>>>> MERGE-SOURCE |
2743 | |
2744 | #. module: account |
2745 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 |
2746 | @@ -129,11 +143,19 @@ |
2747 | #: code:addons/account/account.py:641 |
2748 | #: code:addons/account/account.py:686 |
2749 | #: code:addons/account/account.py:781 |
2750 | +<<<<<<< TREE |
2751 | #: code:addons/account/account.py:1049 |
2752 | #: code:addons/account/account_invoice.py:788 |
2753 | #: code:addons/account/account_invoice.py:791 |
2754 | #: code:addons/account/account_invoice.py:794 |
2755 | #: code:addons/account/account_invoice.py:1514 |
2756 | +======= |
2757 | +#: code:addons/account/account.py:1058 |
2758 | +#: code:addons/account/account_invoice.py:820 |
2759 | +#: code:addons/account/account_invoice.py:823 |
2760 | +#: code:addons/account/account_invoice.py:826 |
2761 | +#: code:addons/account/account_invoice.py:1545 |
2762 | +>>>>>>> MERGE-SOURCE |
2763 | #: code:addons/account/account_move_line.py:98 |
2764 | #: code:addons/account/account_move_line.py:774 |
2765 | #: code:addons/account/account_move_line.py:827 |
2766 | @@ -331,7 +353,7 @@ |
2767 | msgstr "" |
2768 | |
2769 | #. module: account |
2770 | -#: code:addons/account/account_invoice.py:74 |
2771 | +#: code:addons/account/account_invoice.py:77 |
2772 | #, python-format |
2773 | msgid "You must define an analytic journal of type '%s'!" |
2774 | msgstr "" |
2775 | @@ -587,11 +609,23 @@ |
2776 | msgstr "" |
2777 | |
2778 | #. module: account |
2779 | +<<<<<<< TREE |
2780 | #. openerp-web |
2781 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 |
2782 | #, python-format |
2783 | msgid "Nothing to reconcile" |
2784 | msgstr "" |
2785 | +======= |
2786 | +#: report:account.account.balance:0 |
2787 | +#: selection:account.balance.report,display_account:0 |
2788 | +#: selection:account.common.account.report,display_account:0 |
2789 | +#: report:account.general.ledger_landscape:0 |
2790 | +#: selection:account.report.general.ledger,display_account:0 |
2791 | +#: selection:account.tax,type_tax_use:0 |
2792 | +#: selection:account.tax.template,type_tax_use:0 |
2793 | +msgid "All" |
2794 | +msgstr "Sve" |
2795 | +>>>>>>> MERGE-SOURCE |
2796 | |
2797 | #. module: account |
2798 | #: field:account.config.settings,decimal_precision:0 |
2799 | @@ -722,7 +756,9 @@ |
2800 | #: selection:account.common.partner.report,result_selection:0 |
2801 | #: selection:account.partner.balance,result_selection:0 |
2802 | #: selection:account.partner.ledger,result_selection:0 |
2803 | +#: report:account.third_party_ledger:0 |
2804 | #: code:addons/account/report/account_partner_balance.py:297 |
2805 | +#: code:addons/account/report/account_partner_ledger.py:272 |
2806 | #, python-format |
2807 | msgid "Receivable Accounts" |
2808 | msgstr "Potražni računi" |
2809 | @@ -760,7 +796,11 @@ |
2810 | msgstr "Jeste sigurni da želite stvortiti stavke?" |
2811 | |
2812 | #. module: account |
2813 | +<<<<<<< TREE |
2814 | #: code:addons/account/account_invoice.py:1330 |
2815 | +======= |
2816 | +#: code:addons/account/account_invoice.py:1361 |
2817 | +>>>>>>> MERGE-SOURCE |
2818 | #, python-format |
2819 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." |
2820 | msgstr "" |
2821 | @@ -829,7 +869,11 @@ |
2822 | msgstr "Tip" |
2823 | |
2824 | #. module: account |
2825 | +<<<<<<< TREE |
2826 | #: code:addons/account/account_invoice.py:794 |
2827 | +======= |
2828 | +#: code:addons/account/account_invoice.py:826 |
2829 | +>>>>>>> MERGE-SOURCE |
2830 | #, python-format |
2831 | msgid "" |
2832 | "Taxes are missing!\n" |
2833 | @@ -1008,7 +1052,11 @@ |
2834 | msgstr "Obveza" |
2835 | |
2836 | #. module: account |
2837 | +<<<<<<< TREE |
2838 | #: code:addons/account/account_invoice.py:867 |
2839 | +======= |
2840 | +#: code:addons/account/account_invoice.py:899 |
2841 | +>>>>>>> MERGE-SOURCE |
2842 | #, python-format |
2843 | msgid "Please define sequence on the journal related to this invoice." |
2844 | msgstr "" |
2845 | @@ -1079,10 +1127,17 @@ |
2846 | msgstr "" |
2847 | |
2848 | #. module: account |
2849 | +<<<<<<< TREE |
2850 | #: code:addons/account/account.py:2308 |
2851 | #: code:addons/account/account_bank_statement.py:423 |
2852 | #: code:addons/account/account_invoice.py:74 |
2853 | #: code:addons/account/account_invoice.py:744 |
2854 | +======= |
2855 | +#: code:addons/account/account.py:2346 |
2856 | +#: code:addons/account/account_bank_statement.py:424 |
2857 | +#: code:addons/account/account_invoice.py:77 |
2858 | +#: code:addons/account/account_invoice.py:775 |
2859 | +>>>>>>> MERGE-SOURCE |
2860 | #: code:addons/account/account_move_line.py:195 |
2861 | #, python-format |
2862 | msgid "No Analytic Journal !" |
2863 | @@ -1511,8 +1566,10 @@ |
2864 | msgstr "" |
2865 | |
2866 | #. module: account |
2867 | +#: report:account.account.balance:0 |
2868 | #: selection:account.balance.report,display_account:0 |
2869 | #: selection:account.common.account.report,display_account:0 |
2870 | +#: report:account.general.ledger_landscape:0 |
2871 | #: selection:account.partner.balance,display_partner:0 |
2872 | #: selection:account.report.general.ledger,display_account:0 |
2873 | msgid "With balance is not equal to 0" |
2874 | @@ -1742,6 +1799,10 @@ |
2875 | #: view:account.invoice:0 |
2876 | #: view:account.invoice.report:0 |
2877 | #: field:account.move.line,invoice:0 |
2878 | +<<<<<<< TREE |
2879 | +======= |
2880 | +#: code:addons/account/account_invoice.py:1157 |
2881 | +>>>>>>> MERGE-SOURCE |
2882 | #: model:ir.model,name:account.model_account_invoice |
2883 | #: model:res.request.link,name:account.req_link_invoice |
2884 | msgid "Invoice" |
2885 | @@ -1990,11 +2051,20 @@ |
2886 | #: code:addons/account/account_bank_statement.py:418 |
2887 | #: code:addons/account/account_cash_statement.py:256 |
2888 | #: code:addons/account/account_cash_statement.py:300 |
2889 | +<<<<<<< TREE |
2890 | #: code:addons/account/account_invoice.py:867 |
2891 | #: code:addons/account/account_invoice.py:901 |
2892 | #: code:addons/account/account_invoice.py:1091 |
2893 | #: code:addons/account/account_move_line.py:578 |
2894 | #: code:addons/account/account_move_line.py:831 |
2895 | +======= |
2896 | +#: code:addons/account/account_invoice.py:899 |
2897 | +#: code:addons/account/account_invoice.py:933 |
2898 | +#: code:addons/account/account_invoice.py:1124 |
2899 | +#: code:addons/account/account_move_line.py:579 |
2900 | +#: code:addons/account/account_move_line.py:828 |
2901 | +#: code:addons/account/account_move_line.py:851 |
2902 | +>>>>>>> MERGE-SOURCE |
2903 | #: code:addons/account/account_move_line.py:854 |
2904 | #: code:addons/account/account_move_line.py:857 |
2905 | #: code:addons/account/account_move_line.py:1122 |
2906 | @@ -2228,7 +2298,9 @@ |
2907 | #: selection:account.common.partner.report,result_selection:0 |
2908 | #: selection:account.partner.balance,result_selection:0 |
2909 | #: selection:account.partner.ledger,result_selection:0 |
2910 | +#: report:account.third_party_ledger:0 |
2911 | #: code:addons/account/report/account_partner_balance.py:299 |
2912 | +#: code:addons/account/report/account_partner_ledger.py:274 |
2913 | #, python-format |
2914 | msgid "Payable Accounts" |
2915 | msgstr "Dugovni računi" |
2916 | @@ -2533,7 +2605,11 @@ |
2917 | msgstr "" |
2918 | |
2919 | #. module: account |
2920 | +<<<<<<< TREE |
2921 | #: code:addons/account/account_invoice.py:901 |
2922 | +======= |
2923 | +#: code:addons/account/account_invoice.py:933 |
2924 | +>>>>>>> MERGE-SOURCE |
2925 | #, python-format |
2926 | msgid "" |
2927 | "Cannot create the invoice.\n" |
2928 | @@ -2803,6 +2879,7 @@ |
2929 | msgstr "" |
2930 | |
2931 | #. module: account |
2932 | +<<<<<<< TREE |
2933 | #: code:addons/account/account.py:3503 |
2934 | #: code:addons/account/account_bank_statement.py:404 |
2935 | #: code:addons/account/account_invoice.py:378 |
2936 | @@ -2812,6 +2889,16 @@ |
2937 | #: code:addons/account/account_invoice.py:605 |
2938 | #: code:addons/account/account_invoice.py:627 |
2939 | #: code:addons/account/account_move_line.py:535 |
2940 | +======= |
2941 | +#: code:addons/account/account.py:3541 |
2942 | +#: code:addons/account/account_bank_statement.py:405 |
2943 | +#: code:addons/account/account_invoice.py:507 |
2944 | +#: code:addons/account/account_invoice.py:609 |
2945 | +#: code:addons/account/account_invoice.py:624 |
2946 | +#: code:addons/account/account_invoice.py:632 |
2947 | +#: code:addons/account/account_invoice.py:657 |
2948 | +#: code:addons/account/account_move_line.py:536 |
2949 | +>>>>>>> MERGE-SOURCE |
2950 | #, python-format |
2951 | msgid "Configuration Error!" |
2952 | msgstr "" |
2953 | @@ -3034,8 +3121,13 @@ |
2954 | msgstr "" |
2955 | |
2956 | #. module: account |
2957 | +<<<<<<< TREE |
2958 | #: code:addons/account/account.py:2308 |
2959 | #: code:addons/account/account_invoice.py:744 |
2960 | +======= |
2961 | +#: code:addons/account/account.py:2346 |
2962 | +#: code:addons/account/account_invoice.py:775 |
2963 | +>>>>>>> MERGE-SOURCE |
2964 | #: code:addons/account/account_move_line.py:195 |
2965 | #, python-format |
2966 | msgid "You have to define an analytic journal on the '%s' journal!" |
2967 | @@ -3096,6 +3188,11 @@ |
2968 | msgstr "" |
2969 | |
2970 | #. module: account |
2971 | +#: report:account.journal.period.print:0 |
2972 | +msgid "Reference Number" |
2973 | +msgstr "Broj reference" |
2974 | + |
2975 | +#. module: account |
2976 | #: selection:account.entries.report,month:0 |
2977 | #: selection:account.invoice.report,month:0 |
2978 | #: selection:analytic.entries.report,month:0 |
2979 | @@ -3194,7 +3291,11 @@ |
2980 | msgstr "Fiskalna pozicija" |
2981 | |
2982 | #. module: account |
2983 | +<<<<<<< TREE |
2984 | #: code:addons/account/account_invoice.py:791 |
2985 | +======= |
2986 | +#: code:addons/account/account_invoice.py:823 |
2987 | +>>>>>>> MERGE-SOURCE |
2988 | #, python-format |
2989 | msgid "" |
2990 | "Tax base different!\n" |
2991 | @@ -3355,8 +3456,13 @@ |
2992 | msgstr "Prikaz" |
2993 | |
2994 | #. module: account |
2995 | +<<<<<<< TREE |
2996 | #: code:addons/account/account.py:3422 |
2997 | #: code:addons/account/account_bank.py:95 |
2998 | +======= |
2999 | +#: code:addons/account/account.py:3460 |
3000 | +#: code:addons/account/account_bank.py:94 |
3001 | +>>>>>>> MERGE-SOURCE |
3002 | #, python-format |
3003 | msgid "BNK" |
3004 | msgstr "" |
3005 | @@ -3612,7 +3718,11 @@ |
3006 | msgstr "" |
3007 | |
3008 | #. module: account |
3009 | +<<<<<<< TREE |
3010 | #: code:addons/account/account_invoice.py:984 |
3011 | +======= |
3012 | +#: code:addons/account/account_invoice.py:1016 |
3013 | +>>>>>>> MERGE-SOURCE |
3014 | #, python-format |
3015 | msgid "" |
3016 | "You cannot create an invoice on a centralized journal. Uncheck the " |
3017 | @@ -3627,7 +3737,11 @@ |
3018 | msgstr "Početni saldo" |
3019 | |
3020 | #. module: account |
3021 | +<<<<<<< TREE |
3022 | #: code:addons/account/account_invoice.py:1434 |
3023 | +======= |
3024 | +#: code:addons/account/account_invoice.py:1465 |
3025 | +>>>>>>> MERGE-SOURCE |
3026 | #, python-format |
3027 | msgid "No Partner Defined !" |
3028 | msgstr "" |
3029 | @@ -3891,14 +4005,21 @@ |
3030 | msgstr "" |
3031 | |
3032 | #. module: account |
3033 | +<<<<<<< TREE |
3034 | #: report:account.invoice:0 |
3035 | msgid "VAT :" |
3036 | msgstr "PDV:" |
3037 | |
3038 | #. module: account |
3039 | +======= |
3040 | +#: report:account.account.balance:0 |
3041 | +>>>>>>> MERGE-SOURCE |
3042 | #: report:account.central.journal:0 |
3043 | #: view:account.config.settings:0 |
3044 | +#: report:account.general.journal:0 |
3045 | #: report:account.general.ledger:0 |
3046 | +#: report:account.general.ledger_landscape:0 |
3047 | +#: report:account.journal.period.print:0 |
3048 | #: report:account.partner.balance:0 |
3049 | #: report:account.third_party_ledger:0 |
3050 | #: report:account.third_party_ledger_other:0 |
3051 | @@ -4256,7 +4377,11 @@ |
3052 | msgstr "Konsolidirani potomci" |
3053 | |
3054 | #. module: account |
3055 | +<<<<<<< TREE |
3056 | #: code:addons/account/account_invoice.py:550 |
3057 | +======= |
3058 | +#: code:addons/account/account_invoice.py:573 |
3059 | +>>>>>>> MERGE-SOURCE |
3060 | #: code:addons/account/wizard/account_invoice_refund.py:146 |
3061 | #, python-format |
3062 | msgid "Insufficient Data!" |
3063 | @@ -4523,8 +4648,13 @@ |
3064 | msgstr "" |
3065 | |
3066 | #. module: account |
3067 | +<<<<<<< TREE |
3068 | #: code:addons/account/account_invoice.py:583 |
3069 | #: code:addons/account/account_invoice.py:598 |
3070 | +======= |
3071 | +#: code:addons/account/account_invoice.py:610 |
3072 | +#: code:addons/account/account_invoice.py:625 |
3073 | +>>>>>>> MERGE-SOURCE |
3074 | #, python-format |
3075 | msgid "" |
3076 | "Cannot find a chart of account, you should create one from Settings\\" |
3077 | @@ -4797,7 +4927,11 @@ |
3078 | msgstr "" |
3079 | |
3080 | #. module: account |
3081 | +<<<<<<< TREE |
3082 | #: code:addons/account/account_invoice.py:627 |
3083 | +======= |
3084 | +#: code:addons/account/account_invoice.py:658 |
3085 | +>>>>>>> MERGE-SOURCE |
3086 | #, python-format |
3087 | msgid "" |
3088 | "Cannot find any account journal of %s type for this company.\n" |
3089 | @@ -5121,7 +5255,11 @@ |
3090 | msgstr "Porezna prijava" |
3091 | |
3092 | #. module: account |
3093 | +<<<<<<< TREE |
3094 | #: code:addons/account/account_invoice.py:890 |
3095 | +======= |
3096 | +#: code:addons/account/account_invoice.py:922 |
3097 | +>>>>>>> MERGE-SOURCE |
3098 | #, python-format |
3099 | msgid "" |
3100 | "Please verify the price of the invoice !\n" |
3101 | @@ -5448,7 +5586,11 @@ |
3102 | msgstr "Kod za izračunavanje (ako je tip=Python kod)" |
3103 | |
3104 | #. module: account |
3105 | +<<<<<<< TREE |
3106 | #: code:addons/account/account_invoice.py:485 |
3107 | +======= |
3108 | +#: code:addons/account/account_invoice.py:508 |
3109 | +>>>>>>> MERGE-SOURCE |
3110 | #, python-format |
3111 | msgid "" |
3112 | "Cannot find a chart of accounts for this company, you should create one." |
3113 | @@ -5834,6 +5976,18 @@ |
3114 | msgstr "" |
3115 | |
3116 | #. module: account |
3117 | +<<<<<<< TREE |
3118 | +======= |
3119 | +#: code:addons/account/account_invoice.py:474 |
3120 | +#, python-format |
3121 | +msgid "" |
3122 | +"You cannot delete an invoice after it has been validated (and received a " |
3123 | +"number). You can set it back to \"Draft\" state and modify its content, " |
3124 | +"then re-confirm it." |
3125 | +msgstr "" |
3126 | + |
3127 | +#. module: account |
3128 | +>>>>>>> MERGE-SOURCE |
3129 | #: help:account.automatic.reconcile,power:0 |
3130 | msgid "" |
3131 | "Number of partial amounts that can be combined to find a balance point can " |
3132 | @@ -5985,7 +6139,11 @@ |
3133 | #: view:account.config.settings:0 |
3134 | #: view:account.invoice:0 |
3135 | #: view:account.invoice.report:0 |
3136 | +<<<<<<< TREE |
3137 | #: code:addons/account/account_invoice.py:355 |
3138 | +======= |
3139 | +#: code:addons/account/account_invoice.py:390 |
3140 | +>>>>>>> MERGE-SOURCE |
3141 | #, python-format |
3142 | msgid "Supplier" |
3143 | msgstr "Dobavljač" |
3144 | @@ -6005,7 +6163,7 @@ |
3145 | msgstr "Broj računa" |
3146 | |
3147 | #. module: account |
3148 | -#: code:addons/account/account_invoice.py:92 |
3149 | +#: code:addons/account/account_invoice.py:95 |
3150 | #, python-format |
3151 | msgid "Free Reference" |
3152 | msgstr "" |
3153 | @@ -6015,7 +6173,9 @@ |
3154 | #: selection:account.common.partner.report,result_selection:0 |
3155 | #: selection:account.partner.balance,result_selection:0 |
3156 | #: selection:account.partner.ledger,result_selection:0 |
3157 | +#: report:account.third_party_ledger:0 |
3158 | #: code:addons/account/report/account_partner_balance.py:301 |
3159 | +#: code:addons/account/report/account_partner_ledger.py:276 |
3160 | #, python-format |
3161 | msgid "Receivable and Payable Accounts" |
3162 | msgstr "Konta potraživanja i dugovanja" |
3163 | @@ -6313,7 +6473,11 @@ |
3164 | msgstr "" |
3165 | |
3166 | #. module: account |
3167 | +<<<<<<< TREE |
3168 | #: code:addons/account/account_invoice.py:1091 |
3169 | +======= |
3170 | +#: code:addons/account/account_invoice.py:1124 |
3171 | +>>>>>>> MERGE-SOURCE |
3172 | #, python-format |
3173 | msgid "" |
3174 | "You cannot cancel an invoice which is partially paid. You need to " |
3175 | @@ -6486,7 +6650,11 @@ |
3176 | msgstr "" |
3177 | |
3178 | #. module: account |
3179 | +<<<<<<< TREE |
3180 | #: code:addons/account/account_invoice.py:606 |
3181 | +======= |
3182 | +#: code:addons/account/account_invoice.py:633 |
3183 | +>>>>>>> MERGE-SOURCE |
3184 | #, python-format |
3185 | msgid "Invoice line account's company and invoice's compnay does not match." |
3186 | msgstr "" |
3187 | @@ -6634,12 +6802,21 @@ |
3188 | "slućaju, redosljed evaluacije je bitan." |
3189 | |
3190 | #. module: account |
3191 | +<<<<<<< TREE |
3192 | #: code:addons/account/account.py:1410 |
3193 | #: code:addons/account/account.py:1415 |
3194 | #: code:addons/account/account.py:1444 |
3195 | #: code:addons/account/account.py:1451 |
3196 | #: code:addons/account/account_invoice.py:983 |
3197 | #: code:addons/account/account_move_line.py:1008 |
3198 | +======= |
3199 | +#: code:addons/account/account.py:1448 |
3200 | +#: code:addons/account/account.py:1453 |
3201 | +#: code:addons/account/account.py:1482 |
3202 | +#: code:addons/account/account.py:1489 |
3203 | +#: code:addons/account/account_invoice.py:1015 |
3204 | +#: code:addons/account/account_move_line.py:1005 |
3205 | +>>>>>>> MERGE-SOURCE |
3206 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 |
3207 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 |
3208 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 |
3209 | @@ -6717,6 +6894,10 @@ |
3210 | #: report:account.invoice:0 |
3211 | #: selection:account.invoice,type:0 |
3212 | #: selection:account.invoice.report,type:0 |
3213 | +<<<<<<< TREE |
3214 | +======= |
3215 | +#: code:addons/account/account_invoice.py:1160 |
3216 | +>>>>>>> MERGE-SOURCE |
3217 | #: selection:report.invoice.created,type:0 |
3218 | msgid "Supplier Refund" |
3219 | msgstr "Povrat dobavljaču" |
3220 | @@ -7843,7 +8024,11 @@ |
3221 | msgstr "" |
3222 | |
3223 | #. module: account |
3224 | +<<<<<<< TREE |
3225 | #: code:addons/account/account_invoice.py:788 |
3226 | +======= |
3227 | +#: code:addons/account/account_invoice.py:820 |
3228 | +>>>>>>> MERGE-SOURCE |
3229 | #, python-format |
3230 | msgid "Global taxes defined, but they are not in invoice lines !" |
3231 | msgstr "" |
3232 | @@ -7884,7 +8069,11 @@ |
3233 | #: view:account.config.settings:0 |
3234 | #: view:account.invoice:0 |
3235 | #: view:account.invoice.report:0 |
3236 | +<<<<<<< TREE |
3237 | #: code:addons/account/account_invoice.py:353 |
3238 | +======= |
3239 | +#: code:addons/account/account_invoice.py:388 |
3240 | +>>>>>>> MERGE-SOURCE |
3241 | #, python-format |
3242 | msgid "Customer" |
3243 | msgstr "Kupac" |
3244 | @@ -8021,6 +8210,17 @@ |
3245 | msgstr "Transakcije za usklađivanje" |
3246 | |
3247 | #. module: account |
3248 | +<<<<<<< TREE |
3249 | +======= |
3250 | +#: code:addons/account/account_invoice.py:472 |
3251 | +#, python-format |
3252 | +msgid "" |
3253 | +"You cannot delete an invoice which is not draft or cancelled. You should " |
3254 | +"refund it instead." |
3255 | +msgstr "" |
3256 | + |
3257 | +#. module: account |
3258 | +>>>>>>> MERGE-SOURCE |
3259 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement |
3260 | msgid "Legal Reports" |
3261 | msgstr "" |
3262 | @@ -8137,7 +8337,11 @@ |
3263 | msgstr "" |
3264 | |
3265 | #. module: account |
3266 | +<<<<<<< TREE |
3267 | #: code:addons/account/account_invoice.py:869 |
3268 | +======= |
3269 | +#: code:addons/account/account_invoice.py:901 |
3270 | +>>>>>>> MERGE-SOURCE |
3271 | #, python-format |
3272 | msgid "No Invoice Lines !" |
3273 | msgstr "" |
3274 | @@ -8212,7 +8416,11 @@ |
3275 | msgstr "Vezani partner" |
3276 | |
3277 | #. module: account |
3278 | +<<<<<<< TREE |
3279 | #: code:addons/account/account_invoice.py:1434 |
3280 | +======= |
3281 | +#: code:addons/account/account_invoice.py:1465 |
3282 | +>>>>>>> MERGE-SOURCE |
3283 | #, python-format |
3284 | msgid "You must first select a partner !" |
3285 | msgstr "" |
3286 | @@ -9159,7 +9367,11 @@ |
3287 | msgstr "" |
3288 | |
3289 | #. module: account |
3290 | +<<<<<<< TREE |
3291 | #: code:addons/account/account_invoice.py:869 |
3292 | +======= |
3293 | +#: code:addons/account/account_invoice.py:901 |
3294 | +>>>>>>> MERGE-SOURCE |
3295 | #, python-format |
3296 | msgid "Please create some invoice lines." |
3297 | msgstr "" |
3298 | @@ -9713,7 +9925,11 @@ |
3299 | msgstr "Neusklađen" |
3300 | |
3301 | #. module: account |
3302 | +<<<<<<< TREE |
3303 | #: code:addons/account/account_invoice.py:890 |
3304 | +======= |
3305 | +#: code:addons/account/account_invoice.py:922 |
3306 | +>>>>>>> MERGE-SOURCE |
3307 | #, python-format |
3308 | msgid "Bad total !" |
3309 | msgstr "" |
3310 | @@ -10186,6 +10402,7 @@ |
3311 | |
3312 | #. module: account |
3313 | #: field:account.account,company_id:0 |
3314 | +#: report:account.account.balance:0 |
3315 | #: field:account.aged.trial.balance,company_id:0 |
3316 | #: field:account.analytic.journal,company_id:0 |
3317 | #: field:account.balance.report,company_id:0 |
3318 | @@ -10201,7 +10418,9 @@ |
3319 | #: field:account.entries.report,company_id:0 |
3320 | #: field:account.fiscal.position,company_id:0 |
3321 | #: field:account.fiscalyear,company_id:0 |
3322 | +#: report:account.general.journal:0 |
3323 | #: field:account.general.journal,company_id:0 |
3324 | +#: report:account.general.ledger_landscape:0 |
3325 | #: field:account.installer,company_id:0 |
3326 | #: field:account.invoice,company_id:0 |
3327 | #: field:account.invoice.line,company_id:0 |
3328 | @@ -10210,6 +10429,7 @@ |
3329 | #: field:account.invoice.tax,company_id:0 |
3330 | #: field:account.journal,company_id:0 |
3331 | #: field:account.journal.period,company_id:0 |
3332 | +#: report:account.journal.period.print:0 |
3333 | #: field:account.model,company_id:0 |
3334 | #: field:account.move,company_id:0 |
3335 | #: field:account.move.line,company_id:0 |
3336 | @@ -10370,6 +10590,10 @@ |
3337 | #: view:account.invoice:0 |
3338 | #: selection:account.invoice,type:0 |
3339 | #: selection:account.invoice.report,type:0 |
3340 | +<<<<<<< TREE |
3341 | +======= |
3342 | +#: code:addons/account/account_invoice.py:1158 |
3343 | +>>>>>>> MERGE-SOURCE |
3344 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 |
3345 | #: selection:report.invoice.created,type:0 |
3346 | msgid "Supplier Invoice" |
3347 | @@ -10457,8 +10681,10 @@ |
3348 | msgstr "" |
3349 | |
3350 | #. module: account |
3351 | +#: report:account.account.balance:0 |
3352 | #: selection:account.balance.report,display_account:0 |
3353 | #: selection:account.common.account.report,display_account:0 |
3354 | +#: report:account.general.ledger_landscape:0 |
3355 | #: selection:account.report.general.ledger,display_account:0 |
3356 | msgid "With movements" |
3357 | msgstr "Sa kretanjima" |
3358 | @@ -10553,7 +10779,11 @@ |
3359 | msgstr "" |
3360 | |
3361 | #. module: account |
3362 | +<<<<<<< TREE |
3363 | #: code:addons/account/account_invoice.py:1515 |
3364 | +======= |
3365 | +#: code:addons/account/account_invoice.py:1546 |
3366 | +>>>>>>> MERGE-SOURCE |
3367 | #, python-format |
3368 | msgid "" |
3369 | "The selected unit of measure is not compatible with the unit of measure of " |
3370 | @@ -10634,6 +10864,11 @@ |
3371 | #: report:account.invoice:0 |
3372 | #: view:account.invoice:0 |
3373 | #: view:account.invoice.report:0 |
3374 | +<<<<<<< TREE |
3375 | +======= |
3376 | +#: code:addons/account/account_invoice.py:1159 |
3377 | +#, python-format |
3378 | +>>>>>>> MERGE-SOURCE |
3379 | msgid "Refund" |
3380 | msgstr "Povrat" |
3381 | |
3382 | @@ -10704,7 +10939,11 @@ |
3383 | msgstr "Ručni porezi fakture" |
3384 | |
3385 | #. module: account |
3386 | +<<<<<<< TREE |
3387 | #: code:addons/account/account_invoice.py:550 |
3388 | +======= |
3389 | +#: code:addons/account/account_invoice.py:573 |
3390 | +>>>>>>> MERGE-SOURCE |
3391 | #, python-format |
3392 | msgid "The payment term of supplier does not have a payment term line." |
3393 | msgstr "" |
3394 | |
3395 | === modified file 'account/i18n/ca.po' |
3396 | --- account/i18n/ca.po 2013-06-13 18:15:03 +0000 |
3397 | +++ account/i18n/ca.po 2013-06-19 09:20:00 +0000 |
3398 | @@ -4,17 +4,31 @@ |
3399 | # |
3400 | msgid "" |
3401 | msgstr "" |
3402 | +<<<<<<< TREE |
3403 | "Project-Id-Version: OpenERP Server 6.0dev\n" |
3404 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
3405 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
3406 | "PO-Revision-Date: 2013-03-01 14:12+0000\n" |
3407 | "Last-Translator: Florenci Solà - Solatec <Unknown>\n" |
3408 | "Language-Team: \n" |
3409 | +======= |
3410 | +"Project-Id-Version: openobject-addons\n" |
3411 | +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
3412 | +"POT-Creation-Date: 2013-06-14 22:29+0000\n" |
3413 | +"PO-Revision-Date: 2012-12-21 23:00+0000\n" |
3414 | +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
3415 | +"Language-Team: Catalan <ca@li.org>\n" |
3416 | +>>>>>>> MERGE-SOURCE |
3417 | "MIME-Version: 1.0\n" |
3418 | "Content-Type: text/plain; charset=UTF-8\n" |
3419 | "Content-Transfer-Encoding: 8bit\n" |
3420 | +<<<<<<< TREE |
3421 | "X-Launchpad-Export-Date: 2013-03-16 05:13+0000\n" |
3422 | "X-Generator: Launchpad (build 16532)\n" |
3423 | +======= |
3424 | +"X-Launchpad-Export-Date: 2013-06-15 06:14+0000\n" |
3425 | +"X-Generator: Launchpad (build 16667)\n" |
3426 | +>>>>>>> MERGE-SOURCE |
3427 | |
3428 | #. module: account |
3429 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 |
3430 | @@ -135,11 +149,19 @@ |
3431 | #: code:addons/account/account.py:641 |
3432 | #: code:addons/account/account.py:686 |
3433 | #: code:addons/account/account.py:781 |
3434 | +<<<<<<< TREE |
3435 | #: code:addons/account/account.py:1049 |
3436 | #: code:addons/account/account_invoice.py:788 |
3437 | #: code:addons/account/account_invoice.py:791 |
3438 | #: code:addons/account/account_invoice.py:794 |
3439 | #: code:addons/account/account_invoice.py:1514 |
3440 | +======= |
3441 | +#: code:addons/account/account.py:1058 |
3442 | +#: code:addons/account/account_invoice.py:820 |
3443 | +#: code:addons/account/account_invoice.py:823 |
3444 | +#: code:addons/account/account_invoice.py:826 |
3445 | +#: code:addons/account/account_invoice.py:1545 |
3446 | +>>>>>>> MERGE-SOURCE |
3447 | #: code:addons/account/account_move_line.py:98 |
3448 | #: code:addons/account/account_move_line.py:774 |
3449 | #: code:addons/account/account_move_line.py:827 |
3450 | @@ -345,7 +367,7 @@ |
3451 | msgstr "" |
3452 | |
3453 | #. module: account |
3454 | -#: code:addons/account/account_invoice.py:74 |
3455 | +#: code:addons/account/account_invoice.py:77 |
3456 | #, python-format |
3457 | msgid "You must define an analytic journal of type '%s'!" |
3458 | msgstr "" |
3459 | @@ -601,11 +623,23 @@ |
3460 | msgstr "El comptable confirma l'extracte." |
3461 | |
3462 | #. module: account |
3463 | +<<<<<<< TREE |
3464 | #. openerp-web |
3465 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 |
3466 | #, python-format |
3467 | msgid "Nothing to reconcile" |
3468 | msgstr "" |
3469 | +======= |
3470 | +#: report:account.account.balance:0 |
3471 | +#: selection:account.balance.report,display_account:0 |
3472 | +#: selection:account.common.account.report,display_account:0 |
3473 | +#: report:account.general.ledger_landscape:0 |
3474 | +#: selection:account.report.general.ledger,display_account:0 |
3475 | +#: selection:account.tax,type_tax_use:0 |
3476 | +#: selection:account.tax.template,type_tax_use:0 |
3477 | +msgid "All" |
3478 | +msgstr "Tots" |
3479 | +>>>>>>> MERGE-SOURCE |
3480 | |
3481 | #. module: account |
3482 | #: field:account.config.settings,decimal_precision:0 |
3483 | @@ -736,7 +770,9 @@ |
3484 | #: selection:account.common.partner.report,result_selection:0 |
3485 | #: selection:account.partner.balance,result_selection:0 |
3486 | #: selection:account.partner.ledger,result_selection:0 |
3487 | +#: report:account.third_party_ledger:0 |
3488 | #: code:addons/account/report/account_partner_balance.py:297 |
3489 | +#: code:addons/account/report/account_partner_ledger.py:272 |
3490 | #, python-format |
3491 | msgid "Receivable Accounts" |
3492 | msgstr "Comptes a cobrar" |
3493 | @@ -774,7 +810,11 @@ |
3494 | msgstr "Esteu segurs que voleu crear els assentaments?" |
3495 | |
3496 | #. module: account |
3497 | +<<<<<<< TREE |
3498 | #: code:addons/account/account_invoice.py:1330 |
3499 | +======= |
3500 | +#: code:addons/account/account_invoice.py:1361 |
3501 | +>>>>>>> MERGE-SOURCE |
3502 | #, python-format |
3503 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." |
3504 | msgstr "" |
3505 | @@ -843,7 +883,11 @@ |
3506 | msgstr "Tipus" |
3507 | |
3508 | #. module: account |
3509 | +<<<<<<< TREE |
3510 | #: code:addons/account/account_invoice.py:794 |
3511 | +======= |
3512 | +#: code:addons/account/account_invoice.py:826 |
3513 | +>>>>>>> MERGE-SOURCE |
3514 | #, python-format |
3515 | msgid "" |
3516 | "Taxes are missing!\n" |
3517 | @@ -1022,7 +1066,11 @@ |
3518 | msgstr "Passiu" |
3519 | |
3520 | #. module: account |
3521 | +<<<<<<< TREE |
3522 | #: code:addons/account/account_invoice.py:867 |
3523 | +======= |
3524 | +#: code:addons/account/account_invoice.py:899 |
3525 | +>>>>>>> MERGE-SOURCE |
3526 | #, python-format |
3527 | msgid "Please define sequence on the journal related to this invoice." |
3528 | msgstr "" |
3529 | @@ -1096,10 +1144,17 @@ |
3530 | msgstr "" |
3531 | |
3532 | #. module: account |
3533 | +<<<<<<< TREE |
3534 | #: code:addons/account/account.py:2308 |
3535 | #: code:addons/account/account_bank_statement.py:423 |
3536 | #: code:addons/account/account_invoice.py:74 |
3537 | #: code:addons/account/account_invoice.py:744 |
3538 | +======= |
3539 | +#: code:addons/account/account.py:2346 |
3540 | +#: code:addons/account/account_bank_statement.py:424 |
3541 | +#: code:addons/account/account_invoice.py:77 |
3542 | +#: code:addons/account/account_invoice.py:775 |
3543 | +>>>>>>> MERGE-SOURCE |
3544 | #: code:addons/account/account_move_line.py:195 |
3545 | #, python-format |
3546 | msgid "No Analytic Journal !" |
3547 | @@ -1531,8 +1586,10 @@ |
3548 | msgstr "" |
3549 | |
3550 | #. module: account |
3551 | +#: report:account.account.balance:0 |
3552 | #: selection:account.balance.report,display_account:0 |
3553 | #: selection:account.common.account.report,display_account:0 |
3554 | +#: report:account.general.ledger_landscape:0 |
3555 | #: selection:account.partner.balance,display_partner:0 |
3556 | #: selection:account.report.general.ledger,display_account:0 |
3557 | msgid "With balance is not equal to 0" |
3558 | @@ -1762,6 +1819,10 @@ |
3559 | #: view:account.invoice:0 |
3560 | #: view:account.invoice.report:0 |
3561 | #: field:account.move.line,invoice:0 |
3562 | +<<<<<<< TREE |
3563 | +======= |
3564 | +#: code:addons/account/account_invoice.py:1157 |
3565 | +>>>>>>> MERGE-SOURCE |
3566 | #: model:ir.model,name:account.model_account_invoice |
3567 | #: model:res.request.link,name:account.req_link_invoice |
3568 | msgid "Invoice" |
3569 | @@ -2012,11 +2073,20 @@ |
3570 | #: code:addons/account/account_bank_statement.py:418 |
3571 | #: code:addons/account/account_cash_statement.py:256 |
3572 | #: code:addons/account/account_cash_statement.py:300 |
3573 | +<<<<<<< TREE |
3574 | #: code:addons/account/account_invoice.py:867 |
3575 | #: code:addons/account/account_invoice.py:901 |
3576 | #: code:addons/account/account_invoice.py:1091 |
3577 | #: code:addons/account/account_move_line.py:578 |
3578 | #: code:addons/account/account_move_line.py:831 |
3579 | +======= |
3580 | +#: code:addons/account/account_invoice.py:899 |
3581 | +#: code:addons/account/account_invoice.py:933 |
3582 | +#: code:addons/account/account_invoice.py:1124 |
3583 | +#: code:addons/account/account_move_line.py:579 |
3584 | +#: code:addons/account/account_move_line.py:828 |
3585 | +#: code:addons/account/account_move_line.py:851 |
3586 | +>>>>>>> MERGE-SOURCE |
3587 | #: code:addons/account/account_move_line.py:854 |
3588 | #: code:addons/account/account_move_line.py:857 |
3589 | #: code:addons/account/account_move_line.py:1122 |
3590 | @@ -2252,7 +2322,9 @@ |
3591 | #: selection:account.common.partner.report,result_selection:0 |
3592 | #: selection:account.partner.balance,result_selection:0 |
3593 | #: selection:account.partner.ledger,result_selection:0 |
3594 | +#: report:account.third_party_ledger:0 |
3595 | #: code:addons/account/report/account_partner_balance.py:299 |
3596 | +#: code:addons/account/report/account_partner_ledger.py:274 |
3597 | #, python-format |
3598 | msgid "Payable Accounts" |
3599 | msgstr "Comptes a pagar" |
3600 | @@ -2563,7 +2635,11 @@ |
3601 | msgstr "Crea un compte basat en aquesta plantilla" |
3602 | |
3603 | #. module: account |
3604 | +<<<<<<< TREE |
3605 | #: code:addons/account/account_invoice.py:901 |
3606 | +======= |
3607 | +#: code:addons/account/account_invoice.py:933 |
3608 | +>>>>>>> MERGE-SOURCE |
3609 | #, python-format |
3610 | msgid "" |
3611 | "Cannot create the invoice.\n" |
3612 | @@ -2834,6 +2910,7 @@ |
3613 | msgstr "Comptes" |
3614 | |
3615 | #. module: account |
3616 | +<<<<<<< TREE |
3617 | #: code:addons/account/account.py:3503 |
3618 | #: code:addons/account/account_bank_statement.py:404 |
3619 | #: code:addons/account/account_invoice.py:378 |
3620 | @@ -2843,6 +2920,16 @@ |
3621 | #: code:addons/account/account_invoice.py:605 |
3622 | #: code:addons/account/account_invoice.py:627 |
3623 | #: code:addons/account/account_move_line.py:535 |
3624 | +======= |
3625 | +#: code:addons/account/account.py:3541 |
3626 | +#: code:addons/account/account_bank_statement.py:405 |
3627 | +#: code:addons/account/account_invoice.py:507 |
3628 | +#: code:addons/account/account_invoice.py:609 |
3629 | +#: code:addons/account/account_invoice.py:624 |
3630 | +#: code:addons/account/account_invoice.py:632 |
3631 | +#: code:addons/account/account_invoice.py:657 |
3632 | +#: code:addons/account/account_move_line.py:536 |
3633 | +>>>>>>> MERGE-SOURCE |
3634 | #, python-format |
3635 | msgid "Configuration Error!" |
3636 | msgstr "Error de configuració!" |
3637 | @@ -3072,8 +3159,13 @@ |
3638 | msgstr "" |
3639 | |
3640 | #. module: account |
3641 | +<<<<<<< TREE |
3642 | #: code:addons/account/account.py:2308 |
3643 | #: code:addons/account/account_invoice.py:744 |
3644 | +======= |
3645 | +#: code:addons/account/account.py:2346 |
3646 | +#: code:addons/account/account_invoice.py:775 |
3647 | +>>>>>>> MERGE-SOURCE |
3648 | #: code:addons/account/account_move_line.py:195 |
3649 | #, python-format |
3650 | msgid "You have to define an analytic journal on the '%s' journal!" |
3651 | @@ -3134,6 +3226,11 @@ |
3652 | msgstr "" |
3653 | |
3654 | #. module: account |
3655 | +#: report:account.journal.period.print:0 |
3656 | +msgid "Reference Number" |
3657 | +msgstr "Número de referència" |
3658 | + |
3659 | +#. module: account |
3660 | #: selection:account.entries.report,month:0 |
3661 | #: selection:account.invoice.report,month:0 |
3662 | #: selection:analytic.entries.report,month:0 |
3663 | @@ -3241,7 +3338,11 @@ |
3664 | msgstr "Posició fiscal" |
3665 | |
3666 | #. module: account |
3667 | +<<<<<<< TREE |
3668 | #: code:addons/account/account_invoice.py:791 |
3669 | +======= |
3670 | +#: code:addons/account/account_invoice.py:823 |
3671 | +>>>>>>> MERGE-SOURCE |
3672 | #, python-format |
3673 | msgid "" |
3674 | "Tax base different!\n" |
3675 | @@ -3402,8 +3503,13 @@ |
3676 | msgstr "Vista" |
3677 | |
3678 | #. module: account |
3679 | +<<<<<<< TREE |
3680 | #: code:addons/account/account.py:3422 |
3681 | #: code:addons/account/account_bank.py:95 |
3682 | +======= |
3683 | +#: code:addons/account/account.py:3460 |
3684 | +#: code:addons/account/account_bank.py:94 |
3685 | +>>>>>>> MERGE-SOURCE |
3686 | #, python-format |
3687 | msgid "BNK" |
3688 | msgstr "BANC" |
3689 | @@ -3675,7 +3781,11 @@ |
3690 | "les mateixes referències que el propi extracte" |
3691 | |
3692 | #. module: account |
3693 | +<<<<<<< TREE |
3694 | #: code:addons/account/account_invoice.py:984 |
3695 | +======= |
3696 | +#: code:addons/account/account_invoice.py:1016 |
3697 | +>>>>>>> MERGE-SOURCE |
3698 | #, python-format |
3699 | msgid "" |
3700 | "You cannot create an invoice on a centralized journal. Uncheck the " |
3701 | @@ -3690,7 +3800,11 @@ |
3702 | msgstr "Saldo inicial" |
3703 | |
3704 | #. module: account |
3705 | +<<<<<<< TREE |
3706 | #: code:addons/account/account_invoice.py:1434 |
3707 | +======= |
3708 | +#: code:addons/account/account_invoice.py:1465 |
3709 | +>>>>>>> MERGE-SOURCE |
3710 | #, python-format |
3711 | msgid "No Partner Defined !" |
3712 | msgstr "No s'ha definit empresa!" |
3713 | @@ -3958,14 +4072,21 @@ |
3714 | msgstr "" |
3715 | |
3716 | #. module: account |
3717 | +<<<<<<< TREE |
3718 | #: report:account.invoice:0 |
3719 | msgid "VAT :" |
3720 | msgstr "CIF/NIF:" |
3721 | |
3722 | #. module: account |
3723 | +======= |
3724 | +#: report:account.account.balance:0 |
3725 | +>>>>>>> MERGE-SOURCE |
3726 | #: report:account.central.journal:0 |
3727 | #: view:account.config.settings:0 |
3728 | +#: report:account.general.journal:0 |
3729 | #: report:account.general.ledger:0 |
3730 | +#: report:account.general.ledger_landscape:0 |
3731 | +#: report:account.journal.period.print:0 |
3732 | #: report:account.partner.balance:0 |
3733 | #: report:account.third_party_ledger:0 |
3734 | #: report:account.third_party_ledger_other:0 |
3735 | @@ -4332,7 +4453,11 @@ |
3736 | msgstr "Fills consolidats" |
3737 | |
3738 | #. module: account |
3739 | +<<<<<<< TREE |
3740 | #: code:addons/account/account_invoice.py:550 |
3741 | +======= |
3742 | +#: code:addons/account/account_invoice.py:573 |
3743 | +>>>>>>> MERGE-SOURCE |
3744 | #: code:addons/account/wizard/account_invoice_refund.py:146 |
3745 | #, python-format |
3746 | msgid "Insufficient Data!" |
3747 | @@ -4607,8 +4732,13 @@ |
3748 | msgstr "" |
3749 | |
3750 | #. module: account |
3751 | +<<<<<<< TREE |
3752 | #: code:addons/account/account_invoice.py:583 |
3753 | #: code:addons/account/account_invoice.py:598 |
3754 | +======= |
3755 | +#: code:addons/account/account_invoice.py:610 |
3756 | +#: code:addons/account/account_invoice.py:625 |
3757 | +>>>>>>> MERGE-SOURCE |
3758 | #, python-format |
3759 | msgid "" |
3760 | "Cannot find a chart of account, you should create one from Settings\\" |
3761 | @@ -4881,7 +5011,11 @@ |
3762 | msgstr "" |
3763 | |
3764 | #. module: account |
3765 | +<<<<<<< TREE |
3766 | #: code:addons/account/account_invoice.py:627 |
3767 | +======= |
3768 | +#: code:addons/account/account_invoice.py:658 |
3769 | +>>>>>>> MERGE-SOURCE |
3770 | #, python-format |
3771 | msgid "" |
3772 | "Cannot find any account journal of %s type for this company.\n" |
3773 | @@ -5205,7 +5339,11 @@ |
3774 | msgstr "Aplicació impost" |
3775 | |
3776 | #. module: account |
3777 | +<<<<<<< TREE |
3778 | #: code:addons/account/account_invoice.py:890 |
3779 | +======= |
3780 | +#: code:addons/account/account_invoice.py:922 |
3781 | +>>>>>>> MERGE-SOURCE |
3782 | #, python-format |
3783 | msgid "" |
3784 | "Please verify the price of the invoice !\n" |
3785 | @@ -5532,7 +5670,11 @@ |
3786 | msgstr "Codi per calcular (si tipus=codi)" |
3787 | |
3788 | #. module: account |
3789 | +<<<<<<< TREE |
3790 | #: code:addons/account/account_invoice.py:485 |
3791 | +======= |
3792 | +#: code:addons/account/account_invoice.py:508 |
3793 | +>>>>>>> MERGE-SOURCE |
3794 | #, python-format |
3795 | msgid "" |
3796 | "Cannot find a chart of accounts for this company, you should create one." |
3797 | @@ -5924,6 +6066,18 @@ |
3798 | msgstr "" |
3799 | |
3800 | #. module: account |
3801 | +<<<<<<< TREE |
3802 | +======= |
3803 | +#: code:addons/account/account_invoice.py:474 |
3804 | +#, python-format |
3805 | +msgid "" |
3806 | +"You cannot delete an invoice after it has been validated (and received a " |
3807 | +"number). You can set it back to \"Draft\" state and modify its content, " |
3808 | +"then re-confirm it." |
3809 | +msgstr "" |
3810 | + |
3811 | +#. module: account |
3812 | +>>>>>>> MERGE-SOURCE |
3813 | #: help:account.automatic.reconcile,power:0 |
3814 | msgid "" |
3815 | "Number of partial amounts that can be combined to find a balance point can " |
3816 | @@ -6077,7 +6231,11 @@ |
3817 | #: view:account.config.settings:0 |
3818 | #: view:account.invoice:0 |
3819 | #: view:account.invoice.report:0 |
3820 | +<<<<<<< TREE |
3821 | #: code:addons/account/account_invoice.py:355 |
3822 | +======= |
3823 | +#: code:addons/account/account_invoice.py:390 |
3824 | +>>>>>>> MERGE-SOURCE |
3825 | #, python-format |
3826 | msgid "Supplier" |
3827 | msgstr "Proveïdor" |
3828 | @@ -6097,7 +6255,7 @@ |
3829 | msgstr "Compte n°" |
3830 | |
3831 | #. module: account |
3832 | -#: code:addons/account/account_invoice.py:92 |
3833 | +#: code:addons/account/account_invoice.py:95 |
3834 | #, python-format |
3835 | msgid "Free Reference" |
3836 | msgstr "Referència lliure" |
3837 | @@ -6107,7 +6265,9 @@ |
3838 | #: selection:account.common.partner.report,result_selection:0 |
3839 | #: selection:account.partner.balance,result_selection:0 |
3840 | #: selection:account.partner.ledger,result_selection:0 |
3841 | +#: report:account.third_party_ledger:0 |
3842 | #: code:addons/account/report/account_partner_balance.py:301 |
3843 | +#: code:addons/account/report/account_partner_ledger.py:276 |
3844 | #, python-format |
3845 | msgid "Receivable and Payable Accounts" |
3846 | msgstr "Comptes a cobrar i pagar" |
3847 | @@ -6412,7 +6572,11 @@ |
3848 | msgstr "" |
3849 | |
3850 | #. module: account |
3851 | +<<<<<<< TREE |
3852 | #: code:addons/account/account_invoice.py:1091 |
3853 | +======= |
3854 | +#: code:addons/account/account_invoice.py:1124 |
3855 | +>>>>>>> MERGE-SOURCE |
3856 | #, python-format |
3857 | msgid "" |
3858 | "You cannot cancel an invoice which is partially paid. You need to " |
3859 | @@ -6584,7 +6748,11 @@ |
3860 | msgstr "" |
3861 | |
3862 | #. module: account |
3863 | +<<<<<<< TREE |
3864 | #: code:addons/account/account_invoice.py:606 |
3865 | +======= |
3866 | +#: code:addons/account/account_invoice.py:633 |
3867 | +>>>>>>> MERGE-SOURCE |
3868 | #, python-format |
3869 | msgid "Invoice line account's company and invoice's compnay does not match." |
3870 | msgstr "" |
3871 | @@ -6734,12 +6902,21 @@ |
3872 | "impostos fills. En aquest cas, l'ordre d'avaluació és important." |
3873 | |
3874 | #. module: account |
3875 | +<<<<<<< TREE |
3876 | #: code:addons/account/account.py:1410 |
3877 | #: code:addons/account/account.py:1415 |
3878 | #: code:addons/account/account.py:1444 |
3879 | #: code:addons/account/account.py:1451 |
3880 | #: code:addons/account/account_invoice.py:983 |
3881 | #: code:addons/account/account_move_line.py:1008 |
3882 | +======= |
3883 | +#: code:addons/account/account.py:1448 |
3884 | +#: code:addons/account/account.py:1453 |
3885 | +#: code:addons/account/account.py:1482 |
3886 | +#: code:addons/account/account.py:1489 |
3887 | +#: code:addons/account/account_invoice.py:1015 |
3888 | +#: code:addons/account/account_move_line.py:1005 |
3889 | +>>>>>>> MERGE-SOURCE |
3890 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 |
3891 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 |
3892 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 |
3893 | @@ -6825,6 +7002,10 @@ |
3894 | #: report:account.invoice:0 |
3895 | #: selection:account.invoice,type:0 |
3896 | #: selection:account.invoice.report,type:0 |
3897 | +<<<<<<< TREE |
3898 | +======= |
3899 | +#: code:addons/account/account_invoice.py:1160 |
3900 | +>>>>>>> MERGE-SOURCE |
3901 | #: selection:report.invoice.created,type:0 |
3902 | msgid "Supplier Refund" |
3903 | msgstr "Factura rectificativa (abonament) de proveïdor" |
3904 | @@ -7982,7 +8163,11 @@ |
3905 | msgstr "Maig" |
3906 | |
3907 | #. module: account |
3908 | +<<<<<<< TREE |
3909 | #: code:addons/account/account_invoice.py:788 |
3910 | +======= |
3911 | +#: code:addons/account/account_invoice.py:820 |
3912 | +>>>>>>> MERGE-SOURCE |
3913 | #, python-format |
3914 | msgid "Global taxes defined, but they are not in invoice lines !" |
3915 | msgstr "" |
3916 | @@ -8023,7 +8208,11 @@ |
3917 | #: view:account.config.settings:0 |
3918 | #: view:account.invoice:0 |
3919 | #: view:account.invoice.report:0 |
3920 | +<<<<<<< TREE |
3921 | #: code:addons/account/account_invoice.py:353 |
3922 | +======= |
3923 | +#: code:addons/account/account_invoice.py:388 |
3924 | +>>>>>>> MERGE-SOURCE |
3925 | #, python-format |
3926 | msgid "Customer" |
3927 | msgstr "Client" |
3928 | @@ -8160,6 +8349,17 @@ |
3929 | msgstr "Conciliació de transaccions" |
3930 | |
3931 | #. module: account |
3932 | +<<<<<<< TREE |
3933 | +======= |
3934 | +#: code:addons/account/account_invoice.py:472 |
3935 | +#, python-format |
3936 | +msgid "" |
3937 | +"You cannot delete an invoice which is not draft or cancelled. You should " |
3938 | +"refund it instead." |
3939 | +msgstr "" |
3940 | + |
3941 | +#. module: account |
3942 | +>>>>>>> MERGE-SOURCE |
3943 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement |
3944 | msgid "Legal Reports" |
3945 | msgstr "Informes legals" |
3946 | @@ -8276,7 +8476,11 @@ |
3947 | msgstr "Seleccioneu una moneda per aplicar en la factura." |
3948 | |
3949 | #. module: account |
3950 | +<<<<<<< TREE |
3951 | #: code:addons/account/account_invoice.py:869 |
3952 | +======= |
3953 | +#: code:addons/account/account_invoice.py:901 |
3954 | +>>>>>>> MERGE-SOURCE |
3955 | #, python-format |
3956 | msgid "No Invoice Lines !" |
3957 | msgstr "No hi ha línies de factura!" |
3958 | @@ -8355,7 +8559,11 @@ |
3959 | msgstr "Empresa associada" |
3960 | |
3961 | #. module: account |
3962 | +<<<<<<< TREE |
3963 | #: code:addons/account/account_invoice.py:1434 |
3964 | +======= |
3965 | +#: code:addons/account/account_invoice.py:1465 |
3966 | +>>>>>>> MERGE-SOURCE |
3967 | #, python-format |
3968 | msgid "You must first select a partner !" |
3969 | msgstr "Primer heu de seleccionar una empresa!" |
3970 | @@ -9312,7 +9520,11 @@ |
3971 | msgstr "Impost de la compra (%)" |
3972 | |
3973 | #. module: account |
3974 | +<<<<<<< TREE |
3975 | #: code:addons/account/account_invoice.py:869 |
3976 | +======= |
3977 | +#: code:addons/account/account_invoice.py:901 |
3978 | +>>>>>>> MERGE-SOURCE |
3979 | #, python-format |
3980 | msgid "Please create some invoice lines." |
3981 | msgstr "Creeu algunes línies de factura" |
3982 | @@ -9873,7 +10085,11 @@ |
3983 | msgstr "No conciliat" |
3984 | |
3985 | #. module: account |
3986 | +<<<<<<< TREE |
3987 | #: code:addons/account/account_invoice.py:890 |
3988 | +======= |
3989 | +#: code:addons/account/account_invoice.py:922 |
3990 | +>>>>>>> MERGE-SOURCE |
3991 | #, python-format |
3992 | msgid "Bad total !" |
3993 | msgstr "Total erroni!" |
3994 | @@ -10358,6 +10574,7 @@ |
3995 | |
3996 | #. module: account |
3997 | #: field:account.account,company_id:0 |
3998 | +#: report:account.account.balance:0 |
3999 | #: field:account.aged.trial.balance,company_id:0 |
4000 | #: field:account.analytic.journal,company_id:0 |
4001 | #: field:account.balance.report,company_id:0 |
4002 | @@ -10373,7 +10590,9 @@ |
4003 | #: field:account.entries.report,company_id:0 |
4004 | #: field:account.fiscal.position,company_id:0 |
4005 | #: field:account.fiscalyear,company_id:0 |
4006 | +#: report:account.general.journal:0 |
4007 | #: field:account.general.journal,company_id:0 |
4008 | +#: report:account.general.ledger_landscape:0 |
4009 | #: field:account.installer,company_id:0 |
4010 | #: field:account.invoice,company_id:0 |
4011 | #: field:account.invoice.line,company_id:0 |
4012 | @@ -10382,6 +10601,7 @@ |
4013 | #: field:account.invoice.tax,company_id:0 |
4014 | #: field:account.journal,company_id:0 |
4015 | #: field:account.journal.period,company_id:0 |
4016 | +#: report:account.journal.period.print:0 |
4017 | #: field:account.model,company_id:0 |
4018 | #: field:account.move,company_id:0 |
4019 | #: field:account.move.line,company_id:0 |
4020 | @@ -10547,6 +10767,10 @@ |
4021 | #: view:account.invoice:0 |
4022 | #: selection:account.invoice,type:0 |
4023 | #: selection:account.invoice.report,type:0 |
4024 | +<<<<<<< TREE |
4025 | +======= |
4026 | +#: code:addons/account/account_invoice.py:1158 |
4027 | +>>>>>>> MERGE-SOURCE |
4028 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 |
4029 | #: selection:report.invoice.created,type:0 |
4030 | msgid "Supplier Invoice" |
4031 | @@ -10634,8 +10858,10 @@ |
4032 | msgstr "" |
4033 | |
4034 | #. module: account |
4035 | +#: report:account.account.balance:0 |
4036 | #: selection:account.balance.report,display_account:0 |
4037 | #: selection:account.common.account.report,display_account:0 |
4038 | +#: report:account.general.ledger_landscape:0 |
4039 | #: selection:account.report.general.ledger,display_account:0 |
4040 | msgid "With movements" |
4041 | msgstr "Amb moviments" |
4042 | @@ -10732,7 +10958,11 @@ |
4043 | msgstr "" |
4044 | |
4045 | #. module: account |
4046 | +<<<<<<< TREE |
4047 | #: code:addons/account/account_invoice.py:1515 |
4048 | +======= |
4049 | +#: code:addons/account/account_invoice.py:1546 |
4050 | +>>>>>>> MERGE-SOURCE |
4051 | #, python-format |
4052 | msgid "" |
4053 | "The selected unit of measure is not compatible with the unit of measure of " |
4054 | @@ -10814,6 +11044,11 @@ |
4055 | #: report:account.invoice:0 |
4056 | #: view:account.invoice:0 |
4057 | #: view:account.invoice.report:0 |
4058 | +<<<<<<< TREE |
4059 | +======= |
4060 | +#: code:addons/account/account_invoice.py:1159 |
4061 | +#, python-format |
4062 | +>>>>>>> MERGE-SOURCE |
4063 | msgid "Refund" |
4064 | msgstr "Factura rectificativa (abonament)" |
4065 | |
4066 | @@ -10884,7 +11119,11 @@ |
4067 | msgstr "Impostos factura manual" |
4068 | |
4069 | #. module: account |
4070 | +<<<<<<< TREE |
4071 | #: code:addons/account/account_invoice.py:550 |
4072 | +======= |
4073 | +#: code:addons/account/account_invoice.py:573 |
4074 | +>>>>>>> MERGE-SOURCE |
4075 | #, python-format |
4076 | msgid "The payment term of supplier does not have a payment term line." |
4077 | msgstr "" |
4078 | |
4079 | === modified file 'account/i18n/cs.po' |
4080 | --- account/i18n/cs.po 2013-06-13 18:15:03 +0000 |
4081 | +++ account/i18n/cs.po 2013-06-19 09:20:00 +0000 |
4082 | @@ -5,17 +5,30 @@ |
4083 | msgid "" |
4084 | msgstr "" |
4085 | "Project-Id-Version: openobject-addons\n" |
4086 | +<<<<<<< TREE |
4087 | "Report-Msgid-Bugs-To: \n" |
4088 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
4089 | "PO-Revision-Date: 2012-06-20 16:14+0000\n" |
4090 | "Last-Translator: Jiří Hajda <robie@centrum.cz>\n" |
4091 | "Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net>\n" |
4092 | +======= |
4093 | +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4094 | +"POT-Creation-Date: 2013-06-14 22:29+0000\n" |
4095 | +"PO-Revision-Date: 2012-12-21 23:00+0000\n" |
4096 | +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
4097 | +"Language-Team: Czech <cs@li.org>\n" |
4098 | +>>>>>>> MERGE-SOURCE |
4099 | "MIME-Version: 1.0\n" |
4100 | "Content-Type: text/plain; charset=UTF-8\n" |
4101 | "Content-Transfer-Encoding: 8bit\n" |
4102 | +<<<<<<< TREE |
4103 | "X-Launchpad-Export-Date: 2013-03-16 05:13+0000\n" |
4104 | "X-Generator: Launchpad (build 16532)\n" |
4105 | "X-Poedit-Language: Czech\n" |
4106 | +======= |
4107 | +"X-Launchpad-Export-Date: 2013-06-15 06:14+0000\n" |
4108 | +"X-Generator: Launchpad (build 16667)\n" |
4109 | +>>>>>>> MERGE-SOURCE |
4110 | |
4111 | #. module: account |
4112 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 |
4113 | @@ -130,11 +143,19 @@ |
4114 | #: code:addons/account/account.py:641 |
4115 | #: code:addons/account/account.py:686 |
4116 | #: code:addons/account/account.py:781 |
4117 | +<<<<<<< TREE |
4118 | #: code:addons/account/account.py:1049 |
4119 | #: code:addons/account/account_invoice.py:788 |
4120 | #: code:addons/account/account_invoice.py:791 |
4121 | #: code:addons/account/account_invoice.py:794 |
4122 | #: code:addons/account/account_invoice.py:1514 |
4123 | +======= |
4124 | +#: code:addons/account/account.py:1058 |
4125 | +#: code:addons/account/account_invoice.py:820 |
4126 | +#: code:addons/account/account_invoice.py:823 |
4127 | +#: code:addons/account/account_invoice.py:826 |
4128 | +#: code:addons/account/account_invoice.py:1545 |
4129 | +>>>>>>> MERGE-SOURCE |
4130 | #: code:addons/account/account_move_line.py:98 |
4131 | #: code:addons/account/account_move_line.py:774 |
4132 | #: code:addons/account/account_move_line.py:827 |
4133 | @@ -337,7 +358,7 @@ |
4134 | msgstr "" |
4135 | |
4136 | #. module: account |
4137 | -#: code:addons/account/account_invoice.py:74 |
4138 | +#: code:addons/account/account_invoice.py:77 |
4139 | #, python-format |
4140 | msgid "You must define an analytic journal of type '%s'!" |
4141 | msgstr "" |
4142 | @@ -593,11 +614,23 @@ |
4143 | msgstr "Účetní potvrzuje výpis." |
4144 | |
4145 | #. module: account |
4146 | +<<<<<<< TREE |
4147 | #. openerp-web |
4148 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 |
4149 | #, python-format |
4150 | msgid "Nothing to reconcile" |
4151 | msgstr "" |
4152 | +======= |
4153 | +#: report:account.account.balance:0 |
4154 | +#: selection:account.balance.report,display_account:0 |
4155 | +#: selection:account.common.account.report,display_account:0 |
4156 | +#: report:account.general.ledger_landscape:0 |
4157 | +#: selection:account.report.general.ledger,display_account:0 |
4158 | +#: selection:account.tax,type_tax_use:0 |
4159 | +#: selection:account.tax.template,type_tax_use:0 |
4160 | +msgid "All" |
4161 | +msgstr "Vše" |
4162 | +>>>>>>> MERGE-SOURCE |
4163 | |
4164 | #. module: account |
4165 | #: field:account.config.settings,decimal_precision:0 |
4166 | @@ -728,7 +761,9 @@ |
4167 | #: selection:account.common.partner.report,result_selection:0 |
4168 | #: selection:account.partner.balance,result_selection:0 |
4169 | #: selection:account.partner.ledger,result_selection:0 |
4170 | +#: report:account.third_party_ledger:0 |
4171 | #: code:addons/account/report/account_partner_balance.py:297 |
4172 | +#: code:addons/account/report/account_partner_ledger.py:272 |
4173 | #, python-format |
4174 | msgid "Receivable Accounts" |
4175 | msgstr "Pohledávky" |
4176 | @@ -766,7 +801,11 @@ |
4177 | msgstr "Opravdu chcete vytvořit záznamy?" |
4178 | |
4179 | #. module: account |
4180 | +<<<<<<< TREE |
4181 | #: code:addons/account/account_invoice.py:1330 |
4182 | +======= |
4183 | +#: code:addons/account/account_invoice.py:1361 |
4184 | +>>>>>>> MERGE-SOURCE |
4185 | #, python-format |
4186 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." |
4187 | msgstr "" |
4188 | @@ -835,7 +874,11 @@ |
4189 | msgstr "Typ" |
4190 | |
4191 | #. module: account |
4192 | +<<<<<<< TREE |
4193 | #: code:addons/account/account_invoice.py:794 |
4194 | +======= |
4195 | +#: code:addons/account/account_invoice.py:826 |
4196 | +>>>>>>> MERGE-SOURCE |
4197 | #, python-format |
4198 | msgid "" |
4199 | "Taxes are missing!\n" |
4200 | @@ -1015,7 +1058,11 @@ |
4201 | msgstr "Pasiva" |
4202 | |
4203 | #. module: account |
4204 | +<<<<<<< TREE |
4205 | #: code:addons/account/account_invoice.py:867 |
4206 | +======= |
4207 | +#: code:addons/account/account_invoice.py:899 |
4208 | +>>>>>>> MERGE-SOURCE |
4209 | #, python-format |
4210 | msgid "Please define sequence on the journal related to this invoice." |
4211 | msgstr "" |
4212 | @@ -1086,10 +1133,17 @@ |
4213 | msgstr "" |
4214 | |
4215 | #. module: account |
4216 | +<<<<<<< TREE |
4217 | #: code:addons/account/account.py:2308 |
4218 | #: code:addons/account/account_bank_statement.py:423 |
4219 | #: code:addons/account/account_invoice.py:74 |
4220 | #: code:addons/account/account_invoice.py:744 |
4221 | +======= |
4222 | +#: code:addons/account/account.py:2346 |
4223 | +#: code:addons/account/account_bank_statement.py:424 |
4224 | +#: code:addons/account/account_invoice.py:77 |
4225 | +#: code:addons/account/account_invoice.py:775 |
4226 | +>>>>>>> MERGE-SOURCE |
4227 | #: code:addons/account/account_move_line.py:195 |
4228 | #, python-format |
4229 | msgid "No Analytic Journal !" |
4230 | @@ -1520,8 +1574,10 @@ |
4231 | msgstr "" |
4232 | |
4233 | #. module: account |
4234 | +#: report:account.account.balance:0 |
4235 | #: selection:account.balance.report,display_account:0 |
4236 | #: selection:account.common.account.report,display_account:0 |
4237 | +#: report:account.general.ledger_landscape:0 |
4238 | #: selection:account.partner.balance,display_partner:0 |
4239 | #: selection:account.report.general.ledger,display_account:0 |
4240 | msgid "With balance is not equal to 0" |
4241 | @@ -1751,6 +1807,10 @@ |
4242 | #: view:account.invoice:0 |
4243 | #: view:account.invoice.report:0 |
4244 | #: field:account.move.line,invoice:0 |
4245 | +<<<<<<< TREE |
4246 | +======= |
4247 | +#: code:addons/account/account_invoice.py:1157 |
4248 | +>>>>>>> MERGE-SOURCE |
4249 | #: model:ir.model,name:account.model_account_invoice |
4250 | #: model:res.request.link,name:account.req_link_invoice |
4251 | msgid "Invoice" |
4252 | @@ -2001,11 +2061,20 @@ |
4253 | #: code:addons/account/account_bank_statement.py:418 |
4254 | #: code:addons/account/account_cash_statement.py:256 |
4255 | #: code:addons/account/account_cash_statement.py:300 |
4256 | +<<<<<<< TREE |
4257 | #: code:addons/account/account_invoice.py:867 |
4258 | #: code:addons/account/account_invoice.py:901 |
4259 | #: code:addons/account/account_invoice.py:1091 |
4260 | #: code:addons/account/account_move_line.py:578 |
4261 | #: code:addons/account/account_move_line.py:831 |
4262 | +======= |
4263 | +#: code:addons/account/account_invoice.py:899 |
4264 | +#: code:addons/account/account_invoice.py:933 |
4265 | +#: code:addons/account/account_invoice.py:1124 |
4266 | +#: code:addons/account/account_move_line.py:579 |
4267 | +#: code:addons/account/account_move_line.py:828 |
4268 | +#: code:addons/account/account_move_line.py:851 |
4269 | +>>>>>>> MERGE-SOURCE |
4270 | #: code:addons/account/account_move_line.py:854 |
4271 | #: code:addons/account/account_move_line.py:857 |
4272 | #: code:addons/account/account_move_line.py:1122 |
4273 | @@ -2241,7 +2310,9 @@ |
4274 | #: selection:account.common.partner.report,result_selection:0 |
4275 | #: selection:account.partner.balance,result_selection:0 |
4276 | #: selection:account.partner.ledger,result_selection:0 |
4277 | +#: report:account.third_party_ledger:0 |
4278 | #: code:addons/account/report/account_partner_balance.py:299 |
4279 | +#: code:addons/account/report/account_partner_ledger.py:274 |
4280 | #, python-format |
4281 | msgid "Payable Accounts" |
4282 | msgstr "Účty závazků" |
4283 | @@ -2548,7 +2619,11 @@ |
4284 | msgstr "Vytvořit účet založený na šabloně" |
4285 | |
4286 | #. module: account |
4287 | +<<<<<<< TREE |
4288 | #: code:addons/account/account_invoice.py:901 |
4289 | +======= |
4290 | +#: code:addons/account/account_invoice.py:933 |
4291 | +>>>>>>> MERGE-SOURCE |
4292 | #, python-format |
4293 | msgid "" |
4294 | "Cannot create the invoice.\n" |
4295 | @@ -2813,6 +2888,7 @@ |
4296 | msgstr "Účty" |
4297 | |
4298 | #. module: account |
4299 | +<<<<<<< TREE |
4300 | #: code:addons/account/account.py:3503 |
4301 | #: code:addons/account/account_bank_statement.py:404 |
4302 | #: code:addons/account/account_invoice.py:378 |
4303 | @@ -2822,6 +2898,16 @@ |
4304 | #: code:addons/account/account_invoice.py:605 |
4305 | #: code:addons/account/account_invoice.py:627 |
4306 | #: code:addons/account/account_move_line.py:535 |
4307 | +======= |
4308 | +#: code:addons/account/account.py:3541 |
4309 | +#: code:addons/account/account_bank_statement.py:405 |
4310 | +#: code:addons/account/account_invoice.py:507 |
4311 | +#: code:addons/account/account_invoice.py:609 |
4312 | +#: code:addons/account/account_invoice.py:624 |
4313 | +#: code:addons/account/account_invoice.py:632 |
4314 | +#: code:addons/account/account_invoice.py:657 |
4315 | +#: code:addons/account/account_move_line.py:536 |
4316 | +>>>>>>> MERGE-SOURCE |
4317 | #, python-format |
4318 | msgid "Configuration Error!" |
4319 | msgstr "Konfigurační chyba!" |
4320 | @@ -3044,8 +3130,13 @@ |
4321 | msgstr "" |
4322 | |
4323 | #. module: account |
4324 | +<<<<<<< TREE |
4325 | #: code:addons/account/account.py:2308 |
4326 | #: code:addons/account/account_invoice.py:744 |
4327 | +======= |
4328 | +#: code:addons/account/account.py:2346 |
4329 | +#: code:addons/account/account_invoice.py:775 |
4330 | +>>>>>>> MERGE-SOURCE |
4331 | #: code:addons/account/account_move_line.py:195 |
4332 | #, python-format |
4333 | msgid "You have to define an analytic journal on the '%s' journal!" |
4334 | @@ -3106,6 +3197,11 @@ |
4335 | msgstr "" |
4336 | |
4337 | #. module: account |
4338 | +#: report:account.journal.period.print:0 |
4339 | +msgid "Reference Number" |
4340 | +msgstr "Referenční číslo" |
4341 | + |
4342 | +#. module: account |
4343 | #: selection:account.entries.report,month:0 |
4344 | #: selection:account.invoice.report,month:0 |
4345 | #: selection:analytic.entries.report,month:0 |
4346 | @@ -3204,7 +3300,11 @@ |
4347 | msgstr "Finanční pozice" |
4348 | |
4349 | #. module: account |
4350 | +<<<<<<< TREE |
4351 | #: code:addons/account/account_invoice.py:791 |
4352 | +======= |
4353 | +#: code:addons/account/account_invoice.py:823 |
4354 | +>>>>>>> MERGE-SOURCE |
4355 | #, python-format |
4356 | msgid "" |
4357 | "Tax base different!\n" |
4358 | @@ -3360,8 +3460,13 @@ |
4359 | msgstr "Pohled" |
4360 | |
4361 | #. module: account |
4362 | +<<<<<<< TREE |
4363 | #: code:addons/account/account.py:3422 |
4364 | #: code:addons/account/account_bank.py:95 |
4365 | +======= |
4366 | +#: code:addons/account/account.py:3460 |
4367 | +#: code:addons/account/account_bank.py:94 |
4368 | +>>>>>>> MERGE-SOURCE |
4369 | #, python-format |
4370 | msgid "BNK" |
4371 | msgstr "BNK" |
4372 | @@ -3621,7 +3726,11 @@ |
4373 | "účetní záznamy." |
4374 | |
4375 | #. module: account |
4376 | +<<<<<<< TREE |
4377 | #: code:addons/account/account_invoice.py:984 |
4378 | +======= |
4379 | +#: code:addons/account/account_invoice.py:1016 |
4380 | +>>>>>>> MERGE-SOURCE |
4381 | #, python-format |
4382 | msgid "" |
4383 | "You cannot create an invoice on a centralized journal. Uncheck the " |
4384 | @@ -3636,7 +3745,11 @@ |
4385 | msgstr "Počáteční zůstatek" |
4386 | |
4387 | #. module: account |
4388 | +<<<<<<< TREE |
4389 | #: code:addons/account/account_invoice.py:1434 |
4390 | +======= |
4391 | +#: code:addons/account/account_invoice.py:1465 |
4392 | +>>>>>>> MERGE-SOURCE |
4393 | #, python-format |
4394 | msgid "No Partner Defined !" |
4395 | msgstr "Nebyl definován partner !" |
4396 | @@ -3902,14 +4015,21 @@ |
4397 | msgstr "" |
4398 | |
4399 | #. module: account |
4400 | +<<<<<<< TREE |
4401 | #: report:account.invoice:0 |
4402 | msgid "VAT :" |
4403 | msgstr "DPH :" |
4404 | |
4405 | #. module: account |
4406 | +======= |
4407 | +#: report:account.account.balance:0 |
4408 | +>>>>>>> MERGE-SOURCE |
4409 | #: report:account.central.journal:0 |
4410 | #: view:account.config.settings:0 |
4411 | +#: report:account.general.journal:0 |
4412 | #: report:account.general.ledger:0 |
4413 | +#: report:account.general.ledger_landscape:0 |
4414 | +#: report:account.journal.period.print:0 |
4415 | #: report:account.partner.balance:0 |
4416 | #: report:account.third_party_ledger:0 |
4417 | #: report:account.third_party_ledger_other:0 |
4418 | @@ -4269,7 +4389,11 @@ |
4419 | msgstr "Konsolidovaný potomek" |
4420 | |
4421 | #. module: account |
4422 | +<<<<<<< TREE |
4423 | #: code:addons/account/account_invoice.py:550 |
4424 | +======= |
4425 | +#: code:addons/account/account_invoice.py:573 |
4426 | +>>>>>>> MERGE-SOURCE |
4427 | #: code:addons/account/wizard/account_invoice_refund.py:146 |
4428 | #, python-format |
4429 | msgid "Insufficient Data!" |
4430 | @@ -4537,8 +4661,13 @@ |
4431 | msgstr "" |
4432 | |
4433 | #. module: account |
4434 | +<<<<<<< TREE |
4435 | #: code:addons/account/account_invoice.py:583 |
4436 | #: code:addons/account/account_invoice.py:598 |
4437 | +======= |
4438 | +#: code:addons/account/account_invoice.py:610 |
4439 | +#: code:addons/account/account_invoice.py:625 |
4440 | +>>>>>>> MERGE-SOURCE |
4441 | #, python-format |
4442 | msgid "" |
4443 | "Cannot find a chart of account, you should create one from Settings\\" |
4444 | @@ -4811,7 +4940,11 @@ |
4445 | msgstr "" |
4446 | |
4447 | #. module: account |
4448 | +<<<<<<< TREE |
4449 | #: code:addons/account/account_invoice.py:627 |
4450 | +======= |
4451 | +#: code:addons/account/account_invoice.py:658 |
4452 | +>>>>>>> MERGE-SOURCE |
4453 | #, python-format |
4454 | msgid "" |
4455 | "Cannot find any account journal of %s type for this company.\n" |
4456 | @@ -5135,7 +5268,11 @@ |
4457 | msgstr "Daňová aplikace" |
4458 | |
4459 | #. module: account |
4460 | +<<<<<<< TREE |
4461 | #: code:addons/account/account_invoice.py:890 |
4462 | +======= |
4463 | +#: code:addons/account/account_invoice.py:922 |
4464 | +>>>>>>> MERGE-SOURCE |
4465 | #, python-format |
4466 | msgid "" |
4467 | "Please verify the price of the invoice !\n" |
4468 | @@ -5462,7 +5599,11 @@ |
4469 | msgstr "Vypočítat kód (pokud typ = kód)" |
4470 | |
4471 | #. module: account |
4472 | +<<<<<<< TREE |
4473 | #: code:addons/account/account_invoice.py:485 |
4474 | +======= |
4475 | +#: code:addons/account/account_invoice.py:508 |
4476 | +>>>>>>> MERGE-SOURCE |
4477 | #, python-format |
4478 | msgid "" |
4479 | "Cannot find a chart of accounts for this company, you should create one." |
4480 | @@ -5848,6 +5989,18 @@ |
4481 | msgstr "" |
4482 | |
4483 | #. module: account |
4484 | +<<<<<<< TREE |
4485 | +======= |
4486 | +#: code:addons/account/account_invoice.py:474 |
4487 | +#, python-format |
4488 | +msgid "" |
4489 | +"You cannot delete an invoice after it has been validated (and received a " |
4490 | +"number). You can set it back to \"Draft\" state and modify its content, " |
4491 | +"then re-confirm it." |
4492 | +msgstr "" |
4493 | + |
4494 | +#. module: account |
4495 | +>>>>>>> MERGE-SOURCE |
4496 | #: help:account.automatic.reconcile,power:0 |
4497 | msgid "" |
4498 | "Number of partial amounts that can be combined to find a balance point can " |
4499 | @@ -6001,7 +6154,11 @@ |
4500 | #: view:account.config.settings:0 |
4501 | #: view:account.invoice:0 |
4502 | #: view:account.invoice.report:0 |
4503 | +<<<<<<< TREE |
4504 | #: code:addons/account/account_invoice.py:355 |
4505 | +======= |
4506 | +#: code:addons/account/account_invoice.py:390 |
4507 | +>>>>>>> MERGE-SOURCE |
4508 | #, python-format |
4509 | msgid "Supplier" |
4510 | msgstr "Dodavatel" |
4511 | @@ -6021,7 +6178,7 @@ |
4512 | msgstr "Účet n°" |
4513 | |
4514 | #. module: account |
4515 | -#: code:addons/account/account_invoice.py:92 |
4516 | +#: code:addons/account/account_invoice.py:95 |
4517 | #, python-format |
4518 | msgid "Free Reference" |
4519 | msgstr "" |
4520 | @@ -6031,7 +6188,9 @@ |
4521 | #: selection:account.common.partner.report,result_selection:0 |
4522 | #: selection:account.partner.balance,result_selection:0 |
4523 | #: selection:account.partner.ledger,result_selection:0 |
4524 | +#: report:account.third_party_ledger:0 |
4525 | #: code:addons/account/report/account_partner_balance.py:301 |
4526 | +#: code:addons/account/report/account_partner_ledger.py:276 |
4527 | #, python-format |
4528 | msgid "Receivable and Payable Accounts" |
4529 | msgstr "Účty závazků a pohledávek" |
4530 | @@ -6332,7 +6491,11 @@ |
4531 | msgstr "" |
4532 | |
4533 | #. module: account |
4534 | +<<<<<<< TREE |
4535 | #: code:addons/account/account_invoice.py:1091 |
4536 | +======= |
4537 | +#: code:addons/account/account_invoice.py:1124 |
4538 | +>>>>>>> MERGE-SOURCE |
4539 | #, python-format |
4540 | msgid "" |
4541 | "You cannot cancel an invoice which is partially paid. You need to " |
4542 | @@ -6504,7 +6667,11 @@ |
4543 | msgstr "" |
4544 | |
4545 | #. module: account |
4546 | +<<<<<<< TREE |
4547 | #: code:addons/account/account_invoice.py:606 |
4548 | +======= |
4549 | +#: code:addons/account/account_invoice.py:633 |
4550 | +>>>>>>> MERGE-SOURCE |
4551 | #, python-format |
4552 | msgid "Invoice line account's company and invoice's compnay does not match." |
4553 | msgstr "" |
4554 | @@ -6652,12 +6819,21 @@ |
4555 | "daňových potomků. V tomto případě je vyhodnocení pořadí důležité." |
4556 | |
4557 | #. module: account |
4558 | +<<<<<<< TREE |
4559 | #: code:addons/account/account.py:1410 |
4560 | #: code:addons/account/account.py:1415 |
4561 | #: code:addons/account/account.py:1444 |
4562 | #: code:addons/account/account.py:1451 |
4563 | #: code:addons/account/account_invoice.py:983 |
4564 | #: code:addons/account/account_move_line.py:1008 |
4565 | +======= |
4566 | +#: code:addons/account/account.py:1448 |
4567 | +#: code:addons/account/account.py:1453 |
4568 | +#: code:addons/account/account.py:1482 |
4569 | +#: code:addons/account/account.py:1489 |
4570 | +#: code:addons/account/account_invoice.py:1015 |
4571 | +#: code:addons/account/account_move_line.py:1005 |
4572 | +>>>>>>> MERGE-SOURCE |
4573 | #: code:addons/account/wizard/account_automatic_reconcile.py:148 |
4574 | #: code:addons/account/wizard/account_fiscalyear_close.py:88 |
4575 | #: code:addons/account/wizard/account_fiscalyear_close.py:99 |
4576 | @@ -6735,6 +6911,10 @@ |
4577 | #: report:account.invoice:0 |
4578 | #: selection:account.invoice,type:0 |
4579 | #: selection:account.invoice.report,type:0 |
4580 | +<<<<<<< TREE |
4581 | +======= |
4582 | +#: code:addons/account/account_invoice.py:1160 |
4583 | +>>>>>>> MERGE-SOURCE |
4584 | #: selection:report.invoice.created,type:0 |
4585 | msgid "Supplier Refund" |
4586 | msgstr "Dobropis dodavatele" |
4587 | @@ -7861,7 +8041,11 @@ |
4588 | msgstr "Květen" |
4589 | |
4590 | #. module: account |
4591 | +<<<<<<< TREE |
4592 | #: code:addons/account/account_invoice.py:788 |
4593 | +======= |
4594 | +#: code:addons/account/account_invoice.py:820 |
4595 | +>>>>>>> MERGE-SOURCE |
4596 | #, python-format |
4597 | msgid "Global taxes defined, but they are not in invoice lines !" |
4598 | msgstr "" |
4599 | @@ -7903,7 +8087,11 @@ |
4600 | #: view:account.config.settings:0 |
4601 | #: view:account.invoice:0 |
4602 | #: view:account.invoice.report:0 |
4603 | +<<<<<<< TREE |
4604 | #: code:addons/account/account_invoice.py:353 |
4605 | +======= |
4606 | +#: code:addons/account/account_invoice.py:388 |
4607 | +>>>>>>> MERGE-SOURCE |
4608 | #, python-format |
4609 | msgid "Customer" |
4610 | msgstr "Zákazník" |
4611 | @@ -8040,6 +8228,17 @@ |
4612 | msgstr "Vyrovnávací transakce" |
4613 | |
4614 | #. module: account |
4615 | +<<<<<<< TREE |
4616 | +======= |
4617 | +#: code:addons/account/account_invoice.py:472 |
4618 | +#, python-format |
4619 | +msgid "" |
4620 | +"You cannot delete an invoice which is not draft or cancelled. You should " |
4621 | +"refund it instead." |
4622 | +msgstr "" |
4623 | + |
4624 | +#. module: account |
4625 | +>>>>>>> MERGE-SOURCE |
4626 | #: model:ir.ui.menu,name:account.menu_finance_legal_statement |
4627 | msgid "Legal Reports" |
4628 | msgstr "Zákonné výkazy" |
4629 | @@ -8153,7 +8352,11 @@ |
4630 | msgstr "Vyberte měnu pro použití na faktuře" |
4631 | |
4632 | #. module: account |
4633 | +<<<<<<< TREE |
4634 | #: code:addons/account/account_invoice.py:869 |
4635 | +======= |
4636 | +#: code:addons/account/account_invoice.py:901 |
4637 | +>>>>>>> MERGE-SOURCE |
4638 | #, python-format |
4639 | msgid "No Invoice Lines !" |
4640 | msgstr "Žádné řádky faktury !" |
4641 | @@ -8230,7 +8433,11 @@ |
4642 | msgstr "Přidruženého partnera" |
4643 | |
4644 | #. module: account |
4645 | +<<<<<<< TREE |
4646 | #: code:addons/account/account_invoice.py:1434 |
4647 | +======= |
4648 | +#: code:addons/account/account_invoice.py:1465 |
4649 | +>>>>>>> MERGE-SOURCE |
4650 | #, python-format |
4651 | msgid "You must first select a partner !" |
4652 | msgstr "Musíte nejdříve vybrat partnera !" |
4653 | @@ -9178,7 +9385,11 @@ |
4654 | msgstr "Daň nákupu(%)" |
4655 | |
4656 | #. module: account |
4657 | +<<<<<<< TREE |
4658 | #: code:addons/account/account_invoice.py:869 |
4659 | +======= |
4660 | +#: code:addons/account/account_invoice.py:901 |
4661 | +>>>>>>> MERGE-SOURCE |
4662 | #, python-format |
4663 | msgid "Please create some invoice lines." |
4664 | msgstr "Prosíme vytvořete nějaké řádky faktury." |
4665 | @@ -9734,7 +9945,11 @@ |
4666 | msgstr "Nevyrovnaný" |
4667 | |
4668 | #. module: account |
4669 | +<<<<<<< TREE |
4670 | #: code:addons/account/account_invoice.py:890 |
4671 | +======= |
4672 | +#: code:addons/account/account_invoice.py:922 |
4673 | +>>>>>>> MERGE-SOURCE |
4674 | #, python-format |
4675 | msgid "Bad total !" |
4676 | msgstr "Špatný součet !" |
4677 | @@ -10207,6 +10422,7 @@ |
4678 | |
4679 | #. module: account |
4680 | #: field:account.account,company_id:0 |
4681 | +#: report:account.account.balance:0 |
4682 | #: field:account.aged.trial.balance,company_id:0 |
4683 | #: field:account.analytic.journal,company_id:0 |
4684 | #: field:account.balance.report,company_id:0 |
4685 | @@ -10222,7 +10438,9 @@ |
4686 | #: field:account.entries.report,company_id:0 |
4687 | #: field:account.fiscal.position,company_id:0 |
4688 | #: field:account.fiscalyear,company_id:0 |
4689 | +#: report:account.general.journal:0 |
4690 | #: field:account.general.journal,company_id:0 |
4691 | +#: report:account.general.ledger_landscape:0 |
4692 | #: field:account.installer,company_id:0 |
4693 | #: field:account.invoice,company_id:0 |
4694 | #: field:account.invoice.line,company_id:0 |
4695 | @@ -10231,6 +10449,7 @@ |
4696 | #: field:account.invoice.tax,company_id:0 |
4697 | #: field:account.journal,company_id:0 |
4698 | #: field:account.journal.period,company_id:0 |
4699 | +#: report:account.journal.period.print:0 |
4700 | #: field:account.model,company_id:0 |
4701 | #: field:account.move,company_id:0 |
4702 | #: field:account.move.line,company_id:0 |
4703 | @@ -10391,6 +10610,10 @@ |
4704 | #: view:account.invoice:0 |
4705 | #: selection:account.invoice,type:0 |
4706 | #: selection:account.invoice.report,type:0 |
4707 | +<<<<<<< TREE |
4708 | +======= |
4709 | +#: code:addons/account/account_invoice.py:1158 |
4710 | +>>>>>>> MERGE-SOURCE |
4711 | #: model:process.process,name:account.process_process_supplierinvoiceprocess0 |
4712 | #: selection:report.invoice.created,type:0 |
4713 | msgid "Supplier Invoice" |
4714 | @@ -10478,8 +10701,10 @@ |
4715 | msgstr "" |
4716 | |
4717 | #. module: account |
4718 | +#: report:account.account.balance:0 |
4719 | #: selection:account.balance.report,display_account:0 |
4720 | #: selection:account.common.account.report,display_account:0 |
4721 | +#: report:account.general.ledger_landscape:0 |
4722 | #: selection:account.report.general.ledger,display_account:0 |
4723 | msgid "With movements" |
4724 | msgstr "S pohyby" |
4725 | @@ -10574,7 +10799,11 @@ |
4726 | msgstr "Položky řazené dle" |
4727 | |
4728 | #. module: account |
4729 | +<<<<<<< TREE |
4730 | #: code:addons/account/account_invoice.py:1515 |
4731 | +======= |
4732 | +#: code:addons/account/account_invoice.py:1546 |
4733 | +>>>>>>> MERGE-SOURCE |
4734 | #, python-format |
4735 | msgid "" |
4736 | "The selected unit of measure is not compatible with the unit of measure of " |
4737 | @@ -10655,6 +10884,11 @@ |
4738 | #: report:account.invoice:0 |
4739 | #: view:account.invoice:0 |
4740 | #: view:account.invoice.report:0 |
4741 | +<<<<<<< TREE |
4742 | +======= |
4743 | +#: code:addons/account/account_invoice.py:1159 |
4744 | +#, python-format |
4745 | +>>>>>>> MERGE-SOURCE |
4746 | msgid "Refund" |
4747 | msgstr "Dobropis" |
4748 | |
4749 | @@ -10725,7 +10959,11 @@ |
4750 | msgstr "Ruční daně faktury" |
4751 | |
4752 | #. module: account |
4753 | +<<<<<<< TREE |
4754 | #: code:addons/account/account_invoice.py:550 |
4755 | +======= |
4756 | +#: code:addons/account/account_invoice.py:573 |
4757 | +>>>>>>> MERGE-SOURCE |
4758 | #, python-format |
4759 | msgid "The payment term of supplier does not have a payment term line." |
4760 | msgstr "" |
4761 | |
4762 | === modified file 'account/i18n/da.po' |
4763 | --- account/i18n/da.po 2013-06-13 18:15:03 +0000 |
4764 | +++ account/i18n/da.po 2013-06-19 09:20:00 +0000 |
4765 | @@ -7,15 +7,26 @@ |
4766 | msgstr "" |
4767 | "Project-Id-Version: openobject-addons\n" |
4768 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4769 | +<<<<<<< TREE |
4770 | "POT-Creation-Date: 2012-12-21 17:04+0000\n" |
4771 | "PO-Revision-Date: 2012-05-10 18:09+0000\n" |
4772 | "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n" |
4773 | +======= |
4774 | +"POT-Creation-Date: 2013-06-14 22:29+0000\n" |
4775 | +"PO-Revision-Date: 2012-12-21 23:00+0000\n" |
4776 | +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
4777 | +>>>>>>> MERGE-SOURCE |
4778 | "Language-Team: Danish <da@li.org>\n" |
4779 | "MIME-Version: 1.0\n" |
4780 | "Content-Type: text/plain; charset=UTF-8\n" |
4781 | "Content-Transfer-Encoding: 8bit\n" |
4782 | +<<<<<<< TREE |
4783 | "X-Launchpad-Export-Date: 2013-03-16 05:13+0000\n" |
4784 | "X-Generator: Launchpad (build 16532)\n" |
4785 | +======= |
4786 | +"X-Launchpad-Export-Date: 2013-06-15 06:14+0000\n" |
4787 | +"X-Generator: Launchpad (build 16667)\n" |
4788 | +>>>>>>> MERGE-SOURCE |
4789 | |
4790 | #. module: account |
4791 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 |
4792 | @@ -128,11 +139,19 @@ |
4793 | #: code:addons/account/account.py:641 |
4794 | #: code:addons/account/account.py:686 |
4795 | #: code:addons/account/account.py:781 |
4796 | +<<<<<<< TREE |
4797 | #: code:addons/account/account.py:1049 |
4798 | #: code:addons/account/account_invoice.py:788 |
4799 | #: code:addons/account/account_invoice.py:791 |
4800 | #: code:addons/account/account_invoice.py:794 |
4801 | #: code:addons/account/account_invoice.py:1514 |
4802 | +======= |
4803 | +#: code:addons/account/account.py:1058 |
4804 | +#: code:addons/account/account_invoice.py:820 |
4805 | +#: code:addons/account/account_invoice.py:823 |
4806 | +#: code:addons/account/account_invoice.py:826 |
4807 | +#: code:addons/account/account_invoice.py:1545 |
4808 | +>>>>>>> MERGE-SOURCE |
4809 | #: code:addons/account/account_move_line.py:98 |
4810 | #: code:addons/account/account_move_line.py:774 |
4811 | #: code:addons/account/account_move_line.py:827 |
4812 | @@ -332,7 +351,7 @@ |
4813 | msgstr "" |
4814 | |
4815 | #. module: account |
4816 | -#: code:addons/account/account_invoice.py:74 |
4817 | +#: code:addons/account/account_invoice.py:77 |
4818 | #, python-format |
4819 | msgid "You must define an analytic journal of type '%s'!" |
4820 | msgstr "" |
4821 | @@ -588,11 +607,23 @@ |
4822 | msgstr "" |
4823 | |
4824 | #. module: account |
4825 | +<<<<<<< TREE |
4826 | #. openerp-web |
4827 | #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 |
4828 | #, python-format |
4829 | msgid "Nothing to reconcile" |
4830 | msgstr "" |
4831 | +======= |
4832 | +#: report:account.account.balance:0 |
4833 | +#: selection:account.balance.report,display_account:0 |
4834 | +#: selection:account.common.account.report,display_account:0 |
4835 | +#: report:account.general.ledger_landscape:0 |
4836 | +#: selection:account.report.general.ledger,display_account:0 |
4837 | +#: selection:account.tax,type_tax_use:0 |
4838 | +#: selection:account.tax.template,type_tax_use:0 |
4839 | +msgid "All" |
4840 | +msgstr "Alle" |
4841 | +>>>>>>> MERGE-SOURCE |
4842 | |
4843 | #. module: account |
4844 | #: field:account.config.settings,decimal_precision:0 |
4845 | @@ -723,7 +754,9 @@ |
4846 | #: selection:account.common.partner.report,result_selection:0 |
4847 | #: selection:account.partner.balance,result_selection:0 |
4848 | #: selection:account.partner.ledger,result_selection:0 |
4849 | +#: report:account.third_party_ledger:0 |
4850 | #: code:addons/account/report/account_partner_balance.py:297 |
4851 | +#: code:addons/account/report/account_partner_ledger.py:272 |
4852 | #, python-format |
4853 | msgid "Receivable Accounts" |
4854 | msgstr "" |
4855 | @@ -761,7 +794,11 @@ |
4856 | msgstr "" |
4857 | |
4858 | #. module: account |
4859 | +<<<<<<< TREE |
4860 | #: code:addons/account/account_invoice.py:1330 |
4861 | +======= |
4862 | +#: code:addons/account/account_invoice.py:1361 |
4863 | +>>>>>>> MERGE-SOURCE |
4864 | #, python-format |
4865 | msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." |
4866 | msgstr "" |
4867 | @@ -830,7 +867,11 @@ |
4868 | msgstr "" |
4869 | |
4870 | #. module: account |
4871 | +<<<<<<< TREE |
4872 | #: code:addons/account/account_invoice.py:794 |
4873 | +======= |
4874 | +#: code:addons/account/account_invoice.py:826 |
4875 | +>>>>>>> MERGE-SOURCE |
4876 | #, python-format |
4877 | msgid "" |
4878 | "Taxes are missing!\n" |
4879 | @@ -1009,7 +1050,11 @@ |
4880 | msgstr "" |
4881 | |
4882 | #. module: account |
4883 | +<<<<<<< TREE |
4884 | #: code:addons/account/account_invoice.py:867 |
4885 | +======= |
4886 | +#: code:addons/account/account_invoice.py:899 |
4887 | +>>>>>>> MERGE-SOURCE |
4888 | #, python-format |
4889 | msgid "Please define sequence on the journal related to this invoice." |
4890 | msgstr "" |
4891 | @@ -1080,10 +1125,17 @@ |
4892 | msgstr "" |
4893 | |
4894 | #. module: account |
4895 | +<<<<<<< TREE |
4896 | #: code:addons/account/account.py:2308 |
4897 | #: code:addons/account/account_bank_statement.py:423 |
4898 | #: code:addons/account/account_invoice.py:74 |
4899 | #: code:addons/account/account_invoice.py:744 |
4900 | +======= |
4901 | +#: code:addons/account/account.py:2346 |
4902 | +#: code:addons/account/account_bank_statement.py:424 |
4903 | +#: code:addons/account/account_invoice.py:77 |
4904 | +#: code:addons/account/account_invoice.py:775 |
4905 | +>>>>>>> MERGE-SOURCE |
4906 | #: code:addons/account/account_move_line.py:195 |
4907 | #, python-format |
4908 | msgid "No Analytic Journal !" |
4909 | @@ -1512,8 +1564,10 @@ |
4910 | msgstr "" |
4911 | |
4912 | #. module: account |
4913 | +#: report:account.account.balance:0 |
4914 | #: selection:account.balance.report,display_account:0 |
4915 | #: selection:account.common.account.report,display_account:0 |
4916 | +#: report:account.general.ledger_landscape:0 |
4917 | #: selection:account.partner.balance,display_partner:0 |
4918 | #: selection:account.report.general.ledger,display_account:0 |
4919 | msgid "With balance is not equal to 0" |
4920 | @@ -1743,6 +1797,10 @@ |
4921 | #: view:account.invoice:0 |
4922 | #: view:account.invoice.report:0 |
4923 | #: field:account.move.line,invoice:0 |
4924 | +<<<<<<< TREE |
4925 | +======= |
4926 | +#: code:addons/account/account_invoice.py:1157 |
4927 | +>>>>>>> MERGE-SOURCE |
4928 | #: model:ir.model,name:account.model_account_invoice |
4929 | #: model:res.request.link,name:account.req_link_invoice |
4930 | msgid "Invoice" |
4931 | @@ -1991,11 +2049,20 @@ |
4932 | #: code:addons/account/account_bank_statement.py:418 |
4933 | #: code:addons/account/account_cash_statement.py:256 |
4934 | #: code:addons/account/account_cash_statement.py:300 |
4935 | +<<<<<<< TREE |
4936 | #: code:addons/account/account_invoice.py:867 |
4937 | #: code:addons/account/account_invoice.py:901 |
4938 | #: code:addons/account/account_invoice.py:1091 |
4939 | #: code:addons/account/account_move_line.py:578 |
4940 | #: code:addons/account/account_move_line.py:831 |
4941 | +======= |
4942 | +#: code:addons/account/account_invoice.py:899 |
4943 | +#: code:addons/account/account_invoice.py:933 |
4944 | +#: code:addons/account/account_invoice.py:1124 |
4945 | +#: code:addons/account/account_move_line.py:579 |
4946 | +#: code:addons/account/account_move_line.py:828 |
4947 | +#: code:addons/account/account_move_line.py:851 |
4948 | +>>>>>>> MERGE-SOURCE |
4949 | #: code:addons/account/account_move_line.py:854 |
4950 | #: code:addons/account/account_move_line.py:857 |
4951 | #: code:addons/account/account_move_line.py:1122 |
4952 | @@ -2229,7 +2296,9 @@ |
4953 | #: selection:account.common.partner.report,result_selection:0 |
4954 | #: selection:account.partner.balance,result_selection:0 |
4955 | #: selection:account.partner.ledger,result_selection:0 |
4956 | +#: report:account.third_party_ledger:0 |
4957 | #: code:addons/account/report/account_partner_balance.py:299 |
4958 | +#: code:addons/account/report/account_partner_ledger.py:274 |
4959 | #, python-format |
4960 | msgid "Payable Accounts" |
4961 | msgstr "" |
4962 | @@ -2534,7 +2603,11 @@ |
4963 | msgstr "" |
4964 | |
4965 | #. module: account |
4966 | +<<<<<<< TREE |
4967 | #: code:addons/account/account_invoice.py:901 |
4968 | +======= |
4969 | +#: code:addons/account/account_invoice.py:933 |
4970 | +>>>>>>> MERGE-SOURCE |
4971 | #, python-format |
4972 | msgid "" |
4973 | "Cannot create the invoice.\n" |
4974 | @@ -2804,6 +2877,7 @@ |
4975 | msgstr "" |
4976 | |
4977 | #. module: account |
4978 | +<<<<<<< TREE |
4979 | #: code:addons/account/account.py:3503 |
4980 | #: code:addons/account/account_bank_statement.py:404 |
4981 | #: code:addons/account/account_invoice.py:378 |
4982 | @@ -2813,6 +2887,16 @@ |
4983 | #: code:addons/account/account_invoice.py:605 |
4984 | #: code:addons/account/account_invoice.py:627 |
4985 | #: code:addons/account/account_move_line.py:535 |
4986 | +======= |
4987 | +#: code:addons/account/account.py:3541 |
4988 | +#: code:addons/account/account_bank_statement.py:405 |
4989 | +#: code:addons/account/account_invoice.py:507 |
4990 | +#: code:addons/account/account_invoice.py:609 |
4991 | +#: code:addons/account/account_invoice.py:624 |
4992 | +#: code:addons/account/account_invoice.py:632 |
4993 | +#: code:addons/account/account_invoice.py:657 |
4994 | +#: code:addons/account/account_move_line.py:536 |
4995 | +>>>>>>> MERGE-SOURCE |
4996 | #, python-format |
4997 | msgid "Configuration Error!" |
4998 | msgstr "" |
4999 | @@ -3035,8 +3119,13 @@ |
5000 | msgstr "" |
The diff has been truncated for viewing.