diff --git a/addons/account/res_config.py b/addons/account/res_config.py index 8ab93c2fcbb..09df82e38fd 100644 --- a/addons/account/res_config.py +++ b/addons/account/res_config.py @@ -81,31 +81,31 @@ class account_config_settings(osv.osv_memory): 'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next supplier credit note number'), 'module_account_check_writing': fields.boolean('Pay your suppliers by check', - help="""This allows you to check writing and printing. - This installs the module account_check_writing."""), + help='This allows you to check writing and printing.\n' + '-This installs the module account_check_writing.'), 'module_account_accountant': fields.boolean('Full accounting features: journals, legal statements, chart of accounts, etc.', help="""If you do not check this box, you will be able to do invoicing & payments, but not accounting (Journal Items, Chart of Accounts, ...)"""), 'module_account_asset': fields.boolean('Assets management', - help="""This allows you to manage the assets owned by a company or a person. - It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines. - This installs the module account_asset. If you do not check this box, you will be able to do invoicing & payments, - but not accounting (Journal Items, Chart of Accounts, ...)"""), + help='This allows you to manage the assets owned by a company or a person.\n' + 'It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines.\n' + '-This installs the module account_asset. If you do not check this box, you will be able to do invoicing & payments, ' + 'but not accounting (Journal Items, Chart of Accounts, ...)'), 'module_account_budget': fields.boolean('Budget management', - help="""This allows accountants to manage analytic and crossovered budgets. - Once the master budgets and the budgets are defined, - the project managers can set the planned amount on each analytic account. - This installs the module account_budget."""), + help='This allows accountants to manage analytic and crossovered budgets. ' + 'Once the master budgets and the budgets are defined, ' + 'the project managers can set the planned amount on each analytic account.\n' + '-This installs the module account_budget.'), 'module_account_payment': fields.boolean('Manage payment orders', - help="""This allows you to create and manage your payment orders, with purposes to - * serve as base for an easy plug-in of various automated payment mechanisms, and - * provide a more efficient way to manage invoice payments. - This installs the module account_payment."""), + help='This allows you to create and manage your payment orders, with purposes to \n' + '* serve as base for an easy plug-in of various automated payment mechanisms, and \n' + '* provide a more efficient way to manage invoice payments.\n' + '-This installs the module account_payment.' ), 'module_account_voucher': fields.boolean('Manage customer payments', - help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc. - This installs the module account_voucher."""), + help='This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.\n' + '-This installs the module account_voucher.'), 'module_account_followup': fields.boolean('Manage customer payment follow-ups', - help="""This allows to automate letters for unpaid invoices, with multi-level recalls. - This installs the module account_followup."""), + help='This allows to automate letters for unpaid invoices, with multi-level recalls.\n' + '-This installs the module account_followup.'), 'group_proforma_invoices': fields.boolean('Allow pro-forma invoices', implied_group='account.group_proforma_invoices', help="Allows you to put invoices in pro-forma state."), diff --git a/addons/auth_crypt/i18n/da.po b/addons/auth_crypt/i18n/da.po index 4710a5ffaa5..d1e0d789d87 100644 --- a/addons/auth_crypt/i18n/da.po +++ b/addons/auth_crypt/i18n/da.po @@ -1,23 +1,28 @@ # Danish translation for openobject-addons -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 # This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2012. +# FIRST AUTHOR , 2013. # msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-03 16:03+0000\n" -"PO-Revision-Date: 2012-01-27 08:38+0000\n" +"POT-Creation-Date: 2012-12-21 17:05+0000\n" +"PO-Revision-Date: 2013-09-15 20:07+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2013-09-16 05:42+0000\n" +"X-Generator: Launchpad (build 16761)\n" -#. module: base_crypt -#: model:ir.model,name:base_crypt.model_res_users +#. module: auth_crypt +#: field:res.users,password_crypt:0 +msgid "Encrypted Password" +msgstr "Krypteret kodeord" + +#. module: auth_crypt +#: model:ir.model,name:auth_crypt.model_res_users msgid "Users" -msgstr "" +msgstr "Brugere" diff --git a/addons/auth_oauth_signup/i18n/da.po b/addons/auth_oauth_signup/i18n/da.po new file mode 100644 index 00000000000..b6a7a5605b6 --- /dev/null +++ b/addons/auth_oauth_signup/i18n/da.po @@ -0,0 +1,23 @@ +# Danish translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-12-21 17:05+0000\n" +"PO-Revision-Date: 2013-09-15 20:08+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-09-16 05:42+0000\n" +"X-Generator: Launchpad (build 16761)\n" + +#. module: auth_oauth_signup +#: model:ir.model,name:auth_oauth_signup.model_res_users +msgid "Users" +msgstr "Bruger" diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index 6b8578bbf47..9a5309d5c54 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -26,8 +26,8 @@ class base_config_settings(osv.osv_memory): _inherit = 'res.config.settings' _columns = { 'module_multi_company': fields.boolean('Manage multiple companies', - help="""Work in multi-company environments, with appropriate security access between companies. - This installs the module multi_company."""), + help='Work in multi-company environments, with appropriate security access between companies.\n' + '-This installs the module multi_company.'), 'module_share': fields.boolean('Allow documents sharing', help="""Share or embbed any screen of openerp."""), 'module_portal': fields.boolean('Activate the customer portal', @@ -64,18 +64,20 @@ class sale_config_settings(osv.osv_memory): 'module_crm': fields.boolean('CRM'), 'module_sale' : fields.boolean('SALE'), 'module_plugin_thunderbird': fields.boolean('Enable Thunderbird plug-in', - help="""The plugin allows you archive email and its attachments to the selected - OpenERP objects. You can select a partner, or a lead and - attach the selected mail as a .eml file in - the attachment of a selected record. You can create documents for CRM Lead, - Partner from the selected emails. - This installs the module plugin_thunderbird."""), + help='The plugin allows you archive email and its attachments to the selected ' + 'OpenERP objects. You can select a partner, or a lead and ' + 'attach the selected mail as a .eml file in ' + 'the attachment of a selected record. You can create documents for CRM Lead, ' + 'Partner from the selected emails.\n' + '-This installs the module plugin_thunderbird.'), 'module_plugin_outlook': fields.boolean('Enable Outlook plug-in', - help="""The Outlook plugin allows you to select an object that you would like to add - to your email and its attachments from MS Outlook. You can select a partner, - or a lead object and archive a selected - email into an OpenERP mail message with attachments. - This installs the module plugin_outlook."""), + help='The Outlook plugin allows you to select an object that you would like to add ' + 'to your email and its attachments from MS Outlook. You can select a partner, ' + 'or a lead object and archive a selected email into an OpenERP mail message with attachments.\n' + '-This installs the module plugin_outlook.'), + 'module_mass_mailing': fields.boolean( + 'Manage mass mailing campaigns', + help='Get access to statistics with your mass mailing, manage campaigns.'), } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index 73685be95df..b0d7c90c7a0 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -123,6 +123,10 @@