Merge lp:~camptocamp/openobject-addons/7.0-change_icon_webkit_report_20130115 into lp:openobject-addons

Proposed by Maxime @ Camptocamp
Status: Needs review
Proposed branch: lp:~camptocamp/openobject-addons/7.0-change_icon_webkit_report_20130115
Merge into: lp:openobject-addons
Diff against target: 61158 lines (+27725/-3476) (has conflicts)
336 files modified
account/account.py (+2/-0)
account/account_invoice.py (+4/-5)
account/account_move_line.py (+5/-3)
account/account_view.xml (+1/-1)
account/i18n/ar.po (+10/-1)
account/i18n/de.po (+14/-2)
account/i18n/et.po (+15/-6)
account/i18n/fr.po (+191/-116)
account/i18n/it.po (+11/-0)
account/i18n/mn.po (+16/-6)
account/i18n/nl.po (+25/-2)
account/i18n/pt.po (+18/-7)
account/i18n/ro.po (+351/-117)
account/i18n/sk.po (+19/-9)
account/i18n/sl.po (+12/-1)
account/wizard/account_open_closed_fiscalyear_view.xml (+4/-4)
account_accountant/i18n/ro.po (+14/-0)
account_analytic_analysis/account_analytic_analysis_view.xml (+2/-2)
account_analytic_analysis/i18n/fr.po (+40/-21)
account_analytic_analysis/i18n/mn.po (+5/-0)
account_analytic_analysis/i18n/ro.po (+119/-43)
account_analytic_analysis/i18n/sl.po (+12/-1)
account_analytic_default/i18n/de.po (+24/-0)
account_analytic_default/i18n/fr.po (+21/-0)
account_analytic_default/i18n/ro.po (+31/-6)
account_analytic_plans/i18n/ro.po (+24/-13)
account_anglo_saxon/i18n/ro.po (+16/-1)
account_asset/i18n/de.po (+22/-3)
account_asset/i18n/ro.po (+86/-58)
account_bank_statement_extensions/i18n/ro.po (+26/-14)
account_budget/i18n/es_MX.po (+11/-0)
account_budget/i18n/mn.po (+12/-2)
account_budget/i18n/ro.po (+42/-11)
account_chart/i18n/ro.po (+11/-0)
account_check_writing/i18n/de.po (+24/-9)
account_check_writing/i18n/ro.po (+39/-12)
account_check_writing/i18n/sl.po (+245/-0)
account_followup/account_followup.py (+6/-6)
account_followup/i18n/ar.po (+28/-13)
account_followup/i18n/de.po (+160/-1)
account_followup/i18n/fr.po (+111/-84)
account_followup/i18n/nl.po (+283/-20)
account_followup/i18n/ro.po (+369/-101)
account_payment/i18n/ro.po (+40/-16)
account_sequence/i18n/ro.po (+13/-3)
account_test/i18n/fr.po (+241/-0)
account_test/i18n/it.po (+241/-0)
account_test/i18n/nl.po (+287/-0)
account_test/i18n/ro.po (+287/-0)
account_test/i18n/sl.po (+241/-0)
account_voucher/i18n/de.po (+28/-9)
account_voucher/i18n/fr.po (+23/-10)
account_voucher/i18n/nl.po (+118/-30)
account_voucher/i18n/ro.po (+73/-22)
analytic/i18n/de.po (+18/-7)
analytic/i18n/nl.po (+31/-1)
analytic_contract_hr_expense/i18n/sl.po (+72/-0)
anonymization/i18n/nl.po (+31/-1)
auth_crypt/i18n/de.po (+29/-0)
auth_crypt/i18n/ro.po (+28/-0)
auth_ldap/i18n/ro.po (+16/-4)
auth_ldap/i18n/sl.po (+159/-0)
auth_oauth/i18n/pt.po (+135/-0)
auth_oauth/i18n/ro.po (+135/-0)
auth_oauth/i18n/sl.po (+135/-0)
auth_oauth_signup/i18n/de.po (+23/-0)
auth_oauth_signup/i18n/pt.po (+23/-0)
auth_oauth_signup/i18n/ro.po (+23/-0)
auth_signup/i18n/fr.po (+15/-2)
auth_signup/i18n/hu.po (+277/-0)
auth_signup/i18n/nl.po (+29/-2)
auth_signup/i18n/pt.po (+19/-9)
auth_signup/i18n/sl.po (+277/-0)
auth_signup/res_users.py (+4/-1)
base_action_rule/i18n/de.po (+56/-18)
base_action_rule/i18n/fr.po (+13/-2)
base_action_rule/i18n/nl.po (+44/-2)
base_calendar/i18n/de.po (+13/-2)
base_calendar/i18n/nl.po (+13/-3)
base_gengo/i18n/fr.po (+249/-0)
base_import/i18n/de.po (+207/-34)
base_import/i18n/fr.po (+65/-29)
base_import/i18n/sl.po (+1424/-0)
base_setup/i18n/de.po (+29/-5)
base_setup/i18n/es_MX.po (+129/-0)
base_setup/i18n/it.po (+16/-0)
base_setup/i18n/sl.po (+13/-2)
board/i18n/de.po (+12/-1)
board/i18n/sk.po (+13/-3)
board/i18n/sl.po (+28/-4)
claim_from_delivery/i18n/pt.po (+12/-2)
claim_from_delivery/i18n/sl.po (+16/-2)
crm/crm_lead.py (+19/-18)
crm/crm_lead_data.xml (+1/-0)
crm/crm_lead_view.xml (+1/-1)
crm/i18n/de.po (+73/-26)
crm/i18n/fr.po (+13/-1)
crm/i18n/mn.po (+24/-12)
crm/i18n/nl.po (+32/-0)
crm/i18n/ro.po (+362/-142)
crm/i18n/sl.po (+110/-99)
crm_claim/crm_claim.py (+5/-4)
crm_claim/i18n/de.po (+12/-1)
crm_claim/i18n/fr.po (+18/-5)
crm_claim/i18n/ro.po (+89/-34)
crm_claim/i18n/sl.po (+881/-0)
crm_helpdesk/crm_helpdesk.py (+4/-3)
crm_helpdesk/i18n/de.po (+14/-3)
crm_helpdesk/i18n/ro.po (+57/-20)
crm_partner_assign/i18n/de.po (+16/-5)
crm_partner_assign/i18n/nl.po (+15/-2)
crm_partner_assign/i18n/ro.po (+69/-47)
crm_partner_assign/i18n/sl.po (+931/-0)
crm_profiling/i18n/mn.po (+15/-1)
crm_profiling/i18n/ro.po (+20/-5)
crm_todo/i18n/de.po (+11/-1)
crm_todo/i18n/mn.po (+12/-2)
crm_todo/i18n/ro.po (+13/-3)
delivery/i18n/de.po (+39/-8)
delivery/i18n/es_MX.po (+5/-0)
delivery/i18n/mn.po (+18/-7)
document/i18n/de.po (+14/-2)
document/i18n/fr.po (+12/-1)
document/i18n/zh_CN.po (+23/-4)
document_page/document_page_view.xml (+1/-1)
edi/i18n/de.po (+20/-5)
edi/i18n/fr.po (+16/-2)
edi/i18n/sl.po (+87/-0)
email_template/i18n/nl.po (+18/-3)
event/i18n/de.po (+13/-1)
event/i18n/fr.po (+13/-2)
event_moodle/i18n/pt.po (+185/-0)
event_sale/i18n/de.po (+17/-1)
event_sale/i18n/fr.po (+23/-8)
event_sale/i18n/nl.po (+18/-2)
event_sale/i18n/sl.po (+90/-0)
fetchmail/i18n/de.po (+12/-1)
fetchmail/i18n/fr.po (+12/-1)
fleet/fleet.py (+29/-19)
fleet/i18n/de.po (+2057/-0)
fleet/i18n/es_MX.po (+1912/-0)
fleet/i18n/fr.po (+17/-3)
fleet/i18n/nl.po (+28/-18)
google_docs/i18n/ru.po (+188/-0)
google_docs/i18n/zh_CN.po (+197/-0)
hr/i18n/de.po (+14/-2)
hr/i18n/fr.po (+88/-63)
hr/i18n/mn.po (+29/-19)
hr_attendance/i18n/de.po (+13/-1)
hr_evaluation/i18n/de.po (+24/-0)
hr_expense/hr_expense.py (+0/-1)
hr_expense/i18n/de.po (+19/-4)
hr_holidays/hr_holidays.py (+9/-2)
hr_holidays/hr_holidays_data.xml (+1/-1)
hr_holidays/i18n/de.po (+15/-3)
hr_payroll/i18n/de.po (+17/-2)
hr_payroll/i18n/en_GB.po (+13/-1)
hr_payroll/i18n/es_MX.po (+11/-1)
hr_payroll/i18n/sl.po (+1251/-0)
hr_recruitment/hr_recruitment.py (+5/-4)
hr_recruitment/i18n/de.po (+18/-7)
hr_recruitment/i18n/mn.po (+78/-61)
hr_timesheet_invoice/i18n/de.po (+17/-0)
idea/i18n/de.po (+162/-0)
knowledge/i18n/fr.po (+29/-9)
l10n_ar/i18n/pt.po (+173/-0)
l10n_be/i18n/es.po (+34/-18)
l10n_be/i18n/fr.po (+20/-9)
l10n_be/i18n/pt.po (+14/-3)
l10n_be_invoice_bba/i18n/pt.po (+11/-1)
l10n_bo/i18n/pt.po (+43/-0)
l10n_br/i18n/pt.po (+183/-0)
l10n_cr/i18n/it.po (+12/-2)
l10n_cr/i18n/pt.po (+162/-0)
l10n_multilang/i18n/fr.po (+14/-0)
lunch/i18n/de.po (+206/-72)
lunch/i18n/it.po (+45/-31)
lunch/lunch.py (+1/-0)
mail/i18n/de.po (+52/-25)
mail/i18n/fr.po (+67/-38)
mail/i18n/hu.po (+51/-24)
mail/i18n/it.po (+15/-4)
mail/i18n/pt.po (+19/-9)
mail/i18n/sl.po (+36/-26)
mail/mail_alias.py (+1/-1)
mail/mail_followers.py (+0/-7)
mail/mail_mail.py (+44/-3)
mail/mail_thread.py (+70/-22)
mail/static/src/js/mail.js (+84/-77)
mail/static/src/js/mail_followers.js (+3/-0)
mail/static/src/xml/mail.xml (+4/-4)
mail/wizard/invite.py (+0/-2)
mail/wizard/invite_view.xml (+1/-1)
mail/wizard/mail_compose_message.py (+1/-0)
marketing/i18n/fr.po (+19/-4)
marketing/i18n/it.po (+18/-8)
marketing_campaign/i18n/de.po (+34/-4)
marketing_campaign/i18n/it.po (+44/-26)
membership/i18n/de.po (+17/-5)
mrp/i18n/de.po (+55/-6)
mrp/i18n/fr.po (+81/-14)
mrp/i18n/hu.po (+19/-0)
mrp/i18n/it.po (+17/-0)
mrp_byproduct/i18n/fr.po (+12/-1)
mrp_byproduct/i18n/hu.po (+8/-0)
mrp_byproduct/i18n/sl.po (+16/-2)
mrp_operations/i18n/de.po (+13/-1)
mrp_operations/i18n/fr.po (+43/-2)
mrp_repair/i18n/de.po (+13/-1)
multi_company/i18n/de.po (+23/-0)
note/i18n/de.po (+12/-1)
note/i18n/fr.po (+11/-1)
note/i18n/ro.po (+30/-3)
note_pad/i18n/de.po (+29/-0)
note_pad/i18n/fr.po (+28/-0)
pad/static/src/css/etherpad.css (+14/-7)
plugin_outlook/i18n/fr.po (+18/-1)
plugin_thunderbird/i18n/fr.po (+14/-0)
point_of_sale/i18n/de.po (+51/-39)
point_of_sale/i18n/fr.po (+139/-104)
point_of_sale/static/src/js/db.js (+31/-3)
point_of_sale/static/src/js/devices.js (+1/-1)
point_of_sale/static/src/js/models.js (+0/-5)
point_of_sale/static/src/js/screens.js (+10/-3)
point_of_sale/static/src/js/widgets.js (+25/-3)
portal/i18n/de.po (+29/-10)
portal/i18n/fr.po (+83/-24)
portal/i18n/it.po (+21/-4)
portal/i18n/pt.po (+18/-8)
portal/i18n/ro.po (+140/-42)
portal/mail_mail.py (+16/-4)
portal_anonymous/i18n/fr.po (+25/-0)
portal_anonymous/i18n/ro.po (+25/-0)
portal_anonymous/static/src/js/portal_anonymous.js (+2/-1)
portal_claim/i18n/ro.po (+44/-0)
portal_event/i18n/ro.po (+59/-0)
portal_hr_employees/i18n/de.po (+14/-3)
portal_hr_employees/i18n/ro.po (+95/-0)
portal_project/i18n/pt.po (+33/-0)
portal_project/i18n/ro.po (+37/-0)
portal_project_issue/i18n/ro.po (+48/-0)
portal_sale/i18n/de.po (+213/-2)
portal_sale/i18n/ro.po (+563/-0)
procurement/i18n/de.po (+67/-13)
procurement/i18n/fr.po (+48/-0)
procurement/i18n/sl.po (+1037/-0)
product/i18n/ar.po (+73/-62)
product/i18n/de.po (+59/-30)
product/i18n/fr.po (+27/-2)
product/i18n/mn.po (+50/-24)
product/i18n/sl.po (+117/-78)
product_expiry/i18n/de.po (+28/-1)
product_manufacturer/i18n/fr.po (+12/-2)
product_margin/i18n/fr.po (+37/-18)
project/i18n/de.po (+75/-35)
project/i18n/fr.po (+86/-63)
project/i18n/it.po (+11/-1)
project/i18n/mn.po (+15/-4)
project/i18n/nl.po (+16/-3)
project/i18n/sk.po (+19/-9)
project/project.py (+10/-4)
project/project_view.xml (+58/-45)
project_gtd/i18n/fr.po (+13/-2)
project_gtd/i18n/it.po (+22/-7)
project_gtd/i18n/pl.po (+18/-3)
project_issue/i18n/de.po (+76/-33)
project_issue/i18n/hu.po (+18/-7)
project_issue/project_issue.py (+10/-4)
project_issue_sheet/i18n/de.po (+12/-1)
project_issue_sheet/i18n/fr.po (+12/-1)
project_issue_sheet/i18n/hu.po (+5/-0)
project_long_term/i18n/de.po (+12/-1)
project_long_term/i18n/hu.po (+5/-0)
project_mrp/i18n/de.po (+19/-4)
project_mrp/i18n/hu.po (+5/-0)
project_mrp/i18n/mn.po (+12/-2)
project_timesheet/i18n/de.po (+14/-2)
project_timesheet/i18n/fr.po (+17/-0)
project_timesheet/i18n/it.po (+20/-5)
project_timesheet/i18n/zh_CN.po (+13/-2)
purchase/i18n/de.po (+110/-11)
purchase/i18n/fr.po (+83/-30)
purchase/i18n/pt.po (+29/-18)
purchase/i18n/sl.po (+37/-26)
purchase_double_validation/i18n/fr.po (+16/-2)
purchase_double_validation/i18n/sl.po (+49/-0)
resource/i18n/fr.po (+13/-0)
sale/i18n/de.po (+203/-26)
sale/i18n/eu.po (+2130/-0)
sale/i18n/fr.po (+108/-61)
sale/i18n/it.po (+44/-20)
sale/i18n/nl.po (+20/-4)
sale/i18n/pt.po (+13/-2)
sale/i18n/ru.po (+31/-16)
sale/i18n/sl.po (+39/-28)
sale/res_config.py (+10/-3)
sale_analytic_plans/i18n/fr.po (+12/-1)
sale_analytic_plans/i18n/sl.po (+12/-1)
sale_crm/i18n/de.po (+16/-2)
sale_crm/i18n/hu.po (+32/-15)
sale_crm/i18n/it.po (+14/-2)
sale_journal/i18n/fr.po (+19/-2)
sale_journal/i18n/hu.po (+20/-3)
sale_journal/i18n/it.po (+12/-1)
sale_margin/i18n/hu.po (+16/-0)
sale_mrp/i18n/fr.po (+15/-1)
sale_mrp/i18n/hu.po (+16/-1)
sale_order_dates/i18n/fr.po (+12/-2)
sale_order_dates/i18n/hu.po (+18/-4)
sale_stock/i18n/de.po (+26/-1)
sale_stock/i18n/et.po (+13/-2)
sale_stock/i18n/fr.po (+20/-1)
sale_stock/i18n/it.po (+12/-1)
share/i18n/de.po (+13/-2)
stock/i18n/de.po (+26/-12)
stock/i18n/et.po (+19/-10)
stock/i18n/fr.po (+155/-21)
stock/i18n/hu.po (+25/-0)
stock/i18n/it.po (+39/-16)
stock/i18n/nl.po (+118/-52)
stock/i18n/ro.po (+13/-2)
stock/i18n/sl.po (+55/-43)
stock/i18n/zh_CN.po (+40/-21)
stock_invoice_directly/i18n/sl.po (+15/-0)
stock_location/i18n/fr.po (+12/-1)
survey/i18n/fr.po (+24/-12)
survey/i18n/hu.po (+15/-0)
survey/i18n/it.po (+24/-12)
warning/i18n/de.po (+14/-3)
warning/i18n/fr.po (+13/-3)
web_analytics/__openerp__.py (+1/-1)
web_analytics/static/src/js/web_analytics.js (+256/-140)
web_linkedin/i18n/hu.po (+142/-0)
web_linkedin/i18n/ro.po (+29/-15)
web_shortcuts/i18n/hu.po (+25/-0)
web_shortcuts/i18n/ro.po (+10/-1)
Text conflict in account/i18n/ar.po
Text conflict in account/i18n/de.po
Text conflict in account/i18n/et.po
Text conflict in account/i18n/fr.po
Text conflict in account/i18n/it.po
Text conflict in account/i18n/mn.po
Text conflict in account/i18n/nl.po
Text conflict in account/i18n/pt.po
Text conflict in account/i18n/ro.po
Text conflict in account/i18n/sk.po
Text conflict in account/i18n/sl.po
Text conflict in account_accountant/i18n/ro.po
Text conflict in account_analytic_analysis/i18n/fr.po
Text conflict in account_analytic_analysis/i18n/mn.po
Text conflict in account_analytic_analysis/i18n/ro.po
Text conflict in account_analytic_analysis/i18n/sl.po
Text conflict in account_analytic_default/i18n/de.po
Text conflict in account_analytic_default/i18n/fr.po
Text conflict in account_analytic_default/i18n/ro.po
Text conflict in account_analytic_plans/i18n/ro.po
Text conflict in account_anglo_saxon/i18n/ro.po
Text conflict in account_asset/i18n/de.po
Text conflict in account_asset/i18n/ro.po
Text conflict in account_bank_statement_extensions/i18n/ro.po
Text conflict in account_budget/i18n/es_MX.po
Text conflict in account_budget/i18n/mn.po
Text conflict in account_budget/i18n/ro.po
Text conflict in account_chart/i18n/ro.po
Text conflict in account_check_writing/i18n/de.po
Text conflict in account_check_writing/i18n/ro.po
Conflict adding file account_check_writing/i18n/sl.po.  Moved existing file to account_check_writing/i18n/sl.po.moved.
Text conflict in account_followup/i18n/ar.po
Text conflict in account_followup/i18n/de.po
Text conflict in account_followup/i18n/fr.po
Text conflict in account_followup/i18n/nl.po
Text conflict in account_followup/i18n/ro.po
Text conflict in account_payment/i18n/ro.po
Text conflict in account_sequence/i18n/ro.po
Conflict adding file account_test/i18n/fr.po.  Moved existing file to account_test/i18n/fr.po.moved.
Conflict adding file account_test/i18n/it.po.  Moved existing file to account_test/i18n/it.po.moved.
Conflict adding file account_test/i18n/nl.po.  Moved existing file to account_test/i18n/nl.po.moved.
Conflict adding file account_test/i18n/ro.po.  Moved existing file to account_test/i18n/ro.po.moved.
Conflict adding file account_test/i18n/sl.po.  Moved existing file to account_test/i18n/sl.po.moved.
Text conflict in account_voucher/i18n/de.po
Text conflict in account_voucher/i18n/fr.po
Text conflict in account_voucher/i18n/nl.po
Text conflict in account_voucher/i18n/ro.po
Text conflict in analytic/i18n/de.po
Text conflict in analytic/i18n/nl.po
Conflict adding file analytic_contract_hr_expense/i18n/sl.po.  Moved existing file to analytic_contract_hr_expense/i18n/sl.po.moved.
Text conflict in anonymization/i18n/nl.po
Conflict adding file auth_crypt/i18n/de.po.  Moved existing file to auth_crypt/i18n/de.po.moved.
Conflict adding file auth_crypt/i18n/ro.po.  Moved existing file to auth_crypt/i18n/ro.po.moved.
Text conflict in auth_ldap/i18n/ro.po
Conflict adding file auth_ldap/i18n/sl.po.  Moved existing file to auth_ldap/i18n/sl.po.moved.
Conflict adding file auth_oauth/i18n/pt.po.  Moved existing file to auth_oauth/i18n/pt.po.moved.
Conflict adding file auth_oauth/i18n/ro.po.  Moved existing file to auth_oauth/i18n/ro.po.moved.
Conflict adding file auth_oauth/i18n/sl.po.  Moved existing file to auth_oauth/i18n/sl.po.moved.
Conflict adding file auth_oauth_signup/i18n/de.po.  Moved existing file to auth_oauth_signup/i18n/de.po.moved.
Conflict adding file auth_oauth_signup/i18n/pt.po.  Moved existing file to auth_oauth_signup/i18n/pt.po.moved.
Conflict adding file auth_oauth_signup/i18n/ro.po.  Moved existing file to auth_oauth_signup/i18n/ro.po.moved.
Text conflict in auth_signup/i18n/fr.po
Conflict adding file auth_signup/i18n/hu.po.  Moved existing file to auth_signup/i18n/hu.po.moved.
Text conflict in auth_signup/i18n/nl.po
Text conflict in auth_signup/i18n/pt.po
Conflict adding file auth_signup/i18n/sl.po.  Moved existing file to auth_signup/i18n/sl.po.moved.
Text conflict in base_action_rule/i18n/de.po
Text conflict in base_action_rule/i18n/fr.po
Text conflict in base_action_rule/i18n/nl.po
Text conflict in base_calendar/i18n/de.po
Text conflict in base_calendar/i18n/nl.po
Conflict adding file base_gengo/i18n/fr.po.  Moved existing file to base_gengo/i18n/fr.po.moved.
Text conflict in base_import/i18n/de.po
Text conflict in base_import/i18n/fr.po
Conflict adding file base_import/i18n/sl.po.  Moved existing file to base_import/i18n/sl.po.moved.
Text conflict in base_setup/i18n/de.po
Text conflict in base_setup/i18n/es_MX.po
Text conflict in base_setup/i18n/it.po
Text conflict in base_setup/i18n/sl.po
Text conflict in board/i18n/de.po
Text conflict in board/i18n/sk.po
Text conflict in board/i18n/sl.po
Text conflict in claim_from_delivery/i18n/pt.po
Text conflict in claim_from_delivery/i18n/sl.po
Text conflict in crm/i18n/de.po
Text conflict in crm/i18n/fr.po
Text conflict in crm/i18n/mn.po
Text conflict in crm/i18n/nl.po
Text conflict in crm/i18n/ro.po
Text conflict in crm/i18n/sl.po
Text conflict in crm_claim/i18n/de.po
Text conflict in crm_claim/i18n/fr.po
Text conflict in crm_claim/i18n/ro.po
Conflict adding file crm_claim/i18n/sl.po.  Moved existing file to crm_claim/i18n/sl.po.moved.
Text conflict in crm_helpdesk/i18n/de.po
Text conflict in crm_helpdesk/i18n/ro.po
Text conflict in crm_partner_assign/i18n/de.po
Text conflict in crm_partner_assign/i18n/nl.po
Text conflict in crm_partner_assign/i18n/ro.po
Conflict adding file crm_partner_assign/i18n/sl.po.  Moved existing file to crm_partner_assign/i18n/sl.po.moved.
Text conflict in crm_profiling/i18n/mn.po
Text conflict in crm_profiling/i18n/ro.po
Text conflict in crm_todo/i18n/de.po
Text conflict in crm_todo/i18n/mn.po
Text conflict in crm_todo/i18n/ro.po
Text conflict in delivery/i18n/de.po
Text conflict in delivery/i18n/es_MX.po
Text conflict in delivery/i18n/mn.po
Text conflict in document/i18n/de.po
Text conflict in document/i18n/fr.po
Text conflict in document/i18n/zh_CN.po
Text conflict in edi/i18n/de.po
Text conflict in edi/i18n/fr.po
Conflict adding file edi/i18n/sl.po.  Moved existing file to edi/i18n/sl.po.moved.
Text conflict in email_template/i18n/nl.po
Text conflict in event/i18n/de.po
Text conflict in event/i18n/fr.po
Conflict adding file event_moodle/i18n/pt.po.  Moved existing file to event_moodle/i18n/pt.po.moved.
Text conflict in event_sale/i18n/de.po
Text conflict in event_sale/i18n/fr.po
Text conflict in event_sale/i18n/nl.po
Conflict adding file event_sale/i18n/sl.po.  Moved existing file to event_sale/i18n/sl.po.moved.
Text conflict in fetchmail/i18n/de.po
Text conflict in fetchmail/i18n/fr.po
Conflict adding file fleet/i18n/de.po.  Moved existing file to fleet/i18n/de.po.moved.
Conflict adding file fleet/i18n/es_MX.po.  Moved existing file to fleet/i18n/es_MX.po.moved.
Text conflict in fleet/i18n/fr.po
Text conflict in fleet/i18n/nl.po
Conflict adding file google_docs/i18n/ru.po.  Moved existing file to google_docs/i18n/ru.po.moved.
Conflict adding file google_docs/i18n/zh_CN.po.  Moved existing file to google_docs/i18n/zh_CN.po.moved.
Text conflict in hr/i18n/de.po
Text conflict in hr/i18n/fr.po
Text conflict in hr/i18n/mn.po
Text conflict in hr_attendance/i18n/de.po
Text conflict in hr_evaluation/i18n/de.po
Text conflict in hr_expense/i18n/de.po
Text conflict in hr_holidays/i18n/de.po
Text conflict in hr_payroll/i18n/de.po
Text conflict in hr_payroll/i18n/en_GB.po
Text conflict in hr_payroll/i18n/es_MX.po
Conflict adding file hr_payroll/i18n/sl.po.  Moved existing file to hr_payroll/i18n/sl.po.moved.
Text conflict in hr_recruitment/i18n/de.po
Text conflict in hr_recruitment/i18n/mn.po
Text conflict in hr_timesheet_invoice/i18n/de.po
Text conflict in idea/i18n/de.po
Text conflict in knowledge/i18n/fr.po
Text conflict in l10n_be/i18n/es.po
Text conflict in l10n_be/i18n/fr.po
Text conflict in l10n_be/i18n/pt.po
Text conflict in l10n_be_invoice_bba/i18n/pt.po
Conflict adding file l10n_bo/i18n/pt.po.  Moved existing file to l10n_bo/i18n/pt.po.moved.
Text conflict in l10n_cr/i18n/it.po
Text conflict in l10n_multilang/i18n/fr.po
Text conflict in lunch/i18n/de.po
Text conflict in lunch/i18n/it.po
Text conflict in mail/i18n/de.po
Text conflict in mail/i18n/fr.po
Text conflict in mail/i18n/hu.po
Text conflict in mail/i18n/it.po
Text conflict in mail/i18n/pt.po
Text conflict in mail/i18n/sl.po
Text conflict in marketing/i18n/fr.po
Text conflict in marketing/i18n/it.po
Text conflict in marketing_campaign/i18n/de.po
Text conflict in marketing_campaign/i18n/it.po
Text conflict in membership/i18n/de.po
Text conflict in mrp/i18n/de.po
Text conflict in mrp/i18n/fr.po
Text conflict in mrp/i18n/hu.po
Text conflict in mrp/i18n/it.po
Text conflict in mrp_byproduct/i18n/fr.po
Text conflict in mrp_byproduct/i18n/hu.po
Text conflict in mrp_byproduct/i18n/sl.po
Text conflict in mrp_operations/i18n/de.po
Text conflict in mrp_operations/i18n/fr.po
Text conflict in mrp_repair/i18n/de.po
Text conflict in multi_company/i18n/de.po
Text conflict in note/i18n/de.po
Text conflict in note/i18n/fr.po
Text conflict in note/i18n/ro.po
Conflict adding file note_pad/i18n/de.po.  Moved existing file to note_pad/i18n/de.po.moved.
Conflict adding file note_pad/i18n/fr.po.  Moved existing file to note_pad/i18n/fr.po.moved.
Text conflict in plugin_outlook/i18n/fr.po
Text conflict in plugin_thunderbird/i18n/fr.po
Text conflict in point_of_sale/i18n/de.po
Text conflict in point_of_sale/i18n/fr.po
Text conflict in portal/i18n/de.po
Text conflict in portal/i18n/fr.po
Text conflict in portal/i18n/it.po
Text conflict in portal/i18n/pt.po
Text conflict in portal/i18n/ro.po
Conflict adding file portal_anonymous/i18n/fr.po.  Moved existing file to portal_anonymous/i18n/fr.po.moved.
Conflict adding file portal_anonymous/i18n/ro.po.  Moved existing file to portal_anonymous/i18n/ro.po.moved.
Conflict adding file portal_claim/i18n/ro.po.  Moved existing file to portal_claim/i18n/ro.po.moved.
Conflict adding file portal_event/i18n/ro.po.  Moved existing file to portal_event/i18n/ro.po.moved.
Text conflict in portal_hr_employees/i18n/de.po
Conflict adding file portal_hr_employees/i18n/ro.po.  Moved existing file to portal_hr_employees/i18n/ro.po.moved.
Conflict adding file portal_project/i18n/pt.po.  Moved existing file to portal_project/i18n/pt.po.moved.
Conflict adding file portal_project/i18n/ro.po.  Moved existing file to portal_project/i18n/ro.po.moved.
Conflict adding file portal_project_issue/i18n/ro.po.  Moved existing file to portal_project_issue/i18n/ro.po.moved.
Text conflict in portal_sale/i18n/de.po
Conflict adding file portal_sale/i18n/ro.po.  Moved existing file to portal_sale/i18n/ro.po.moved.
Text conflict in procurement/i18n/de.po
Text conflict in procurement/i18n/fr.po
Conflict adding file procurement/i18n/sl.po.  Moved existing file to procurement/i18n/sl.po.moved.
Text conflict in product/i18n/ar.po
Text conflict in product/i18n/de.po
Text conflict in product/i18n/fr.po
Text conflict in product/i18n/mn.po
Text conflict in product/i18n/sl.po
Text conflict in product_expiry/i18n/de.po
Text conflict in product_manufacturer/i18n/fr.po
Text conflict in product_margin/i18n/fr.po
Text conflict in project/i18n/de.po
Text conflict in project/i18n/fr.po
Text conflict in project/i18n/it.po
Text conflict in project/i18n/mn.po
Text conflict in project/i18n/nl.po
Text conflict in project/i18n/sk.po
Text conflict in project_gtd/i18n/fr.po
Text conflict in project_gtd/i18n/it.po
Text conflict in project_gtd/i18n/pl.po
Text conflict in project_issue/i18n/de.po
Text conflict in project_issue/i18n/hu.po
Text conflict in project_issue_sheet/i18n/de.po
Text conflict in project_issue_sheet/i18n/fr.po
Text conflict in project_issue_sheet/i18n/hu.po
Text conflict in project_long_term/i18n/de.po
Text conflict in project_long_term/i18n/hu.po
Text conflict in project_mrp/i18n/de.po
Text conflict in project_mrp/i18n/hu.po
Text conflict in project_mrp/i18n/mn.po
Text conflict in project_timesheet/i18n/de.po
Text conflict in project_timesheet/i18n/fr.po
Text conflict in project_timesheet/i18n/it.po
Text conflict in project_timesheet/i18n/zh_CN.po
Text conflict in purchase/i18n/de.po
Text conflict in purchase/i18n/fr.po
Text conflict in purchase/i18n/pt.po
Text conflict in purchase/i18n/sl.po
Text conflict in purchase_double_validation/i18n/fr.po
Conflict adding file purchase_double_validation/i18n/sl.po.  Moved existing file to purchase_double_validation/i18n/sl.po.moved.
Text conflict in resource/i18n/fr.po
Text conflict in sale/i18n/de.po
Conflict adding file sale/i18n/eu.po.  Moved existing file to sale/i18n/eu.po.moved.
Text conflict in sale/i18n/fr.po
Text conflict in sale/i18n/it.po
Text conflict in sale/i18n/nl.po
Text conflict in sale/i18n/pt.po
Text conflict in sale/i18n/ru.po
Text conflict in sale/i18n/sl.po
Text conflict in sale_analytic_plans/i18n/fr.po
Text conflict in sale_analytic_plans/i18n/sl.po
Text conflict in sale_crm/i18n/de.po
Text conflict in sale_crm/i18n/hu.po
Text conflict in sale_crm/i18n/it.po
Text conflict in sale_journal/i18n/fr.po
Text conflict in sale_journal/i18n/hu.po
Text conflict in sale_journal/i18n/it.po
Text conflict in sale_margin/i18n/hu.po
Text conflict in sale_mrp/i18n/fr.po
Text conflict in sale_mrp/i18n/hu.po
Text conflict in sale_order_dates/i18n/fr.po
Text conflict in sale_order_dates/i18n/hu.po
Text conflict in sale_stock/i18n/de.po
Text conflict in sale_stock/i18n/et.po
Text conflict in sale_stock/i18n/fr.po
Text conflict in sale_stock/i18n/it.po
Text conflict in share/i18n/de.po
Text conflict in stock/i18n/de.po
Text conflict in stock/i18n/et.po
Text conflict in stock/i18n/fr.po
Text conflict in stock/i18n/hu.po
Text conflict in stock/i18n/it.po
Text conflict in stock/i18n/nl.po
Text conflict in stock/i18n/ro.po
Text conflict in stock/i18n/sl.po
Text conflict in stock/i18n/zh_CN.po
Text conflict in stock_invoice_directly/i18n/sl.po
Text conflict in stock_location/i18n/fr.po
Text conflict in survey/i18n/fr.po
Text conflict in survey/i18n/hu.po
Text conflict in survey/i18n/it.po
Text conflict in warning/i18n/de.po
Text conflict in warning/i18n/fr.po
Conflict adding file web_linkedin/i18n/hu.po.  Moved existing file to web_linkedin/i18n/hu.po.moved.
Text conflict in web_linkedin/i18n/ro.po
Conflict adding file web_shortcuts/i18n/hu.po.  Moved existing file to web_shortcuts/i18n/hu.po.moved.
Text conflict in web_shortcuts/i18n/ro.po
To merge this branch: bzr merge lp:~camptocamp/openobject-addons/7.0-change_icon_webkit_report_20130115
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+143270@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

8579. By Maxime @ Camptocamp on 2013-01-15

[CHG] changed icon of module report_webkit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account.py'
2--- account/account.py 2012-12-19 11:34:13 +0000
3+++ account/account.py 2013-01-15 10:40:30 +0000
4@@ -1463,6 +1463,7 @@
5 line_id = self.pool.get('account.move.line').create(cr, uid, {
6 'name': _(mode.capitalize()+' Centralisation'),
7 'centralisation': mode,
8+ 'partner_id': False,
9 'account_id': account_id,
10 'move_id': move.id,
11 'journal_id': move.journal_id.id,
12@@ -1501,6 +1502,7 @@
13 line_id = self.pool.get('account.move.line').create(cr, uid, {
14 'name': _('Currency Adjustment'),
15 'centralisation': 'currency',
16+ 'partner_id': False,
17 'account_id': account_id,
18 'move_id': move.id,
19 'journal_id': move.journal_id.id,
20
21=== modified file 'account/account_invoice.py'
22--- account/account_invoice.py 2012-12-21 16:48:08 +0000
23+++ account/account_invoice.py 2013-01-15 10:40:30 +0000
24@@ -1484,11 +1484,10 @@
25 new_price = res_final['value']['price_unit'] * currency.rate
26 res_final['value']['price_unit'] = new_price
27
28- if result['uos_id'] != res.uom_id.id:
29- selected_uom = self.pool.get('product.uom_id').browse(cr, uid, result['uos_id'], context=context)
30- if res.uom_id.category_id.id == selected_uom.category_id.id:
31- new_price = res_final['value']['price_unit'] * uom_id.factor_inv
32- res_final['value']['price_unit'] = new_price
33+ if result['uos_id'] and result['uos_id'] != res.uom_id.id:
34+ selected_uom = self.pool.get('product.uom').browse(cr, uid, result['uos_id'], context=context)
35+ new_price = self.pool.get('product.uom')._compute_price(cr, uid, res.uom_id.id, res_final['value']['price_unit'], result['uos_id'])
36+ res_final['value']['price_unit'] = new_price
37 return res_final
38
39 def uos_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
40
41=== modified file 'account/account_move_line.py'
42--- account/account_move_line.py 2012-12-18 17:55:47 +0000
43+++ account/account_move_line.py 2013-01-15 10:40:30 +0000
44@@ -1137,9 +1137,11 @@
45 if context is None:
46 context = {}
47 if vals.get('move_id', False):
48- company_id = self.pool.get('account.move').read(cr, uid, vals['move_id'], ['company_id']).get('company_id', False)
49- if company_id:
50- vals['company_id'] = company_id[0]
51+ move = self.pool.get('account.move').browse(cr, uid, vals['move_id'], context=context)
52+ if move.company_id:
53+ vals['company_id'] = move.company_id.id
54+ if move.date and not vals.get('date'):
55+ vals['date'] = move.date
56 if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
57 raise osv.except_osv(_('Bad Account!'), _('You cannot use an inactive account.'))
58 if 'journal_id' in vals and vals['journal_id']:
59
60=== modified file 'account/account_view.xml'
61--- account/account_view.xml 2012-12-21 16:48:08 +0000
62+++ account/account_view.xml 2013-01-15 10:40:30 +0000
63@@ -97,7 +97,7 @@
64 <form string="Account Period" version="7.0">
65 <header>
66 <button string="Close Period" name="%(account.action_account_period_close)d" type="action" class="oe_highlight" states="draft"/>
67- <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/>
68+ <button name="action_draft" states="done" string="Re-Open Period" type="object" groups="account.group_account_manager"/>
69 <field name="state" widget="statusbar" nolabel="1"/>
70 </header>
71 <sheet>
72
73=== modified file 'account/i18n/ar.po'
74--- account/i18n/ar.po 2013-01-04 09:39:53 +0000
75+++ account/i18n/ar.po 2013-01-15 10:40:30 +0000
76@@ -7,14 +7,23 @@
77 "Project-Id-Version: OpenERP Server 6.0dev\n"
78 "Report-Msgid-Bugs-To: support@openerp.com\n"
79 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
80+<<<<<<< TREE
81 "PO-Revision-Date: 2012-12-15 22:53+0000\n"
82+=======
83+"PO-Revision-Date: 2013-01-08 08:27+0000\n"
84+>>>>>>> MERGE-SOURCE
85 "Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
86 "Language-Team: \n"
87 "MIME-Version: 1.0\n"
88 "Content-Type: text/plain; charset=UTF-8\n"
89 "Content-Transfer-Encoding: 8bit\n"
90+<<<<<<< TREE
91 "X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
92 "X-Generator: Launchpad (build 16378)\n"
93+=======
94+"X-Launchpad-Export-Date: 2013-01-09 05:52+0000\n"
95+"X-Generator: Launchpad (build 16412)\n"
96+>>>>>>> MERGE-SOURCE
97
98 #. module: account
99 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
100@@ -3166,7 +3175,7 @@
101 #: view:account.unreconcile:0
102 #: view:account.unreconcile.reconcile:0
103 msgid "Unreconcile Transactions"
104-msgstr ""
105+msgstr "عمليات غير مسّوية"
106
107 #. module: account
108 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
109
110=== modified file 'account/i18n/de.po'
111--- account/i18n/de.po 2013-01-04 09:39:53 +0000
112+++ account/i18n/de.po 2013-01-15 10:40:30 +0000
113@@ -7,15 +7,24 @@
114 "Project-Id-Version: OpenERP Server 6.0dev\n"
115 "Report-Msgid-Bugs-To: support@openerp.com\n"
116 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
117+<<<<<<< TREE
118 "PO-Revision-Date: 2012-12-21 01:59+0000\n"
119+=======
120+"PO-Revision-Date: 2013-01-07 23:46+0000\n"
121+>>>>>>> MERGE-SOURCE
122 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
123 "consulting.net>\n"
124 "Language-Team: \n"
125 "MIME-Version: 1.0\n"
126 "Content-Type: text/plain; charset=UTF-8\n"
127 "Content-Transfer-Encoding: 8bit\n"
128+<<<<<<< TREE
129 "X-Launchpad-Export-Date: 2012-12-22 05:30+0000\n"
130 "X-Generator: Launchpad (build 16378)\n"
131+=======
132+"X-Launchpad-Export-Date: 2013-01-08 06:04+0000\n"
133+"X-Generator: Launchpad (build 16402)\n"
134+>>>>>>> MERGE-SOURCE
135
136 #. module: account
137 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
138@@ -3872,7 +3881,7 @@
139 #. module: account
140 #: field:account.partner.reconcile.process,to_reconcile:0
141 msgid "Remaining Partners"
142-msgstr "Offene Rechnungen Partner"
143+msgstr "Verbleibende Partner"
144
145 #. module: account
146 #: view:account.subscription:0
147@@ -8566,6 +8575,9 @@
148 "Refund base on this type. You can not Modify and Cancel if the invoice is "
149 "already reconciled"
150 msgstr ""
151+"Diese Auswahl legt fest, wie die Gutschrift vorgenommen wird. Sie können die "
152+"Rechnung nicht Abbrechen oder Modifizieren, wenn die Rechnung bereits "
153+"beglichen wurde."
154
155 #. module: account
156 #: field:account.bank.statement.line,sequence:0
157@@ -11498,7 +11510,7 @@
158 #. module: account
159 #: field:res.partner,credit:0
160 msgid "Total Receivable"
161-msgstr "Gesamt Forderungen"
162+msgstr "Summe Debitoren"
163
164 #. module: account
165 #: view:account.move.line:0
166
167=== modified file 'account/i18n/et.po'
168--- account/i18n/et.po 2013-01-04 09:39:53 +0000
169+++ account/i18n/et.po 2013-01-15 10:40:30 +0000
170@@ -7,14 +7,23 @@
171 "Project-Id-Version: OpenERP Server 6.0dev\n"
172 "Report-Msgid-Bugs-To: support@openerp.com\n"
173 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
174+<<<<<<< TREE
175 "PO-Revision-Date: 2012-12-21 20:57+0000\n"
176+=======
177+"PO-Revision-Date: 2013-01-07 21:23+0000\n"
178+>>>>>>> MERGE-SOURCE
179 "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
180 "Language-Team: \n"
181 "MIME-Version: 1.0\n"
182 "Content-Type: text/plain; charset=UTF-8\n"
183 "Content-Transfer-Encoding: 8bit\n"
184+<<<<<<< TREE
185 "X-Launchpad-Export-Date: 2012-12-22 05:29+0000\n"
186 "X-Generator: Launchpad (build 16378)\n"
187+=======
188+"X-Launchpad-Export-Date: 2013-01-08 06:04+0000\n"
189+"X-Generator: Launchpad (build 16402)\n"
190+>>>>>>> MERGE-SOURCE
191
192 #. module: account
193 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
194@@ -363,7 +372,7 @@
195 #: view:account.invoice.report:0
196 #: field:account.invoice.report,user_id:0
197 msgid "Salesperson"
198-msgstr ""
199+msgstr "Müügimees"
200
201 #. module: account
202 #: view:account.bank.statement:0
203@@ -4661,7 +4670,7 @@
204 #. module: account
205 #: field:account.invoice,reference_type:0
206 msgid "Payment Reference"
207-msgstr ""
208+msgstr "Makse viide"
209
210 #. module: account
211 #: selection:account.financial.report,style_overwrite:0
212@@ -5992,7 +6001,7 @@
213 #: code:addons/account/account_invoice.py:91
214 #, python-format
215 msgid "Free Reference"
216-msgstr ""
217+msgstr "Vaba viide"
218
219 #. module: account
220 #: selection:account.aged.trial.balance,result_selection:0
221@@ -6081,7 +6090,7 @@
222 #. module: account
223 #: view:account.invoice:0
224 msgid "(update)"
225-msgstr ""
226+msgstr "(uuenda)"
227
228 #. module: account
229 #: field:account.aged.trial.balance,filter:0
230@@ -7273,7 +7282,7 @@
231 #: field:account.invoice.line,origin:0
232 #: field:report.invoice.created,origin:0
233 msgid "Source Document"
234-msgstr ""
235+msgstr "Alusdokument"
236
237 #. module: account
238 #: help:account.config.settings,company_footer:0
239@@ -10117,7 +10126,7 @@
240 #. module: account
241 #: field:account.invoice,check_total:0
242 msgid "Verification Total"
243-msgstr ""
244+msgstr "Kontrollsumma"
245
246 #. module: account
247 #: report:account.analytic.account.balance:0
248
249=== modified file 'account/i18n/fr.po'
250--- account/i18n/fr.po 2013-01-04 09:39:53 +0000
251+++ account/i18n/fr.po 2013-01-15 10:40:30 +0000
252@@ -7,14 +7,23 @@
253 "Project-Id-Version: OpenERP Server 6.0dev\n"
254 "Report-Msgid-Bugs-To: support@openerp.com\n"
255 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
256+<<<<<<< TREE
257 "PO-Revision-Date: 2013-01-03 13:30+0000\n"
258+=======
259+"PO-Revision-Date: 2013-01-11 08:36+0000\n"
260+>>>>>>> MERGE-SOURCE
261 "Last-Translator: Numérigraphe <Unknown>\n"
262 "Language-Team: \n"
263 "MIME-Version: 1.0\n"
264 "Content-Type: text/plain; charset=UTF-8\n"
265 "Content-Transfer-Encoding: 8bit\n"
266+<<<<<<< TREE
267 "X-Launchpad-Export-Date: 2013-01-04 04:47+0000\n"
268 "X-Generator: Launchpad (build 16393)\n"
269+=======
270+"X-Launchpad-Export-Date: 2013-01-12 05:40+0000\n"
271+"X-Generator: Launchpad (build 16420)\n"
272+>>>>>>> MERGE-SOURCE
273
274 #. module: account
275 #: code:addons/account/wizard/account_fiscalyear_close.py:41
276@@ -233,6 +242,9 @@
277 "which is set after generating opening entries from 'Generate Opening "
278 "Entries'."
279 msgstr ""
280+"Vous devez définir un \"Journal d'écritures de clôture\" pour cet exercice "
281+"qui est utilisé après avoir généré les écritures d'ouverture depuis "
282+"\"Générer les écritures d'ouverture\""
283
284 #. module: account
285 #: field:account.fiscal.position.account,account_src_id:0
286@@ -337,7 +349,7 @@
287 msgstr ""
288 "Le type de compte est utilisé comme indication pour l'utilisateur, ainsi que "
289 "pour créer des rapports comptables spécifiques à certains pays, et enfin "
290-"pour gérer les clotûres d'exercices fiscaux (et établir les écritures "
291+"pour gérer les clôtures d'exercices (et établir les écritures "
292 "correspondantes)"
293
294 #. module: account
295@@ -401,7 +413,7 @@
296 "Installs localized accounting charts to match as closely as possible the "
297 "accounting needs of your company based on your country."
298 msgstr ""
299-"Installez des plans comptable localisés pour correspondre aussi étroitement "
300+"Installe des plans comptables localisés pour correspondre aussi étroitement "
301 "que possible aux besoins comptables de votre entreprise en fonction de votre "
302 "pays."
303
304@@ -556,6 +568,7 @@
305 #: selection:account.invoice.refund,filter_refund:0
306 msgid "Modify: create refund, reconcile and create a new draft invoice"
307 msgstr ""
308+"Modifier : Créer un avoir, le rapprocher et créer une nouvelle facture"
309
310 #. module: account
311 #: help:account.config.settings,tax_calculation_rounding_method:0
312@@ -701,7 +714,7 @@
313 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
314 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
315 msgid "Close a Fiscal Year"
316-msgstr "Clôturer un exercice comptable"
317+msgstr "Fermer un exercice"
318
319 #. module: account
320 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
321@@ -743,7 +756,7 @@
322 msgid ""
323 "Specified journal does not have any account move entries in draft state for "
324 "this period."
325-msgstr ""
326+msgstr "Ce journal n'a pas d'écriture brouillon pour cette période."
327
328 #. module: account
329 #: view:account.fiscal.position:0
330@@ -804,6 +817,8 @@
331 "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
332 "and 'draft' or ''}"
333 msgstr ""
334+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
335+"and 'draft' or ''}"
336
337 #. module: account
338 #: view:account.period:0
339@@ -841,6 +856,9 @@
340 "lines for refunds. Leave empty if you don't want to use an analytic account "
341 "on the invoice tax lines by default."
342 msgstr ""
343+"Définissez le compte analytique qui sera utilisé par défaut sur les lignes "
344+"d'avoir. Laissez vide si vous ne voulez pas utiliser de compte analytique "
345+"sur les lignes d'avoir."
346
347 #. module: account
348 #: view:account.account:0
349@@ -861,7 +879,7 @@
350 #. module: account
351 #: view:account.invoice.refund:0
352 msgid "Create Refund"
353-msgstr ""
354+msgstr "Créer avoir"
355
356 #. module: account
357 #: constraint:account.move.line:0
358@@ -905,6 +923,8 @@
359 "Cannot %s invoice which is already reconciled, invoice should be "
360 "unreconciled first. You can only refund this invoice."
361 msgstr ""
362+"Vous ne pouvez pas %s la facture, qui est déjà rapprochée : le rapprochement "
363+"doit d'abord être annulé. Vous pouvez seulement créer un avoir."
364
365 #. module: account
366 #: selection:account.financial.report,display_detail:0
367@@ -1064,6 +1084,8 @@
368 " opening/closing fiscal "
369 "year process."
370 msgstr ""
371+"Impossible d'annuler le rapprochement d'écritures qui ont été générées par "
372+"le processus d'ouverture/de fermeture d'exercice"
373
374 #. module: account
375 #: model:ir.actions.act_window,name:account.action_subscription_form_new
376@@ -1258,7 +1280,7 @@
377 #. module: account
378 #: field:account.journal,with_last_closing_balance:0
379 msgid "Opening With Last Closing Balance"
380-msgstr ""
381+msgstr "Ouverture avec solde de la dernière clôture"
382
383 #. module: account
384 #: help:account.tax.code,notprintable:0
385@@ -1280,7 +1302,7 @@
386 #. module: account
387 #: help:account.fiscalyear.close,fy_id:0
388 msgid "Select a Fiscal year to close"
389-msgstr "Choisissez un exercice comptable à clôturer"
390+msgstr "Choisissez un exercice à fermer"
391
392 #. module: account
393 #: help:account.account.template,user_type:0
394@@ -1294,7 +1316,7 @@
395 #. module: account
396 #: view:account.invoice:0
397 msgid "Refund "
398-msgstr ""
399+msgstr "Avoir "
400
401 #. module: account
402 #: code:addons/account/account_analytic_line.py:90
403@@ -1529,6 +1551,7 @@
404 #, python-format
405 msgid "You can only change currency for Draft Invoice."
406 msgstr ""
407+"Il n'est possible de changer la devise que sur les factures en brouillon."
408
409 #. module: account
410 #: report:account.invoice:0
411@@ -1599,12 +1622,12 @@
412 #. module: account
413 #: field:account.fiscalyear.close.state,fy_id:0
414 msgid "Fiscal Year to Close"
415-msgstr ""
416+msgstr "Exercice à fermer"
417
418 #. module: account
419 #: field:account.config.settings,sale_sequence_prefix:0
420 msgid "Invoice sequence"
421-msgstr ""
422+msgstr "Séquence de facture"
423
424 #. module: account
425 #: model:ir.model,name:account.model_account_entries_report
426@@ -1780,7 +1803,7 @@
427 #: selection:account.fiscalyear,state:0
428 #: selection:account.period,state:0
429 msgid "Closed"
430-msgstr "Clôturé"
431+msgstr "Fermé"
432
433 #. module: account
434 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
435@@ -1904,7 +1927,7 @@
436 #. module: account
437 #: view:ir.sequence:0
438 msgid "Fiscal Year Sequence"
439-msgstr "Séquence pour exercice comptable"
440+msgstr "Séquence pour exercice"
441
442 #. module: account
443 #: field:account.config.settings,group_analytic_accounting:0
444@@ -1947,7 +1970,7 @@
445 #: model:account.payment.term,name:account.account_payment_term_15days
446 #: model:account.payment.term,note:account.account_payment_term_15days
447 msgid "15 Days"
448-msgstr ""
449+msgstr "15 jours"
450
451 #. module: account
452 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
453@@ -1999,7 +2022,7 @@
454 #. module: account
455 #: view:account.open.closed.fiscalyear:0
456 msgid "Cancel Fiscal Year Opening Entries"
457-msgstr ""
458+msgstr "Annuler les écritures d'ouverture d'exercice"
459
460 #. module: account
461 #: report:account.journal.period.print.sale.purchase:0
462@@ -2029,7 +2052,7 @@
463 #. module: account
464 #: field:account.config.settings,module_account_payment:0
465 msgid "Manage payment orders"
466-msgstr ""
467+msgstr "Gérer les ordres de paiement"
468
469 #. module: account
470 #: view:account.period:0
471@@ -2040,7 +2063,7 @@
472 #: view:account.bank.statement:0
473 #: field:account.bank.statement,last_closing_balance:0
474 msgid "Last Closing Balance"
475-msgstr ""
476+msgstr "Dernier solde de clôture"
477
478 #. module: account
479 #: model:ir.model,name:account.model_account_common_journal_report
480@@ -2072,7 +2095,7 @@
481 #: help:account.tax.template,ref_tax_code_id:0
482 #: help:account.tax.template,tax_code_id:0
483 msgid "Use this code for the tax declaration."
484-msgstr ""
485+msgstr "Utiliser ce code pour la déclaration de taxe."
486
487 #. module: account
488 #: help:account.period,special:0
489@@ -2087,7 +2110,7 @@
490 #. module: account
491 #: model:mail.message.subtype,description:account.mt_invoice_validated
492 msgid "Invoice validated"
493-msgstr ""
494+msgstr "Facture validée"
495
496 #. module: account
497 #: field:account.config.settings,module_account_check_writing:0
498@@ -2115,6 +2138,13 @@
499 "useful because it enables you to preview at any time the tax that you owe at "
500 "the start and end of the month or quarter."
501 msgstr ""
502+"Ce menu permet d'imprimer une déclaration fiscale en fonction des factures "
503+"ou des paiements. Sélectionnez une ou plusieurs périodes de l'exercice. Les "
504+"informations requises pour une déclaration fiscale sont générées "
505+"automatiquement par OpenERP grâce aux factures (ou des paiements, dans "
506+"certains pays). Ces données sont mises à jour en temps réel. C'est très "
507+"utile car elle vous permet de prévisualiser à tout moment l'impôt que vous "
508+"devez, au début et à la fin du mois ou du trimestre."
509
510 #. module: account
511 #: code:addons/account/account.py:409
512@@ -2215,6 +2245,8 @@
513 "This journal already contains items for this period, therefore you cannot "
514 "modify its company field."
515 msgstr ""
516+"Ce journal contient des éléments pour cette période, vous ne pouvez donc pas "
517+"modifier le champ \"Société\"."
518
519 #. module: account
520 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
521@@ -2324,14 +2356,14 @@
522 #. module: account
523 #: view:account.fiscalyear.close.state:0
524 msgid "Close Fiscal Year"
525-msgstr ""
526+msgstr "Fermer l'exercice"
527
528 #. module: account
529 #. openerp-web
530 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
531 #, python-format
532 msgid "Journal :"
533-msgstr ""
534+msgstr "Journal :"
535
536 #. module: account
537 #: sql_constraint:account.fiscal.position.tax:0
538@@ -2430,6 +2462,8 @@
539 "If you want the journal should be control at opening/closing, check this "
540 "option"
541 msgstr ""
542+"Si vous voulez que le journal soit contrôlé à l'ouverture / fermeture, "
543+"cochez cette option"
544
545 #. module: account
546 #: view:account.bank.statement:0
547@@ -2521,7 +2555,7 @@
548 #. module: account
549 #: model:res.groups,name:account.group_supplier_inv_check_total
550 msgid "Check Total on supplier invoices"
551-msgstr ""
552+msgstr "Vérifier le total des factures fournisseurs"
553
554 #. module: account
555 #: selection:account.invoice,state:0
556@@ -2545,7 +2579,7 @@
557 "dans OpenERP : \"vue\" ne peut pas avoir d'écritures, \"consolidation\" sont "
558 "des comptes qui peuvent avoir des comptes enfants pour les consolidations "
559 "multi-sociétés, \"à payer/à recevoir\" sont des comptes de partenaires (pour "
560-"les calculs de débit / crédit), \"fermé\" pour les comptes dépréciés."
561+"les calculs de débit / crédit), \"fermé\" pour les comptes obsolètes."
562
563 #. module: account
564 #: view:account.chart.template:0
565@@ -2658,7 +2692,7 @@
566 #: field:accounting.report,fiscalyear_id_cmp:0
567 #: model:ir.model,name:account.model_account_fiscalyear
568 msgid "Fiscal Year"
569-msgstr "Exercice comptable"
570+msgstr "Exercice"
571
572 #. module: account
573 #: help:account.aged.trial.balance,fiscalyear_id:0
574@@ -2677,7 +2711,7 @@
575 #: help:accounting.report,fiscalyear_id:0
576 #: help:accounting.report,fiscalyear_id_cmp:0
577 msgid "Keep empty for all open fiscal year"
578-msgstr "Laisser vide pour tous les exercices fiscaux ouverts"
579+msgstr "Laisser vide pour tous les exercices ouverts"
580
581 #. module: account
582 #: code:addons/account/account.py:653
583@@ -2686,6 +2720,8 @@
584 "You cannot change the type of account from 'Closed' to any other type as it "
585 "contains journal items!"
586 msgstr ""
587+"Impossible de changer le type d'un compte de \"Fermé\" en un autre type car "
588+"il contient des écritures !"
589
590 #. module: account
591 #: field:account.invoice.report,account_line_id:0
592@@ -2725,6 +2761,8 @@
593 "In order to delete a bank statement, you must first cancel it to delete "
594 "related journal items."
595 msgstr ""
596+"Pour pouvoir supprimer un relevé bancaire, vous devez tout d'abord l'annuler "
597+"pour supprimer les enregistrements associés du journal."
598
599 #. module: account
600 #: field:account.invoice.report,payment_term:0
601@@ -2746,7 +2784,7 @@
602 #: code:addons/account/account_move_line.py:578
603 #, python-format
604 msgid "You cannot create journal items on a closed account %s %s."
605-msgstr ""
606+msgstr "Impossible de créer des écritures sur un compte fermé %s %s."
607
608 #. module: account
609 #: field:account.period.close,sure:0
610@@ -3426,7 +3464,7 @@
611 #. module: account
612 #: model:ir.model,name:account.model_account_open_closed_fiscalyear
613 msgid "Choose Fiscal Year"
614-msgstr "Choisissez l'exercice comptable"
615+msgstr "Choisissez l'exercice"
616
617 #. module: account
618 #: view:account.config.settings:0
619@@ -3496,7 +3534,7 @@
620 #. module: account
621 #: field:res.partner,property_supplier_payment_term:0
622 msgid "Supplier Payment Term"
623-msgstr ""
624+msgstr "Conditions de paiement fournisseur"
625
626 #. module: account
627 #: view:account.fiscalyear:0
628@@ -3842,13 +3880,13 @@
629 #: model:ir.actions.act_window,name:account.action_account_period_tree
630 #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
631 msgid "Close a Period"
632-msgstr "Clôturer une période"
633+msgstr "Fermer une période"
634
635 #. module: account
636 #: view:account.bank.statement:0
637 #: field:account.cashbox.line,subtotal_opening:0
638 msgid "Opening Subtotal"
639-msgstr ""
640+msgstr "Sous-total d'ouverture"
641
642 #. module: account
643 #: constraint:account.move.line:0
644@@ -4082,6 +4120,8 @@
645 "There is no fiscal year defined for this date.\n"
646 "Please create one from the configuration of the accounting menu."
647 msgstr ""
648+"Aucun exercice défini à cette date.\n"
649+"Veuillez en créer un dans le menu \"Paramétrage de la comptabilité\""
650
651 #. module: account
652 #: view:account.addtmpl.wizard:0
653@@ -4144,7 +4184,7 @@
654 #. module: account
655 #: model:ir.model,name:account.model_account_journal_cashbox_line
656 msgid "account.journal.cashbox.line"
657-msgstr ""
658+msgstr "account.journal.cashbox.line"
659
660 #. module: account
661 #: model:ir.model,name:account.model_account_partner_reconcile_process
662@@ -4155,8 +4195,8 @@
663 #: view:account.chart:0
664 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
665 msgstr ""
666-"(Si vous ne sélectionnez pas d'exercice comptable, tous les exercices "
667-"comptables ouverts seront pris)"
668+"(Si vous ne sélectionnez pas d'exercice, tous les exercices ouverts seront "
669+"pris)"
670
671 #. module: account
672 #: selection:account.aged.trial.balance,filter:0
673@@ -4523,9 +4563,9 @@
674 "counterpart."
675 msgstr ""
676 "Les bonnes pratiques exigent qu'on utilise un journal dédié aux écritures "
677-"d'ouverture. Notez que celui-ci doit avoir des comptes de crédit et de débit "
678-"définis par défaut, être de type \"Situation\" et avoir une contrepartie "
679-"centralisée."
680+"d'ouverture des exercices. Notez que celui-ci doit avoir des comptes de "
681+"crédit et de débit définis par défaut, être de type \"Situation\" et avoir "
682+"une contrepartie centralisée."
683
684 #. module: account
685 #: view:account.installer:0
686@@ -4634,6 +4674,8 @@
687 "If you put \"%(year)s\" in the prefix, it will be replaced by the current "
688 "year."
689 msgstr ""
690+"Si vous indiquez \"%(year)s\" dans le préfixe, ce sera remplacé par l'année "
691+"actuelle."
692
693 #. module: account
694 #: help:account.account,active:0
695@@ -4745,6 +4787,8 @@
696 "Error!\n"
697 "You cannot create recursive Tax Codes."
698 msgstr ""
699+"Erreur !\n"
700+"Vous ne pouvez pas créer de codes de taxe récursifs."
701
702 #. module: account
703 #: constraint:account.period:0
704@@ -4775,7 +4819,7 @@
705 #. module: account
706 #: field:account.config.settings,purchase_sequence_prefix:0
707 msgid "Supplier invoice sequence"
708-msgstr ""
709+msgstr "Séquence de facture fournisseur"
710
711 #. module: account
712 #: code:addons/account/account_invoice.py:587
713@@ -4806,7 +4850,7 @@
714 #. module: account
715 #: selection:account.journal,type:0
716 msgid "Bank and Checks"
717-msgstr ""
718+msgstr "Banque et chèques"
719
720 #. module: account
721 #: field:account.account.template,note:0
722@@ -4834,7 +4878,7 @@
723 #: view:account.bank.statement:0
724 #: field:account.cashbox.line,subtotal_closing:0
725 msgid "Closing Subtotal"
726-msgstr ""
727+msgstr "Sous-total de clôture"
728
729 #. module: account
730 #: field:account.tax,base_code_id:0
731@@ -4904,7 +4948,7 @@
732 #. module: account
733 #: selection:account.move.line,state:0
734 msgid "Balanced"
735-msgstr ""
736+msgstr "Équilibrée"
737
738 #. module: account
739 #: model:process.node,note:account.process_node_importinvoice0
740@@ -4918,6 +4962,8 @@
741 "There is currently no company without chart of account. The wizard will "
742 "therefore not be executed."
743 msgstr ""
744+"Il n'y a pour l'instant pas de société sans plan comptable. L'assistant ne "
745+"peut donc pas être exécuté."
746
747 #. module: account
748 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
749@@ -4932,7 +4978,7 @@
750 #. module: account
751 #: field:account.invoice,reference_type:0
752 msgid "Payment Reference"
753-msgstr ""
754+msgstr "Référence du paiement"
755
756 #. module: account
757 #: selection:account.financial.report,style_overwrite:0
758@@ -5129,7 +5175,7 @@
759 #. module: account
760 #: view:account.journal:0
761 msgid "Unit Of Currency Definition"
762-msgstr ""
763+msgstr "Définition de l'unité monétaire"
764
765 #. module: account
766 #: help:account.partner.ledger,amount_currency:0
767@@ -5138,6 +5184,8 @@
768 "It adds the currency column on report if the currency differs from the "
769 "company currency."
770 msgstr ""
771+"Il ajoute la colonne devise sur le rapport si la devise est différente de la "
772+"devise de la société."
773
774 #. module: account
775 #: code:addons/account/account.py:3346
776@@ -5222,7 +5270,7 @@
777 #. module: account
778 #: field:account.fiscalyear.close,fy2_id:0
779 msgid "New Fiscal Year"
780-msgstr "Nouvel exercice comptable"
781+msgstr "Nouvel exercice"
782
783 #. module: account
784 #: view:account.invoice:0
785@@ -5240,7 +5288,7 @@
786 #. module: account
787 #: help:account.config.settings,expects_chart_of_accounts:0
788 msgid "Check this box if this company is a legal entity."
789-msgstr ""
790+msgstr "Cochez cette case si cette société est une personne morale."
791
792 #. module: account
793 #: model:account.account.type,name:account.conf_account_type_chk
794@@ -5407,7 +5455,7 @@
795 #: view:account.bank.statement:0
796 #: field:account.journal,cash_control:0
797 msgid "Cash Control"
798-msgstr ""
799+msgstr "Contrôle de caisse"
800
801 #. module: account
802 #: field:account.analytic.balance,date2:0
803@@ -5437,7 +5485,7 @@
804 #: code:addons/account/account_cash_statement.py:301
805 #, python-format
806 msgid "There is no %s Account on the journal %s."
807-msgstr ""
808+msgstr "Il n'y a pas de compte %s dans le journal %s."
809
810 #. module: account
811 #: model:res.groups,name:account.group_account_user
812@@ -5725,6 +5773,7 @@
813 msgid ""
814 "Cannot find a chart of accounts for this company, you should create one."
815 msgstr ""
816+"Plan comptable introuvable pour cette société : vous devez en créer un."
817
818 #. module: account
819 #: selection:account.analytic.journal,type:0
820@@ -5763,6 +5812,15 @@
821 msgstr "Montant"
822
823 #. module: account
824+<<<<<<< TREE
825+=======
826+#: code:addons/account/wizard/account_fiscalyear_close.py:41
827+#, python-format
828+msgid "End of Fiscal Year Entry"
829+msgstr "Écriture de fin d'exercice"
830+
831+#. module: account
832+>>>>>>> MERGE-SOURCE
833 #: model:process.transition,name:account.process_transition_customerinvoice0
834 #: model:process.transition,name:account.process_transition_paymentorderreconcilation0
835 #: model:process.transition,name:account.process_transition_statemententries0
836@@ -5882,6 +5940,8 @@
837 #, python-format
838 msgid "You can not add/modify entries in a closed period %s of journal %s."
839 msgstr ""
840+"Impossible d'ajouter/modifier des écritures dans une période fermée %s du "
841+"journal %s."
842
843 #. module: account
844 #: view:account.journal:0
845@@ -6121,7 +6181,7 @@
846 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
847 #, python-format
848 msgid "You must set a period length greater than 0."
849-msgstr ""
850+msgstr "Vous devez indiquer une longueur de période supérieure à 0."
851
852 #. module: account
853 #: view:account.fiscal.position.template:0
854@@ -6423,7 +6483,7 @@
855 #. module: account
856 #: field:account.journal,loss_account_id:0
857 msgid "Loss Account"
858-msgstr ""
859+msgstr "Compte de perte"
860
861 #. module: account
862 #: field:account.tax,account_collected_id:0
863@@ -6698,7 +6758,7 @@
864 #. module: account
865 #: help:account.fiscalyear.close.state,fy_id:0
866 msgid "Select a fiscal year to close"
867-msgstr "Choisissez un exercice à clôturer"
868+msgstr "Choisissez un exercice à fermer"
869
870 #. module: account
871 #: help:account.chart.template,tax_template_ids:0
872@@ -6719,7 +6779,7 @@
873 #: field:account.chart,fiscalyear:0
874 #: view:account.fiscalyear:0
875 msgid "Fiscal year"
876-msgstr "Exercice comptable"
877+msgstr "Exercice"
878
879 #. module: account
880 #: view:account.move.reconcile:0
881@@ -6779,7 +6839,7 @@
882 #. module: account
883 #: constraint:account.move.line:0
884 msgid "You cannot create journal items on closed account."
885-msgstr "Vous ne pouvez pas créer d'écriture sur un compte clos"
886+msgstr "Vous ne pouvez pas créer d'écriture sur un compte fermé."
887
888 #. module: account
889 #: code:addons/account/account_invoice.py:610
890@@ -6807,7 +6867,7 @@
891 #: code:addons/account/installer.py:48
892 #, python-format
893 msgid "Custom"
894-msgstr ""
895+msgstr "Personnalisé"
896
897 #. module: account
898 #: view:account.analytic.account:0
899@@ -6828,7 +6888,7 @@
900 #. module: account
901 #: field:account.journal,internal_account_id:0
902 msgid "Internal Transfers Account"
903-msgstr ""
904+msgstr "Compte de transferts internes"
905
906 #. module: account
907 #: code:addons/account/wizard/pos_box.py:33
908@@ -6876,7 +6936,7 @@
909 #. module: account
910 #: field:account.bank.statement,difference:0
911 msgid "Difference"
912-msgstr ""
913+msgstr "Différence"
914
915 #. module: account
916 #: help:account.tax,include_base_amount:0
917@@ -6948,12 +7008,12 @@
918 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
919 #, python-format
920 msgid "User Error!"
921-msgstr ""
922+msgstr "Erreur utilisateur !"
923
924 #. module: account
925 #: view:account.open.closed.fiscalyear:0
926 msgid "Discard"
927-msgstr ""
928+msgstr "Annuler"
929
930 #. module: account
931 #: selection:account.account,type:0
932@@ -6971,7 +7031,7 @@
933 #. module: account
934 #: field:account.config.settings,has_default_company:0
935 msgid "Has default company"
936-msgstr ""
937+msgstr "A une société par défaut"
938
939 #. module: account
940 #: view:account.fiscalyear.close:0
941@@ -6980,7 +7040,7 @@
942 "year. Note that you can run this wizard many times for the same fiscal year: "
943 "it will simply replace the old opening entries with the new ones."
944 msgstr ""
945-"Cet assistant génère les écritures de fin d'exercice pour l'année fiscale "
946+"Cet assistant génère les écritures de fin d'exercice pour l'exercice "
947 "sélectionnée. Il peut être utilisé plusieurs fois pour le même exercice : il "
948 " remplacera alors les anciennes écritures par les nouvelles."
949
950@@ -7330,7 +7390,7 @@
951 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
952 #, python-format
953 msgid "You must set a start date."
954-msgstr ""
955+msgstr "Vous devez indiquer une date de début."
956
957 #. module: account
958 #: view:account.automatic.reconcile:0
959@@ -7378,7 +7438,7 @@
960 #: code:addons/account/wizard/account_invoice_refund.py:147
961 #, python-format
962 msgid "No period found on the invoice."
963-msgstr ""
964+msgstr "Aucune période trouvée sur la facture."
965
966 #. module: account
967 #: help:account.partner.ledger,page_split:0
968@@ -7513,6 +7573,8 @@
969 "Configuration error!\n"
970 "The currency chosen should be shared by the default accounts too."
971 msgstr ""
972+"Erreur de paramétrage !\n"
973+"La devise choisie doit être également partagée par les comptes par défaut."
974
975 #. module: account
976 #: code:addons/account/account.py:2256
977@@ -7562,6 +7624,8 @@
978 "Error!\n"
979 "The start date of a fiscal year must precede its end date."
980 msgstr ""
981+"Erreur !\n"
982+"La date de début d'un exercice doit précéder sa date de fin."
983
984 #. module: account
985 #: view:account.tax.template:0
986@@ -7652,7 +7716,7 @@
987 #. module: account
988 #: field:account.analytic.line,currency_id:0
989 msgid "Account Currency"
990-msgstr ""
991+msgstr "Devise du compte"
992
993 #. module: account
994 #: report:account.invoice:0
995@@ -7718,7 +7782,7 @@
996 #. module: account
997 #: view:account.invoice:0
998 msgid "Customer Reference"
999-msgstr ""
1000+msgstr "Référence client"
1001
1002 #. module: account
1003 #: field:account.account.template,parent_id:0
1004@@ -7775,7 +7839,7 @@
1005 #. module: account
1006 #: field:account.config.settings,purchase_tax_rate:0
1007 msgid "Purchase tax (%)"
1008-msgstr ""
1009+msgstr "Taxe d'achat (%)"
1010
1011 #. module: account
1012 #: help:res.partner,credit:0
1013@@ -7816,7 +7880,7 @@
1014 msgstr ""
1015 "Cochez cette case pour indiquer que chaque écriture de ce journal ne créera "
1016 "pas une nouvelle contrepartie, mais partagera la même contrepartie. Cela est "
1017-"utilisé dans la clôture des exercices comptables."
1018+"utilisé dans la clôture des exercices."
1019
1020 #. module: account
1021 #: field:account.bank.statement,closing_date:0
1022@@ -7878,7 +7942,7 @@
1023 #. module: account
1024 #: model:ir.model,name:account.model_cash_box_out
1025 msgid "cash.box.out"
1026-msgstr ""
1027+msgstr "cash.box.out"
1028
1029 #. module: account
1030 #: help:account.config.settings,currency_id:0
1031@@ -8165,7 +8229,7 @@
1032 #. module: account
1033 #: field:account.fiscalyear.close,fy_id:0
1034 msgid "Fiscal Year to close"
1035-msgstr "Exercice comptable à clôturer"
1036+msgstr "Exercice à fermer"
1037
1038 #. module: account
1039 #: view:account.invoice.cancel:0
1040@@ -8304,11 +8368,13 @@
1041 "Error!\n"
1042 "You cannot create recursive accounts."
1043 msgstr ""
1044+"Erreur !\n"
1045+"Vous ne pouvez pas créer de comptes récursifs."
1046
1047 #. module: account
1048 #: model:ir.model,name:account.model_cash_box_in
1049 msgid "cash.box.in"
1050-msgstr ""
1051+msgstr "cash.box.in"
1052
1053 #. module: account
1054 #: help:account.invoice,move_id:0
1055@@ -8318,7 +8384,7 @@
1056 #. module: account
1057 #: model:ir.model,name:account.model_account_config_settings
1058 msgid "account.config.settings"
1059-msgstr ""
1060+msgstr "account.config.settings"
1061
1062 #. module: account
1063 #: selection:account.config.settings,period:0
1064@@ -8341,7 +8407,7 @@
1065 #: code:addons/account/static/src/js/account_move_reconciliation.js:89
1066 #, python-format
1067 msgid "You must choose at least one record."
1068-msgstr ""
1069+msgstr "Vous devez sélectionner au moins un enregistrement."
1070
1071 #. module: account
1072 #: field:account.account,parent_id:0
1073@@ -8353,7 +8419,7 @@
1074 #: code:addons/account/account_cash_statement.py:292
1075 #, python-format
1076 msgid "Profit"
1077-msgstr ""
1078+msgstr "Bénéfice"
1079
1080 #. module: account
1081 #: help:account.payment.term.line,days2:0
1082@@ -8430,7 +8496,7 @@
1083 #: help:account.bank.statement,message_unread:0
1084 #: help:account.invoice,message_unread:0
1085 msgid "If checked new messages require your attention."
1086-msgstr ""
1087+msgstr "Si coché, de nouveaux messages demandent votre attention."
1088
1089 #. module: account
1090 #: field:res.company,tax_calculation_rounding_method:0
1091@@ -8505,8 +8571,8 @@
1092 "Select Fiscal Year which you want to remove entries for its End of year "
1093 "entries journal"
1094 msgstr ""
1095-"Sélectionnez l'exercice comptable pour lequel vous voulez effacer des "
1096-"écritures"
1097+"Sélectionnez l'exercice pour lequel vous voulez effacer les écritures de fin "
1098+"d'exercice"
1099
1100 #. module: account
1101 #: field:account.tax.template,type_tax_use:0
1102@@ -8555,6 +8621,7 @@
1103 msgid ""
1104 "Is this reconciliation produced by the opening of a new fiscal year ?."
1105 msgstr ""
1106+"Ce rapprochement est-il produit par l'ouverture d'un nouvel exercice ?"
1107
1108 #. module: account
1109 #: view:account.analytic.line:0
1110@@ -8588,7 +8655,7 @@
1111 #. module: account
1112 #: view:account.bank.statement:0
1113 msgid "Opening Cash Control"
1114-msgstr ""
1115+msgstr "Contrôle d'ouverture de caisse"
1116
1117 #. module: account
1118 #: model:process.node,note:account.process_node_invoiceinvoice0
1119@@ -8628,7 +8695,7 @@
1120 #. module: account
1121 #: view:account.config.settings:0
1122 msgid "No Fiscal Year Defined for This Company"
1123-msgstr ""
1124+msgstr "Aucun exercice défini pour cette société"
1125
1126 #. module: account
1127 #: view:account.invoice:0
1128@@ -8659,7 +8726,7 @@
1129 #: code:addons/account/account.py:1297
1130 #, python-format
1131 msgid "Please define a sequence on the journal."
1132-msgstr ""
1133+msgstr "Veuillez définir une séquence sur ce journal."
1134
1135 #. module: account
1136 #: help:account.tax.template,amount:0
1137@@ -8732,7 +8799,7 @@
1138 #: code:addons/account/wizard/account_report_common.py:158
1139 #, python-format
1140 msgid "Select a starting and an ending period."
1141-msgstr ""
1142+msgstr "Sélectionnez une période de début et de fin."
1143
1144 #. module: account
1145 #: field:account.config.settings,sale_sequence_next:0
1146@@ -8781,6 +8848,9 @@
1147 "This wizard will remove the end of year journal entries of selected fiscal "
1148 "year. Note that you can run this wizard many times for the same fiscal year."
1149 msgstr ""
1150+"Cet assistant va supprimer les écritures de fermeture de l'exercice "
1151+"sélectionné. Notez que vous pouvez exécuter l'assistant plusieurs fois "
1152+"reprises pour le même exercice."
1153
1154 #. module: account
1155 #: report:account.invoice:0
1156@@ -8831,7 +8901,7 @@
1157 #. module: account
1158 #: field:account.journal,centralisation:0
1159 msgid "Centralized Counterpart"
1160-msgstr ""
1161+msgstr "Contrepartie centralisée"
1162
1163 #. module: account
1164 #: help:account.move.line,blocked:0
1165@@ -8878,7 +8948,7 @@
1166 #: code:addons/account/account_invoice.py:389
1167 #, python-format
1168 msgid "Unknown Error!"
1169-msgstr ""
1170+msgstr "Erreur inconnue !"
1171
1172 #. module: account
1173 #: model:ir.model,name:account.model_account_move_bank_reconcile
1174@@ -8888,7 +8958,7 @@
1175 #. module: account
1176 #: view:account.config.settings:0
1177 msgid "Apply"
1178-msgstr ""
1179+msgstr "Appliquer"
1180
1181 #. module: account
1182 #: field:account.financial.report,account_type_ids:0
1183@@ -8973,7 +9043,7 @@
1184 #. module: account
1185 #: model:ir.model,name:account.model_account_fiscalyear_close_state
1186 msgid "Fiscalyear Close state"
1187-msgstr "État fermé de l'exercice comptable"
1188+msgstr "Fermeture d'exercice comptable"
1189
1190 #. module: account
1191 #: field:account.invoice.refund,journal_id:0
1192@@ -8996,7 +9066,7 @@
1193 msgid ""
1194 "In order to close a period, you must first post related journal entries."
1195 msgstr ""
1196-"Afin de pouvoir clôturer la période, vous devez préalablement valider les "
1197+"Afin de pouvoir fermer la période, vous devez préalablement valider les "
1198 "écritures de cette période."
1199
1200 #. module: account
1201@@ -9101,7 +9171,7 @@
1202 #. module: account
1203 #: model:ir.model,name:account.model_account_fiscalyear_close
1204 msgid "Fiscalyear Close"
1205-msgstr "Clôture de l'exercice comptable"
1206+msgstr "Fermeture de l'exercice comptable"
1207
1208 #. module: account
1209 #: sql_constraint:account.account:0
1210@@ -9150,7 +9220,7 @@
1211 #. module: account
1212 #: field:account.config.settings,sale_tax_rate:0
1213 msgid "Sales tax (%)"
1214-msgstr ""
1215+msgstr "Taxe de vente (%)"
1216
1217 #. module: account
1218 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
1219@@ -9241,7 +9311,7 @@
1220 #. module: account
1221 #: help:account.chart,fiscalyear:0
1222 msgid "Keep empty for all open fiscal years"
1223-msgstr "Conserver vide pour tous les exercices comptables ouverts"
1224+msgstr "Laissez vide pour tous les exercices comptables ouverts"
1225
1226 #. module: account
1227 #: help:account.move.line,amount_currency:0
1228@@ -9392,7 +9462,7 @@
1229 #: field:account.bank.statement,message_is_follower:0
1230 #: field:account.invoice,message_is_follower:0
1231 msgid "Is a Follower"
1232-msgstr ""
1233+msgstr "Est abonné"
1234
1235 #. module: account
1236 #: view:account.move:0
1237@@ -9412,7 +9482,7 @@
1238 #. module: account
1239 #: field:account.config.settings,has_fiscal_year:0
1240 msgid "Company has a fiscal year"
1241-msgstr ""
1242+msgstr "La société a un exercice"
1243
1244 #. module: account
1245 #: help:account.tax,child_depend:0
1246@@ -9428,7 +9498,7 @@
1247 #: code:addons/account/account.py:634
1248 #, python-format
1249 msgid "You cannot deactivate an account that contains journal items."
1250-msgstr ""
1251+msgstr "Vous ne pouvez pas désactiver un compte contenant des écritures."
1252
1253 #. module: account
1254 #: selection:account.tax,applicable_type:0
1255@@ -9504,7 +9574,7 @@
1256 #. module: account
1257 #: view:account.fiscalyear.close.state:0
1258 msgid "Close states of Fiscal year and periods"
1259-msgstr "Fermer les états de l'exercice comptable et des périodes"
1260+msgstr "Fermer des exercices et des périodes"
1261
1262 #. module: account
1263 #: field:account.config.settings,purchase_refund_journal_id:0
1264@@ -9793,7 +9863,7 @@
1265 #. module: account
1266 #: view:account.fiscalyear.close:0
1267 msgid "Generate Fiscal Year Opening Entries"
1268-msgstr "Générer les écritures d'ouvertures d'exercice comptable"
1269+msgstr "Générer les écritures d'ouverture d'exercice"
1270
1271 #. module: account
1272 #: report:account.third_party_ledger:0
1273@@ -9830,7 +9900,7 @@
1274 #: code:addons/account/wizard/account_period_close.py:51
1275 #, python-format
1276 msgid "Invalid Action!"
1277-msgstr "Action invalide!"
1278+msgstr "Action incorrecte !"
1279
1280 #. module: account
1281 #: view:account.bank.statement:0
1282@@ -9853,7 +9923,10 @@
1283 "Error!\n"
1284 "The period is invalid. Either some periods are overlapping or the period's "
1285 "dates are not matching the scope of the fiscal year."
1286-msgstr "Erreur !"
1287+msgstr ""
1288+"Erreur !\n"
1289+"Cette période est incorrecte. Soit des périodes se chevauchent, soit les "
1290+"dates des périodes sont en dehors des dates de l'exercice."
1291
1292 #. module: account
1293 #: report:account.overdue:0
1294@@ -9889,6 +9962,8 @@
1295 "This field contains the information related to the numbering of the journal "
1296 "entries of this journal."
1297 msgstr ""
1298+"Cet champ contient les informations relatives à la numérotation des "
1299+"écritures de ce journal."
1300
1301 #. module: account
1302 #: field:account.invoice,sent:0
1303@@ -10000,13 +10075,13 @@
1304 #: model:account.payment.term,name:account.account_payment_term_immediate
1305 #: model:account.payment.term,note:account.account_payment_term_immediate
1306 msgid "Immediate Payment"
1307-msgstr ""
1308+msgstr "Paiement immédiat"
1309
1310 #. module: account
1311 #: code:addons/account/account.py:1464
1312 #, python-format
1313 msgid " Centralisation"
1314-msgstr ""
1315+msgstr " Centralisation"
1316
1317 #. module: account
1318 #: help:account.journal,type:0
1319@@ -10017,12 +10092,12 @@
1320 "journals. Select 'Opening/Closing Situation' for entries generated for new "
1321 "fiscal years."
1322 msgstr ""
1323-"Sélectionnez 'Vente' pour le journal de ventes. Sélectionnez 'Achats' pour "
1324-"le journal des achats. Sélectionnez 'Caisse' ou 'Banque' pour les journaux "
1325-"qui sont utilisés dans les règlements des clients ou des fournisseurs. "
1326-"Sélectionnez 'Général' pour les journaux d' opérations diverses. "
1327-"Sélectionnez 'Ouverture / Fermeture' pour les journaux qui contiendront les "
1328-"écritures générées lors des nouveaux exercices."
1329+"Sélectionnez \"Vente\" pour le journal de ventes. Sélectionnez \"Achats\" "
1330+"pour le journal des achats. Sélectionnez \"Caisse\" ou \"Banque\" pour les "
1331+"journaux qui sont utilisés dans les règlements des clients ou des "
1332+"fournisseurs. Sélectionnez \"Général\" pour les journaux d'opérations "
1333+"diverses. Sélectionnez \"Ouverture / Fermeture\" pour les journaux qui "
1334+"contiendront les écritures générées lors des nouveaux exercices."
1335
1336 #. module: account
1337 #: view:account.subscription:0
1338@@ -10122,14 +10197,14 @@
1339 "want to lock this period for tax related calculation."
1340 msgstr ""
1341 "Une période est une durée pendant laquelle les écritures comptables doivent "
1342-"être enregistrées dans la comptabilité des activités connexes. La période "
1343-"mensuelle est la norme, mais en fonction de votre pays ou de besoins de "
1344-"l'entreprise, vous pouvez aussi avoir des périodes trimestrielles. Après la "
1345-"fermeture d'une période, il sera impossible d'enregistrer de nouvelles "
1346-"écritures comptables, toutes les nouvelles saisies doivent être faites sur "
1347-"la période suivante ouverte. Fermez une période si vous ne souhaitez plus "
1348-"enregistrer de nouvelles entrées et que vous souhaitez verrouiller cette "
1349-"période pour le calcul des taxes."
1350+"être enregistrées pour la comptabilité des activités. La période mensuelle "
1351+"est la norme, mais en fonction de votre pays ou des besoins de l'entreprise, "
1352+"vous pouvez aussi avoir des périodes trimestrielles. Après la fermeture "
1353+"d'une période, il sera impossible d'enregistrer de nouvelles écritures "
1354+"comptables : toutes les nouvelles saisies doivent être faites sur la période "
1355+"ouverte suivante . Fermez une période si vous ne souhaitez plus enregistrer "
1356+"de nouvelles écritures et que vous souhaitez verrouiller cette période pour "
1357+"le calcul des taxes."
1358
1359 #. module: account
1360 #: view:account.analytic.account:0
1361@@ -10151,7 +10226,7 @@
1362 #. module: account
1363 #: view:account.installer:0
1364 msgid "Configure your Fiscal Year"
1365-msgstr "Paramétrer votre année fiscale"
1366+msgstr "Paramétrer votre exercice"
1367
1368 #. module: account
1369 #: field:account.period,name:0
1370@@ -10527,7 +10602,7 @@
1371 #. module: account
1372 #: view:ir.sequence:0
1373 msgid "Fiscal Year Sequences"
1374-msgstr "Séquences des exercices comptables"
1375+msgstr "Séquences des exercices"
1376
1377 #. module: account
1378 #: selection:account.financial.report,display_detail:0
1379@@ -10865,12 +10940,12 @@
1380 "payable/receivable are for partners accounts (for debit/credit "
1381 "computations), closed for depreciated accounts."
1382 msgstr ""
1383-"Le 'type interne' est utilisé pour des caractéristiques disponibles sur "
1384+"Le \"Type interne\" est utilisé pour des caractéristiques disponibles sur "
1385 "différents types de comptes : la saisie d'écritures est impossible dans les "
1386-"comptes de 'vue', 'consolidation' doit être utilisé dans des environnements "
1387-"multi-sociétés nécessitant la consolidation des résultats, "
1388-"'clients/fournisseurs' pour les comptes de tiers, 'clôturé' pour les comptes "
1389-"fermés."
1390+"comptes \"Vue\", \"Consolidation\" doit être utilisé dans des "
1391+"environnements multi-sociétés nécessitant la consolidation des résultats, "
1392+"\"Clients/fournisseurs\" pour les comptes de tiers, \"Fermé\" pour les "
1393+"comptes obsolètes."
1394
1395 #. module: account
1396 #: selection:account.balance.report,display_account:0
1397@@ -11174,7 +11249,7 @@
1398 #: view:ir.sequence:0
1399 #: model:ir.ui.menu,name:account.menu_action_account_fiscalyear
1400 msgid "Fiscal Years"
1401-msgstr "Exercices comptables"
1402+msgstr "Exercices"
1403
1404 #. module: account
1405 #: help:account.analytic.journal,active:0
1406@@ -11272,7 +11347,7 @@
1407 #. module: account
1408 #: field:res.partner,property_payment_term:0
1409 msgid "Customer Payment Term"
1410-msgstr ""
1411+msgstr "Conditions de paiement client"
1412
1413 #. module: account
1414 #: help:accounting.report,label_filter:0
1415
1416=== modified file 'account/i18n/it.po'
1417--- account/i18n/it.po 2013-01-13 04:38:12 +0000
1418+++ account/i18n/it.po 2013-01-15 10:40:30 +0000
1419@@ -7,14 +7,25 @@
1420 "Project-Id-Version: OpenERP Server 6.0dev\n"
1421 "Report-Msgid-Bugs-To: support@openerp.com\n"
1422 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
1423+<<<<<<< TREE
1424 "PO-Revision-Date: 2013-01-12 08:31+0000\n"
1425 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
1426 "Language-Team: \n"
1427+=======
1428+"PO-Revision-Date: 2013-01-07 23:55+0000\n"
1429+"Last-Translator: Sergio Corato <Unknown>\n"
1430+"Language-Team: Italian <it@li.org>\n"
1431+>>>>>>> MERGE-SOURCE
1432 "MIME-Version: 1.0\n"
1433 "Content-Type: text/plain; charset=UTF-8\n"
1434 "Content-Transfer-Encoding: 8bit\n"
1435+<<<<<<< TREE
1436 "X-Launchpad-Export-Date: 2013-01-13 04:38+0000\n"
1437 "X-Generator: Launchpad (build 16420)\n"
1438+=======
1439+"X-Launchpad-Export-Date: 2013-01-08 06:05+0000\n"
1440+"X-Generator: Launchpad (build 16402)\n"
1441+>>>>>>> MERGE-SOURCE
1442
1443 #. module: account
1444 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
1445
1446=== modified file 'account/i18n/mn.po'
1447--- account/i18n/mn.po 2013-01-04 09:39:53 +0000
1448+++ account/i18n/mn.po 2013-01-15 10:40:30 +0000
1449@@ -8,14 +8,24 @@
1450 "Project-Id-Version: openobject-addons\n"
1451 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1452 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
1453+<<<<<<< TREE
1454 "PO-Revision-Date: 2012-08-07 07:42+0000\n"
1455 "Last-Translator: gobi <Unknown>\n"
1456+=======
1457+"PO-Revision-Date: 2013-01-11 09:46+0000\n"
1458+"Last-Translator: erdenebold <erdenebold10@gmail.com>\n"
1459+>>>>>>> MERGE-SOURCE
1460 "Language-Team: Mongolian <mn@li.org>\n"
1461 "MIME-Version: 1.0\n"
1462 "Content-Type: text/plain; charset=UTF-8\n"
1463 "Content-Transfer-Encoding: 8bit\n"
1464+<<<<<<< TREE
1465 "X-Launchpad-Export-Date: 2012-12-22 05:32+0000\n"
1466 "X-Generator: Launchpad (build 16378)\n"
1467+=======
1468+"X-Launchpad-Export-Date: 2013-01-12 05:40+0000\n"
1469+"X-Generator: Launchpad (build 16420)\n"
1470+>>>>>>> MERGE-SOURCE
1471
1472 #. module: account
1473 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
1474@@ -370,7 +380,7 @@
1475 #. module: account
1476 #: help:account.config.settings,group_analytic_accounting:0
1477 msgid "Allows you to use the analytic accounting."
1478-msgstr ""
1479+msgstr "Та аналитик данс хэрэглэхийг зөвшөөрөх."
1480
1481 #. module: account
1482 #: view:account.invoice:0
1483@@ -623,7 +633,7 @@
1484 #. module: account
1485 #: field:ir.sequence,fiscal_ids:0
1486 msgid "Sequences"
1487-msgstr "Дараалал"
1488+msgstr "Дарааллууд"
1489
1490 #. module: account
1491 #: field:account.financial.report,account_report_id:0
1492@@ -767,7 +777,7 @@
1493 #. module: account
1494 #: model:ir.model,name:account.model_account_report_general_ledger
1495 msgid "General Ledger Report"
1496-msgstr "Ерөнхий дэвтэр"
1497+msgstr "Ерөнхий тайлан"
1498
1499 #. module: account
1500 #: view:account.invoice:0
1501@@ -783,7 +793,7 @@
1502 #: code:addons/account/account_invoice.py:1329
1503 #, python-format
1504 msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
1505-msgstr ""
1506+msgstr "Хэсэгчлэн төлсөн нэхэмжлэл: %s %s of %s%s (%s%s үлдэгдэл)."
1507
1508 #. module: account
1509 #: view:account.invoice:0
1510@@ -876,7 +886,7 @@
1511 #: code:addons/account/account_move_line.py:854
1512 #, python-format
1513 msgid "Entry is already reconciled."
1514-msgstr ""
1515+msgstr "Аль хэдийн зассан бичилт"
1516
1517 #. module: account
1518 #: view:account.move.line.unreconcile.select:0
1519@@ -888,7 +898,7 @@
1520 #. module: account
1521 #: model:ir.model,name:account.model_account_analytic_journal_report
1522 msgid "Account Analytic Journal"
1523-msgstr "Аналитик журнал"
1524+msgstr "Аналитик дансны журнал"
1525
1526 #. module: account
1527 #: view:account.invoice:0
1528
1529=== modified file 'account/i18n/nl.po'
1530--- account/i18n/nl.po 2013-01-04 09:39:53 +0000
1531+++ account/i18n/nl.po 2013-01-15 10:40:30 +0000
1532@@ -7,14 +7,25 @@
1533 "Project-Id-Version: OpenERP Server 6.0dev\n"
1534 "Report-Msgid-Bugs-To: support@openerp.com\n"
1535 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
1536+<<<<<<< TREE
1537 "PO-Revision-Date: 2012-12-20 20:11+0000\n"
1538 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
1539 "Language-Team: \n"
1540+=======
1541+"PO-Revision-Date: 2013-01-07 13:27+0000\n"
1542+"Last-Translator: Leen Sonneveld <leen.sonneveld@opensol.nl>\n"
1543+"Language-Team: Dutch <nl@li.org>\n"
1544+>>>>>>> MERGE-SOURCE
1545 "MIME-Version: 1.0\n"
1546 "Content-Type: text/plain; charset=UTF-8\n"
1547 "Content-Transfer-Encoding: 8bit\n"
1548+<<<<<<< TREE
1549 "X-Launchpad-Export-Date: 2012-12-22 05:29+0000\n"
1550 "X-Generator: Launchpad (build 16378)\n"
1551+=======
1552+"X-Launchpad-Export-Date: 2013-01-08 06:04+0000\n"
1553+"X-Generator: Launchpad (build 16402)\n"
1554+>>>>>>> MERGE-SOURCE
1555
1556 #, python-format
1557 #~ msgid "Integrity Error !"
1558@@ -479,7 +490,7 @@
1559 #. module: account
1560 #: help:account.bank.statement.line,name:0
1561 msgid "Originator to Beneficiary Information"
1562-msgstr ""
1563+msgstr "Opdrachtgever aan begunstigde Informatie"
1564
1565 #. module: account
1566 #. openerp-web
1567@@ -1311,6 +1322,18 @@
1568 " </p>\n"
1569 " "
1570 msgstr ""
1571+"<p class=\"oe_view_nocontent_create\">\n"
1572+" Klik om een nieuw kasregister aan te maken.\n"
1573+" </p><p>\n"
1574+" Met aan kasregister kunt u in- en uitgaven in uw kas "
1575+"journaal\n"
1576+" beheren. HIermee kunt u eenvoudig de dagelijkse "
1577+"kassabetalingen\n"
1578+" volgen. U kunt het kasgeld dat in de kassa zit invoeren en "
1579+"daarna\n"
1580+" registreren wanneer geld de kassa in of uitgaat.\n"
1581+" </p>\n"
1582+" "
1583
1584 #. module: account
1585 #: model:account.account.type,name:account.data_account_type_bank
1586@@ -2214,7 +2237,7 @@
1587 " Een bankafschrift is een samenvatting van alle financiele "
1588 "transacties\n"
1589 " van een bankrekening gedurende een bepaalde periode.\n"
1590-" U ontvangt deze periodieke van uw bank.\n"
1591+" U ontvangt deze periodiek van uw bank.\n"
1592 " </p><p>\n"
1593 " Met OpenERP kunt u de bankafschriften direct afletteren\n"
1594 " met de gerelateerde in- en verkoopfacturen.\n"
1595
1596=== modified file 'account/i18n/pt.po'
1597--- account/i18n/pt.po 2013-01-04 09:39:53 +0000
1598+++ account/i18n/pt.po 2013-01-15 10:40:30 +0000
1599@@ -7,14 +7,25 @@
1600 "Project-Id-Version: OpenERP Server 6.0dev\n"
1601 "Report-Msgid-Bugs-To: support@openerp.com\n"
1602 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
1603+<<<<<<< TREE
1604 "PO-Revision-Date: 2012-12-18 15:21+0000\n"
1605 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
1606 "Language-Team: \n"
1607+=======
1608+"PO-Revision-Date: 2013-01-08 17:44+0000\n"
1609+"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
1610+"Language-Team: Portuguese <pt@li.org>\n"
1611+>>>>>>> MERGE-SOURCE
1612 "MIME-Version: 1.0\n"
1613 "Content-Type: text/plain; charset=UTF-8\n"
1614 "Content-Transfer-Encoding: 8bit\n"
1615+<<<<<<< TREE
1616 "X-Launchpad-Export-Date: 2012-12-22 05:33+0000\n"
1617 "X-Generator: Launchpad (build 16378)\n"
1618+=======
1619+"X-Launchpad-Export-Date: 2013-01-09 05:52+0000\n"
1620+"X-Generator: Launchpad (build 16412)\n"
1621+>>>>>>> MERGE-SOURCE
1622
1623 #. module: account
1624 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
1625@@ -1105,7 +1116,7 @@
1626 #. module: account
1627 #: view:account.config.settings:0
1628 msgid "Features"
1629-msgstr ""
1630+msgstr "Funcionalidades"
1631
1632 #. module: account
1633 #: code:addons/account/account.py:2298
1634@@ -1540,7 +1551,7 @@
1635 #: code:addons/account/account.py:768
1636 #, python-format
1637 msgid "%s (copy)"
1638-msgstr ""
1639+msgstr "%s (cópia)"
1640
1641 #. module: account
1642 #: selection:account.balance.report,display_account:0
1643@@ -1609,7 +1620,7 @@
1644 #: code:addons/account/wizard/account_report_common.py:164
1645 #, python-format
1646 msgid "Not implemented."
1647-msgstr ""
1648+msgstr "Não foi implementado."
1649
1650 #. module: account
1651 #: view:account.invoice.refund:0
1652@@ -1830,7 +1841,7 @@
1653 #: model:account.payment.term,name:account.account_payment_term_15days
1654 #: model:account.payment.term,note:account.account_payment_term_15days
1655 msgid "15 Days"
1656-msgstr ""
1657+msgstr "15 dias"
1658
1659 #. module: account
1660 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
1661@@ -9238,7 +9249,7 @@
1662 #: field:account.bank.statement,message_is_follower:0
1663 #: field:account.invoice,message_is_follower:0
1664 msgid "Is a Follower"
1665-msgstr ""
1666+msgstr "É um seguidor"
1667
1668 #. module: account
1669 #: view:account.move:0
1670@@ -9258,7 +9269,7 @@
1671 #. module: account
1672 #: field:account.config.settings,has_fiscal_year:0
1673 msgid "Company has a fiscal year"
1674-msgstr ""
1675+msgstr "A empresa tem um ano fiscal"
1676
1677 #. module: account
1678 #: help:account.tax,child_depend:0
1679@@ -9506,7 +9517,7 @@
1680 #. module: account
1681 #: view:account.invoice:0
1682 msgid "Ask Refund"
1683-msgstr ""
1684+msgstr "Pedir reembolso"
1685
1686 #. module: account
1687 #: view:account.move.line:0
1688
1689=== modified file 'account/i18n/ro.po'
1690--- account/i18n/ro.po 2013-01-04 09:39:53 +0000
1691+++ account/i18n/ro.po 2013-01-15 10:40:30 +0000
1692@@ -7,14 +7,25 @@
1693 "Project-Id-Version: OpenERP Server 6.0dev\n"
1694 "Report-Msgid-Bugs-To: support@openerp.com\n"
1695 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
1696+<<<<<<< TREE
1697 "PO-Revision-Date: 2012-12-10 07:21+0000\n"
1698 "Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
1699 "Language-Team: \n"
1700+=======
1701+"PO-Revision-Date: 2013-01-09 13:00+0000\n"
1702+"Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
1703+"Language-Team: Romanian <ro@li.org>\n"
1704+>>>>>>> MERGE-SOURCE
1705 "MIME-Version: 1.0\n"
1706 "Content-Type: text/plain; charset=UTF-8\n"
1707 "Content-Transfer-Encoding: 8bit\n"
1708+<<<<<<< TREE
1709 "X-Launchpad-Export-Date: 2012-12-22 05:33+0000\n"
1710 "X-Generator: Launchpad (build 16378)\n"
1711+=======
1712+"X-Launchpad-Export-Date: 2013-01-10 05:35+0000\n"
1713+"X-Generator: Launchpad (build 16412)\n"
1714+>>>>>>> MERGE-SOURCE
1715
1716 #. module: account
1717 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
1718@@ -26,7 +37,8 @@
1719 msgid ""
1720 "An account fiscal position could be defined only once time on same accounts."
1721 msgstr ""
1722-"O poziție fiscal poate fi definită o singură dată pe aceleași tip de cont."
1723+"O poziție fiscala a contului poate fi definita o singura data pe aceleasi "
1724+"tip de cont."
1725
1726 #. module: account
1727 #: help:account.tax.code,sequence:0
1728@@ -63,7 +75,7 @@
1729 #: code:addons/account/account_bank_statement.py:368
1730 #, python-format
1731 msgid "Journal item \"%s\" is not valid."
1732-msgstr "Elementul \"%s\" din jurnal nu este valid."
1733+msgstr "Elementul \"%s\" din registru nu este valabil."
1734
1735 #. module: account
1736 #: model:ir.model,name:account.model_report_aged_receivable
1737@@ -95,6 +107,8 @@
1738 "Error!\n"
1739 "You cannot create recursive account templates."
1740 msgstr ""
1741+"Eroare!\n"
1742+"Nu puteti crea sabloane de cont recursive."
1743
1744 #. module: account
1745 #. openerp-web
1746@@ -125,8 +139,8 @@
1747 "If the active field is set to False, it will allow you to hide the payment "
1748 "term without removing it."
1749 msgstr ""
1750-"In cazul in care campul activ este setat pe Fals, aceasta va va permite sa "
1751-"ascundeti termenul plata fara a-l sterge."
1752+"In cazul in care campul activ este setat pe Fals, va va permite sa ascundeti "
1753+"termenul de plata fara sa il stergeti."
1754
1755 #. module: account
1756 #: code:addons/account/account.py:641
1757@@ -150,7 +164,7 @@
1758 #: code:addons/account/wizard/account_validate_account_move.py:61
1759 #, python-format
1760 msgid "Warning!"
1761-msgstr "Avertizare!"
1762+msgstr "Avertisment!"
1763
1764 #. module: account
1765 #: code:addons/account/account.py:3149
1766@@ -166,6 +180,9 @@
1767 "which is set after generating opening entries from 'Generate Opening "
1768 "Entries'."
1769 msgstr ""
1770+"Trebuie sa setati 'Inregistrari in Registru Sfarsit de An' pentru acest An "
1771+"Fiscal, care este setat dupa generarea de inregistrari de deschidere din "
1772+"'Genereaza Inregistrari de Deschidere'."
1773
1774 #. module: account
1775 #: field:account.fiscal.position.account,account_src_id:0
1776@@ -184,6 +201,13 @@
1777 " </p>\n"
1778 " "
1779 msgstr ""
1780+"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
1781+" Faceti click pentru a adauga o perioada fiscala.\n"
1782+" </p><p>\n"
1783+" O perioada contabila este o luna sau un trimestru. De\n"
1784+" obicei corespunde perioadelor din declaratia fiscala.\n"
1785+" </p>\n"
1786+" "
1787
1788 #. module: account
1789 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
1790@@ -198,7 +222,7 @@
1791 #. module: account
1792 #: help:account.config.settings,code_digits:0
1793 msgid "No. of digits to use for account code"
1794-msgstr ""
1795+msgstr "Numarul de cifre folosite pentru codul contului"
1796
1797 #. module: account
1798 #: help:account.analytic.journal,type:0
1799@@ -218,6 +242,9 @@
1800 "lines for invoices. Leave empty if you don't want to use an analytic account "
1801 "on the invoice tax lines by default."
1802 msgstr ""
1803+"Configurati contul analitic care va fi folosit implicit in liniile facturii "
1804+"fiscale pentru facturi. Lasati necompletat daca nu doriti sa folositi un "
1805+"cont analitic implicit in liniile facturii fiscale."
1806
1807 #. module: account
1808 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
1809@@ -238,17 +265,17 @@
1810 #. module: account
1811 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
1812 msgid "Belgian Reports"
1813-msgstr "Rapoarte belgiene"
1814+msgstr "Rapoarte Belgiene"
1815
1816 #. module: account
1817 #: model:mail.message.subtype,name:account.mt_invoice_validated
1818 msgid "Validated"
1819-msgstr ""
1820+msgstr "Validat(a)"
1821
1822 #. module: account
1823 #: model:account.account.type,name:account.account_type_income_view1
1824 msgid "Income View"
1825-msgstr ""
1826+msgstr "Vizualizare Venituri"
1827
1828 #. module: account
1829 #: help:account.account,user_type:0
1830@@ -259,12 +286,12 @@
1831 msgstr ""
1832 "Tipul de cont este folosit in scop informativ, pentru a genera rapoarte "
1833 "juridice specifice tarilor, si pentru a configura regulile pentru inchiderea "
1834-"unui an fiscal si a genera inregistrari deschise."
1835+"unui an fiscal si a genera inregistrari de deschidere."
1836
1837 #. module: account
1838 #: field:account.config.settings,sale_refund_sequence_next:0
1839 msgid "Next credit note number"
1840-msgstr ""
1841+msgstr "Numarul urmator de nota de credit"
1842
1843 #. module: account
1844 #: help:account.config.settings,module_account_voucher:0
1845@@ -273,6 +300,9 @@
1846 "sales, purchase, expense, contra, etc.\n"
1847 " This installs the module account_voucher."
1848 msgstr ""
1849+"Acesta include toate cerintele de baza ale inregistrarilor voucherelor "
1850+"pentru banca, numerar, vanzari, achizitii, cheltuieli, contra, etc.\n"
1851+" Acesta instaleaza modulul cont_voucher."
1852
1853 #. module: account
1854 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
1855@@ -304,6 +334,18 @@
1856 " </p>\n"
1857 " "
1858 msgstr ""
1859+"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
1860+" Faceti click pentru a crea o rambursare pentru client. \n"
1861+" </p><p>\n"
1862+" O rambursare este un document care atribuie o factura "
1863+"complet sau\n"
1864+" partial.\n"
1865+" </p><p>\n"
1866+" In loc sa creati manual o rambursare pentru client,\n"
1867+" puteti sa o generati direct din factura asociata "
1868+"clientului.\n"
1869+" </p>\n"
1870+" "
1871
1872 #. module: account
1873 #: help:account.installer,charts:0
1874@@ -311,8 +353,9 @@
1875 "Installs localized accounting charts to match as closely as possible the "
1876 "accounting needs of your company based on your country."
1877 msgstr ""
1878-"Installs a localizat grafice contabile care se potrivesc cat mai indeaproape "
1879-"nevoilor contabile ale companiei dumneavoastra in functie de tara d-voastra."
1880+"Instaleaza planuri de conturi localizate care se potrivesc cat mai "
1881+"indeaproape nevoilor contabile ale companiei dumneavoastra in functie de "
1882+"tara d-voastra."
1883
1884 #. module: account
1885 #: model:ir.model,name:account.model_account_unreconcile
1886@@ -322,7 +365,7 @@
1887 #. module: account
1888 #: field:account.config.settings,module_account_budget:0
1889 msgid "Budget management"
1890-msgstr ""
1891+msgstr "Gestionare bugete"
1892
1893 #. module: account
1894 #: view:product.template:0
1895@@ -343,7 +386,7 @@
1896 #. module: account
1897 #: field:account.config.settings,group_multi_currency:0
1898 msgid "Allow multi currencies"
1899-msgstr ""
1900+msgstr "Permite valute multiple"
1901
1902 #. module: account
1903 #: code:addons/account/account_invoice.py:73
1904@@ -364,12 +407,12 @@
1905 #: code:addons/account/wizard/account_automatic_reconcile.py:148
1906 #, python-format
1907 msgid "You must select accounts to reconcile."
1908-msgstr ""
1909+msgstr "Trebuie sa selectati conturile pentru reconciliere."
1910
1911 #. module: account
1912 #: help:account.config.settings,group_analytic_accounting:0
1913 msgid "Allows you to use the analytic accounting."
1914-msgstr ""
1915+msgstr "Va permite sa folositi contabilitatea analitica."
1916
1917 #. module: account
1918 #: view:account.invoice:0
1919@@ -377,7 +420,7 @@
1920 #: view:account.invoice.report:0
1921 #: field:account.invoice.report,user_id:0
1922 msgid "Salesperson"
1923-msgstr ""
1924+msgstr "Agent de vanzari"
1925
1926 #. module: account
1927 #: view:account.bank.statement:0
1928@@ -404,7 +447,7 @@
1929 #. module: account
1930 #: selection:account.journal,type:0
1931 msgid "Opening/Closing Situation"
1932-msgstr "Situatie Deschidere/Inchidere"
1933+msgstr "Situatie la Deschidere/Inchidere"
1934
1935 #. module: account
1936 #: help:account.journal,currency:0
1937@@ -432,18 +475,26 @@
1938 "this box, you will be able to do invoicing & payments,\n"
1939 " but not accounting (Journal Items, Chart of Accounts, ...)"
1940 msgstr ""
1941+"Acesta va permite sa gestionati activele detinute de o companie sau de o "
1942+"persoana.\n"
1943+" Tine evidenta deprecierilor care au avut loc la activele "
1944+"respective, si creeaza miscarea de cont pentru liniile deprecierilor.\n"
1945+" TAcesta instaleaza modulul cont_active. Daca nu selectati "
1946+"aceasta casuta, veti putea sa faceti facturarea & platile,\n"
1947+" dar nu si contabilitatea (Elemente ale Registrului, Plan de "
1948+"Conturi, ...)"
1949
1950 #. module: account
1951 #: help:account.bank.statement.line,name:0
1952 msgid "Originator to Beneficiary Information"
1953-msgstr ""
1954+msgstr "Autorul Informatiilor despre Beneficiar"
1955
1956 #. module: account
1957 #. openerp-web
1958 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
1959 #, python-format
1960 msgid "Period :"
1961-msgstr ""
1962+msgstr "Perioada :"
1963
1964 #. module: account
1965 #: field:account.account.template,chart_template_id:0
1966@@ -457,6 +508,7 @@
1967 #: selection:account.invoice.refund,filter_refund:0
1968 msgid "Modify: create refund, reconcile and create a new draft invoice"
1969 msgstr ""
1970+"Modifica: creeaza ramburs, reconciliaza si creeaza o factura ciorna noua"
1971
1972 #. module: account
1973 #: help:account.config.settings,tax_calculation_rounding_method:0
1974@@ -470,6 +522,16 @@
1975 "should choose 'Round per line' because you certainly want the sum of your "
1976 "tax-included line subtotals to be equal to the total amount with taxes."
1977 msgstr ""
1978+"Daca selectati 'Rotunjire pe fiecare linie' : pentru fiecare taxa, valoarea "
1979+"de impozitare va fi mai intai calculata si rotunjita pentru fiecare linie "
1980+"PO/SO/factura, iar apoi aceste sume rotunjite vor fi adunate, ceea ce duce "
1981+"la valoarea totala de impozitare. Daca selectati 'Rotunjire globala': pentru "
1982+"fiecare taxa, valoarea de impozitare va fi calculata pentru fiecare linie "
1983+"PO/SO/factura, iar apoi aceste sume vor fi adunate, si in cele din urma "
1984+"aceasta suma totala de impozitare va fi rotunjita. Daca vindeti cu taxele "
1985+"incluse, ar trebui sa selectati 'Rotunjire pe fiecare linie' pentru ca veti "
1986+"dori cu siguranta ca suma liniei subtotalurilor cu taxa inclusa sa fie egala "
1987+"cu suma totala cu taxe."
1988
1989 #. module: account
1990 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
1991@@ -484,7 +546,7 @@
1992 #. module: account
1993 #: view:account.journal:0
1994 msgid "Available Coins"
1995-msgstr ""
1996+msgstr "Monedele Disponibile"
1997
1998 #. module: account
1999 #: field:accounting.report,enable_filter:0
2000@@ -522,7 +584,7 @@
2001 #: model:ir.model,name:account.model_account_journal
2002 #: field:validate.account.move,journal_id:0
2003 msgid "Journal"
2004-msgstr "Jurnal"
2005+msgstr "Registru"
2006
2007 #. module: account
2008 #: model:ir.model,name:account.model_account_invoice_confirm
2009@@ -537,7 +599,7 @@
2010 #. module: account
2011 #: help:account.invoice.line,sequence:0
2012 msgid "Gives the sequence of this line when displaying the invoice."
2013-msgstr ""
2014+msgstr "Ofera secventa acestei linii atunci cand afiseaza factura."
2015
2016 #. module: account
2017 #: field:account.bank.statement,account_id:0
2018@@ -606,12 +668,12 @@
2019 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
2020 #, python-format
2021 msgid "Nothing to reconcile"
2022-msgstr ""
2023+msgstr "Nimic de reconciliat"
2024
2025 #. module: account
2026 #: field:account.config.settings,decimal_precision:0
2027 msgid "Decimal precision on journal entries"
2028-msgstr ""
2029+msgstr "Precizie zecimala la inregistrarile in registru"
2030
2031 #. module: account
2032 #: selection:account.config.settings,period:0
2033@@ -637,6 +699,8 @@
2034 "Specified journal does not have any account move entries in draft state for "
2035 "this period."
2036 msgstr ""
2037+"Registrul specificat nu are nici o inregistrare a miscarilor din cont in "
2038+"starea ciorna pentru aceasta perioada."
2039
2040 #. module: account
2041 #: view:account.fiscal.position:0
2042@@ -659,12 +723,12 @@
2043 #: code:addons/account/wizard/account_change_currency.py:70
2044 #, python-format
2045 msgid "Current currency is not configured properly."
2046-msgstr ""
2047+msgstr "Valuta actuala nu este configurata corect."
2048
2049 #. module: account
2050 #: field:account.journal,profit_account_id:0
2051 msgid "Profit Account"
2052-msgstr ""
2053+msgstr "Cont Profit"
2054
2055 #. module: account
2056 #: code:addons/account/account_move_line.py:1157
2057@@ -689,7 +753,7 @@
2058 #: code:addons/account/account.py:1551
2059 #, python-format
2060 msgid "Cannot create move with currency different from .."
2061-msgstr ""
2062+msgstr "Nu se poate crea miscarea cu valuta diferita de .."
2063
2064 #. module: account
2065 #: model:email.template,report_name:account.email_template_edi_invoice
2066@@ -697,6 +761,8 @@
2067 "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
2068 "and 'draft' or ''}"
2069 msgstr ""
2070+"Factura_${(obiect.numar sau '').inlocuieste('/','_')}_${obiect.stare == "
2071+"'ciorna' si 'ciorna' sau ''}"
2072
2073 #. module: account
2074 #: view:account.period:0
2075@@ -712,7 +778,7 @@
2076 #. module: account
2077 #: field:account.fiscalyear.close,period_id:0
2078 msgid "Opening Entries Period"
2079-msgstr "Perioada Deschidere Inregistrari"
2080+msgstr "Perioada Inregistrarilor de Deschidere"
2081
2082 #. module: account
2083 #: model:ir.model,name:account.model_account_journal_period
2084@@ -724,6 +790,8 @@
2085 msgid ""
2086 "You cannot create more than one move per period on a centralized journal."
2087 msgstr ""
2088+"Nu puteti crea mai mult de o miscare in fiecare perioada intr-un registru "
2089+"centralizat."
2090
2091 #. module: account
2092 #: help:account.tax,account_analytic_paid_id:0
2093@@ -732,6 +800,9 @@
2094 "lines for refunds. Leave empty if you don't want to use an analytic account "
2095 "on the invoice tax lines by default."
2096 msgstr ""
2097+"Configurati contul analitic care va fi folosit implicit in liniile facturii "
2098+"fiscale pentru rambursari. Lasati necompletati daca nu doriti sa folositi un "
2099+"cont analitic implicit in liniile facturii fiscale."
2100
2101 #. module: account
2102 #: view:account.account:0
2103@@ -747,12 +818,12 @@
2104 #. module: account
2105 #: view:account.config.settings:0
2106 msgid "Configure your company bank accounts"
2107-msgstr ""
2108+msgstr "Configurati conturile bancare ale companiei dumneavoastra"
2109
2110 #. module: account
2111 #: view:account.invoice.refund:0
2112 msgid "Create Refund"
2113-msgstr ""
2114+msgstr "Creati Rambursare"
2115
2116 #. module: account
2117 #: constraint:account.move.line:0
2118@@ -782,7 +853,7 @@
2119 #: code:addons/account/account_invoice.py:1329
2120 #, python-format
2121 msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
2122-msgstr ""
2123+msgstr "Factura platita partial: %s%s din %s%s (%s%s ramas)."
2124
2125 #. module: account
2126 #: view:account.invoice:0
2127@@ -796,6 +867,8 @@
2128 "Cannot %s invoice which is already reconciled, invoice should be "
2129 "unreconciled first. You can only refund this invoice."
2130 msgstr ""
2131+"Nu se poate %s factura care este deja reconciliata, factura ar trebui mai "
2132+"intai nereconciliata. Puteti rambursa doar aceasta factura."
2133
2134 #. module: account
2135 #: selection:account.financial.report,display_detail:0
2136@@ -875,7 +948,7 @@
2137 #: code:addons/account/account_move_line.py:854
2138 #, python-format
2139 msgid "Entry is already reconciled."
2140-msgstr ""
2141+msgstr "Inregistrarea a fost deja reconciliata."
2142
2143 #. module: account
2144 #: view:account.move.line.unreconcile.select:0
2145@@ -892,7 +965,7 @@
2146 #. module: account
2147 #: view:account.invoice:0
2148 msgid "Send by Email"
2149-msgstr ""
2150+msgstr "Trimite prin Email"
2151
2152 #. module: account
2153 #: help:account.central.journal,amount_currency:0
2154@@ -903,16 +976,17 @@
2155 "Print Report with the currency column if the currency differs from the "
2156 "company currency."
2157 msgstr ""
2158+"Tipariti Raportul cu coloana valutei daca valuta difera de valuta companiei."
2159
2160 #. module: account
2161 #: report:account.analytic.account.quantity_cost_ledger:0
2162 msgid "J.C./Move name"
2163-msgstr "J.C. / Nume miscare"
2164+msgstr "J.C./Nume miscare"
2165
2166 #. module: account
2167 #: view:account.account:0
2168 msgid "Account Code and Name"
2169-msgstr ""
2170+msgstr "Codul si Numele Contului"
2171
2172 #. module: account
2173 #: selection:account.entries.report,month:0
2174@@ -943,6 +1017,10 @@
2175 " </p>\n"
2176 " "
2177 msgstr ""
2178+"<p>\n"
2179+" Nu au fost gasite elemente ale registrului.\n"
2180+" </p>\n"
2181+" "
2182
2183 #. module: account
2184 #: code:addons/account/account.py:1637
2185@@ -952,6 +1030,8 @@
2186 " opening/closing fiscal "
2187 "year process."
2188 msgstr ""
2189+"Nu puteti nereconcilia elemente ale registrului daca au fost generate de "
2190+"procesul de deschidere/inchidere a anului fiscal."
2191
2192 #. module: account
2193 #: model:ir.actions.act_window,name:account.action_subscription_form_new
2194@@ -974,7 +1054,7 @@
2195 #: model:ir.actions.act_window,name:account.action_tax_code_tree
2196 #: model:ir.ui.menu,name:account.menu_action_tax_code_tree
2197 msgid "Chart of Taxes"
2198-msgstr "Plan de Taxe"
2199+msgstr "Plan Fiscal"
2200
2201 #. module: account
2202 #: view:account.fiscalyear:0
2203@@ -989,12 +1069,12 @@
2204 #. module: account
2205 #: field:account.config.settings,purchase_journal_id:0
2206 msgid "Purchase journal"
2207-msgstr ""
2208+msgstr "Registru achizitii"
2209
2210 #. module: account
2211 #: model:mail.message.subtype,description:account.mt_invoice_paid
2212 msgid "Invoice paid"
2213-msgstr ""
2214+msgstr "Factura platita"
2215
2216 #. module: account
2217 #: view:validate.account.move:0
2218@@ -1012,7 +1092,7 @@
2219 #. module: account
2220 #: help:account.invoice,supplier_invoice_number:0
2221 msgid "The reference of this invoice as provided by the supplier."
2222-msgstr ""
2223+msgstr "Referinta acestei facturi asa cum a fost oferita de furnizor."
2224
2225 #. module: account
2226 #: selection:account.account,type:0
2227@@ -1100,7 +1180,7 @@
2228 #. module: account
2229 #: view:account.config.settings:0
2230 msgid "Features"
2231-msgstr ""
2232+msgstr "Caracteristici"
2233
2234 #. module: account
2235 #: code:addons/account/account.py:2298
2236@@ -1136,16 +1216,30 @@
2237 " </p>\n"
2238 " "
2239 msgstr ""
2240+"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
2241+" Faceti click pentru a adauga un cont.\n"
2242+" </p><p>\n"
2243+" Atunci cand efectuati tranzactii cu valute multiple, puteti "
2244+"pierde sau castiga\n"
2245+" bani din cauza modificarilor cursului de schimb valutar. "
2246+"Acest meniu va ofera\n"
2247+" o estimare a Castigului sau a Pierderii pe care le-ati fi "
2248+"realizat daca acele\n"
2249+" tranzactii ar fi fost efectuate astazi. Valabil doar pentru "
2250+"conturile care au\n"
2251+" setata o valuta secundara.\n"
2252+" </p>\n"
2253+" "
2254
2255 #. module: account
2256 #: field:account.bank.accounts.wizard,acc_name:0
2257 msgid "Account Name."
2258-msgstr "Numele contului."
2259+msgstr "Numele Contului."
2260
2261 #. module: account
2262 #: field:account.journal,with_last_closing_balance:0
2263 msgid "Opening With Last Closing Balance"
2264-msgstr ""
2265+msgstr "Deschidere cu Ultimul Sold la Inchidere"
2266
2267 #. module: account
2268 #: help:account.tax.code,notprintable:0
2269@@ -1153,6 +1247,8 @@
2270 "Check this box if you don't want any tax related to this tax code to appear "
2271 "on invoices"
2272 msgstr ""
2273+"Bifati aceasta casuta daca nu doriti ca taxele legate de acest cod fiscal sa "
2274+"apara pe facturi"
2275
2276 #. module: account
2277 #: field:report.account.receivable,name:0
2278@@ -1181,13 +1277,14 @@
2279 #. module: account
2280 #: view:account.invoice:0
2281 msgid "Refund "
2282-msgstr ""
2283+msgstr "Rambursare "
2284
2285 #. module: account
2286 #: code:addons/account/account_analytic_line.py:90
2287 #, python-format
2288 msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
2289 msgstr ""
2290+"Nu exista un cont de cheltuieli definit pentru acest produs: \"%s\" (id:%d)."
2291
2292 #. module: account
2293 #: view:account.tax:0
2294@@ -1209,7 +1306,7 @@
2295 #. module: account
2296 #: field:account.config.settings,sale_refund_journal_id:0
2297 msgid "Sale refund journal"
2298-msgstr ""
2299+msgstr "Registru de rambursare vanzari"
2300
2301 #. module: account
2302 #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
2303@@ -1228,6 +1325,20 @@
2304 " </p>\n"
2305 " "
2306 msgstr ""
2307+"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
2308+" Faceti click pentru a crea un registru de numerar nou.\n"
2309+" </p><p>\n"
2310+" O casa de marcat va permite sa gestionati intrarile de "
2311+"numerar in registrele\n"
2312+" de numerar. Aceasta caracteristica furnizeaza o modalitate "
2313+"usoara de a urmari platile\n"
2314+" in numerar izi de zi. Puteti introduce monedele care se afla "
2315+"in\n"
2316+" caseta de numerar, iar apoi puteti inregistra cand banii "
2317+"intra sau\n"
2318+" ies din caseta de numerar.\n"
2319+" </p>\n"
2320+" "
2321
2322 #. module: account
2323 #: model:account.account.type,name:account.data_account_type_bank
2324@@ -1245,7 +1356,7 @@
2325 #. module: account
2326 #: view:account.tax:0
2327 msgid "Refunds"
2328-msgstr ""
2329+msgstr "Rambursari"
2330
2331 #. module: account
2332 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
2333@@ -1255,7 +1366,7 @@
2334 #. module: account
2335 #: view:account.tax:0
2336 msgid "Account Tax"
2337-msgstr "Taxa Cont"
2338+msgstr "Cont Fiscal"
2339
2340 #. module: account
2341 #: help:account.account,foreign_balance:0
2342@@ -1289,6 +1400,9 @@
2343 "The amount expressed in the secondary currency must be positif when journal "
2344 "item are debit and negatif when journal item are credit."
2345 msgstr ""
2346+"Suma exprimata in valuta secundara trebuie sa fie pozitiva atunci cand "
2347+"elementele din registru sunt de debit si negativa atunci cand elementele din "
2348+"registru sunt de credit."
2349
2350 #. module: account
2351 #: view:account.invoice.cancel:0
2352@@ -1322,7 +1436,7 @@
2353 #. module: account
2354 #: field:account.config.settings,chart_template_id:0
2355 msgid "Template"
2356-msgstr ""
2357+msgstr "Sablon"
2358
2359 #. module: account
2360 #: selection:account.analytic.journal,type:0
2361@@ -1351,7 +1465,7 @@
2362 #: help:account.invoice,origin:0
2363 #: help:account.invoice.line,origin:0
2364 msgid "Reference of the document that produced this invoice."
2365-msgstr "Referinta la documentul care a produs aceasta factura."
2366+msgstr "Referinta documentului care a produs aceasta factura."
2367
2368 #. module: account
2369 #: view:account.analytic.line:0
2370@@ -1414,7 +1528,7 @@
2371 #: code:addons/account/wizard/account_change_currency.py:38
2372 #, python-format
2373 msgid "You can only change currency for Draft Invoice."
2374-msgstr ""
2375+msgstr "Puteti schimba valuta doar pentru Factura Ciorna."
2376
2377 #. module: account
2378 #: report:account.invoice:0
2379@@ -1450,7 +1564,7 @@
2380 #. module: account
2381 #: view:account.tax.code.template:0
2382 msgid "Search tax template"
2383-msgstr "Cautati sablon taxa"
2384+msgstr "Cauta sablon fiscal"
2385
2386 #. module: account
2387 #: view:account.move.reconcile:0
2388@@ -1485,12 +1599,12 @@
2389 #. module: account
2390 #: field:account.fiscalyear.close.state,fy_id:0
2391 msgid "Fiscal Year to Close"
2392-msgstr ""
2393+msgstr "An Fiscal de Inchis"
2394
2395 #. module: account
2396 #: field:account.config.settings,sale_sequence_prefix:0
2397 msgid "Invoice sequence"
2398-msgstr ""
2399+msgstr "Succesiunea facturilor"
2400
2401 #. module: account
2402 #: model:ir.model,name:account.model_account_entries_report
2403@@ -1509,11 +1623,13 @@
2404 "And after getting confirmation from the bank it will be in 'Confirmed' "
2405 "status."
2406 msgstr ""
2407+"Atunci cand este creat un extras nou, statusul lui va fi 'Ciorna'.\n"
2408+"Dupa primirea confirmarii din partea bancii, statusul lui va fi 'Confirmat'."
2409
2410 #. module: account
2411 #: field:account.invoice.report,state:0
2412 msgid "Invoice Status"
2413-msgstr ""
2414+msgstr "Starea Facturii"
2415
2416 #. module: account
2417 #: view:account.bank.statement:0
2418@@ -1535,7 +1651,7 @@
2419 #: code:addons/account/account.py:768
2420 #, python-format
2421 msgid "%s (copy)"
2422-msgstr ""
2423+msgstr "%s (copie)"
2424
2425 #. module: account
2426 #: selection:account.balance.report,display_account:0
2427@@ -1552,6 +1668,8 @@
2428 "There is no default debit account defined \n"
2429 "on journal \"%s\"."
2430 msgstr ""
2431+"Nu exista un cont de debit implicit definit \n"
2432+"in registru \"%s\"."
2433
2434 #. module: account
2435 #: view:account.tax:0
2436@@ -1586,6 +1704,8 @@
2437 "There is nothing to reconcile. All invoices and payments\n"
2438 " have been reconciled, your partner balance is clean."
2439 msgstr ""
2440+"Nu exista nimic de reconciliat. Toate facturile si platile\n"
2441+" au fost reconciliate, soldul partenerului este gol."
2442
2443 #. module: account
2444 #: field:account.chart.template,code_digits:0
2445@@ -1604,17 +1724,17 @@
2446 #: code:addons/account/wizard/account_report_common.py:164
2447 #, python-format
2448 msgid "Not implemented."
2449-msgstr ""
2450+msgstr "Nu este implementat."
2451
2452 #. module: account
2453 #: view:account.invoice.refund:0
2454 msgid "Credit Note"
2455-msgstr "Notă de credit"
2456+msgstr "Nota de credit"
2457
2458 #. module: account
2459 #: view:account.config.settings:0
2460 msgid "eInvoicing & Payments"
2461-msgstr ""
2462+msgstr "eFacturare & Plati"
2463
2464 #. module: account
2465 #: view:account.analytic.cost.ledger.journal.report:0
2466@@ -1632,7 +1752,7 @@
2467 "By unchecking the active field, you may hide a fiscal position without "
2468 "deleting it."
2469 msgstr ""
2470-"Daca debifati campul activ, puteti ascunde o positie fiscala fara sa o "
2471+"Daca debifati campul activ, puteti ascunde o pozitie fiscala fara sa o "
2472 "stergeti."
2473
2474 #. module: account
2475@@ -1655,7 +1775,7 @@
2476 #. module: account
2477 #: field:account.config.settings,company_footer:0
2478 msgid "Bank accounts footer preview"
2479-msgstr ""
2480+msgstr "Previzualizare subsol conturi bancare"
2481
2482 #. module: account
2483 #: selection:account.account,type:0
2484@@ -1696,12 +1816,12 @@
2485 #. module: account
2486 #: view:account.journal:0
2487 msgid "Advanced Settings"
2488-msgstr ""
2489+msgstr "Configurari Avansate"
2490
2491 #. module: account
2492 #: view:account.bank.statement:0
2493 msgid "Search Bank Statements"
2494-msgstr "Cautati Extrase de cont"
2495+msgstr "Cauta Extrasele de cont"
2496
2497 #. module: account
2498 #: view:account.move.line:0
2499@@ -1765,6 +1885,19 @@
2500 " </p>\n"
2501 " "
2502 msgstr ""
2503+"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
2504+" Faceti click pentru a defini un nou tip de cont.\n"
2505+" </p><p>\n"
2506+" Tipul de cont este folosit pentru a determina modul in care "
2507+"un cont este folosit in\n"
2508+" fiecare registru. Metoda de tergiversare a unui tip de cont "
2509+"determina\n"
2510+" procesul pentru inchiderea anuala. Rapoartele precum "
2511+"Bilantul\n"
2512+" si rapoartele Profit si Pierderi folosesc categoria\n"
2513+" (profit/pierderi sau bilantul).\n"
2514+" </p>\n"
2515+" "
2516
2517 #. module: account
2518 #: report:account.invoice:0
2519@@ -1779,7 +1912,7 @@
2520 #. module: account
2521 #: field:account.move,balance:0
2522 msgid "balance"
2523-msgstr ""
2524+msgstr "sold"
2525
2526 #. module: account
2527 #: model:process.node,note:account.process_node_analytic0
2528@@ -1790,12 +1923,12 @@
2529 #. module: account
2530 #: view:ir.sequence:0
2531 msgid "Fiscal Year Sequence"
2532-msgstr "Secventa An Fiscal"
2533+msgstr "Succesiune Ani Fiscali"
2534
2535 #. module: account
2536 #: field:account.config.settings,group_analytic_accounting:0
2537 msgid "Analytic accounting"
2538-msgstr ""
2539+msgstr "Contabilitate analitica"
2540
2541 #. module: account
2542 #: report:account.overdue:0
2543@@ -1814,6 +1947,15 @@
2544 "should choose 'Round per line' because you certainly want the sum of your "
2545 "tax-included line subtotals to be equal to the total amount with taxes."
2546 msgstr ""
2547+"Daca selectati 'Rotunjire pe Linie' : pentru fiecare taxa, valoarea ei va fi "
2548+"mai intai calculata si rotunjita pentru fiecare linie PO/SO/factura, iar "
2549+"apoi aceste valori rotunjite vor fi adunate, ceea ce duce la valoarea totala "
2550+"a acelei taxe. Daca selectati 'Rotunjire Globala': pentru fiecare taxa, "
2551+"valoarea ei va fi calculata pentru fiecare linie PO/SO/factura, iar apoi "
2552+"aceste sume vor fi rotunjite si, in cele din urma, aceasta valoare totala a "
2553+"taxei va fi rotunjita. Daca vindeti cu taxele incluse, ar trebui sa alegeti "
2554+"'Rotunjire pe linie' pentru ca veti dori cu siguranta ca suma liniei "
2555+"subtotalurilor cu taxe incluse sa fie egala cu suma totala cu taxe."
2556
2557 #. module: account
2558 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
2559@@ -1825,7 +1967,7 @@
2560 #: model:account.payment.term,name:account.account_payment_term_15days
2561 #: model:account.payment.term,note:account.account_payment_term_15days
2562 msgid "15 Days"
2563-msgstr ""
2564+msgstr "15 Zile"
2565
2566 #. module: account
2567 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
2568@@ -1845,12 +1987,14 @@
2569 "The journal must have centralized counterpart without the Skipping draft "
2570 "state option checked."
2571 msgstr ""
2572+"Registrul trebuie sa aiba un echivalent centralizat fara optiunea Omite "
2573+"starea ciorna selectata."
2574
2575 #. module: account
2576 #: code:addons/account/account_move_line.py:857
2577 #, python-format
2578 msgid "Some entries are already reconciled."
2579-msgstr ""
2580+msgstr "Unele inregistrari sunt deja reconciliate."
2581
2582 #. module: account
2583 #: field:account.tax.code,sum:0
2584@@ -1860,7 +2004,7 @@
2585 #. module: account
2586 #: view:account.change.currency:0
2587 msgid "This wizard will change the currency of the invoice"
2588-msgstr "Acest wizard va schimba moneda an care este exprimata factura"
2589+msgstr "Acest wizard va schimba moneda in care este exprimata factura"
2590
2591 #. module: account
2592 #: view:account.installer:0
2593@@ -1868,6 +2012,8 @@
2594 "Select a configuration package to setup automatically your\n"
2595 " taxes and chart of accounts."
2596 msgstr ""
2597+"Selectati un pachet de configurare pentru a configura automat\n"
2598+" taxele si planul dumneavoastra de conturi."
2599
2600 #. module: account
2601 #: view:account.analytic.account:0
2602@@ -1877,7 +2023,7 @@
2603 #. module: account
2604 #: view:account.open.closed.fiscalyear:0
2605 msgid "Cancel Fiscal Year Opening Entries"
2606-msgstr ""
2607+msgstr "Anuleaza Inregistrarile de Deschidere ale Anului Fiscal"
2608
2609 #. module: account
2610 #: report:account.journal.period.print.sale.purchase:0
2611@@ -1907,18 +2053,18 @@
2612 #. module: account
2613 #: field:account.config.settings,module_account_payment:0
2614 msgid "Manage payment orders"
2615-msgstr ""
2616+msgstr "Gestioneaza ordinele de plata"
2617
2618 #. module: account
2619 #: view:account.period:0
2620 msgid "Duration"
2621-msgstr ""
2622+msgstr "Durata"
2623
2624 #. module: account
2625 #: view:account.bank.statement:0
2626 #: field:account.bank.statement,last_closing_balance:0
2627 msgid "Last Closing Balance"
2628-msgstr ""
2629+msgstr "Ultimul Sold la Inchidere"
2630
2631 #. module: account
2632 #: model:ir.model,name:account.model_account_common_journal_report
2633@@ -1950,7 +2096,7 @@
2634 #: help:account.tax.template,ref_tax_code_id:0
2635 #: help:account.tax.template,tax_code_id:0
2636 msgid "Use this code for the tax declaration."
2637-msgstr ""
2638+msgstr "Folositi acest cod pentru declaratia fiscala."
2639
2640 #. module: account
2641 #: help:account.period,special:0
2642@@ -1965,12 +2111,12 @@
2643 #. module: account
2644 #: model:mail.message.subtype,description:account.mt_invoice_validated
2645 msgid "Invoice validated"
2646-msgstr ""
2647+msgstr "Factura validata"
2648
2649 #. module: account
2650 #: field:account.config.settings,module_account_check_writing:0
2651 msgid "Pay your suppliers by check"
2652-msgstr ""
2653+msgstr "Plateste furnizorii cu cecuri"
2654
2655 #. module: account
2656 #: field:account.move.line.reconcile,credit:0
2657@@ -1981,7 +2127,7 @@
2658 #: field:account.bank.statement,message_ids:0
2659 #: field:account.invoice,message_ids:0
2660 msgid "Messages"
2661-msgstr ""
2662+msgstr "Mesaje"
2663
2664 #. module: account
2665 #: view:account.vat.declaration:0
2666@@ -1993,6 +2139,13 @@
2667 "useful because it enables you to preview at any time the tax that you owe at "
2668 "the start and end of the month or quarter."
2669 msgstr ""
2670+"Acest meniu tipareste o declaratie fiscala pe baza facturilor sau a "
2671+"platilor. Selectati una sau mai multe perioade ale anului fiscal. "
2672+"Informatiile necesare unei declaratii fiscale sunt generate automat de "
2673+"OpenERP din facturi (sau plati, in unele tari). Aceste date sunt actualizate "
2674+"in timp real. Acest lucru este foarte util pentru ca va permite sa "
2675+"previzualizati oricand impozitul datorat la inceputul si sfarsitul lunii sau "
2676+"trimestrului."
2677
2678 #. module: account
2679 #: code:addons/account/account.py:409
2680@@ -2063,6 +2216,18 @@
2681 " </p>\n"
2682 " "
2683 msgstr ""
2684+"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
2685+" Faceti click pentru a inregistra o noua factura a "
2686+"furnizorului.\n"
2687+" </p><p>\n"
2688+" Puteti controla factura de la furnizorul dumneavoastra in "
2689+"functie de\n"
2690+" ceea ce ati cumparat sau primit. De asemenea, OpenERP poate "
2691+"genera\n"
2692+" automat facturi ciorna din ordinele de achizitie sau "
2693+"chitante.\n"
2694+" </p>\n"
2695+" "
2696
2697 #. module: account
2698 #: sql_constraint:account.move.line:0
2699@@ -2080,12 +2245,12 @@
2700 #. module: account
2701 #: model:ir.model,name:account.model_mail_compose_message
2702 msgid "Email composition wizard"
2703-msgstr ""
2704+msgstr "Wizardul de compunere email-uri"
2705
2706 #. module: account
2707 #: model:ir.model,name:account.model_account_period_close
2708 msgid "period close"
2709-msgstr "incheierea perioadei"
2710+msgstr "inchiderea perioadei"
2711
2712 #. module: account
2713 #: code:addons/account/account.py:1049
2714@@ -2094,6 +2259,8 @@
2715 "This journal already contains items for this period, therefore you cannot "
2716 "modify its company field."
2717 msgstr ""
2718+"Acest registru contine deja elemente pentru aceasta perioada, prin urmare nu "
2719+"puteti modifica campul."
2720
2721 #. module: account
2722 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
2723@@ -2103,7 +2270,7 @@
2724 #. module: account
2725 #: field:account.vat.declaration,based_on:0
2726 msgid "Based on"
2727-msgstr "Pe baza"
2728+msgstr "Bazat pe"
2729
2730 #. module: account
2731 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
2732@@ -2122,11 +2289,25 @@
2733 " </p>\n"
2734 " "
2735 msgstr ""
2736+"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
2737+" Faceti click pentru a inregistra un extras de cont.\n"
2738+" </p><p>\n"
2739+" Un extras de cont este un rezumat al tuturor tranzactiilor "
2740+"financiare\n"
2741+" care au loc intr-o anumita perioada de timp intr-un cont "
2742+"bancar. Ar\n"
2743+" trebui ca banca sa vi-l trimita periodic.\n"
2744+" </p><p>\n"
2745+" OpenERP va permite sa reconciliati o linie a extrasului de "
2746+"cont direct cu\n"
2747+" facturile de vanzare sau achizitie asociate.\n"
2748+" </p>\n"
2749+" "
2750
2751 #. module: account
2752 #: field:account.config.settings,currency_id:0
2753 msgid "Default company currency"
2754-msgstr ""
2755+msgstr "Valuta implicita a companiei"
2756
2757 #. module: account
2758 #: field:account.invoice,move_id:0
2759@@ -2174,13 +2355,13 @@
2760 #: field:account.bank.statement,message_follower_ids:0
2761 #: field:account.invoice,message_follower_ids:0
2762 msgid "Followers"
2763-msgstr ""
2764+msgstr "Persoane interesate"
2765
2766 #. module: account
2767 #: model:ir.actions.act_window,name:account.action_account_print_journal
2768 #: model:ir.model,name:account.model_account_print_journal
2769 msgid "Account Print Journal"
2770-msgstr "Jurnal Tiparire Cont"
2771+msgstr "Cont Tiparire Registru"
2772
2773 #. module: account
2774 #: model:ir.model,name:account.model_product_category
2775@@ -2194,6 +2375,8 @@
2776 "You cannot change the type of account to '%s' type as it contains journal "
2777 "items!"
2778 msgstr ""
2779+"Nu puteti schimba tipul contului in tipul '%s' deoarece contine elemente ale "
2780+"registrului!"
2781
2782 #. module: account
2783 #: model:ir.model,name:account.model_account_aged_trial_balance
2784@@ -2203,36 +2386,38 @@
2785 #. module: account
2786 #: view:account.fiscalyear.close.state:0
2787 msgid "Close Fiscal Year"
2788-msgstr ""
2789+msgstr "Inchide Anul Fiscal"
2790
2791 #. module: account
2792 #. openerp-web
2793 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
2794 #, python-format
2795 msgid "Journal :"
2796-msgstr ""
2797+msgstr "Registru :"
2798
2799 #. module: account
2800 #: sql_constraint:account.fiscal.position.tax:0
2801 msgid "A tax fiscal position could be defined only once time on same taxes."
2802 msgstr ""
2803+"O pozitie fiscala de impozitare poate fi definita doar o singura data pentru "
2804+"aceleasi taxe."
2805
2806 #. module: account
2807 #: view:account.tax:0
2808 #: view:account.tax.template:0
2809 msgid "Tax Definition"
2810-msgstr "Definite Taxe"
2811+msgstr "Definire Taxe"
2812
2813 #. module: account
2814 #: view:account.config.settings:0
2815 #: model:ir.actions.act_window,name:account.action_account_config
2816 msgid "Configure Accounting"
2817-msgstr ""
2818+msgstr "Configureaza Contabilitatea"
2819
2820 #. module: account
2821 #: field:account.invoice.report,uom_name:0
2822 msgid "Reference Unit of Measure"
2823-msgstr ""
2824+msgstr "Unitatea de Masura de Referinta"
2825
2826 #. module: account
2827 #: help:account.journal,allow_date:0
2828@@ -2248,12 +2433,12 @@
2829 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
2830 #, python-format
2831 msgid "Good job!"
2832-msgstr ""
2833+msgstr "Buna treaba!"
2834
2835 #. module: account
2836 #: field:account.config.settings,module_account_asset:0
2837 msgid "Assets management"
2838-msgstr ""
2839+msgstr "Managementul activelor"
2840
2841 #. module: account
2842 #: view:account.account:0
2843@@ -2309,6 +2494,8 @@
2844 "If you want the journal should be control at opening/closing, check this "
2845 "option"
2846 msgstr ""
2847+"Selectati aceasta optiune daca doriti ca registrul sa fie controlat la "
2848+"deschidere/inchidere"
2849
2850 #. module: account
2851 #: view:account.bank.statement:0
2852@@ -2338,7 +2525,7 @@
2853 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
2854 #, python-format
2855 msgid "Standard Encoding"
2856-msgstr "Inregistrare standard"
2857+msgstr "Codare standard"
2858
2859 #. module: account
2860 #: view:account.journal.select:0
2861@@ -2349,7 +2536,7 @@
2862 #. module: account
2863 #: field:account.config.settings,purchase_refund_sequence_next:0
2864 msgid "Next supplier credit note number"
2865-msgstr ""
2866+msgstr "Numarul notei de credit a furnizorului urmator"
2867
2868 #. module: account
2869 #: field:account.automatic.reconcile,account_ids:0
2870@@ -2383,7 +2570,7 @@
2871 #. module: account
2872 #: view:account.tax.chart:0
2873 msgid "Account tax charts"
2874-msgstr "Cont Planuri fiscale"
2875+msgstr "Planuri de conturi fiscale"
2876
2877 #. module: account
2878 #: model:account.payment.term,name:account.account_payment_term_net
2879@@ -2395,12 +2582,12 @@
2880 #: code:addons/account/account_cash_statement.py:256
2881 #, python-format
2882 msgid "You do not have rights to open this %s journal !"
2883-msgstr ""
2884+msgstr "Nu aveti dreptul de a deschide acest registru %s !"
2885
2886 #. module: account
2887 #: model:res.groups,name:account.group_supplier_inv_check_total
2888 msgid "Check Total on supplier invoices"
2889-msgstr ""
2890+msgstr "Verifica Totalul de pe facturile furnizorilor"
2891
2892 #. module: account
2893 #: selection:account.invoice,state:0
2894@@ -2475,7 +2662,7 @@
2895 #. module: account
2896 #: help:account.config.settings,default_sale_tax:0
2897 msgid "This sale tax will be assigned by default on new products."
2898-msgstr ""
2899+msgstr "Aceasta taxa de vanzare va fi atribuita implicit produselor noi."
2900
2901 #. module: account
2902 #: report:account.general.ledger_landscape:0
2903@@ -2565,6 +2752,8 @@
2904 "You cannot change the type of account from 'Closed' to any other type as it "
2905 "contains journal items!"
2906 msgstr ""
2907+"Nu puteti modifica tipul contului din 'Inchis' in orice alt tip deoarece "
2908+"contine elemente ale registrului!"
2909
2910 #. module: account
2911 #: field:account.invoice.report,account_line_id:0
2912@@ -2574,7 +2763,7 @@
2913 #. module: account
2914 #: view:account.addtmpl.wizard:0
2915 msgid "Create an Account Based on this Template"
2916-msgstr "Creare Cont bazat pe acest sablon"
2917+msgstr "Creeaza un Cont pe baza acestui Sablon"
2918
2919 #. module: account
2920 #: code:addons/account/account_invoice.py:905
2921@@ -2585,6 +2774,11 @@
2922 "amount greater than the total invoiced amount. In order to avoid rounding "
2923 "issues, the latest line of your payment term must be of type 'balance'."
2924 msgstr ""
2925+"Nu se poate crea factura.\n"
2926+"Termenul de plata asociat este probabil configurat gresit deoarece da o suma "
2927+"calculata mai mare decat suma totala facturata. Pentru a evita problemele "
2928+"legate de rotunjire, ultima linie a termenului de plata trebuie sa fie de "
2929+"tipul 'sold'."
2930
2931 #. module: account
2932 #: view:account.move:0
2933@@ -2627,12 +2821,12 @@
2934 #: code:addons/account/account_move_line.py:578
2935 #, python-format
2936 msgid "You cannot create journal items on a closed account %s %s."
2937-msgstr ""
2938+msgstr "Nu puteti crea elemente ale registrului intr-un cont inchis %s %s."
2939
2940 #. module: account
2941 #: field:account.period.close,sure:0
2942 msgid "Check this box"
2943-msgstr "Bifati casuaa aceasta"
2944+msgstr "Bifati casuta aceasta"
2945
2946 #. module: account
2947 #: view:account.common.report:0
2948@@ -2648,12 +2842,12 @@
2949 #. module: account
2950 #: view:product.category:0
2951 msgid "Account Properties"
2952-msgstr ""
2953+msgstr "Proprietatile Contului"
2954
2955 #. module: account
2956 #: selection:account.invoice.refund,filter_refund:0
2957 msgid "Create a draft refund"
2958-msgstr ""
2959+msgstr "Creeaza o rambursare ciorna"
2960
2961 #. module: account
2962 #: view:account.partner.reconcile.process:0
2963@@ -2663,7 +2857,7 @@
2964 #. module: account
2965 #: view:account.analytic.line:0
2966 msgid "Fin. Account"
2967-msgstr ""
2968+msgstr "Cont Fin."
2969
2970 #. module: account
2971 #: field:account.tax,tax_code_id:0
2972@@ -2725,7 +2919,7 @@
2973 #. module: account
2974 #: model:ir.actions.act_window,name:account.act_account_renew_view
2975 msgid "Accounts to Renew"
2976-msgstr "Conturi de reinnoit"
2977+msgstr "Conturi de Reinnoit"
2978
2979 #. module: account
2980 #: model:ir.model,name:account.model_account_model_line
2981@@ -2767,6 +2961,22 @@
2982 " </p>\n"
2983 " "
2984 msgstr ""
2985+"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
2986+" Faceti click pentru a crea o inregistrare in registru.\n"
2987+" </p><p>\n"
2988+" O inregistrare in registru consta din mai multe elemente ale "
2989+"registrului, fiecare dintre\n"
2990+" acestea fiind sau o tranzactie de debit, sau una de credit.\n"
2991+" </p><p>\n"
2992+" OpenERP creeaza automat o inregistrare in registru pentru "
2993+"fiecare document\n"
2994+" contabil: factura, rambursare, plata furnizorului, extrase "
2995+"de cont,\n"
2996+" etc. Astfel, ar trebui sa inregtistrati manual "
2997+"inregistrarile in registru doar/in special\n"
2998+" pentru operatiuni diverse.\n"
2999+" </p>\n"
3000+" "
3001
3002 #. module: account
3003 #: help:account.invoice,payment_term:0
3004@@ -2784,7 +2994,7 @@
3005 #. module: account
3006 #: field:account.config.settings,purchase_sequence_next:0
3007 msgid "Next supplier invoice number"
3008-msgstr ""
3009+msgstr "Numarul facturii urmatoare a furnizorului"
3010
3011 #. module: account
3012 #: view:account.analytic.cost.ledger.journal.report:0
3013@@ -2833,7 +3043,7 @@
3014 #: field:account.config.settings,default_purchase_tax:0
3015 #: field:account.config.settings,purchase_tax:0
3016 msgid "Default purchase tax"
3017-msgstr ""
3018+msgstr "Taxa de cumparare implicita"
3019
3020 #. module: account
3021 #: view:account.account:0
3022@@ -2867,6 +3077,7 @@
3023 #, python-format
3024 msgid "Statement %s confirmed, journal items were created."
3025 msgstr ""
3026+"Extrasul %s a fost confirmat, au fost create elemente ale registrului."
3027
3028 #. module: account
3029 #: field:account.invoice.report,price_average:0
3030@@ -2919,7 +3130,7 @@
3031 #. module: account
3032 #: view:wizard.multi.charts.accounts:0
3033 msgid "Purchase Tax"
3034-msgstr ""
3035+msgstr "Taxa de cumparare"
3036
3037 #. module: account
3038 #: help:account.move.line,tax_code_id:0
3039@@ -2980,6 +3191,23 @@
3040 " </p>\n"
3041 " "
3042 msgstr ""
3043+"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
3044+" Faceti click pentru a incepe un nou an fiscal.\n"
3045+" </p><p>\n"
3046+" Definiti anul fiscal al companiei dumneavoastra in functie "
3047+"de nevoile dumneavoastra. Un\n"
3048+" an financiar este o perioada la finalul careia sunt "
3049+"alcatuite\n"
3050+" conturile unei companii (de obicei 12 luni). De obicei, anul "
3051+"financiar este\n"
3052+" mentionat cu data la care se incheie. De exemplu,\n"
3053+" daca anul financiar al unei companii se incheie in 20 "
3054+"noiembrie 2011, atunci\n"
3055+" tot ceea ce este cuprins intre 1 decembrie 2010 si 30 "
3056+"noiembrie 2011\n"
3057+" va fi considerat drept Anul Fiscal 2011.\n"
3058+" </p>\n"
3059+" "
3060
3061 #. module: account
3062 #: view:account.common.report:0
3063@@ -3016,7 +3244,7 @@
3064 #. module: account
3065 #: constraint:account.move.line:0
3066 msgid "Account and Period must belong to the same company."
3067-msgstr ""
3068+msgstr "Contul si Perioada trebuie sa apartina aceleiasi companii."
3069
3070 #. module: account
3071 #: field:account.invoice.line,discount:0
3072@@ -3046,7 +3274,7 @@
3073 #: field:account.bank.statement,message_unread:0
3074 #: field:account.invoice,message_unread:0
3075 msgid "Unread Messages"
3076-msgstr ""
3077+msgstr "Mesaje necitite"
3078
3079 #. module: account
3080 #: code:addons/account/wizard/account_invoice_state.py:44
3081@@ -3055,12 +3283,14 @@
3082 "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
3083 "Forma' state."
3084 msgstr ""
3085+"Facturile selectate nu pot fi confirmate deoarece nu sunt in starea 'Ciorna' "
3086+"sau 'Pro-Forma'."
3087
3088 #. module: account
3089 #: code:addons/account/account.py:1062
3090 #, python-format
3091 msgid "You should choose the periods that belong to the same company."
3092-msgstr ""
3093+msgstr "Ar trebui sa alegeti perioadele care apartin aceleiasi companii."
3094
3095 #. module: account
3096 #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
3097@@ -3073,17 +3303,17 @@
3098 #: code:addons/account/account.py:1411
3099 #, python-format
3100 msgid "You cannot delete a posted journal entry \"%s\"."
3101-msgstr ""
3102+msgstr "Nu puteti sterge o inregistrare afisata \"%s\" a registrului."
3103
3104 #. module: account
3105 #: view:account.invoice:0
3106 msgid "Accounting Period"
3107-msgstr ""
3108+msgstr "Perioada Contabila"
3109
3110 #. module: account
3111 #: field:account.config.settings,sale_journal_id:0
3112 msgid "Sale journal"
3113-msgstr ""
3114+msgstr "Registru de vanzari"
3115
3116 #. module: account
3117 #: code:addons/account/account.py:2298
3118@@ -3091,7 +3321,7 @@
3119 #: code:addons/account/account_move_line.py:195
3120 #, python-format
3121 msgid "You have to define an analytic journal on the '%s' journal!"
3122-msgstr "Trebuie sa definiti un jurnal analitic in jurnalul '%s' !"
3123+msgstr "Trebuie sa definiti un registru analitic pentru registrul '%s' !"
3124
3125 #. module: account
3126 #: code:addons/account/account.py:781
3127@@ -3100,6 +3330,8 @@
3128 "This journal already contains items, therefore you cannot modify its company "
3129 "field."
3130 msgstr ""
3131+"Acest registru contine deja elemente, prin urmare nu ii puteti modifica "
3132+"campul de companie."
3133
3134 #. module: account
3135 #: code:addons/account/account.py:409
3136@@ -3108,6 +3340,8 @@
3137 "You need an Opening journal with centralisation checked to set the initial "
3138 "balance."
3139 msgstr ""
3140+"Aveti nevoie de un Registru de deschidere cu centralizarea selectata pentru "
3141+"a stabili soldul initial."
3142
3143 #. module: account
3144 #: model:ir.actions.act_window,name:account.action_tax_code_list
3145@@ -3145,7 +3379,7 @@
3146 #. module: account
3147 #: field:accounting.report,debit_credit:0
3148 msgid "Display Debit/Credit Columns"
3149-msgstr ""
3150+msgstr "Afiseaza Coloanele Debit/Credit"
3151
3152 #. module: account
3153 #: selection:account.entries.report,month:0
3154@@ -3170,12 +3404,12 @@
3155 #: view:account.unreconcile:0
3156 #: view:account.unreconcile.reconcile:0
3157 msgid "Unreconcile Transactions"
3158-msgstr ""
3159+msgstr "Nu reconciliaza Tranzactiile"
3160
3161 #. module: account
3162 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
3163 msgid "Only One Chart Template Available"
3164-msgstr ""
3165+msgstr "Doar un singur sablon de planuri disponibil"
3166
3167 #. module: account
3168 #: view:account.chart.template:0
3169@@ -3188,7 +3422,7 @@
3170 #: field:account.bank.statement,message_summary:0
3171 #: field:account.invoice,message_summary:0
3172 msgid "Summary"
3173-msgstr ""
3174+msgstr "Rezumat"
3175
3176 #. module: account
3177 #: help:account.invoice,period_id:0
3178
3179=== modified file 'account/i18n/sk.po'
3180--- account/i18n/sk.po 2013-01-04 09:39:53 +0000
3181+++ account/i18n/sk.po 2013-01-15 10:40:30 +0000
3182@@ -8,14 +8,24 @@
3183 "Project-Id-Version: openobject-addons\n"
3184 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3185 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
3186+<<<<<<< TREE
3187 "PO-Revision-Date: 2010-12-09 10:27+0000\n"
3188 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
3189+=======
3190+"PO-Revision-Date: 2013-01-05 19:13+0000\n"
3191+"Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
3192+>>>>>>> MERGE-SOURCE
3193 "Language-Team: Slovak <sk@li.org>\n"
3194 "MIME-Version: 1.0\n"
3195 "Content-Type: text/plain; charset=UTF-8\n"
3196 "Content-Transfer-Encoding: 8bit\n"
3197+<<<<<<< TREE
3198 "X-Launchpad-Export-Date: 2012-12-22 05:33+0000\n"
3199 "X-Generator: Launchpad (build 16378)\n"
3200+=======
3201+"X-Launchpad-Export-Date: 2013-01-06 05:30+0000\n"
3202+"X-Generator: Launchpad (build 16393)\n"
3203+>>>>>>> MERGE-SOURCE
3204
3205 #. module: account
3206 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
3207@@ -1665,7 +1675,7 @@
3208 #. module: account
3209 #: view:account.journal:0
3210 msgid "Advanced Settings"
3211-msgstr ""
3212+msgstr "Pokročilé nastavenia"
3213
3214 #. module: account
3215 #: view:account.bank.statement:0
3216@@ -3065,7 +3075,7 @@
3217 #: model:ir.ui.menu,name:account.menu_account_customer
3218 #: model:ir.ui.menu,name:account.menu_finance_receivables
3219 msgid "Customers"
3220-msgstr ""
3221+msgstr "Zákazníci"
3222
3223 #. module: account
3224 #: report:account.analytic.account.cost_ledger:0
3225@@ -3225,7 +3235,7 @@
3226 #: model:process.process,name:account.process_process_invoiceprocess0
3227 #: selection:report.invoice.created,type:0
3228 msgid "Customer Invoice"
3229-msgstr ""
3230+msgstr "Faktúra zákazníka"
3231
3232 #. module: account
3233 #: model:ir.model,name:account.model_account_open_closed_fiscalyear
3234@@ -5318,7 +5328,7 @@
3235 #: model:ir.actions.act_window,name:account.action_payment_term_form
3236 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
3237 msgid "Payment Terms"
3238-msgstr ""
3239+msgstr "Termín úhrady"
3240
3241 #. module: account
3242 #: help:account.chart.template,complete_tax_set:0
3243@@ -6556,7 +6566,7 @@
3244 #: field:account.invoice,internal_number:0
3245 #: field:report.invoice.created,number:0
3246 msgid "Invoice Number"
3247-msgstr ""
3248+msgstr "Číslo faktúry"
3249
3250 #. module: account
3251 #: field:account.bank.statement,difference:0
3252@@ -7219,7 +7229,7 @@
3253 #: model:ir.actions.act_window,name:account.action_invoice_tree1
3254 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1
3255 msgid "Customer Invoices"
3256-msgstr ""
3257+msgstr "Faktúry zákazníkov"
3258
3259 #. module: account
3260 #: view:account.tax:0
3261@@ -7404,7 +7414,7 @@
3262 #: field:account.invoice,date_invoice:0
3263 #: field:report.invoice.created,date_invoice:0
3264 msgid "Invoice Date"
3265-msgstr ""
3266+msgstr "Dátum faktúry"
3267
3268 #. module: account
3269 #: view:account.invoice.report:0
3270@@ -7856,7 +7866,7 @@
3271 #: code:addons/account/account_invoice.py:361
3272 #, python-format
3273 msgid "Customer"
3274-msgstr ""
3275+msgstr "Zákazník"
3276
3277 #. module: account
3278 #: field:account.financial.report,name:0
3279@@ -9854,7 +9864,7 @@
3280 #: field:account.invoice,number:0
3281 #: field:account.move,name:0
3282 msgid "Number"
3283-msgstr ""
3284+msgstr "Číslo"
3285
3286 #. module: account
3287 #: report:account.analytic.account.journal:0
3288
3289=== modified file 'account/i18n/sl.po'
3290--- account/i18n/sl.po 2013-01-04 09:39:53 +0000
3291+++ account/i18n/sl.po 2013-01-15 10:40:30 +0000
3292@@ -7,14 +7,25 @@
3293 "Project-Id-Version: OpenERP Server 6.0dev\n"
3294 "Report-Msgid-Bugs-To: support@openerp.com\n"
3295 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
3296+<<<<<<< TREE
3297 "PO-Revision-Date: 2012-12-20 23:02+0000\n"
3298 "Last-Translator: Dusan Laznik <laznik@mentis.si>\n"
3299 "Language-Team: \n"
3300+=======
3301+"PO-Revision-Date: 2013-01-13 12:01+0000\n"
3302+"Last-Translator: Dušan Laznik (Mentis) <laznik@mentis.si>\n"
3303+"Language-Team: Slovenian <sl@li.org>\n"
3304+>>>>>>> MERGE-SOURCE
3305 "MIME-Version: 1.0\n"
3306 "Content-Type: text/plain; charset=UTF-8\n"
3307 "Content-Transfer-Encoding: 8bit\n"
3308+<<<<<<< TREE
3309 "X-Launchpad-Export-Date: 2012-12-22 05:34+0000\n"
3310 "X-Generator: Launchpad (build 16378)\n"
3311+=======
3312+"X-Launchpad-Export-Date: 2013-01-14 05:17+0000\n"
3313+"X-Generator: Launchpad (build 16420)\n"
3314+>>>>>>> MERGE-SOURCE
3315
3316 #. module: account
3317 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
3318@@ -5728,7 +5739,7 @@
3319 #: selection:account.period,state:0
3320 #: selection:report.invoice.created,state:0
3321 msgid "Open"
3322-msgstr "Odpri"
3323+msgstr "Odprto"
3324
3325 #. module: account
3326 #: view:account.config.settings:0
3327
3328=== modified file 'account/wizard/account_open_closed_fiscalyear_view.xml'
3329--- account/wizard/account_open_closed_fiscalyear_view.xml 2012-11-29 22:26:45 +0000
3330+++ account/wizard/account_open_closed_fiscalyear_view.xml 2013-01-15 10:40:30 +0000
3331@@ -5,8 +5,8 @@
3332 <field name="name">account.open.closed.fiscalyear.form</field>
3333 <field name="model">account.open.closed.fiscalyear</field>
3334 <field name="arch" type="xml">
3335- <form string="Cancel Fiscal Year Opening Entries" version="7.0">
3336- <separator string="Cancel Fiscal Year Opening Entries"/>
3337+ <form string="Cancel Fiscal Year Closing Entries" version="7.0">
3338+ <separator string="Cancel Fiscal Year Closing Entries"/>
3339 <p class="oe_grey">
3340 This wizard will remove the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year.
3341 </p>
3342@@ -14,7 +14,7 @@
3343 <field name="fyear_id" domain="[('state','=','draft'), ('end_journal_period_id', '!=', False)]"/>
3344 </group>
3345 <footer>
3346- <button string="Cancel Opening Entries" name="remove_entries" type="object" class="oe_highlight"/>
3347+ <button string="Cancel Closing Entries" name="remove_entries" type="object" class="oe_highlight"/>
3348 or
3349 <button string="Discard" class="oe_link" special="cancel"/>
3350 </footer>
3351@@ -23,7 +23,7 @@
3352 </record>
3353
3354 <record id="action_account_open_closed_fiscalyear" model="ir.actions.act_window">
3355- <field name="name">Cancel Opening Entries</field>
3356+ <field name="name">Cancel Closing Entries</field>
3357 <field name="res_model">account.open.closed.fiscalyear</field>
3358 <field name="view_type">form</field>
3359 <field name="view_mode">tree,form</field>
3360
3361=== modified file 'account_accountant/i18n/ro.po'
3362--- account_accountant/i18n/ro.po 2013-01-04 09:39:53 +0000
3363+++ account_accountant/i18n/ro.po 2013-01-15 10:40:30 +0000
3364@@ -8,18 +8,29 @@
3365 "Project-Id-Version: openobject-addons\n"
3366 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3367 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
3368+<<<<<<< TREE
3369 "PO-Revision-Date: 2010-11-27 07:29+0000\n"
3370 "Last-Translator: OpenERP Administrators <Unknown>\n"
3371+=======
3372+"PO-Revision-Date: 2013-01-07 16:18+0000\n"
3373+"Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
3374+>>>>>>> MERGE-SOURCE
3375 "Language-Team: Romanian <ro@li.org>\n"
3376 "MIME-Version: 1.0\n"
3377 "Content-Type: text/plain; charset=UTF-8\n"
3378 "Content-Transfer-Encoding: 8bit\n"
3379+<<<<<<< TREE
3380 "X-Launchpad-Export-Date: 2012-12-22 06:03+0000\n"
3381 "X-Generator: Launchpad (build 16378)\n"
3382+=======
3383+"X-Launchpad-Export-Date: 2013-01-08 06:05+0000\n"
3384+"X-Generator: Launchpad (build 16402)\n"
3385+>>>>>>> MERGE-SOURCE
3386
3387 #. module: account_accountant
3388 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
3389 msgid "Open Accounting Menu"
3390+<<<<<<< TREE
3391 msgstr ""
3392
3393 #~ msgid "Accountant"
3394@@ -36,3 +47,6 @@
3395 #~ "Acest modul permite utilizatorului admin accesul la toate caracteristicile "
3396 #~ "contabile precum elementele jurnalului sau planul de conturi.\n"
3397 #~ " "
3398+=======
3399+msgstr "Deschide Meniul Contabilitate"
3400+>>>>>>> MERGE-SOURCE
3401
3402=== modified file 'account_analytic_analysis/account_analytic_analysis_view.xml'
3403--- account_analytic_analysis/account_analytic_analysis_view.xml 2012-12-21 16:48:08 +0000
3404+++ account_analytic_analysis/account_analytic_analysis_view.xml 2013-01-15 10:40:30 +0000
3405@@ -22,8 +22,8 @@
3406 <label for="quantity_max"/>
3407 <div>
3408 <field name="quantity_max"/>
3409- <div attrs="{'invisible': [('quantity','=',0)]}" class="oe_grey">
3410- <field name="quantity" class="oe_inline"/> Units Done
3411+ <div attrs="{'invisible': [('hours_quantity','=',0)]}" class="oe_grey">
3412+ <field name="hours_quantity" class="oe_inline"/> Units Consumed
3413 </div>
3414 <div attrs="{'invisible': [('quantity_max','=',0)]}" class="oe_grey">
3415 <field name="remaining_hours" class="oe_inline"/> Units Remaining
3416
3417=== modified file 'account_analytic_analysis/i18n/fr.po'
3418--- account_analytic_analysis/i18n/fr.po 2013-01-04 09:39:53 +0000
3419+++ account_analytic_analysis/i18n/fr.po 2013-01-15 10:40:30 +0000
3420@@ -7,19 +7,30 @@
3421 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
3422 "Report-Msgid-Bugs-To: support@openerp.com\n"
3423 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
3424+<<<<<<< TREE
3425 "PO-Revision-Date: 2012-12-19 15:53+0000\n"
3426 "Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\n"
3427 "Language-Team: \n"
3428+=======
3429+"PO-Revision-Date: 2013-01-08 09:03+0000\n"
3430+"Last-Translator: Numérigraphe <Unknown>\n"
3431+"Language-Team: French <fr@li.org>\n"
3432+>>>>>>> MERGE-SOURCE
3433 "MIME-Version: 1.0\n"
3434 "Content-Type: text/plain; charset=UTF-8\n"
3435 "Content-Transfer-Encoding: 8bit\n"
3436+<<<<<<< TREE
3437 "X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
3438 "X-Generator: Launchpad (build 16378)\n"
3439+=======
3440+"X-Launchpad-Export-Date: 2013-01-09 05:52+0000\n"
3441+"X-Generator: Launchpad (build 16412)\n"
3442+>>>>>>> MERGE-SOURCE
3443
3444 #. module: account_analytic_analysis
3445 #: view:account.analytic.account:0
3446 msgid "No order to invoice, create"
3447-msgstr ""
3448+msgstr "Aucune commande à facturer, créer"
3449
3450 #. module: account_analytic_analysis
3451 #: view:account.analytic.account:0
3452@@ -98,13 +109,13 @@
3453 #. module: account_analytic_analysis
3454 #: help:account.analytic.account,timesheet_ca_invoiced:0
3455 msgid "Sum of timesheet lines invoiced for this contract."
3456-msgstr ""
3457+msgstr "Total du temps passé facturé pour ce contrat."
3458
3459 #. module: account_analytic_analysis
3460 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
3461 #, python-format
3462 msgid "Sales Order Lines of %s"
3463-msgstr ""
3464+msgstr "Lignes de commandes de %s"
3465
3466 #. module: account_analytic_analysis
3467 #: help:account.analytic.account,revenue_per_hour:0
3468@@ -156,7 +167,7 @@
3469 #. module: account_analytic_analysis
3470 #: view:account.analytic.account:0
3471 msgid "Account Manager"
3472-msgstr ""
3473+msgstr "Responsable du compte"
3474
3475 #. module: account_analytic_analysis
3476 #: help:account.analytic.account,remaining_hours_to_invoice:0
3477@@ -172,7 +183,7 @@
3478 #. module: account_analytic_analysis
3479 #: view:account.analytic.account:0
3480 msgid "Contracts not assigned"
3481-msgstr ""
3482+msgstr "Liste des contrats non assignés"
3483
3484 #. module: account_analytic_analysis
3485 #: help:account.analytic.account,theorical_margin:0
3486@@ -211,6 +222,7 @@
3487 #: help:account.analytic.account,remaining_hours:0
3488 msgid "Computed using the formula: Maximum Time - Total Worked Time"
3489 msgstr ""
3490+"Calculé en appliquant la formule: Temps Maximum - Total du temps passé"
3491
3492 #. module: account_analytic_analysis
3493 #: help:account.analytic.account,hours_quantity:0
3494@@ -225,12 +237,12 @@
3495 #. module: account_analytic_analysis
3496 #: view:account.analytic.account:0
3497 msgid "Nothing to invoice, create"
3498-msgstr ""
3499+msgstr "Rien à facturer, créer"
3500
3501 #. module: account_analytic_analysis
3502 #: model:res.groups,name:account_analytic_analysis.group_template_required
3503 msgid "Mandatory use of templates in contracts"
3504-msgstr ""
3505+msgstr "Utilisation obligatoire des modèles dans les contrats"
3506
3507 #. module: account_analytic_analysis
3508 #: field:account.analytic.account,hours_quantity:0
3509@@ -414,6 +426,8 @@
3510 "Allows you to set the template field as required when creating an analytic "
3511 "account or a contract."
3512 msgstr ""
3513+"Vous permet de rendre le champ template obligatoire lors de la création d'un "
3514+"compte analytique ou d'un contrat."
3515
3516 #. module: account_analytic_analysis
3517 #: help:account.analytic.account,hours_qtt_invoiced:0
3518@@ -448,12 +462,12 @@
3519 #. module: account_analytic_analysis
3520 #: field:account.analytic.account,toinvoice_total:0
3521 msgid "Total to Invoice"
3522-msgstr ""
3523+msgstr "Total à facturer"
3524
3525 #. module: account_analytic_analysis
3526 #: view:account.analytic.account:0
3527 msgid "Sale Orders"
3528-msgstr ""
3529+msgstr "Commandes de vente"
3530
3531 #. module: account_analytic_analysis
3532 #: view:account.analytic.account:0
3533@@ -463,7 +477,7 @@
3534 #. module: account_analytic_analysis
3535 #: field:account.analytic.account,invoiced_total:0
3536 msgid "Total Invoiced"
3537-msgstr ""
3538+msgstr "Total facturé"
3539
3540 #. module: account_analytic_analysis
3541 #: help:account.analytic.account,remaining_ca:0
3542@@ -479,7 +493,7 @@
3543 #. module: account_analytic_analysis
3544 #: view:account.analytic.account:0
3545 msgid "Units Remaining"
3546-msgstr ""
3547+msgstr "Unités restantes"
3548
3549 #. module: account_analytic_analysis
3550 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
3551@@ -527,7 +541,7 @@
3552 #. module: account_analytic_analysis
3553 #: help:account.analytic.account,toinvoice_total:0
3554 msgid " Sum of everything that could be invoiced for this contract."
3555-msgstr ""
3556+msgstr " Somme de tout ce qui est facturable pour ce contrat"
3557
3558 #. module: account_analytic_analysis
3559 #: field:account.analytic.account,theorical_margin:0
3560@@ -537,7 +551,7 @@
3561 #. module: account_analytic_analysis
3562 #: field:account.analytic.account,remaining_total:0
3563 msgid "Total Remaining"
3564-msgstr ""
3565+msgstr "Total restant"
3566
3567 #. module: account_analytic_analysis
3568 #: help:account.analytic.account,real_margin:0
3569@@ -547,12 +561,12 @@
3570 #. module: account_analytic_analysis
3571 #: field:account.analytic.account,hours_qtt_est:0
3572 msgid "Estimation of Hours to Invoice"
3573-msgstr ""
3574+msgstr "Estimation des heures à facturer"
3575
3576 #. module: account_analytic_analysis
3577 #: field:account.analytic.account,fix_price_invoices:0
3578 msgid "Fixed Price"
3579-msgstr ""
3580+msgstr "Forfait"
3581
3582 #. module: account_analytic_analysis
3583 #: help:account.analytic.account,last_worked_date:0
3584@@ -562,23 +576,23 @@
3585 #. module: account_analytic_analysis
3586 #: model:ir.model,name:account_analytic_analysis.model_sale_config_settings
3587 msgid "sale.config.settings"
3588-msgstr ""
3589+msgstr "sale.config.settings"
3590
3591 #. module: account_analytic_analysis
3592 #: field:sale.config.settings,group_template_required:0
3593 msgid "Mandatory use of templates."
3594-msgstr ""
3595+msgstr "Utilisation obligatoire des modèles."
3596
3597 #. module: account_analytic_analysis
3598 #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
3599 #: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
3600 msgid "Contract Template"
3601-msgstr ""
3602+msgstr "Modèle de contrat"
3603
3604 #. module: account_analytic_analysis
3605 #: view:account.analytic.account:0
3606 msgid "Units Done"
3607-msgstr ""
3608+msgstr "Unités terminées"
3609
3610 #. module: account_analytic_analysis
3611 #: help:account.analytic.account,total_cost:0
3612@@ -593,7 +607,7 @@
3613 #. module: account_analytic_analysis
3614 #: field:account.analytic.account,est_total:0
3615 msgid "Total Estimation"
3616-msgstr ""
3617+msgstr "Estimation totale"
3618
3619 #. module: account_analytic_analysis
3620 #: field:account.analytic.account,remaining_ca:0
3621@@ -620,15 +634,17 @@
3622 msgid ""
3623 "the field template of the analytic accounts and contracts will be required."
3624 msgstr ""
3625+"Le champ \"modèle\" des comptes analytiques et des contrats sera obligatoire."
3626
3627 #. module: account_analytic_analysis
3628 #: field:account.analytic.account,invoice_on_timesheets:0
3629 msgid "On Timesheets"
3630-msgstr ""
3631+msgstr "Sur les feuilles de temps"
3632
3633 #. module: account_analytic_analysis
3634 #: view:account.analytic.account:0
3635 msgid "Total"
3636+<<<<<<< TREE
3637 msgstr ""
3638
3639 #~ msgid "Hours summary by user"
3640@@ -825,3 +841,6 @@
3641
3642 #~ msgid "Associated Partner"
3643 #~ msgstr "Partenaire associé"
3644+=======
3645+msgstr "Total"
3646+>>>>>>> MERGE-SOURCE
3647
3648=== modified file 'account_analytic_analysis/i18n/mn.po'
3649--- account_analytic_analysis/i18n/mn.po 2013-01-04 09:39:53 +0000
3650+++ account_analytic_analysis/i18n/mn.po 2013-01-15 10:40:30 +0000
3651@@ -13,8 +13,13 @@
3652 "MIME-Version: 1.0\n"
3653 "Content-Type: text/plain; charset=UTF-8\n"
3654 "Content-Transfer-Encoding: 8bit\n"
3655+<<<<<<< TREE
3656 "X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
3657 "X-Generator: Launchpad (build 16378)\n"
3658+=======
3659+"X-Launchpad-Export-Date: 2013-01-05 05:39+0000\n"
3660+"X-Generator: Launchpad (build 16393)\n"
3661+>>>>>>> MERGE-SOURCE
3662
3663 #. module: account_analytic_analysis
3664 #: view:account.analytic.account:0
3665
3666=== modified file 'account_analytic_analysis/i18n/ro.po'
3667--- account_analytic_analysis/i18n/ro.po 2013-01-04 09:39:53 +0000
3668+++ account_analytic_analysis/i18n/ro.po 2013-01-15 10:40:30 +0000
3669@@ -7,19 +7,30 @@
3670 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
3671 "Report-Msgid-Bugs-To: support@openerp.com\n"
3672 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
3673+<<<<<<< TREE
3674 "PO-Revision-Date: 2010-10-30 16:17+0000\n"
3675 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
3676 "Language-Team: \n"
3677+=======
3678+"PO-Revision-Date: 2013-01-11 21:31+0000\n"
3679+"Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
3680+"Language-Team: Romanian <ro@li.org>\n"
3681+>>>>>>> MERGE-SOURCE
3682 "MIME-Version: 1.0\n"
3683 "Content-Type: text/plain; charset=UTF-8\n"
3684 "Content-Transfer-Encoding: 8bit\n"
3685+<<<<<<< TREE
3686 "X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
3687 "X-Generator: Launchpad (build 16378)\n"
3688+=======
3689+"X-Launchpad-Export-Date: 2013-01-12 05:40+0000\n"
3690+"X-Generator: Launchpad (build 16420)\n"
3691+>>>>>>> MERGE-SOURCE
3692
3693 #. module: account_analytic_analysis
3694 #: view:account.analytic.account:0
3695 msgid "No order to invoice, create"
3696-msgstr ""
3697+msgstr "Nici o comanda de facturat, creati una"
3698
3699 #. module: account_analytic_analysis
3700 #: view:account.analytic.account:0
3701@@ -29,12 +40,12 @@
3702 #. module: account_analytic_analysis
3703 #: view:account.analytic.account:0
3704 msgid "To Invoice"
3705-msgstr ""
3706+msgstr "De facturat"
3707
3708 #. module: account_analytic_analysis
3709 #: view:account.analytic.account:0
3710 msgid "Remaining"
3711-msgstr ""
3712+msgstr "Ramas(a)"
3713
3714 #. module: account_analytic_analysis
3715 #: view:account.analytic.account:0
3716@@ -69,11 +80,17 @@
3717 "to\n"
3718 " define the customer invoice price rate."
3719 msgstr ""
3720+"Atunci cand facturati pe baza pontajului, OpenERP foloseste\n"
3721+" lista de preturi a contactului care foloseste "
3722+"pretul\n"
3723+" definit al produselor asociate fiecarui angajat "
3724+"pentru a\n"
3725+" defini rata pretului facturii clientului."
3726
3727 #. module: account_analytic_analysis
3728 #: view:account.analytic.account:0
3729 msgid "⇒ Invoice"
3730-msgstr ""
3731+msgstr "⇒ Factura"
3732
3733 #. module: account_analytic_analysis
3734 #: field:account.analytic.account,ca_invoiced:0
3735@@ -83,12 +100,12 @@
3736 #. module: account_analytic_analysis
3737 #: field:account.analytic.account,last_worked_invoiced_date:0
3738 msgid "Date of Last Invoiced Cost"
3739-msgstr "Data ultimului cost facturat"
3740+msgstr "Data Ultimului Cost Facturat"
3741
3742 #. module: account_analytic_analysis
3743 #: help:account.analytic.account,fix_price_to_invoice:0
3744 msgid "Sum of quotations for this contract."
3745-msgstr ""
3746+msgstr "Suma cotatiilor pentru acest contract."
3747
3748 #. module: account_analytic_analysis
3749 #: help:account.analytic.account,ca_invoiced:0
3750@@ -98,13 +115,13 @@
3751 #. module: account_analytic_analysis
3752 #: help:account.analytic.account,timesheet_ca_invoiced:0
3753 msgid "Sum of timesheet lines invoiced for this contract."
3754-msgstr ""
3755+msgstr "Suma liniilor fiselor de pontaj facturate pentru acest contract."
3756
3757 #. module: account_analytic_analysis
3758 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
3759 #, python-format
3760 msgid "Sales Order Lines of %s"
3761-msgstr ""
3762+msgstr "Liniile Comenzii de Vanzare de %s"
3763
3764 #. module: account_analytic_analysis
3765 #: help:account.analytic.account,revenue_per_hour:0
3766@@ -122,7 +139,7 @@
3767 #. module: account_analytic_analysis
3768 #: view:account.analytic.account:0
3769 msgid "Partner"
3770-msgstr ""
3771+msgstr "Partener"
3772
3773 #. module: account_analytic_analysis
3774 #: view:account.analytic.account:0
3775@@ -147,6 +164,22 @@
3776 " </p>\n"
3777 " "
3778 msgstr ""
3779+"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
3780+" Faceti click pentru a defini un contract nou.\n"
3781+" </p><p>\n"
3782+" Aici veti gasi contractele care trebuie reinnointe pentru "
3783+"ca\n"
3784+" data de sfarsit a trecut sau efortul de lucru este mai mare "
3785+"decat cel\n"
3786+" maxim autorizat.\n"
3787+" </p><p>\n"
3788+" OpenERP configureaza automat reinnoirea contractelor aflate "
3789+"in starea de\n"
3790+" asteptare. Dupa negocieri, agentul de vanzari ar trebui sa "
3791+"inchida sau sa reinnoiasca\n"
3792+" contractele in asteptare.\n"
3793+" </p>\n"
3794+" "
3795
3796 #. module: account_analytic_analysis
3797 #: view:account.analytic.account:0
3798@@ -156,27 +189,27 @@
3799 #. module: account_analytic_analysis
3800 #: view:account.analytic.account:0
3801 msgid "Account Manager"
3802-msgstr ""
3803+msgstr "Manager financiar contabil"
3804
3805 #. module: account_analytic_analysis
3806 #: help:account.analytic.account,remaining_hours_to_invoice:0
3807 msgid "Computed using the formula: Maximum Time - Total Invoiced Time"
3808-msgstr ""
3809+msgstr "Calculat folosind formula: Timpul Maxim - Timpul Total Facturat"
3810
3811 #. module: account_analytic_analysis
3812 #: view:account.analytic.account:0
3813 msgid "Expected"
3814-msgstr ""
3815+msgstr "Estimat"
3816
3817 #. module: account_analytic_analysis
3818 #: view:account.analytic.account:0
3819 msgid "Contracts not assigned"
3820-msgstr ""
3821+msgstr "Contracte nealocate"
3822
3823 #. module: account_analytic_analysis
3824 #: help:account.analytic.account,theorical_margin:0
3825 msgid "Computed using the formula: Theoretical Revenue - Total Costs"
3826-msgstr ""
3827+msgstr "Calculat folosind formula: Venitul Teoretic - Costurile Totale"
3828
3829 #. module: account_analytic_analysis
3830 #: field:account.analytic.account,hours_qtt_invoiced:0
3831@@ -197,6 +230,8 @@
3832 "{'required': [('type','=','contract')], 'invisible': [('type','in',['view', "
3833 "'normal','template'])]}"
3834 msgstr ""
3835+"{'obligatoriu': [('tip','=','contract')], 'invizibil': "
3836+"[('tip','in',['vizualizare', 'normal','sablon'])]}"
3837
3838 #. module: account_analytic_analysis
3839 #: field:account.analytic.account,real_margin_rate:0
3840@@ -206,7 +241,7 @@
3841 #. module: account_analytic_analysis
3842 #: help:account.analytic.account,remaining_hours:0
3843 msgid "Computed using the formula: Maximum Time - Total Worked Time"
3844-msgstr ""
3845+msgstr "Calculat folosind formula: Timpul Maxim - Timpul Total Lucrat="
3846
3847 #. module: account_analytic_analysis
3848 #: help:account.analytic.account,hours_quantity:0
3849@@ -220,17 +255,17 @@
3850 #. module: account_analytic_analysis
3851 #: view:account.analytic.account:0
3852 msgid "Nothing to invoice, create"
3853-msgstr ""
3854+msgstr "Nimic de facturat, creati"
3855
3856 #. module: account_analytic_analysis
3857 #: model:res.groups,name:account_analytic_analysis.group_template_required
3858 msgid "Mandatory use of templates in contracts"
3859-msgstr ""
3860+msgstr "Utilizare obligatorie a sabloanelor in contracte"
3861
3862 #. module: account_analytic_analysis
3863 #: field:account.analytic.account,hours_quantity:0
3864 msgid "Total Worked Time"
3865-msgstr ""
3866+msgstr "Timpul Total Lucrat"
3867
3868 #. module: account_analytic_analysis
3869 #: field:account.analytic.account,real_margin:0
3870@@ -250,12 +285,12 @@
3871 #. module: account_analytic_analysis
3872 #: view:account.analytic.account:0
3873 msgid "or view"
3874-msgstr ""
3875+msgstr "sau vizualizare"
3876
3877 #. module: account_analytic_analysis
3878 #: view:account.analytic.account:0
3879 msgid "Customer Contracts"
3880-msgstr ""
3881+msgstr "Contractele Clientilor"
3882
3883 #. module: account_analytic_analysis
3884 #: view:account.analytic.account:0
3885@@ -272,7 +307,7 @@
3886 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
3887 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
3888 msgid "Time & Materials to Invoice"
3889-msgstr ""
3890+msgstr "Timp si Materiale de Facturat"
3891
3892 #. module: account_analytic_analysis
3893 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
3894@@ -283,12 +318,12 @@
3895 #. module: account_analytic_analysis
3896 #: view:account.analytic.account:0
3897 msgid "Start Date"
3898-msgstr ""
3899+msgstr "Data de Inceput"
3900
3901 #. module: account_analytic_analysis
3902 #: view:account.analytic.account:0
3903 msgid "Invoiced"
3904-msgstr ""
3905+msgstr "Facturat"
3906
3907 #. module: account_analytic_analysis
3908 #: view:account.analytic.account:0
3909@@ -302,12 +337,12 @@
3910 #. module: account_analytic_analysis
3911 #: view:account.analytic.account:0
3912 msgid "Pending contracts to renew with your customer"
3913-msgstr "Contracte in asteptare care vor fi reiinoite cu clientul d-voastra"
3914+msgstr "Contracte in asteptare care vor fi reinnoite cu clientul d-voastra"
3915
3916 #. module: account_analytic_analysis
3917 #: view:account.analytic.account:0
3918 msgid "Timesheets"
3919-msgstr ""
3920+msgstr "Fise de pontaj"
3921
3922 #. module: account_analytic_analysis
3923 #: help:account.analytic.account,hours_qtt_non_invoiced:0
3924@@ -331,7 +366,7 @@
3925 #. module: account_analytic_analysis
3926 #: view:account.analytic.account:0
3927 msgid "Status"
3928-msgstr ""
3929+msgstr "Status"
3930
3931 #. module: account_analytic_analysis
3932 #: field:account.analytic.account,ca_theorical:0
3933@@ -353,7 +388,7 @@
3934 #. module: account_analytic_analysis
3935 #: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
3936 msgid "Sales Orders"
3937-msgstr ""
3938+msgstr "Comenzi de Vanzari"
3939
3940 #. module: account_analytic_analysis
3941 #: help:account.analytic.account,last_invoice_date:0
3942@@ -390,6 +425,16 @@
3943 " </p>\n"
3944 " "
3945 msgstr ""
3946+"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
3947+" Faceti click pentru a crea un sablon al contractului.\n"
3948+" </p><p>\n"
3949+" Sabloanele sunt folosite pentru a prefigura "
3950+"contractul/proiectul care \n"
3951+" poate fi selectat de catre agentii de vanzari pentru a "
3952+"configura repede\n"
3953+" termenii si conditiile contractului.\n"
3954+" </p>\n"
3955+" "
3956
3957 #. module: account_analytic_analysis
3958 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
3959@@ -407,6 +452,8 @@
3960 "Allows you to set the template field as required when creating an analytic "
3961 "account or a contract."
3962 msgstr ""
3963+"Va permite sa setati campul sablonului asa cum trebuie atunci cand creeaza "
3964+"un cont analitic sau un contract."
3965
3966 #. module: account_analytic_analysis
3967 #: help:account.analytic.account,hours_qtt_invoiced:0
3968@@ -437,16 +484,27 @@
3969 " </p>\n"
3970 " "
3971 msgstr ""
3972+"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
3973+" Faceti click pentru a crea un contract nou.\n"
3974+" </p><p>\n"
3975+" Utilizati contractele pentru a urmari sarcini, probleme, "
3976+"fise de pontaj sau facturarea pe baza\n"
3977+" muncii efectuate, a ordinelor de cheltuieli si/sau a "
3978+"comenzilor de vanzari. OpenERP va gestiona automat\n"
3979+" alertele pentru reinnoirea contractelor agentului de "
3980+"vanzari indreptatit.\n"
3981+" </p>\n"
3982+" "
3983
3984 #. module: account_analytic_analysis
3985 #: field:account.analytic.account,toinvoice_total:0
3986 msgid "Total to Invoice"
3987-msgstr ""
3988+msgstr "Totalul de Facturat"
3989
3990 #. module: account_analytic_analysis
3991 #: view:account.analytic.account:0
3992 msgid "Sale Orders"
3993-msgstr ""
3994+msgstr "Comenzi de Vanzari"
3995
3996 #. module: account_analytic_analysis
3997 #: view:account.analytic.account:0
3998@@ -456,12 +514,13 @@
3999 #. module: account_analytic_analysis
4000 #: field:account.analytic.account,invoiced_total:0
4001 msgid "Total Invoiced"
4002-msgstr ""
4003+msgstr "Total Facturat"
4004
4005 #. module: account_analytic_analysis
4006 #: help:account.analytic.account,remaining_ca:0
4007 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
4008-msgstr "Calculat folosind formula: Pretul maxim factura - Valoarea facturata"
4009+msgstr ""
4010+"Calculat folosind formula: Pretul maxim factura - Valoarea facturata."
4011
4012 #. module: account_analytic_analysis
4013 #: field:account.analytic.account,last_invoice_date:0
4014@@ -471,7 +530,7 @@
4015 #. module: account_analytic_analysis
4016 #: view:account.analytic.account:0
4017 msgid "Units Remaining"
4018-msgstr ""
4019+msgstr "Unitati Ramase"
4020
4021 #. module: account_analytic_analysis
4022 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
4023@@ -486,6 +545,15 @@
4024 " </p>\n"
4025 " "
4026 msgstr ""
4027+"<p>\n"
4028+" Aici veti gasi fise de pontaj si achizitii pe care le-ati "
4029+"efectuat pentru\n"
4030+" contracte care pot fi refacturate clientului. Daca doriti\n"
4031+" sa inregistrati activitati noi de facturat, ar trebui sa "
4032+"folositi meniul\n"
4033+" fiselor de pontaj.\n"
4034+" </p>\n"
4035+" "
4036
4037 #. module: account_analytic_analysis
4038 #: field:account.analytic.account,hours_qtt_non_invoiced:0
4039@@ -509,6 +577,9 @@
4040 "remaining subtotals which, in turn, are computed as the maximum between "
4041 "'(Estimation - Invoiced)' and 'To Invoice' amounts"
4042 msgstr ""
4043+"Asteptarile privind veniturile ramase pentru acest contract. Calculat ca "
4044+"suma subtotalurilor ramase care, in schimb, sunt calculate drept maximul "
4045+"dintre sumele '(Estimare - Facturat)' si 'De Facturat'"
4046
4047 #. module: account_analytic_analysis
4048 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
4049@@ -519,7 +590,7 @@
4050 #. module: account_analytic_analysis
4051 #: help:account.analytic.account,toinvoice_total:0
4052 msgid " Sum of everything that could be invoiced for this contract."
4053-msgstr ""
4054+msgstr " Suma a tot ceea ce poate fi facturat pentru acest contract."
4055
4056 #. module: account_analytic_analysis
4057 #: field:account.analytic.account,theorical_margin:0
4058@@ -529,22 +600,22 @@
4059 #. module: account_analytic_analysis
4060 #: field:account.analytic.account,remaining_total:0
4061 msgid "Total Remaining"
4062-msgstr ""
4063+msgstr "Total ramas"
4064
4065 #. module: account_analytic_analysis
4066 #: help:account.analytic.account,real_margin:0
4067 msgid "Computed using the formula: Invoiced Amount - Total Costs."
4068-msgstr "Calculat folosind formula: Valoare facturata - Total costuri."
4069+msgstr "Calculat folosind formula: Valoarea Facturata - Costuri Totale."
4070
4071 #. module: account_analytic_analysis
4072 #: field:account.analytic.account,hours_qtt_est:0
4073 msgid "Estimation of Hours to Invoice"
4074-msgstr ""
4075+msgstr "Estimarea Orelor de Facturat"
4076
4077 #. module: account_analytic_analysis
4078 #: field:account.analytic.account,fix_price_invoices:0
4079 msgid "Fixed Price"
4080-msgstr ""
4081+msgstr "Pret Fix"
4082
4083 #. module: account_analytic_analysis
4084 #: help:account.analytic.account,last_worked_date:0
4085@@ -554,23 +625,23 @@
4086 #. module: account_analytic_analysis
4087 #: model:ir.model,name:account_analytic_analysis.model_sale_config_settings
4088 msgid "sale.config.settings"
4089-msgstr ""
4090+msgstr "setari.config.vanzare"
4091
4092 #. module: account_analytic_analysis
4093 #: field:sale.config.settings,group_template_required:0
4094 msgid "Mandatory use of templates."
4095-msgstr ""
4096+msgstr "Utilizare obligatorie a sabloanelor."
4097
4098 #. module: account_analytic_analysis
4099 #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
4100 #: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
4101 msgid "Contract Template"
4102-msgstr ""
4103+msgstr "Sablon de Contract"
4104
4105 #. module: account_analytic_analysis
4106 #: view:account.analytic.account:0
4107 msgid "Units Done"
4108-msgstr ""
4109+msgstr "Unitati Efectuate"
4110
4111 #. module: account_analytic_analysis
4112 #: help:account.analytic.account,total_cost:0
4113@@ -584,7 +655,7 @@
4114 #. module: account_analytic_analysis
4115 #: field:account.analytic.account,est_total:0
4116 msgid "Total Estimation"
4117-msgstr ""
4118+msgstr "Estimarea Totala"
4119
4120 #. module: account_analytic_analysis
4121 #: field:account.analytic.account,remaining_ca:0
4122@@ -611,15 +682,17 @@
4123 msgid ""
4124 "the field template of the analytic accounts and contracts will be required."
4125 msgstr ""
4126+"va fi necesar campul sablon al conturilor analitice si al contractelor."
4127
4128 #. module: account_analytic_analysis
4129 #: field:account.analytic.account,invoice_on_timesheets:0
4130 msgid "On Timesheets"
4131-msgstr ""
4132+msgstr "Pe Fisele de Pontaj"
4133
4134 #. module: account_analytic_analysis
4135 #: view:account.analytic.account:0
4136 msgid "Total"
4137+<<<<<<< TREE
4138 msgstr ""
4139
4140 #~ msgid ""
4141@@ -811,3 +884,6 @@
4142 #~ "asteptare pentru a avertiza asupra inregistrarii fiselor de pontaj. Agentii "
4143 #~ "de vanzari ar trebui sa verifice toare conturile in asteptare si sa le "
4144 #~ "redeschida sau sa le inchida in functie de negocierea cu clientul."
4145+=======
4146+msgstr "Total"
4147+>>>>>>> MERGE-SOURCE
4148
4149=== modified file 'account_analytic_analysis/i18n/sl.po'
4150--- account_analytic_analysis/i18n/sl.po 2013-01-04 09:39:53 +0000
4151+++ account_analytic_analysis/i18n/sl.po 2013-01-15 10:40:30 +0000
4152@@ -7,14 +7,25 @@
4153 "Project-Id-Version: OpenERP Server 6.0dev\n"
4154 "Report-Msgid-Bugs-To: support@openerp.com\n"
4155 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
4156+<<<<<<< TREE
4157 "PO-Revision-Date: 2010-10-30 12:01+0000\n"
4158 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
4159 "Language-Team: \n"
4160+=======
4161+"PO-Revision-Date: 2013-01-13 12:08+0000\n"
4162+"Last-Translator: Dušan Laznik (Mentis) <laznik@mentis.si>\n"
4163+"Language-Team: Slovenian <sl@li.org>\n"
4164+>>>>>>> MERGE-SOURCE
4165 "MIME-Version: 1.0\n"
4166 "Content-Type: text/plain; charset=UTF-8\n"
4167 "Content-Transfer-Encoding: 8bit\n"
4168+<<<<<<< TREE
4169 "X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
4170 "X-Generator: Launchpad (build 16378)\n"
4171+=======
4172+"X-Launchpad-Export-Date: 2013-01-14 05:17+0000\n"
4173+"X-Generator: Launchpad (build 16420)\n"
4174+>>>>>>> MERGE-SOURCE
4175
4176 #. module: account_analytic_analysis
4177 #: view:account.analytic.account:0
4178@@ -439,7 +450,7 @@
4179 #. module: account_analytic_analysis
4180 #: view:account.analytic.account:0
4181 msgid "Open"
4182-msgstr "Odpri"
4183+msgstr "Odprto"
4184
4185 #. module: account_analytic_analysis
4186 #: field:account.analytic.account,invoiced_total:0
4187
4188=== modified file 'account_analytic_default/i18n/de.po'
4189--- account_analytic_default/i18n/de.po 2013-01-04 09:39:53 +0000
4190+++ account_analytic_default/i18n/de.po 2013-01-15 10:40:30 +0000
4191@@ -7,15 +7,27 @@
4192 "Project-Id-Version: OpenERP Server 6.0dev\n"
4193 "Report-Msgid-Bugs-To: support@openerp.com\n"
4194 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
4195+<<<<<<< TREE
4196 "PO-Revision-Date: 2012-12-06 22:26+0000\n"
4197 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
4198 "consulting.net>\n"
4199 "Language-Team: \n"
4200+=======
4201+"PO-Revision-Date: 2013-01-06 19:42+0000\n"
4202+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
4203+"consulting.net>\n"
4204+"Language-Team: German <de@li.org>\n"
4205+>>>>>>> MERGE-SOURCE
4206 "MIME-Version: 1.0\n"
4207 "Content-Type: text/plain; charset=UTF-8\n"
4208 "Content-Transfer-Encoding: 8bit\n"
4209+<<<<<<< TREE
4210 "X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
4211 "X-Generator: Launchpad (build 16378)\n"
4212+=======
4213+"X-Launchpad-Export-Date: 2013-01-07 05:44+0000\n"
4214+"X-Generator: Launchpad (build 16402)\n"
4215+>>>>>>> MERGE-SOURCE
4216
4217 #. module: account_analytic_default
4218 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
4219@@ -41,6 +53,10 @@
4220 "default (e.g. create new customer invoice or Sales order if we select this "
4221 "product, it will automatically take this as an analytic account)"
4222 msgstr ""
4223+"Wählen Sie das Produkt, welches diese Kostenstelle als Standard bei einer "
4224+"Buchung eintragen soll (z.B. bei einer Rechnung oder einem Auftrag soll dann "
4225+"diese Kostenstelle automatisch eingetragen werden, wenn das entsprechende "
4226+"Produkt ausgewählt wird)."
4227
4228 #. module: account_analytic_default
4229 #: model:ir.model,name:account_analytic_default.model_stock_picking
4230@@ -65,6 +81,10 @@
4231 "default (e.g. create new customer invoice or Sales order if we select this "
4232 "partner, it will automatically take this as an analytic account)"
4233 msgstr ""
4234+"Wählen Sie den Partner aus, bei dem diese Kostenstelle als Standard bei "
4235+"einer Buchung eingetragen werden soll (z.B. bei einer Rechnung oder einem "
4236+"Auftrag soll dann diese Kostenstelle automatisch eingetragen werden, wenn "
4237+"der entsprechende Partner ausgewählt wird)."
4238
4239 #. module: account_analytic_default
4240 #: view:account.analytic.default:0
4241@@ -118,6 +138,10 @@
4242 "default (e.g. create new customer invoice or Sales order if we select this "
4243 "company, it will automatically take this as an analytic account)"
4244 msgstr ""
4245+"Wählen Sie das Unternehmen aus, bei dem diese Kostenstelle als Standard bei "
4246+"einer Buchung eingetragen werden soll (z.B. bei einer Rechnung oder einem "
4247+"Auftrag soll dann diese Kostenstelle automatisch eingetragen werden, wenn "
4248+"das entsprechende Unternehmen ausgewählt wird)."
4249
4250 #. module: account_analytic_default
4251 #: view:account.analytic.default:0
4252
4253=== modified file 'account_analytic_default/i18n/fr.po'
4254--- account_analytic_default/i18n/fr.po 2013-01-04 09:39:53 +0000
4255+++ account_analytic_default/i18n/fr.po 2013-01-15 10:40:30 +0000
4256@@ -7,14 +7,25 @@
4257 "Project-Id-Version: OpenERP Server 6.0dev\n"
4258 "Report-Msgid-Bugs-To: support@openerp.com\n"
4259 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
4260+<<<<<<< TREE
4261 "PO-Revision-Date: 2012-12-18 18:07+0000\n"
4262 "Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\n"
4263 "Language-Team: \n"
4264+=======
4265+"PO-Revision-Date: 2013-01-09 08:34+0000\n"
4266+"Last-Translator: Numérigraphe <Unknown>\n"
4267+"Language-Team: French <fr@li.org>\n"
4268+>>>>>>> MERGE-SOURCE
4269 "MIME-Version: 1.0\n"
4270 "Content-Type: text/plain; charset=UTF-8\n"
4271 "Content-Transfer-Encoding: 8bit\n"
4272+<<<<<<< TREE
4273 "X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
4274 "X-Generator: Launchpad (build 16378)\n"
4275+=======
4276+"X-Launchpad-Export-Date: 2013-01-10 05:35+0000\n"
4277+"X-Generator: Launchpad (build 16412)\n"
4278+>>>>>>> MERGE-SOURCE
4279
4280 #. module: account_analytic_default
4281 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
4282@@ -40,6 +51,9 @@
4283 "default (e.g. create new customer invoice or Sales order if we select this "
4284 "product, it will automatically take this as an analytic account)"
4285 msgstr ""
4286+"Choisissez un article qui utilisera le compte analytique par défaut (par ex. "
4287+": à la création d'une facture client ou d'une commande de vente, si ce "
4288+"produit est ajouté, ce compte analytique sera automatiquement utilisé)"
4289
4290 #. module: account_analytic_default
4291 #: model:ir.model,name:account_analytic_default.model_stock_picking
4292@@ -64,6 +78,9 @@
4293 "default (e.g. create new customer invoice or Sales order if we select this "
4294 "partner, it will automatically take this as an analytic account)"
4295 msgstr ""
4296+"Choisissez un client qui utilisera le compte analytique par défaut (par ex. "
4297+": à la création d'une facture client ou d'une commande de vente, si ce "
4298+"client est sélectionné, ce compte analytique sera automatiquement utilisé)"
4299
4300 #. module: account_analytic_default
4301 #: view:account.analytic.default:0
4302@@ -118,6 +135,10 @@
4303 "default (e.g. create new customer invoice or Sales order if we select this "
4304 "company, it will automatically take this as an analytic account)"
4305 msgstr ""
4306+"Choisissez une société qui utilisera le compte analytique par défaut (par "
4307+"ex. : à la création d'une facture client ou d'une commande de vente, si "
4308+"cette société est sélectionnée, ce compte analytique sera automatiquement "
4309+"utilisé)"
4310
4311 #. module: account_analytic_default
4312 #: view:account.analytic.default:0
4313
4314=== modified file 'account_analytic_default/i18n/ro.po'
4315--- account_analytic_default/i18n/ro.po 2013-01-04 09:39:53 +0000
4316+++ account_analytic_default/i18n/ro.po 2013-01-15 10:40:30 +0000
4317@@ -7,21 +7,32 @@
4318 "Project-Id-Version: OpenERP Server 6.0dev\n"
4319 "Report-Msgid-Bugs-To: support@openerp.com\n"
4320 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
4321+<<<<<<< TREE
4322 "PO-Revision-Date: 2011-03-17 07:29+0000\n"
4323 "Last-Translator: Dorin <dhongu@gmail.com>\n"
4324 "Language-Team: \n"
4325+=======
4326+"PO-Revision-Date: 2013-01-07 17:34+0000\n"
4327+"Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
4328+"Language-Team: Romanian <ro@li.org>\n"
4329+>>>>>>> MERGE-SOURCE
4330 "MIME-Version: 1.0\n"
4331 "Content-Type: text/plain; charset=UTF-8\n"
4332 "Content-Transfer-Encoding: 8bit\n"
4333+<<<<<<< TREE
4334 "X-Launchpad-Export-Date: 2012-12-22 05:45+0000\n"
4335 "X-Generator: Launchpad (build 16378)\n"
4336+=======
4337+"X-Launchpad-Export-Date: 2013-01-08 06:05+0000\n"
4338+"X-Generator: Launchpad (build 16402)\n"
4339+>>>>>>> MERGE-SOURCE
4340
4341 #. module: account_analytic_default
4342 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
4343 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
4344 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
4345 msgid "Analytic Rules"
4346-msgstr "Reguli analitice"
4347+msgstr "Reguli Analitice"
4348
4349 #. module: account_analytic_default
4350 #: view:account.analytic.default:0
4351@@ -31,7 +42,7 @@
4352 #. module: account_analytic_default
4353 #: help:account.analytic.default,date_stop:0
4354 msgid "Default end date for this Analytic Account."
4355-msgstr ""
4356+msgstr "Data de sfarsit implicita pentru acest Cont Analitic."
4357
4358 #. module: account_analytic_default
4359 #: help:account.analytic.default,product_id:0
4360@@ -40,6 +51,10 @@
4361 "default (e.g. create new customer invoice or Sales order if we select this "
4362 "product, it will automatically take this as an analytic account)"
4363 msgstr ""
4364+"Selectati un produs care va folosi contul analitic specificat in parametrii "
4365+"initiali analitici (de exemplu, creeaza o factura noua pentru un client sau "
4366+"o Comanda de vanzare daca selectam acest produs, il va considera automat "
4367+"drept un cont analitic)"
4368
4369 #. module: account_analytic_default
4370 #: model:ir.model,name:account_analytic_default.model_stock_picking
4371@@ -64,12 +79,16 @@
4372 "default (e.g. create new customer invoice or Sales order if we select this "
4373 "partner, it will automatically take this as an analytic account)"
4374 msgstr ""
4375+"Selectati un partener care va folosi contul analitic specificat in "
4376+"parametrii initiali analitici (de exemplu, creeaza o factura noua pentru un "
4377+"client sau o Comanda de vanzare daca selectam acest partener, il va "
4378+"considera automat drept un cont analitic)"
4379
4380 #. module: account_analytic_default
4381 #: view:account.analytic.default:0
4382 #: field:account.analytic.default,company_id:0
4383 msgid "Company"
4384-msgstr "Companie"
4385+msgstr "Compania"
4386
4387 #. module: account_analytic_default
4388 #: view:account.analytic.default:0
4389@@ -92,7 +111,7 @@
4390 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
4391 #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
4392 msgid "Analytic Defaults"
4393-msgstr "Conturi Analitice implicite"
4394+msgstr "Parametri Impliciti Analitici"
4395
4396 #. module: account_analytic_default
4397 #: field:account.analytic.default,sequence:0
4398@@ -104,6 +123,8 @@
4399 msgid ""
4400 "Select a user which will use analytic account specified in analytic default."
4401 msgstr ""
4402+"Selectati un utilizator care va folosi contul analitic specificat in "
4403+"parametrii impliciti analitici."
4404
4405 #. module: account_analytic_default
4406 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
4407@@ -117,6 +138,10 @@
4408 "default (e.g. create new customer invoice or Sales order if we select this "
4409 "company, it will automatically take this as an analytic account)"
4410 msgstr ""
4411+"Selecteaza o companie care va folosi contul analitic specificat in "
4412+"parametrii impliciti analitici (de exemplu, creeaza o noua factura a "
4413+"clientului sau o Comanda de vanzare daca selectam aceasta companie, care va "
4414+"fi considerata automat drept un cont analitic)"
4415
4416 #. module: account_analytic_default
4417 #: view:account.analytic.default:0
4418@@ -132,7 +157,7 @@
4419 #. module: account_analytic_default
4420 #: help:account.analytic.default,date_start:0
4421 msgid "Default start date for this Analytic Account."
4422-msgstr ""
4423+msgstr "Data de inceput implicita pentru acest Cont Analitic."
4424
4425 #. module: account_analytic_default
4426 #: view:account.analytic.default:0
4427@@ -148,7 +173,7 @@
4428 #. module: account_analytic_default
4429 #: field:account.analytic.default,date_start:0
4430 msgid "Start Date"
4431-msgstr "Data de incepere"
4432+msgstr "Data de Inceput"
4433
4434 #. module: account_analytic_default
4435 #: help:account.analytic.default,sequence:0
4436
4437=== modified file 'account_analytic_plans/i18n/ro.po'
4438--- account_analytic_plans/i18n/ro.po 2013-01-04 09:39:53 +0000
4439+++ account_analytic_plans/i18n/ro.po 2013-01-15 10:40:30 +0000
4440@@ -7,14 +7,25 @@
4441 "Project-Id-Version: OpenERP Server 6.0dev\n"
4442 "Report-Msgid-Bugs-To: support@openerp.com\n"
4443 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
4444+<<<<<<< TREE
4445 "PO-Revision-Date: 2010-10-30 08:46+0000\n"
4446 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
4447 "Language-Team: \n"
4448+=======
4449+"PO-Revision-Date: 2013-01-11 22:25+0000\n"
4450+"Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
4451+"Language-Team: Romanian <ro@li.org>\n"
4452+>>>>>>> MERGE-SOURCE
4453 "MIME-Version: 1.0\n"
4454 "Content-Type: text/plain; charset=UTF-8\n"
4455 "Content-Transfer-Encoding: 8bit\n"
4456+<<<<<<< TREE
4457 "X-Launchpad-Export-Date: 2012-12-22 05:42+0000\n"
4458 "X-Generator: Launchpad (build 16378)\n"
4459+=======
4460+"X-Launchpad-Export-Date: 2013-01-12 05:40+0000\n"
4461+"X-Generator: Launchpad (build 16420)\n"
4462+>>>>>>> MERGE-SOURCE
4463
4464 #. module: account_analytic_plans
4465 #: field:account.analytic.plan.instance,account4_ids:0
4466@@ -48,7 +59,7 @@
4467 #: code:addons/account_analytic_plans/account_analytic_plans.py:234
4468 #, python-format
4469 msgid "The total should be between %s and %s."
4470-msgstr ""
4471+msgstr "Totalul ar trebui sa fie intre %s si %s."
4472
4473 #. module: account_analytic_plans
4474 #: view:account.analytic.plan:0
4475@@ -91,7 +102,7 @@
4476 #. module: account_analytic_plans
4477 #: field:account.analytic.plan.instance.line,plan_id:0
4478 msgid "Plan Id"
4479-msgstr "Id plan"
4480+msgstr "Id Plan"
4481
4482 #. module: account_analytic_plans
4483 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
4484@@ -133,7 +144,7 @@
4485 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
4486 #, python-format
4487 msgid "There are no analytic lines related to account %s."
4488-msgstr ""
4489+msgstr "Nu exista linii analitice asociate contului %s."
4490
4491 #. module: account_analytic_plans
4492 #: field:account.analytic.plan.instance,account3_ids:0
4493@@ -144,12 +155,12 @@
4494 #: view:account.crossovered.analytic:0
4495 #: view:analytic.plan.create.model:0
4496 msgid "or"
4497-msgstr ""
4498+msgstr "sau"
4499
4500 #. module: account_analytic_plans
4501 #: model:ir.model,name:account_analytic_plans.model_account_analytic_line
4502 msgid "Analytic Line"
4503-msgstr "Linie analitica"
4504+msgstr "Linie Analitica"
4505
4506 #. module: account_analytic_plans
4507 #: report:account.analytic.account.crossovered.analytic:0
4508@@ -283,7 +294,7 @@
4509 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
4510 #, python-format
4511 msgid "Error!"
4512-msgstr ""
4513+msgstr "Eroare!"
4514
4515 #. module: account_analytic_plans
4516 #: report:account.analytic.account.crossovered.analytic:0
4517@@ -299,7 +310,7 @@
4518 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
4519 #, python-format
4520 msgid "User Error!"
4521-msgstr ""
4522+msgstr "Eroare utilizator!"
4523
4524 #. module: account_analytic_plans
4525 #: field:account.analytic.plan.instance,account6_ids:0
4526@@ -317,7 +328,7 @@
4527 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
4528 #, python-format
4529 msgid "Please put a name and a code before saving the model."
4530-msgstr ""
4531+msgstr "Inainte de a salva modelul, dati-i un nume si un cod."
4532
4533 #. module: account_analytic_plans
4534 #: report:account.analytic.account.crossovered.analytic:0
4535@@ -349,14 +360,14 @@
4536 #: code:addons/account_analytic_plans/account_analytic_plans.py:486
4537 #, python-format
4538 msgid "You have to define an analytic journal on the '%s' journal."
4539-msgstr ""
4540+msgstr "Trebuie sa definiti un registru analitic in registrul '%s'."
4541
4542 #. module: account_analytic_plans
4543 #: code:addons/account_analytic_plans/account_analytic_plans.py:342
4544 #: code:addons/account_analytic_plans/account_analytic_plans.py:486
4545 #, python-format
4546 msgid "No Analytic Journal !"
4547-msgstr "Nu exista nici un jurnal analitic !"
4548+msgstr "Nu exista nici un Registru Analitic !"
4549
4550 #. module: account_analytic_plans
4551 #: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
4552@@ -377,12 +388,12 @@
4553 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
4554 #, python-format
4555 msgid "There is no analytic plan defined."
4556-msgstr ""
4557+msgstr "Nu exista nici un plan analitic definit."
4558
4559 #. module: account_analytic_plans
4560 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
4561 msgid "Bank Statement"
4562-msgstr "Extras de cont"
4563+msgstr "extras cont banca/ fila reg. casa"
4564
4565 #. module: account_analytic_plans
4566 #: field:account.analytic.plan.instance.line,analytic_account_id:0
4567@@ -404,7 +415,7 @@
4568 #: code:addons/account_analytic_plans/account_analytic_plans.py:221
4569 #, python-format
4570 msgid "A model with this name and code already exists."
4571-msgstr ""
4572+msgstr "Deja exista un model cu acest nume si cod."
4573
4574 #. module: account_analytic_plans
4575 #: help:account.analytic.plan.line,root_analytic_id:0
4576
4577=== modified file 'account_anglo_saxon/i18n/ro.po'
4578--- account_anglo_saxon/i18n/ro.po 2013-01-04 09:39:53 +0000
4579+++ account_anglo_saxon/i18n/ro.po 2013-01-15 10:40:30 +0000
4580@@ -8,19 +8,29 @@
4581 "Project-Id-Version: openobject-addons\n"
4582 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4583 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
4584+<<<<<<< TREE
4585 "PO-Revision-Date: 2011-01-19 13:52+0000\n"
4586 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
4587+=======
4588+"PO-Revision-Date: 2013-01-07 17:45+0000\n"
4589+"Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
4590+>>>>>>> MERGE-SOURCE
4591 "Language-Team: Romanian <ro@li.org>\n"
4592 "MIME-Version: 1.0\n"
4593 "Content-Type: text/plain; charset=UTF-8\n"
4594 "Content-Transfer-Encoding: 8bit\n"
4595+<<<<<<< TREE
4596 "X-Launchpad-Export-Date: 2012-12-22 05:55+0000\n"
4597 "X-Generator: Launchpad (build 16378)\n"
4598+=======
4599+"X-Launchpad-Export-Date: 2013-01-08 06:05+0000\n"
4600+"X-Generator: Launchpad (build 16402)\n"
4601+>>>>>>> MERGE-SOURCE
4602
4603 #. module: account_anglo_saxon
4604 #: model:ir.model,name:account_anglo_saxon.model_product_category
4605 msgid "Product Category"
4606-msgstr "Categorie Produs"
4607+msgstr "Categoria Produsului"
4608
4609 #. module: account_anglo_saxon
4610 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
4611@@ -60,6 +70,7 @@
4612 "This account will be used to value price difference between purchase price "
4613 "and cost price."
4614 msgstr ""
4615+<<<<<<< TREE
4616 "Acest cont va fi folosit pentru diferentele de pret dintre pretul de "
4617 "achizitie si pretul standard."
4618
4619@@ -126,3 +137,7 @@
4620
4621 #~ msgid "Invoice Number must be unique per Company!"
4622 #~ msgstr "Numarul Facturii trebuie sa fie unic per Companie!"
4623+=======
4624+"Acest cont va fi folosit pentru a evalua diferentele de pret dintre pretul "
4625+"de achizitie si pretul de cost."
4626+>>>>>>> MERGE-SOURCE
4627
4628=== modified file 'account_asset/i18n/de.po'
4629--- account_asset/i18n/de.po 2013-01-04 09:39:53 +0000
4630+++ account_asset/i18n/de.po 2013-01-15 10:40:30 +0000
4631@@ -8,15 +8,26 @@
4632 "Project-Id-Version: openobject-addons\n"
4633 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4634 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
4635+<<<<<<< TREE
4636 "PO-Revision-Date: 2012-12-17 22:26+0000\n"
4637 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
4638 "consulting.net>\n"
4639+=======
4640+"PO-Revision-Date: 2013-01-06 19:52+0000\n"
4641+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
4642+"consulting.net>\n"
4643+>>>>>>> MERGE-SOURCE
4644 "Language-Team: German <de@li.org>\n"
4645 "MIME-Version: 1.0\n"
4646 "Content-Type: text/plain; charset=UTF-8\n"
4647 "Content-Transfer-Encoding: 8bit\n"
4648+<<<<<<< TREE
4649 "X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
4650 "X-Generator: Launchpad (build 16378)\n"
4651+=======
4652+"X-Launchpad-Export-Date: 2013-01-07 05:44+0000\n"
4653+"X-Generator: Launchpad (build 16402)\n"
4654+>>>>>>> MERGE-SOURCE
4655
4656 #. module: account_asset
4657 #: view:account.asset.asset:0
4658@@ -151,6 +162,7 @@
4659 #: help:account.asset.asset,method_period:0
4660 msgid "The amount of time between two depreciations, in months"
4661 msgstr ""
4662+"Die Zeitspanne, in Monaten, die zwischen zwei Abschreibungen liegen soll."
4663
4664 #. module: account_asset
4665 #: field:account.asset.depreciation.line,depreciation_date:0
4666@@ -268,6 +280,8 @@
4667 #: help:account.asset.history,method_number:0
4668 msgid "The number of depreciations needed to depreciate your asset"
4669 msgstr ""
4670+"Die Anzahl an Abschreibungen, die das Anlagegut über die Nutzungsdauer "
4671+"vollständig abschreibt."
4672
4673 #. module: account_asset
4674 #: view:account.asset.category:0
4675@@ -297,7 +311,7 @@
4676 #. module: account_asset
4677 #: field:account.asset.depreciation.line,remaining_value:0
4678 msgid "Next Period Depreciation"
4679-msgstr ""
4680+msgstr "Nächste Abschreibungsperiode"
4681
4682 #. module: account_asset
4683 #: help:account.asset.history,method_period:0
4684@@ -348,7 +362,7 @@
4685 #. module: account_asset
4686 #: view:asset.modify:0
4687 msgid "months"
4688-msgstr ""
4689+msgstr "Monate"
4690
4691 #. module: account_asset
4692 #: model:ir.model,name:account_asset.model_account_invoice_line
4693@@ -610,7 +624,7 @@
4694 #. module: account_asset
4695 #: field:account.asset.depreciation.line,amount:0
4696 msgid "Current Depreciation"
4697-msgstr ""
4698+msgstr "Aktuelle Abschreibungen"
4699
4700 #. module: account_asset
4701 #: field:account.asset.asset,name:0
4702@@ -655,6 +669,11 @@
4703 " * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
4704 " * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
4705 msgstr ""
4706+"Wählen Sie die Abschreibungsmethode aus, die alle Abschreibungen berechnet.\n"
4707+" * Lineare AfA: Kalkuliert auf dieser Berechnungsgrundlage: "
4708+"Anschaffungswert / Nutzungsdauer\n"
4709+" * Degressive AfA: Kalkuliert auf dieser Berechnungsgrundlage: Restwert * "
4710+"Abschreibungsfaktor"
4711
4712 #. module: account_asset
4713 #: field:account.asset.depreciation.line,move_check:0
4714
4715=== modified file 'account_asset/i18n/ro.po'
4716--- account_asset/i18n/ro.po 2013-01-04 09:39:53 +0000
4717+++ account_asset/i18n/ro.po 2013-01-15 10:40:30 +0000
4718@@ -8,14 +8,24 @@
4719 "Project-Id-Version: openobject-addons\n"
4720 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4721 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
4722+<<<<<<< TREE
4723 "PO-Revision-Date: 2012-10-17 08:25+0000\n"
4724 "Last-Translator: filsys <office@filsystem.ro>\n"
4725+=======
4726+"PO-Revision-Date: 2013-01-11 23:01+0000\n"
4727+"Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
4728+>>>>>>> MERGE-SOURCE
4729 "Language-Team: Romanian <ro@li.org>\n"
4730 "MIME-Version: 1.0\n"
4731 "Content-Type: text/plain; charset=UTF-8\n"
4732 "Content-Transfer-Encoding: 8bit\n"
4733+<<<<<<< TREE
4734 "X-Launchpad-Export-Date: 2012-12-22 06:05+0000\n"
4735 "X-Generator: Launchpad (build 16378)\n"
4736+=======
4737+"X-Launchpad-Export-Date: 2013-01-12 05:40+0000\n"
4738+"X-Generator: Launchpad (build 16420)\n"
4739+>>>>>>> MERGE-SOURCE
4740
4741 #. module: account_asset
4742 #: view:account.asset.asset:0
4743@@ -42,7 +52,7 @@
4744 #. module: account_asset
4745 #: view:asset.asset.report:0
4746 msgid "Group By..."
4747-msgstr "Grupează după..."
4748+msgstr "Grupeaza dupa..."
4749
4750 #. module: account_asset
4751 #: field:asset.asset.report,gross_value:0
4752@@ -67,7 +77,7 @@
4753 "Indicates that the first depreciation entry for this asset have to be done "
4754 "from the purchase date instead of the first January"
4755 msgstr ""
4756-"Indica faptul ca prima inregistrare a amortizarii acestor active trebuie "
4757+"Indica faptul ca prima inregistrare a devalorizarii acestor active trebuie "
4758 "efectuata de la data cumpararii si nu de la intai ianuarie"
4759
4760 #. module: account_asset
4761@@ -87,19 +97,19 @@
4762 #. module: account_asset
4763 #: view:asset.modify:0
4764 msgid "Modify"
4765-msgstr "Modifică"
4766+msgstr "Modifica"
4767
4768 #. module: account_asset
4769 #: selection:account.asset.asset,state:0
4770 #: view:asset.asset.report:0
4771 #: selection:asset.asset.report,state:0
4772 msgid "Running"
4773-msgstr "În derulare"
4774+msgstr "In derulare"
4775
4776 #. module: account_asset
4777 #: view:account.asset.asset:0
4778 msgid "Set to Draft"
4779-msgstr "Schimbă în ciornă"
4780+msgstr "Seteaza ca Ciorna"
4781
4782 #. module: account_asset
4783 #: view:asset.asset.report:0
4784@@ -132,13 +142,13 @@
4785 #: field:account.move.line,entry_ids:0
4786 #: model:ir.actions.act_window,name:account_asset.act_entries_open
4787 msgid "Entries"
4788-msgstr "Înregistrări"
4789+msgstr "Inregistrari"
4790
4791 #. module: account_asset
4792 #: view:account.asset.asset:0
4793 #: field:account.asset.asset,depreciation_line_ids:0
4794 msgid "Depreciation Lines"
4795-msgstr "Linii amortizare"
4796+msgstr "Liniile Devalorizarii"
4797
4798 #. module: account_asset
4799 #: help:account.asset.asset,salvage_value:0
4800@@ -148,19 +158,19 @@
4801 #. module: account_asset
4802 #: help:account.asset.asset,method_period:0
4803 msgid "The amount of time between two depreciations, in months"
4804-msgstr ""
4805+msgstr "Perioada de timp dintre doua devalorizari, in luni"
4806
4807 #. module: account_asset
4808 #: field:account.asset.depreciation.line,depreciation_date:0
4809 #: view:asset.asset.report:0
4810 #: field:asset.asset.report,depreciation_date:0
4811 msgid "Depreciation Date"
4812-msgstr "Data amortizare"
4813+msgstr "Data Devalorizarii"
4814
4815 #. module: account_asset
4816 #: constraint:account.asset.asset:0
4817 msgid "Error ! You cannot create recursive assets."
4818-msgstr ""
4819+msgstr "Eroare ! Nu puteti crea active recurente."
4820
4821 #. module: account_asset
4822 #: field:asset.asset.report,posted_value:0
4823@@ -180,7 +190,7 @@
4824 #. module: account_asset
4825 #: field:account.asset.category,account_depreciation_id:0
4826 msgid "Depreciation Account"
4827-msgstr "Cont amortizare"
4828+msgstr "Cont de Devalorizare"
4829
4830 #. module: account_asset
4831 #: view:account.asset.asset:0
4832@@ -194,18 +204,18 @@
4833 #. module: account_asset
4834 #: field:account.asset.depreciation.line,move_id:0
4835 msgid "Depreciation Entry"
4836-msgstr "Inregistrare amortizare"
4837+msgstr "Inregistrarea Devalorizarii"
4838
4839 #. module: account_asset
4840 #: view:asset.asset.report:0
4841 #: field:asset.asset.report,nbr:0
4842 msgid "# of Depreciation Lines"
4843-msgstr "# Linii Amortizare"
4844+msgstr "# Liniilor Devalorizarii"
4845
4846 #. module: account_asset
4847 #: field:account.asset.asset,method_period:0
4848 msgid "Number of Months in a Period"
4849-msgstr ""
4850+msgstr "Numarul de Luni dintr-o Perioada"
4851
4852 #. module: account_asset
4853 #: view:asset.asset.report:0
4854@@ -241,7 +251,7 @@
4855 #: field:account.asset.history,method_period:0
4856 #: field:asset.modify,method_period:0
4857 msgid "Period Length"
4858-msgstr "Lungime perioada"
4859+msgstr "Durata Perioadei"
4860
4861 #. module: account_asset
4862 #: selection:account.asset.asset,state:0
4863@@ -265,12 +275,12 @@
4864 #: help:account.asset.category,method_number:0
4865 #: help:account.asset.history,method_number:0
4866 msgid "The number of depreciations needed to depreciate your asset"
4867-msgstr ""
4868+msgstr "Numarul de devalorizari necesar pentru a va devaloriza activele"
4869
4870 #. module: account_asset
4871 #: view:account.asset.category:0
4872 msgid "Analytic Information"
4873-msgstr "Informatii analitice"
4874+msgstr "Informatii Analitice"
4875
4876 #. module: account_asset
4877 #: field:account.asset.category,account_analytic_id:0
4878@@ -290,17 +300,17 @@
4879 "depreciations\"."
4880 msgstr ""
4881 "Prorata temporis poate fi aplicata doar pentru metoda timp \"numarul "
4882-"amortizarilor\""
4883+"devalorizarilor\""
4884
4885 #. module: account_asset
4886 #: field:account.asset.depreciation.line,remaining_value:0
4887 msgid "Next Period Depreciation"
4888-msgstr ""
4889+msgstr "Urmatoarea Perioada a Devalorizarii"
4890
4891 #. module: account_asset
4892 #: help:account.asset.history,method_period:0
4893 msgid "Time in month between two depreciations"
4894-msgstr "Perioada in luni dintre doua amortizari."
4895+msgstr "Perioada in luni dintre doua devalorizari."
4896
4897 #. module: account_asset
4898 #: view:asset.modify:0
4899@@ -330,7 +340,7 @@
4900 #. module: account_asset
4901 #: field:account.asset.asset,parent_id:0
4902 msgid "Parent Asset"
4903-msgstr "Parinte activ"
4904+msgstr "Active Principale"
4905
4906 #. module: account_asset
4907 #: view:account.asset.history:0
4908@@ -346,7 +356,7 @@
4909 #. module: account_asset
4910 #: view:asset.modify:0
4911 msgid "months"
4912-msgstr ""
4913+msgstr "luni"
4914
4915 #. module: account_asset
4916 #: model:ir.model,name:account_asset.model_account_invoice_line
4917@@ -356,7 +366,7 @@
4918 #. module: account_asset
4919 #: view:account.asset.asset:0
4920 msgid "Depreciation Board"
4921-msgstr "Panou amortizare"
4922+msgstr "Panou Devalorizare"
4923
4924 #. module: account_asset
4925 #: field:asset.asset.report,unposted_value:0
4926@@ -374,7 +384,7 @@
4927 #: view:asset.depreciation.confirmation.wizard:0
4928 #: view:asset.modify:0
4929 msgid "or"
4930-msgstr ""
4931+msgstr "sau"
4932
4933 #. module: account_asset
4934 #: field:account.asset.asset,note:0
4935@@ -393,11 +403,11 @@
4936 "depreciations won't go beyond."
4937 msgstr ""
4938 "Metoda care va fi folosita pentru calcularea datelor si numarul liniilor "
4939-"amortizarii.\n"
4940-"Numarul de amortizari: Fixati numarul liniilor amortizarii si perioada "
4941-"dintre 2 amortizari.\n"
4942-"Data de sfarsit: Alegeti perioada dintre 2 amortizari si data pe care "
4943-"amortizarile nu o vor depasi."
4944+"devalorizarii.\n"
4945+"Numarul de devalorizari: Fixati numarul liniilor devalorizarii si perioada "
4946+"dintre 2 devalorizari.\n"
4947+"Data de sfarsit: Alegeti perioada dintre 2 devalorizari si data pe care "
4948+"acestea nu o vor depasi."
4949
4950 #. module: account_asset
4951 #: help:account.asset.asset,method_time:0
4952@@ -411,11 +421,11 @@
4953 "depreciations won't go beyond."
4954 msgstr ""
4955 "Alegeti metoda care va fi folosita pentru a calcula datele si numarul "
4956-"liniilor amortizarii.\n"
4957-"* Numarul Amortizarilor: Fixati numarul liniilor amortizarii si perioada "
4958-"dintre 2 amortizari.\n"
4959-"* Data de sfarsit: Alegeti perioada dintre 2 amortizari si data pe care "
4960-"amortizarile nu o vor depasi."
4961+"liniilor devalorizarilor.\n"
4962+"* Numarul Devalorizarilo: Fixati numarul liniilor devalorizarii si perioada "
4963+"dintre 2 devalorizari.\n"
4964+"* Data de sfarsit: Alegeti perioada dintre 2 devalorizari si data pe care "
4965+"acestea nu o vor depasi."
4966
4967 #. module: account_asset
4968 #: view:asset.asset.report:0
4969@@ -425,7 +435,7 @@
4970 #. module: account_asset
4971 #: view:account.asset.asset:0
4972 msgid "Closed"
4973-msgstr "Inchis"
4974+msgstr "Inchis(a)"
4975
4976 #. module: account_asset
4977 #: help:account.asset.asset,state:0
4978@@ -436,12 +446,18 @@
4979 "You can manually close an asset when the depreciation is over. If the last "
4980 "line of depreciation is posted, the asset automatically goes in that status."
4981 msgstr ""
4982+"Atunci cand sunt create active, starea este 'Ciorna'.\n"
4983+"Daca activele sunt confirmate, starea devine 'In derulare', iar liniile "
4984+"devalorizarii pot fi afisate in contabilitate.\n"
4985+"Puteti inchide manual activele atunci cand devalorizarea ia sfarsit. Daca "
4986+"ultima linie a devalorizarii este afisata, activele ajung automat in starea "
4987+"respectiva."
4988
4989 #. module: account_asset
4990 #: field:account.asset.asset,state:0
4991 #: field:asset.asset.report,state:0
4992 msgid "Status"
4993-msgstr ""
4994+msgstr "Stare"
4995
4996 #. module: account_asset
4997 #: field:account.asset.asset,partner_id:0
4998@@ -452,7 +468,7 @@
4999 #. module: account_asset
5000 #: view:asset.asset.report:0
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: