diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py index c7c0652cc50..c61ccc8b6bd 100644 --- a/openerp/addons/base/__openerp__.py +++ b/openerp/addons/base/__openerp__.py @@ -36,7 +36,7 @@ The kernel of OpenERP, needed for all installation. 'data': [ 'base_data.xml', 'currency_data.xml', - 'country_data.xml', + 'res/res_country_data.xml', 'security/base_security.xml', 'base_menu.xml', 'res/res_security.xml', diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml index 37c360b5cd8..4c429fe56ff 100644 --- a/openerp/addons/base/base_data.xml +++ b/openerp/addons/base/base_data.xml @@ -29,1031 +29,6 @@ - - - United Arab Emirates - ae - - - Afghanistan, Islamic State of - af - - - Antigua and Barbuda - ag - - - Anguilla - ai - - - Albania - al - - - Armenia - am - - - Netherlands Antilles - an - - - Angola - ao - - - Antarctica - aq - - - Argentina - ar - - - American Samoa - as - - - Austria - at - - - Australia - au - - - - Aruba - aw - - - Åland Islands - ax - - - Azerbaijan - az - - - Bosnia-Herzegovina - ba - - - Barbados - bb - - - Bangladesh - bd - - - Belgium - be - - - - Burkina Faso - bf - - - Bulgaria - bg - - - Bahrain - bh - - - Burundi - bi - - - Benin - bj - - - Saint Barthélémy - bl - - - Bermuda - bm - - - Brunei Darussalam - bn - - - Bolivia - bo - - - Bonaire, Sint Eustatius and Saba - bq - - - Brazil - br - - - - Bahamas - bs - - - Bhutan - bt - - - Bouvet Island - bv - - - Botswana - bw - - - Belarus - by - - - Belize - bz - - - Canada - ca - - - - Cocos (Keeling) Islands - cc - - - Central African Republic - cf - - - Congo, Democratic Republic of the - cd - - - Congo - cg - - - Switzerland - ch - - - Ivory Coast (Cote D'Ivoire) - ci - - - Cook Islands - ck - - - Chile - cl - - - Cameroon - cm - - - China - cn - - - Colombia - co - - - Costa Rica - cr - - - Cuba - cu - - - Cape Verde - cv - - - Curaçao - cw - - - Christmas Island - cx - - - Cyprus - cy - - - Czech Republic - cz - - - Germany - de - - - - Djibouti - dj - - - Denmark - dk - - - Dominica - dm - - - Dominican Republic - do - - - Algeria - dz - - - Ecuador - ec - - - Estonia - ee - - - Egypt - eg - - - Western Sahara - eh - - - Eritrea - er - - - Spain - es - - - - Ethiopia - et - - - Finland - fi - - - Fiji - fj - - - Falkland Islands - fk - - - Micronesia - fm - - - Faroe Islands - fo - - - France - fr - - - - Gabon - ga - - - Grenada - gd - - - Georgia - ge - - - French Guyana - gf - - - Ghana - gh - - - Gibraltar - gi - - - Guernsey - gg - - - Greenland - gl - - - Gambia - gm - - - Guinea - gn - - - Guadeloupe (French) - gp - - - Equatorial Guinea - gq - - - Greece - gr - - - South Georgia and the South Sandwich Islands - gs - - - Guatemala - gt - - - Guam (USA) - gu - - - Guinea Bissau - gw - - - Guyana - gy - - - Hong Kong - hk - - - Heard and McDonald Islands - hm - - - Honduras - hn - - - Croatia - hr - - - Haiti - ht - - - Hungary - hu - - - Indonesia - id - - - Ireland - ie - - - Israel - il - - - Isle of Man - im - - - India - in - - - - British Indian Ocean Territory - io - - - Iraq - iq - - - Iran - ir - - - Iceland - is - - - Italy - it - - - Jersey - je - - - Jamaica - jm - - - Jordan - jo - - - Japan - jp - - - Kenya - ke - - - Kyrgyz Republic (Kyrgyzstan) - kg - - - Cambodia, Kingdom of - kh - - - Kiribati - ki - - - Comoros - km - - - Saint Kitts & Nevis Anguilla - kn - - - North Korea - kp - - - South Korea - kr - - - Kuwait - kw - - - Cayman Islands - ky - - - Kazakhstan - kz - - - Laos - la - - - Lebanon - lb - - - Saint Lucia - lc - - - Liechtenstein - li - - - Sri Lanka - lk - - - Liberia - lr - - - Lesotho - ls - - - Lithuania - lt - - - Luxembourg - lu - - - Latvia - lv - - - Libya - ly - - - Morocco - ma - - - Monaco - mc - - - Moldavia - md - - - Montenegro - me - - - Saint Martin (French part) - mf - - - Madagascar - mg - - - Marshall Islands - mh - - - Macedonia, the former Yugoslav Republic of - mk - - - Mali - ml - - - Myanmar - mm - - - Mongolia - mn - - - Macau - mo - - - Northern Mariana Islands - mp - - - Martinique (French) - mq - - - Mauritania - mr - - - Montserrat - ms - - - Malta - mt - - - Mauritius - mu - - - Maldives - mv - - - Malawi - mw - - - Mexico - mx - - - Malaysia - my - - - Mozambique - mz - - - Namibia - na - - - New Caledonia (French) - nc - - - Niger - ne - - - Norfolk Island - nf - - - Nigeria - ng - - - Nicaragua - ni - - - Netherlands - nl - - - - Norway - no - - - Nepal - np - - - Nauru - nr - - - Neutral Zone - nt - - - Niue - nu - - - New Zealand - nz - - - Oman - om - - - Panama - pa - - - Peru - pe - - - Polynesia (French) - pf - - - Papua New Guinea - pg - - - Philippines - ph - - - Pakistan - pk - - - Poland - pl - - - Saint Pierre and Miquelon - pm - - - Pitcairn Island - pn - - - Puerto Rico - pr - - - Palestinian Territory, Occupied - ps - - - Portugal - pt - - - Palau - pw - - - Paraguay - py - - - Qatar - qa - - - Reunion (French) - re - - - Romania - ro - - - Serbia - rs - - - Russian Federation - ru - - - Rwanda - rw - - - Saudi Arabia - sa - - - Solomon Islands - sb - - - Seychelles - sc - - - Sudan - sd - - - Sweden - se - - - Singapore - sg - - - Saint Helena - sh - - - Slovenia - si - - - Svalbard and Jan Mayen Islands - sj - - - Slovakia - sk - - - Sierra Leone - sl - - - San Marino - sm - - - Senegal - sn - - - Somalia - so - - - Suriname - sr - - - South Sudan - ss - - - Saint Tome (Sao Tome) and Principe - st - - - El Salvador - sv - - - Sint Maarten (Dutch part) - sx - - - Syria - sy - - - Swaziland - sz - - - Turks and Caicos Islands - tc - - - Chad - td - - - French Southern Territories - tf - - - Togo - tg - - - Thailand - th - - - Tajikistan - tj - - - Tokelau - tk - - - Turkmenistan - tm - - - Tunisia - tn - - - Tonga - to - - - East Timor - tp - - - Turkey - tr - - - Trinidad and Tobago - tt - - - Tuvalu - tv - - - Taiwan - tw - - - Tanzania - tz - - - Ukraine - ua - - - Uganda - ug - - - United Kingdom - - gb - - - USA Minor Outlying Islands - um - - - United States - us - - - - Uruguay - uy - - - Uzbekistan - uz - - - Holy See (Vatican City State) - va - - - Saint Vincent & Grenadines - vc - - - Venezuela - ve - - - Virgin Islands (British) - vg - - - Virgin Islands (USA) - vi - - - Vietnam - vn - - - Vanuatu - vu - - - Wallis and Futuna Islands - wf - - - Samoa - ws - - - Yemen - ye - - - Mayotte - yt - - - Yugoslavia - yu - - - South Africa - za - - - Zambia - zm - - - - Zaire - zr - - - Zimbabwe - zw - - Your Company @@ -1087,8 +62,6 @@ Your Company Your Company Slogan - Web: http://www.yourcompany.com - Tel: +33 1 49 51 23 94 - Bank Accounts... to be configured in menu Settings > Accounting/Invoicing. diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml index 770e0e2d329..2e6a6d3a27f 100644 --- a/openerp/addons/base/base_menu.xml +++ b/openerp/addons/base/base_menu.xml @@ -29,5 +29,17 @@ + + Open Settings Menu + reload + + + + + automatic + 100 + done + + diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po index cb52e2f5de9..d2c6ebb3e1b 100644 --- a/openerp/addons/base/i18n/af.po +++ b/openerp/addons/base/i18n/af.po @@ -794,7 +794,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3701,7 +3701,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5480,7 +5480,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "" #. module: base @@ -11014,7 +11014,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11134,7 +11134,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po index 3e1e29f7661..e618a02e88c 100644 --- a/openerp/addons/base/i18n/am.po +++ b/openerp/addons/base/i18n/am.po @@ -775,7 +775,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3682,7 +3682,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5461,7 +5461,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "" #. module: base @@ -10995,7 +10995,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11115,7 +11115,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po index e127ce1abbb..9ea225bb79f 100644 --- a/openerp/addons/base/i18n/ar.po +++ b/openerp/addons/base/i18n/ar.po @@ -798,7 +798,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3769,7 +3769,7 @@ msgstr "GPL-2 أو إصدار أحدث" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5573,7 +5573,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "رمز الولاية (ثلاثة حروف).\n" #. module: base @@ -11138,7 +11138,7 @@ msgstr "المتواليات" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11261,7 +11261,7 @@ msgstr "مرشح الفرز" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "السيدة" #. module: base diff --git a/openerp/addons/base/i18n/base.pot b/openerp/addons/base/i18n/base.pot index 884dac7d821..7721ab2711c 100644 --- a/openerp/addons/base/i18n/base.pot +++ b/openerp/addons/base/i18n/base.pot @@ -727,7 +727,7 @@ msgstr "" #: help:ir.actions.todo,type:0 msgid "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets automatically to Done." +"Launch Manually Once: after having been launched manually, it sets automatically to Done." msgstr "" #. module: base @@ -1317,11 +1317,6 @@ msgstr "" msgid "Create _Menu" msgstr "" -#. module: base -#: field:res.payterm,name:0 -msgid "Payment Term (short name)" -msgstr "" - #. module: base #: model:ir.model,name:base.model_res_bank #: view:res.bank:0 @@ -2155,7 +2150,7 @@ msgstr "" #. module: base #: selection:base.language.install,lang:0 -msgid "Portugese (BR) / Português (BR)" +msgid "Portuguese (BR) / Português (BR)" msgstr "" #. module: base @@ -3002,7 +2997,7 @@ msgstr "" #. module: base #: selection:base.language.install,lang:0 -msgid "Portugese / Português" +msgid "Portuguese / Português" msgstr "" #. module: base @@ -3206,11 +3201,6 @@ msgstr "" msgid "Error ! You cannot create recursive associated members." msgstr "" -#. module: base -#: view:res.payterm:0 -msgid "Payment Term" -msgstr "" - #. module: base #: selection:res.lang,direction:0 msgid "Right-to-Left" @@ -3430,7 +3420,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Sir" msgstr "" #. module: base @@ -5037,7 +5027,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." "" msgstr "" @@ -10134,7 +10124,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -10249,7 +10239,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base @@ -11306,6 +11296,35 @@ msgstr "" msgid "Madam" msgstr "" +#. module: base +#: model:res.partner.title,name:base.res_partner_title_mister +msgid "Mister" +msgstr "" +#. module: base +#: model:res.partner.title,name:base.res_partner_title_doctor +msgid "Doctor" +msgstr "" +#. module: base +#: model:res.partner.title,name:base.res_partner_title_prof +msgid "Professor" +msgstr "" + +#. module: base +#: model:res.partner.title,shortcut:base.res_partner_title_mister +msgid "Mr." +msgstr "" + +#. module: base +#: model:res.partner.title,shortcut:base.res_partner_title_doctor +msgid "Dr." +msgstr "" + +#. module: base +#: model:res.partner.title,shortcut:base.res_partner_title_prof +msgid "Prof." +msgstr "" + + #. module: base #: model:res.country,name:base.ee msgid "Estonia" diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po index 3d2625e4733..ca934b47963 100644 --- a/openerp/addons/base/i18n/bg.po +++ b/openerp/addons/base/i18n/bg.po @@ -799,7 +799,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3753,8 +3753,8 @@ msgstr "GPL версия 2 или по-нова" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." -msgstr "M." +msgid "Mr." +msgstr "Mr." #. module: base #: code:addons/base/module/module.py:519 @@ -5554,7 +5554,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Кодът на държавата в три букви.\n" #. module: base @@ -11117,7 +11117,7 @@ msgstr "Последователност" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11237,7 +11237,7 @@ msgstr "Филтър" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Г-жа" #. module: base diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po index 9a3b2255563..a4522c344c8 100644 --- a/openerp/addons/base/i18n/bs.po +++ b/openerp/addons/base/i18n/bs.po @@ -783,7 +783,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3690,7 +3690,7 @@ msgstr "GPL-2 ili novija verzija" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5469,7 +5469,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "" #. module: base @@ -11003,7 +11003,7 @@ msgstr "Sekvence" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11123,7 +11123,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po index 6fc2fb91702..a4d102d7818 100644 --- a/openerp/addons/base/i18n/ca.po +++ b/openerp/addons/base/i18n/ca.po @@ -807,7 +807,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3805,7 +3805,7 @@ msgstr "GPL-2 o versió posterior" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "Sr." #. module: base @@ -5641,7 +5641,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "El codi de la província de 3 caràcters.\n" #. module: base @@ -11259,7 +11259,7 @@ msgstr "Seqüències" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "Sra." #. module: base @@ -11385,7 +11385,7 @@ msgstr "Filtre" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Sra." #. module: base diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po index 6069a8e44ca..5fce16df6c7 100644 --- a/openerp/addons/base/i18n/cs.po +++ b/openerp/addons/base/i18n/cs.po @@ -805,7 +805,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3835,8 +3835,8 @@ msgstr "GPL-2 nebo pozdější verze" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." -msgstr "M." +msgid "Mr." +msgstr "Mr." #. module: base #: code:addons/base/module/module.py:519 @@ -5650,7 +5650,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Kód státu ve třech znacích.\n" #. module: base @@ -11276,7 +11276,7 @@ msgstr "Posloupnosti" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "Paní" #. module: base @@ -11398,7 +11398,7 @@ msgstr "Filtr" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Pan" #. module: base diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po index 62dc22344a7..879d4a76f24 100644 --- a/openerp/addons/base/i18n/da.po +++ b/openerp/addons/base/i18n/da.po @@ -775,7 +775,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3682,7 +3682,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5461,7 +5461,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "" #. module: base @@ -10995,7 +10995,7 @@ msgstr "Sekvenser" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11115,7 +11115,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po index 301be6a019e..8c5989a1e5b 100644 --- a/openerp/addons/base/i18n/de.po +++ b/openerp/addons/base/i18n/de.po @@ -869,7 +869,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "Manuell: manuell gestartet" @@ -4345,7 +4345,7 @@ msgstr "GPL-2 oder höher" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "Hr." #. module: base @@ -6486,7 +6486,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Der 3 stellige Staatencode\n" #. module: base @@ -12558,7 +12558,7 @@ msgstr "Sequenzen" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "Frau" #. module: base @@ -12683,7 +12683,7 @@ msgstr "Filter" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Frau" #. module: base diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po index 610613af10c..888dd371b21 100644 --- a/openerp/addons/base/i18n/el.po +++ b/openerp/addons/base/i18n/el.po @@ -795,7 +795,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3776,7 +3776,7 @@ msgstr "GPL-2 ή μεταγενέστερη έκδοση" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5589,7 +5589,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Ο κωδικός κατάστασης με 3 χαρακτήρες\n" #. module: base @@ -11159,7 +11159,7 @@ msgstr "Ιεραρχήσεις" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11281,7 +11281,7 @@ msgstr "Φίλτρο" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Κα/Δς" #. module: base diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po index ee7bd182672..c435e12b4ce 100644 --- a/openerp/addons/base/i18n/en_GB.po +++ b/openerp/addons/base/i18n/en_GB.po @@ -862,7 +862,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" "Manual: Launched manually.\n" @@ -4355,8 +4355,8 @@ msgstr "GPL-2 or later version" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." -msgstr "M." +msgid "Mr." +msgstr "Mr." #. module: base #: code:addons/base/module/module.py:519 @@ -6310,8 +6310,8 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" -msgstr "The state code in three chars.\n" +msgid "The state code in max. three chars." +msgstr "The state code in max. three chars." #. module: base #: model:res.country,name:base.sj @@ -11913,8 +11913,8 @@ msgstr "Sequences" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" -msgstr "Mss" +msgid "Miss" +msgstr "Miss" #. module: base #: model:ir.model,name:base.model_ir_ui_view @@ -12038,8 +12038,8 @@ msgstr "Filter" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." -msgstr "Ms." +msgid "Mrs." +msgstr "Mrs." #. module: base #: view:base.module.import:0 diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po index 3f0a4646113..853e7c31fc4 100644 --- a/openerp/addons/base/i18n/es.po +++ b/openerp/addons/base/i18n/es.po @@ -853,7 +853,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" "Manual: Se lanza manualmente.\n" @@ -4029,7 +4029,7 @@ msgstr "GPL-2 o versión posterior" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "Sr." #. module: base @@ -5868,7 +5868,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "El código de la provincia de 3 caracteres.\n" #. module: base @@ -11486,7 +11486,7 @@ msgstr "Secuencias" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "Sra." #. module: base @@ -11613,7 +11613,7 @@ msgstr "Filtro" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Sra." #. module: base diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po index f215912bd37..188fedf98fa 100644 --- a/openerp/addons/base/i18n/es_CL.po +++ b/openerp/addons/base/i18n/es_CL.po @@ -835,7 +835,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3843,7 +3843,7 @@ msgstr "GPL-2 o versión posterior" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "Sr." #. module: base @@ -5682,7 +5682,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "El código de la provincia de 3 caracteres.\n" #. module: base @@ -11300,7 +11300,7 @@ msgstr "Secuencias" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "Sra." #. module: base @@ -11427,7 +11427,7 @@ msgstr "Filtro" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Sra." #. module: base diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po index 87c2b8aa483..59784f67f0d 100644 --- a/openerp/addons/base/i18n/es_CR.po +++ b/openerp/addons/base/i18n/es_CR.po @@ -879,7 +879,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" "Manual: Lanzado manualmente.\n" @@ -4442,7 +4442,7 @@ msgstr "GPL-2 o versión posterior" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "Sr." #. module: base @@ -6736,7 +6736,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "El código de la provincia de 3 caracteres.\n" #. module: base @@ -13818,7 +13818,7 @@ msgstr "Secuencias" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "Sra." #. module: base @@ -13945,7 +13945,7 @@ msgstr "Filtro" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Sra." #. module: base diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po index 0ba92adb8ff..1f654b96e4b 100644 --- a/openerp/addons/base/i18n/es_EC.po +++ b/openerp/addons/base/i18n/es_EC.po @@ -847,7 +847,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" "Manual: Se lanza manualmente.\n" @@ -4019,8 +4019,8 @@ msgstr "GPL-2 o versión posterior" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." -msgstr "M." +msgid "Mr." +msgstr "Mr." #. module: base #: code:addons/base/module/module.py:519 @@ -5872,7 +5872,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "El código de la provincia de 3 caracteres.\n" #. module: base @@ -11535,8 +11535,8 @@ msgstr "Secuencias" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" -msgstr "Mss" +msgid "Miss" +msgstr "Miss" #. module: base #: model:ir.model,name:base.model_ir_ui_view @@ -11662,7 +11662,7 @@ msgstr "Filtro" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Sra." #. module: base diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po index aac50f06100..201786b5436 100644 --- a/openerp/addons/base/i18n/et.po +++ b/openerp/addons/base/i18n/et.po @@ -788,7 +788,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3713,7 +3713,7 @@ msgstr "GPL-2 või hilisem versioon" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5499,7 +5499,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Maakonna kolmekohaline kood.\n" #. module: base @@ -11043,7 +11043,7 @@ msgstr "Jadad" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11163,7 +11163,7 @@ msgstr "Filter" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po index 792b21b6765..a1a9b7153e2 100644 --- a/openerp/addons/base/i18n/eu.po +++ b/openerp/addons/base/i18n/eu.po @@ -775,7 +775,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3682,7 +3682,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5461,7 +5461,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "" #. module: base @@ -10995,7 +10995,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11115,7 +11115,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po index 066fe2500d8..27f15b9588e 100644 --- a/openerp/addons/base/i18n/fa.po +++ b/openerp/addons/base/i18n/fa.po @@ -786,7 +786,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3715,7 +3715,7 @@ msgstr "مجوز GPL-2 یا نگارش بالاتر" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5502,7 +5502,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "کد استان در ۳ نویسه‌ای.\n" #. module: base @@ -11048,7 +11048,7 @@ msgstr "دنباله‌ها" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11168,7 +11168,7 @@ msgstr "پالایه" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po index 6d1b941729e..a7c3b27cd3c 100644 --- a/openerp/addons/base/i18n/fa_AF.po +++ b/openerp/addons/base/i18n/fa_AF.po @@ -775,7 +775,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3682,7 +3682,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5461,7 +5461,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "" #. module: base @@ -10995,7 +10995,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11115,7 +11115,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po index 62d3fff7aa8..c991f971828 100644 --- a/openerp/addons/base/i18n/fi.po +++ b/openerp/addons/base/i18n/fi.po @@ -805,7 +805,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3799,7 +3799,7 @@ msgstr "GPL-2 tai myöhäisempi versio" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5630,7 +5630,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Osavaltion koodi kolmella kirjaimella.\n" #. module: base @@ -11278,7 +11278,7 @@ msgstr "Jaksot" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11404,8 +11404,8 @@ msgstr "Suodin" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." -msgstr "Ms." +msgid "Mrs." +msgstr "Mrs." #. module: base #: view:base.module.import:0 diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po index 02830069df2..bf3cb22327c 100644 --- a/openerp/addons/base/i18n/fr.po +++ b/openerp/addons/base/i18n/fr.po @@ -879,7 +879,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" "Manuel : lancé manuellement.\n" @@ -4422,7 +4422,7 @@ msgstr "GPL-2 ou version supérieure" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "M." #. module: base @@ -6659,7 +6659,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Le code état en trois caractères.\n" #. module: base @@ -13001,8 +13001,8 @@ msgstr "Séquences" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" -msgstr "Mme" +msgid "Miss" +msgstr "Mlle" #. module: base #: model:ir.model,name:base.model_ir_ui_view @@ -13129,8 +13129,8 @@ msgstr "Filtre" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." -msgstr "Mlle" +msgid "Mrs." +msgstr "Mme" #. module: base #: view:base.module.import:0 diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po index a1f6dec55ea..ec3b210b927 100644 --- a/openerp/addons/base/i18n/gl.po +++ b/openerp/addons/base/i18n/gl.po @@ -808,7 +808,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3805,8 +3805,8 @@ msgstr "GPL-2 ou versión posterior" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." -msgstr "M." +msgid "Mr." +msgstr "Mr." #. module: base #: code:addons/base/module/module.py:519 @@ -5635,7 +5635,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "O código de estado en tres caracteres.\n" #. module: base @@ -11245,8 +11245,8 @@ msgstr "Secuencias" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" -msgstr "MSS" +msgid "Miss" +msgstr "Miss" #. module: base #: model:ir.model,name:base.model_ir_ui_view @@ -11372,7 +11372,7 @@ msgstr "Filtro" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Ms" #. module: base diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po index 63b5e98ee3e..86ee39654d2 100644 --- a/openerp/addons/base/i18n/he.po +++ b/openerp/addons/base/i18n/he.po @@ -785,7 +785,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3702,7 +3702,7 @@ msgstr "גרסא GPL-2 או מאוחרת יותר." #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5487,7 +5487,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "ביטוי הקוד בשלוש תוים.\n" #. module: base @@ -11030,7 +11030,7 @@ msgstr "רציפות" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11150,7 +11150,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po index a001f4b9cbe..a8cbd469f06 100644 --- a/openerp/addons/base/i18n/hr.po +++ b/openerp/addons/base/i18n/hr.po @@ -840,7 +840,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3835,7 +3835,7 @@ msgstr "GPL-2 ili novija verzija" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "g." #. module: base @@ -5646,7 +5646,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Troznamenkasta šifra države/pokrajine/županije.\n" #. module: base @@ -11218,7 +11218,7 @@ msgstr "Sekvence" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "gđica" #. module: base @@ -11344,7 +11344,7 @@ msgstr "Filter" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "gđa." #. module: base diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po index 3a4de493607..8e9a7bcd686 100644 --- a/openerp/addons/base/i18n/hu.po +++ b/openerp/addons/base/i18n/hu.po @@ -804,7 +804,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3792,7 +3792,7 @@ msgstr "GPL-2 vagy korábbi verzió" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "Úr" #. module: base @@ -5625,7 +5625,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Az állam kódja három karakterben.\n" #. module: base @@ -11243,8 +11243,8 @@ msgstr "Sorszámok" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" -msgstr "Mss" +msgid "Miss" +msgstr "Miss" #. module: base #: model:ir.model,name:base.model_ir_ui_view @@ -11372,8 +11372,8 @@ msgstr "Szűrő" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." -msgstr "Ms." +msgid "Mrs." +msgstr "Mrs." #. module: base #: view:base.module.import:0 diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po index aa1d7e92777..35b84bad12d 100644 --- a/openerp/addons/base/i18n/hy.po +++ b/openerp/addons/base/i18n/hy.po @@ -775,7 +775,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3682,7 +3682,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5461,7 +5461,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "" #. module: base @@ -10995,7 +10995,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11115,7 +11115,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po index 20884ecd62d..6907213e8d2 100644 --- a/openerp/addons/base/i18n/id.po +++ b/openerp/addons/base/i18n/id.po @@ -779,7 +779,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3686,7 +3686,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5465,7 +5465,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "" #. module: base @@ -10999,7 +10999,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11119,7 +11119,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po index b7d55808fb0..d4020680c67 100644 --- a/openerp/addons/base/i18n/is.po +++ b/openerp/addons/base/i18n/is.po @@ -793,7 +793,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" "Handvirkt: Keyrt handvirkt\n" @@ -3716,7 +3716,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5495,7 +5495,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "" #. module: base @@ -11033,7 +11033,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11153,7 +11153,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po index b73f9844de2..78b5b4eb008 100644 --- a/openerp/addons/base/i18n/it.po +++ b/openerp/addons/base/i18n/it.po @@ -847,7 +847,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" "Manuale: Esegui manualmente\n" @@ -3855,8 +3855,8 @@ msgstr "GPL-2 o successiva" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." -msgstr "M." +msgid "Mr." +msgstr "Mr." #. module: base #: code:addons/base/module/module.py:519 @@ -5690,7 +5690,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Il codice dello stato in 3 caratteri\n" #. module: base @@ -11312,8 +11312,8 @@ msgstr "Sequenze" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" -msgstr "Mss" +msgid "Miss" +msgstr "Miss" #. module: base #: model:ir.model,name:base.model_ir_ui_view @@ -11439,7 +11439,7 @@ msgstr "Filtro" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Sig.ra" #. module: base diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po index 331db58c6fa..dd48dceb85f 100644 --- a/openerp/addons/base/i18n/kk.po +++ b/openerp/addons/base/i18n/kk.po @@ -775,7 +775,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3682,7 +3682,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5461,7 +5461,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "" #. module: base @@ -10995,7 +10995,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11115,7 +11115,7 @@ msgstr "Сүзгі" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "миссис" #. module: base diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po index dff6a43c5e1..9d0f5276cc1 100644 --- a/openerp/addons/base/i18n/ko.po +++ b/openerp/addons/base/i18n/ko.po @@ -784,7 +784,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3729,7 +3729,7 @@ msgstr "GPL-2 또는 이후 버젼" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5518,7 +5518,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "3문자의 상태 코드\n" #. module: base @@ -11056,7 +11056,7 @@ msgstr "시퀀스" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11176,7 +11176,7 @@ msgstr "필터" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po index 71314ff39ec..c4795e2c8b4 100644 --- a/openerp/addons/base/i18n/lt.po +++ b/openerp/addons/base/i18n/lt.po @@ -778,7 +778,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3694,7 +3694,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5483,7 +5483,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Savivaldybės kodas iš trijų simbolių.\n" #. module: base @@ -11029,7 +11029,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11149,7 +11149,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Ponia" #. module: base diff --git a/openerp/addons/base/i18n/lt_LT.po b/openerp/addons/base/i18n/lt_LT.po index be05dc522d1..e9dba2fbd46 100644 --- a/openerp/addons/base/i18n/lt_LT.po +++ b/openerp/addons/base/i18n/lt_LT.po @@ -5407,7 +5407,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." "" msgstr "" diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po index a487c340251..d8c9f71053f 100644 --- a/openerp/addons/base/i18n/mk.po +++ b/openerp/addons/base/i18n/mk.po @@ -786,7 +786,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3693,7 +3693,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5472,7 +5472,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "" #. module: base @@ -11006,7 +11006,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11126,7 +11126,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po index 273d4002096..6da5ca40c6a 100644 --- a/openerp/addons/base/i18n/mn.po +++ b/openerp/addons/base/i18n/mn.po @@ -860,7 +860,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" "Гараар: Гараар ажилуулна.\n" @@ -4217,8 +4217,8 @@ msgstr "GPL-2 болон дараагийн хувилбар" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." -msgstr "M." +msgid "Mr." +msgstr "Mr." #. module: base #: code:addons/base/module/module.py:519 @@ -6338,7 +6338,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Мужийн код гурван тэмдэгтээр.\n" #. module: base @@ -13104,7 +13104,7 @@ msgstr "Дараалал" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "Хатагтай" #. module: base @@ -13230,7 +13230,7 @@ msgstr "Шүүлт" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Хатагтай." #. module: base diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po index 5a6b76b7e6a..d2d44b0e797 100644 --- a/openerp/addons/base/i18n/nb.po +++ b/openerp/addons/base/i18n/nb.po @@ -807,7 +807,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3746,8 +3746,8 @@ msgstr "GPL-2 eller senere versjon" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." -msgstr "M." +msgid "Mr." +msgstr "Mr." #. module: base #: code:addons/base/module/module.py:519 @@ -5545,7 +5545,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Koden til staten med tre karakterer.\n" #. module: base @@ -11093,7 +11093,7 @@ msgstr "Sekvenser" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11213,7 +11213,7 @@ msgstr "Filter" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po index dbd37e376ac..eaef41bcfed 100644 --- a/openerp/addons/base/i18n/nl.po +++ b/openerp/addons/base/i18n/nl.po @@ -836,7 +836,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" "Handmatig: Start handmatig.\n" @@ -3940,7 +3940,7 @@ msgstr "GPL-2 of latere versie" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "Hr." #. module: base @@ -5803,7 +5803,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "De provinciecode in drie karakters.\n" #. module: base @@ -11528,7 +11528,7 @@ msgstr "Reeksen" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "Mej." #. module: base @@ -11655,7 +11655,7 @@ msgstr "Filter" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Mw." #. module: base diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po index bf6b8deabaf..7affdca458b 100644 --- a/openerp/addons/base/i18n/nl_BE.po +++ b/openerp/addons/base/i18n/nl_BE.po @@ -790,7 +790,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3697,7 +3697,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5476,7 +5476,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "" #. module: base @@ -11010,7 +11010,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11130,7 +11130,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/nl_NL.po b/openerp/addons/base/i18n/nl_NL.po index 267b058bfef..7b51b9be54a 100644 --- a/openerp/addons/base/i18n/nl_NL.po +++ b/openerp/addons/base/i18n/nl_NL.po @@ -5598,7 +5598,7 @@ msgstr "STOCK_MEDIA_PAUSE" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "De provinciecode in drie karakters.\n" #. module: base diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po index 77e41253840..1ddbdd2992f 100644 --- a/openerp/addons/base/i18n/pl.po +++ b/openerp/addons/base/i18n/pl.po @@ -797,7 +797,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3778,7 +3778,7 @@ msgstr "GPL-2 lub wersja późniejsza" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5599,7 +5599,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Trzyliterowy kod regionu\n" #. module: base @@ -11196,7 +11196,7 @@ msgstr "Numeracje" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11318,7 +11318,7 @@ msgstr "Filtr" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Pani" #. module: base diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po index 3a7516a9dc2..2fe5ba9cabd 100644 --- a/openerp/addons/base/i18n/pt_BR.po +++ b/openerp/addons/base/i18n/pt_BR.po @@ -7,15 +7,14 @@ msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:44+0000\n" -"PO-Revision-Date: 2012-08-20 15:33+0000\n" -"Last-Translator: Renato Lima - http://www.akretion.com " -"\n" +"PO-Revision-Date: 2012-09-11 09:31+0000\n" +"Last-Translator: Carlos Paiva \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:45+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-12 04:36+0000\n" +"X-Generator: Launchpad (build 15930)\n" #. module: base #: model:res.country,name:base.sh @@ -196,7 +195,7 @@ msgstr "Bélgica - comunicação estruturada" #. module: base #: field:ir.actions.act_window,target:0 msgid "Target Window" -msgstr "Janela Destino" +msgstr "Janela de destino" #. module: base #: model:ir.module.module,shortdesc:base.module_sale_analytic_plans @@ -382,7 +381,7 @@ msgstr "" #. module: base #: sql_constraint:res.lang:0 msgid "The name of the language must be unique !" -msgstr "O nome da língua deve ser único !" +msgstr "O nome do idioma deve ser único!" #. module: base #: model:ir.module.module,description:base.module_import_base @@ -452,7 +451,7 @@ msgstr "Regras de ação automatizada" #. module: base #: view:ir.attachment:0 msgid "Owner" -msgstr "Dono" +msgstr "Proprietário" #. module: base #: field:ir.actions.act_window,src_model:0 @@ -610,8 +609,8 @@ msgid "" "If you check this, then the second time the user prints with same attachment " "name, it returns the previous report." msgstr "" -"Se marcar esta opção, na segunda vez que usar a impressora com o mesmo " -"anexo, usará a impressora anterior" +"Se você marcar esta opção, na segunda vez que o usuário imprimir com o mesmo " +"nome de anexo, retornará a impressão anterior." #. module: base #: model:ir.module.module,shortdesc:base.module_sale_layout @@ -1035,7 +1034,7 @@ msgstr "" #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade #: model:ir.model,name:base.model_base_module_upgrade msgid "Module Upgrade" -msgstr "Atualizar múdlos" +msgstr "Atualizar Módulos" #. module: base #: selection:base.language.install,lang:0 @@ -1147,7 +1146,7 @@ msgstr "" #. module: base #: view:res.lang:0 msgid "%B - Full month name." -msgstr "%B - Nome do mes completo" +msgstr "%B - Nome do mês completo" #. module: base #: field:ir.actions.todo,type:0 @@ -1169,7 +1168,7 @@ msgstr "Tipo" #. module: base #: field:ir.mail_server,smtp_user:0 msgid "Username" -msgstr "Nome do usuário" +msgstr "Nome de usuário" #. module: base #: code:addons/orm.py:398 @@ -1235,7 +1234,7 @@ msgstr "Registro #%d do %s não foi encontrado, não é possível copiar!" #. module: base #: field:ir.module.module,contributors:0 msgid "Contributors" -msgstr "Contribuidores" +msgstr "Colaboradores" #. module: base #: model:ir.module.module,description:base.module_project_planning @@ -1298,7 +1297,7 @@ msgstr "Uganda" #. module: base #: field:ir.model.access,perm_unlink:0 msgid "Delete Access" -msgstr "Acesso deletado" +msgstr "Excluir Acesso" #. module: base #: model:res.country,name:base.ne @@ -1445,7 +1444,7 @@ msgstr "Sistema de gestão de documentos" #. module: base #: model:ir.module.module,shortdesc:base.module_crm_claim msgid "Claims Management" -msgstr "Gestão de reclamações" +msgstr "Gestão de Solicitações" #. module: base #: model:ir.ui.menu,name:base.menu_purchase_root @@ -1470,10 +1469,10 @@ msgid "" "use the accounting application of OpenERP, journals and accounts will be " "created automatically based on these data." msgstr "" -"Configurar contas de banco da sua empresa e selecione aqueles que devem " -"aparecer no rodapé do relatório. Você pode reordenar contas bancárias de " -"exibição de lista. Se você usar o aplicativo de contabilidade do OpenERP, " -"diários e contas serão criadas automaticamente com base nos dados." +"Configure as contas bancárias da empresa e escolha quais deverão aparecer no " +"rodapé do relatório. Você pode reordenar na listagem. Se você usar o " +"aplicativo de Contabilidade do OpenERP, os diários e contas serão criadas " +"automaticamente com base nesses dados." #. module: base #: view:ir.module.module:0 @@ -2174,17 +2173,17 @@ msgstr "%s (cópia)" #. module: base #: model:ir.module.module,shortdesc:base.module_account_chart msgid "Template of Charts of Accounts" -msgstr "Modelo de gráficos de contas" +msgstr "Modelo de Plano de Contas" #. module: base #: field:res.partner.address,type:0 msgid "Address Type" -msgstr "Tipo de endereço" +msgstr "Tipo de Endereço" #. module: base #: view:ir.ui.menu:0 msgid "Full Path" -msgstr "Endereço completo" +msgstr "Caminho Completo" #. module: base #: model:ir.module.module,description:base.module_l10n_br @@ -2284,7 +2283,7 @@ msgid "" "decimal number [00,53]. All days in a new year preceding the first Sunday " "are considered to be in week 0." msgstr "" -"%U - Número da semana do ano (Domingo com oo primeiro dia da semana) com 2 " +"%U - Número da semana do ano (Domingo como o primeiro dia da semana) com 2 " "decimais [00,53]. Todos os dias, em um novo ano que precede o primeiro " "domingo são considerados na semana 0." @@ -2646,7 +2645,7 @@ msgstr "Editor de Workflow" #: selection:ir.module.module,state:0 #: selection:ir.module.module.dependency,state:0 msgid "To be removed" -msgstr "Para ser removido" +msgstr "A ser removido" #. module: base #: model:ir.model,name:base.model_ir_sequence @@ -2913,7 +2912,7 @@ msgstr "Frances(BE) / Frances(BE)" #: view:ir.actions.server:0 #: field:workflow.activity,action_id:0 msgid "Server Action" -msgstr "Ação de servidor" +msgstr "Ação de Servidor" #. module: base #: help:ir.actions.client,params:0 @@ -2968,7 +2967,7 @@ msgstr "SMS - Gateway: clickatell" #. module: base #: view:ir.actions.server:0 msgid "Field Mappings" -msgstr "Mapeando campos" +msgstr "Mapeamentos de Campo" #. module: base #: code:addons/base/publisher_warranty/publisher_warranty.py:125 @@ -3090,7 +3089,7 @@ msgstr "" #. module: base #: view:res.lang:0 msgid "%p - Equivalent of either AM or PM." -msgstr "%p - Equivalente de cada uma das AM ou PM." +msgstr "%p - Equivalente a AM ou PM." #. module: base #: view:ir.actions.server:0 @@ -3412,7 +3411,7 @@ msgstr "Setor de RH" #. module: base #: model:ir.ui.menu,name:base.menu_dashboard_admin msgid "Administration Dashboard" -msgstr "Painel de administração" +msgstr "Painel de Administração" #. module: base #: code:addons/orm.py:4408 @@ -3434,7 +3433,7 @@ msgstr "Dependência de módulos" #. module: base #: selection:publisher_warranty.contract.wizard,state:0 msgid "Draft" -msgstr "Rascunho" +msgstr "Provisório" #. module: base #: selection:res.users,view:0 @@ -3503,7 +3502,7 @@ msgstr "Administrador RH" #. module: base #: model:ir.module.module,shortdesc:base.module_hr_contract msgid "Employee Contracts" -msgstr "Contratos de empregado" +msgstr "Contratos de Funcionários" #. module: base #: model:ir.module.module,description:base.module_wiki_faq @@ -3529,7 +3528,7 @@ msgstr "" #. module: base #: constraint:res.company:0 msgid "Error! You can not create recursive companies." -msgstr "Erro! Voce não pode criar empresas recursivas" +msgstr "Erro! Você não pode criar empresas recursivas." #. module: base #: model:ir.actions.act_window,name:base.action_res_users @@ -3556,7 +3555,7 @@ msgstr "Tratamento para o contato" #. module: base #: model:ir.module.module,shortdesc:base.module_product_manufacturer msgid "Products Manufacturers" -msgstr "Fabricantes de produtos" +msgstr "Fabricantes dos Produtos" #. module: base #: code:addons/base/ir/ir_mail_server.py:217 @@ -3640,7 +3639,7 @@ msgstr "Alemanha / Deutsch" #. module: base #: view:ir.actions.server:0 msgid "Fields Mapping" -msgstr "Mapendo campos" +msgstr "Mapeamento de Campos" #. module: base #: model:ir.module.module,shortdesc:base.module_web_dashboard @@ -3964,7 +3963,7 @@ msgstr "" #. module: base #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "Erro! Você não pode criar recursiva a membros associados." +msgstr "Erro! Você não pode criar membros associados recursivamente." #. module: base #: view:res.payterm:0 @@ -4068,7 +4067,7 @@ msgstr "" #. module: base #: view:ir.model:0 msgid "Create a Menu" -msgstr "Criar um menu" +msgstr "Criar um Menu" #. module: base #: help:res.partner,vat:0 @@ -4161,7 +4160,7 @@ msgstr "" #. module: base #: view:ir.actions.todo:0 msgid "Search Actions" -msgstr "Ações de pesquisa" +msgstr "Ações da Pesquisa" #. module: base #: model:ir.actions.act_window,name:base.action_view_partner_wizard_ean_check @@ -4563,7 +4562,7 @@ msgstr "Planos de Contas" #. module: base #: view:res.request:0 msgid "Request Date" -msgstr "Data da Mensagem" +msgstr "Data de Solicitação:" #. module: base #: code:addons/base/module/wizard/base_export_language.py:52 @@ -4809,7 +4808,7 @@ msgstr "Setor de Telecom" #. module: base #: field:workflow.transition,trigger_model:0 msgid "Trigger Object" -msgstr "Objeto a disparar" +msgstr "Acionar Objeto" #. module: base #: sql_constraint:ir.sequence.type:0 @@ -4819,7 +4818,7 @@ msgstr "`code` precisa ser único." #. module: base #: model:ir.module.module,shortdesc:base.module_hr_expense msgid "Expenses Management" -msgstr "Gerenciamento de despesas" +msgstr "Controle de Despesas" #. module: base #: view:workflow.activity:0 @@ -4852,7 +4851,7 @@ msgstr "Marketing" #. module: base #: view:res.partner.bank:0 msgid "Bank account" -msgstr "Conta Bancaria" +msgstr "Conta Bancária" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_gr @@ -4872,7 +4871,7 @@ msgstr "Tipo de Sequencia" #. module: base #: view:ir.ui.view.custom:0 msgid "Customized Architecture" -msgstr "Arquitetura Customisada" +msgstr "Arquitetura Personalizada" #. module: base #: model:ir.module.module,shortdesc:base.module_web_gantt @@ -5167,7 +5166,7 @@ msgstr "Validação do Número do IVA" #. module: base #: model:ir.module.module,shortdesc:base.module_crm_partner_assign msgid "Partners Geo-Localization" -msgstr "Parceiros Geo-localização" +msgstr "Geo-Localização dos Parceiros" #. module: base #: model:res.country,name:base.ke @@ -5298,7 +5297,7 @@ msgstr "Esse contrato já está registrado no sistema." #: model:ir.actions.act_window,name:base.action_res_partner_bank_type_form #: model:ir.ui.menu,name:base.menu_action_res_partner_bank_typeform msgid "Bank Account Types" -msgstr "Tipos de contas bancárias" +msgstr "Tipos de Contas Bancárias" #. module: base #: help:ir.sequence,suffix:0 @@ -5379,7 +5378,7 @@ msgstr "Mauritius" #: view:ir.model.access:0 #: view:ir.rule:0 msgid "Full Access" -msgstr "Acesso completo" +msgstr "Acesso Completo" #. module: base #: view:ir.actions.act_window:0 @@ -5453,7 +5452,7 @@ msgstr "Hungria" #. module: base #: model:ir.module.module,shortdesc:base.module_hr_recruitment msgid "Recruitment Process" -msgstr "Processo de Recrutamento" +msgstr "Processo de Seleção" #. module: base #: model:res.country,name:base.br @@ -5494,7 +5493,7 @@ msgstr "Espanhol (PA) / Español (PA)" #: view:res.currency:0 #: field:res.currency,rate_ids:0 msgid "Rates" -msgstr "Preços" +msgstr "Taxas" #. module: base #: model:res.country,name:base.sy @@ -5539,7 +5538,7 @@ msgstr "" #. module: base #: selection:res.request,state:0 msgid "draft" -msgstr "esboço" +msgstr "Provisório" #. module: base #: selection:ir.property,type:0 @@ -5741,7 +5740,7 @@ msgstr "Campo" #. module: base #: model:ir.module.module,shortdesc:base.module_project_long_term msgid "Long Term Projects" -msgstr "Projectos de longo prazo" +msgstr "Projetos de Longo Prazo" #. module: base #: model:res.country,name:base.ve @@ -5761,7 +5760,7 @@ msgstr "Zâmbia" #. module: base #: view:ir.actions.todo:0 msgid "Launch Configuration Wizard" -msgstr "Assistente de configuração" +msgstr "Iniciar o Assistente de Configuração" #. module: base #: help:res.partner,user_id:0 @@ -6017,7 +6016,7 @@ msgstr "Web" #. module: base #: model:ir.module.module,shortdesc:base.module_lunch msgid "Lunch Orders" -msgstr "Abir Ordens" +msgstr "Pedidos de Almoço" #. module: base #: selection:base.language.install,lang:0 @@ -6175,7 +6174,7 @@ msgstr "Testar" #. module: base #: model:ir.module.module,shortdesc:base.module_web_kanban msgid "Base Kanban" -msgstr "" +msgstr "Painéis Kanban" #. module: base #: view:ir.actions.act_window:0 @@ -6196,7 +6195,7 @@ msgstr "Título" #: field:base.module.import,state:0 #: field:base.module.update,state:0 msgid "state" -msgstr "status" +msgstr "situação" #. module: base #: model:ir.module.module,description:base.module_account_analytic_analysis @@ -6330,7 +6329,7 @@ msgstr "" #. module: base #: field:res.partner.bank.type.field,bank_type_id:0 msgid "Bank Type" -msgstr "Tipo de banco" +msgstr "Tipo de Banco" #. module: base #: code:addons/base/res/res_users.py:87 @@ -6394,7 +6393,7 @@ msgstr "res.partner.title" #. module: base #: view:res.partner.bank:0 msgid "Bank Account Owner" -msgstr "Titular da conta bancária" +msgstr "Titular da Conta Bancária" #. module: base #: model:ir.module.category,name:base.module_category_uncategorized @@ -6446,7 +6445,7 @@ msgstr "Guadalupe (em francês)" #: code:addons/base/res/res_lang.py:191 #, python-format msgid "User Error" -msgstr "Erro de usuário" +msgstr "Erro do Usuário" #. module: base #: help:workflow.transition,signal:0 @@ -6487,7 +6486,7 @@ msgstr "Nome do Menu" #. module: base #: view:ir.module.module:0 msgid "Author Website" -msgstr "Autor do site" +msgstr "Site do Autor" #. module: base #: model:ir.module.module,description:base.module_board @@ -6534,7 +6533,7 @@ msgstr "Carregar uma tradução oficial" #. module: base #: model:ir.module.module,shortdesc:base.module_account_cancel msgid "Cancel Journal Entries" -msgstr "Cancelar entradas de diário" +msgstr "Cancelar Entradas de Diário" #. module: base #: view:ir.actions.server:0 @@ -6545,7 +6544,7 @@ msgstr "Configuração de ação" #: model:ir.model,name:base.model_res_partner_address #: view:res.partner.address:0 msgid "Partner Addresses" -msgstr "Endereços do parceiro" +msgstr "Endereços do Parceiro" #. module: base #: help:ir.mail_server,smtp_debug:0 @@ -6565,7 +6564,7 @@ msgstr "Construtor de Consulta" #. module: base #: selection:ir.actions.todo,type:0 msgid "Launch Automatically" -msgstr "Iniciar automaticamente" +msgstr "Iniciar Automaticamente" #. module: base #: model:ir.module.module,description:base.module_mail @@ -6687,7 +6686,7 @@ msgstr "ir.actions.url" #. module: base #: model:res.widget,title:base.currency_converter_widget msgid "Currency Converter" -msgstr "conversor de moedas" +msgstr "Conversor de Moedas" #. module: base #: help:ir.values,key:0 @@ -6695,6 +6694,8 @@ msgid "" "- Action: an action attached to one slot of the given model\n" "- Default: a default value for a model field" msgstr "" +"- Ação: uma ação ligada a um slot do modelo dado\n" +"- Padrão: um valor padrão para um campo modelo" #. module: base #: model:ir.actions.act_window,name:base.action_partner_addess_tree @@ -6710,7 +6711,7 @@ msgstr "Numero de módulos adicionados" #. module: base #: view:res.currency:0 msgid "Price Accuracy" -msgstr "Precisão do preço" +msgstr "Precisão do Preço" #. module: base #: selection:base.language.install,lang:0 @@ -6737,7 +6738,7 @@ msgstr "Desinstalar" #. module: base #: model:ir.module.module,shortdesc:base.module_account_budget msgid "Budgets Management" -msgstr "Gestão de orçamentos" +msgstr "Gestão de Orçamentos" #. module: base #: field:workflow.triggers,workitem_id:0 @@ -6795,7 +6796,7 @@ msgstr "Para" #. module: base #: view:ir.sequence:0 msgid "Current Year without Century: %(y)s" -msgstr "Ano atual sem o século: %(y)s" +msgstr "Ano Atual (2 dígitos): %(y)s" #. module: base #: help:ir.actions.client,tag:0 @@ -6944,7 +6945,7 @@ msgstr "Não existe uma visão do tipo '%s' definida para a estrutura!" #. module: base #: view:ir.module.module:0 msgid "Defined Reports" -msgstr "Relatórios definidos" +msgstr "Relatórios Definidos" #. module: base #: model:ir.actions.act_window,name:base.action_payterm_form @@ -7070,7 +7071,7 @@ msgstr "Incluir recarregamento automático dos dados" #. module: base #: help:res.partner,employee:0 msgid "Check this box if the partner is an Employee." -msgstr "Marque esta caixa se o parceiro for um empregado." +msgstr "Marque esta caixa se o parceiro for um Funcionário." #. module: base #: model:ir.module.module,shortdesc:base.module_crm_profiling @@ -7085,7 +7086,7 @@ msgstr "Rastreador de Problemas" #. module: base #: selection:ir.cron,interval_type:0 msgid "Work Days" -msgstr "Dias de trabalho" +msgstr "Dias de Trabalho" #. module: base #: model:ir.module.module,shortdesc:base.module_multi_company @@ -7117,7 +7118,7 @@ msgstr "" #. module: base #: field:base.language.export,advice:0 msgid "Advice" -msgstr "Advertência" +msgstr "Recomendação" #. module: base #: view:res.company:0 @@ -7202,12 +7203,12 @@ msgstr "View herdada" #. module: base #: view:ir.translation:0 msgid "Source Term" -msgstr "Equipe Origem" +msgstr "Termo de Origem" #. module: base #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet msgid "Timesheets Validation" -msgstr "Validação de quadros de horários" +msgstr "Validação da Planilha de Horas" #. module: base #: model:ir.ui.menu,name:base.menu_main_pm @@ -7280,12 +7281,12 @@ msgstr "Contrato de manutenção" #: model:res.groups,name:base.group_user #: field:res.partner,employee:0 msgid "Employee" -msgstr "Empregado" +msgstr "Funcionário" #. module: base #: field:ir.model.access,perm_create:0 msgid "Create Access" -msgstr "Acesso Criação" +msgstr "Criar Acesso" #. module: base #: field:res.bank,state:0 @@ -7298,7 +7299,7 @@ msgstr "Estado(UF)" #. module: base #: field:ir.actions.server,copy_object:0 msgid "Copy Of" -msgstr "Copiar de" +msgstr "Cópia de" #. module: base #: field:ir.model,osv_memory:0 @@ -7354,7 +7355,7 @@ msgstr "Ao excluir" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_multilang msgid "Multi Language Chart of Accounts" -msgstr "Plano de contas multi idiomas" +msgstr "Plano de Contas Multi-Idiomas" #. module: base #: selection:res.lang,direction:0 @@ -7400,7 +7401,7 @@ msgstr "Assinatura" #. module: base #: model:ir.module.module,shortdesc:base.module_crm_caldav msgid "Meetings Synchronization" -msgstr "Sincronização de reuniões" +msgstr "Sincronização de Reuniões" #. module: base #: field:ir.actions.act_window,context:0 @@ -7416,7 +7417,7 @@ msgstr "res.widget.user" #. module: base #: field:res.partner.category,complete_name:0 msgid "Full Name" -msgstr "Nome completo" +msgstr "Nome Completo" #. module: base #: view:base.module.configuration:0 @@ -7432,7 +7433,7 @@ msgstr "O nome do módulo deve ser único!" #. module: base #: model:ir.module.module,shortdesc:base.module_base_contact msgid "Contacts Management" -msgstr "Administração de contatos" +msgstr "Administração de Contatos" #. module: base #: model:ir.module.module,description:base.module_l10n_fr_rib @@ -7632,7 +7633,7 @@ msgstr "" #: code:addons/orm.py:1883 #, python-format msgid "Insufficient fields for Calendar View!" -msgstr "Não tem campos suficiente para representação de calendário" +msgstr "Sem campos suficientes para Visualização de Calendário" #. module: base #: selection:ir.property,type:0 @@ -7693,7 +7694,7 @@ msgstr "Menus criados" #. module: base #: model:ir.module.module,shortdesc:base.module_account_analytic_default msgid "Account Analytic Defaults" -msgstr "Padrões analíticos de conta" +msgstr "Padrões Analíticos da Conta" #. module: base #: model:ir.module.module,description:base.module_hr_contract @@ -7823,7 +7824,7 @@ msgstr "Lido" #. module: base #: model:ir.module.module,shortdesc:base.module_association msgid "Associations Management" -msgstr "Gestão de associações" +msgstr "Gestão de Associações" #. module: base #: help:ir.model,modules:0 @@ -7917,7 +7918,7 @@ msgstr "Campos" #. module: base #: model:ir.actions.act_window,name:base.action_partner_employee_form msgid "Employees" -msgstr "Colaboradores" +msgstr "Funcionários" #. module: base #: field:ir.exports.line,name:0 @@ -7964,7 +7965,7 @@ msgstr "Ref. Visão de Pesquisa" #. module: base #: field:ir.module.module,installed_version:0 msgid "Latest version" -msgstr "Última verão" +msgstr "Última versão" #. module: base #: view:ir.mail_server:0 @@ -8090,7 +8091,7 @@ msgstr "Burquina Fasso" #. module: base #: selection:ir.model.fields,state:0 msgid "Custom Field" -msgstr "Customizar campo" +msgstr "Campo Personalizado" #. module: base #: model:ir.module.module,description:base.module_project_retro_planning @@ -8266,7 +8267,7 @@ msgstr "Gestão de Conhecimento" #. module: base #: model:ir.actions.act_window,name:base.bank_account_update msgid "Company Bank Accounts" -msgstr "Contas bancárias da empresa" +msgstr "Contas Bancárias da Empresa" #. module: base #: help:ir.mail_server,smtp_pass:0 @@ -8331,7 +8332,7 @@ msgstr "" #. module: base #: model:res.partner.bank.type,name:base.bank_normal msgid "Normal Bank Account" -msgstr "Conta bancária normal" +msgstr "Conta Bancária Normal" #. module: base #: view:ir.actions.wizard:0 @@ -8568,7 +8569,7 @@ msgstr "ir.ui.menu" #: model:ir.module.category,name:base.module_category_project_management #: model:ir.module.module,shortdesc:base.module_project msgid "Project Management" -msgstr "Gerenciamento de projetos" +msgstr "Gerenciamento de Projetos" #. module: base #: model:res.country,name:base.us @@ -8676,7 +8677,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_base_iban msgid "IBAN Bank Accounts" -msgstr "" +msgstr "Contas Bancárias IBAN" #. module: base #: field:res.company,user_ids:0 @@ -8755,7 +8756,7 @@ msgstr "2. %a ,%A ==> Sex, Sexta" #. module: base #: view:res.request.history:0 msgid "Request History" -msgstr "Histórico das mensagens" +msgstr "Histórico de Solicitações" #. module: base #: help:ir.rule,global:0 @@ -8810,7 +8811,7 @@ msgstr "Dominica" #. module: base #: model:ir.module.module,shortdesc:base.module_base_module_record msgid "Record and Create Modules" -msgstr "Gravar e criar módulos" +msgstr "Gravar e Criar Módulos" #. module: base #: model:ir.model,name:base.model_partner_sms_send @@ -8946,7 +8947,7 @@ msgstr "Segundo: %(sec)s" #. module: base #: model:ir.ui.menu,name:base.menu_view_base_module_update msgid "Update Modules List" -msgstr "Atualizar lista de módulos" +msgstr "Atualizar Lista de Módulos" #. module: base #: code:addons/base/module/module.py:295 @@ -9071,7 +9072,7 @@ msgstr "México" #: code:addons/base/ir/ir_mail_server.py:414 #, python-format msgid "Missing SMTP Server" -msgstr "Falha no servidor de SMTP" +msgstr "Faltando o Servidor SMTP" #. module: base #: field:ir.attachment,name:0 @@ -9197,7 +9198,7 @@ msgstr "Ações Múltiplas" #: view:base.language.import:0 #: view:wizard.ir.model.menu.create:0 msgid "_Close" -msgstr "_Close" +msgstr "(_C) Fechar" #. module: base #: field:multi_company.default,company_dest_id:0 @@ -9217,7 +9218,7 @@ msgstr "ID da visão definido no arquivo xml" #. module: base #: model:ir.model,name:base.model_base_module_import msgid "Import Module" -msgstr "Importar módulo" +msgstr "Importar Módulo" #. module: base #: model:res.country,name:base.as @@ -9334,7 +9335,7 @@ msgstr "Iteração" #. module: base #: model:ir.module.module,shortdesc:base.module_project_planning msgid "Resources Planing" -msgstr "Planejamento de recursos" +msgstr "Planejamento de Recursos" #. module: base #: field:ir.module.module,complexity:0 @@ -9349,14 +9350,14 @@ msgstr "Incorporado" #. module: base #: model:res.partner.bank.type.field,name:base.bank_normal_field_bic msgid "bank_bic" -msgstr "" +msgstr "bank_bic" #. module: base #: code:addons/orm.py:3988 #: code:addons/orm.py:4085 #, python-format msgid "UserError" -msgstr "Erro de usuário" +msgstr "Erro de Usuário" #. module: base #: model:ir.module.module,description:base.module_account_analytic_default @@ -9463,7 +9464,7 @@ msgstr "Gerenciamento de Reparos" #. module: base #: model:ir.module.module,shortdesc:base.module_account_asset msgid "Assets Management" -msgstr "Gestão de ativos" +msgstr "Gestão Patrimonial" #. module: base #: view:ir.model.access:0 @@ -9734,7 +9735,7 @@ msgstr "Ilhas Marianas do Norte" #. module: base #: model:ir.module.module,shortdesc:base.module_claim_from_delivery msgid "Claim on Deliveries" -msgstr "Reclamar sobre as entregas" +msgstr "Solicitações em Entregas" #. module: base #: model:res.country,name:base.sb @@ -9750,7 +9751,7 @@ msgstr "Ilhas Salomão" #: code:addons/orm.py:4408 #, python-format msgid "AccessError" -msgstr "AccessError" +msgstr "Erro de Acesso" #. module: base #: view:res.request:0 @@ -9789,7 +9790,7 @@ msgstr "" #. module: base #: field:res.log,create_date:0 msgid "Creation Date" -msgstr "Data de criação" +msgstr "Data de Criação" #. module: base #: view:ir.translation:0 @@ -9829,7 +9830,7 @@ msgstr "Ucrânia" #: field:res.company,website:0 #: field:res.partner,website:0 msgid "Website" -msgstr "Página da Web" +msgstr "Site" #. module: base #: selection:ir.mail_server,smtp_encryption:0 @@ -9946,7 +9947,7 @@ msgstr "" #: field:ir.ui.view,type:0 #: field:wizard.ir.model.menu.create.line,view_type:0 msgid "View Type" -msgstr "Tipo de visão" +msgstr "Tipo de Visão" #. module: base #: model:ir.ui.menu,name:base.next_id_2 @@ -9957,7 +9958,7 @@ msgstr "Interface de Usuário" #: field:res.partner,child_ids:0 #: field:res.request,ref_partner_id:0 msgid "Partner Ref." -msgstr "Código Parceiro" +msgstr "Cód. do Parceiro" #. module: base #: field:ir.attachment,create_date:0 @@ -10023,7 +10024,7 @@ msgstr "O módulo adiciona usuário do google em res.user" #: selection:base.module.import,state:0 #: selection:base.module.update,state:0 msgid "done" -msgstr "Concluído" +msgstr "concluído" #. module: base #: view:ir.actions.act_window:0 @@ -10038,7 +10039,7 @@ msgstr "Uruguai - plano de contas" #. module: base #: model:ir.ui.menu,name:base.menu_administration_shortcut msgid "Custom Shortcuts" -msgstr "Atalhos Customizados" +msgstr "Atalhos Personalizados" #. module: base #: selection:base.language.install,lang:0 @@ -10177,7 +10178,7 @@ msgstr "Código Python" #. module: base #: help:ir.actions.server,state:0 msgid "Type of the Action that is to be executed" -msgstr "Tipo de ação a ser executada" +msgstr "Tipo de Ação a ser executada" #. module: base #: model:ir.module.module,description:base.module_base @@ -10223,7 +10224,7 @@ msgstr "Zona Neutra" #. module: base #: view:ir.model:0 msgid "Custom" -msgstr "Personalizar" +msgstr "Personalizado" #. module: base #: view:res.request:0 @@ -10401,7 +10402,7 @@ msgstr "Guiana" #. module: base #: model:ir.module.module,shortdesc:base.module_product_expiry msgid "Products Expiry Date" -msgstr "Data de validade" +msgstr "Data de Validade" #. module: base #: model:ir.module.module,description:base.module_account @@ -10543,7 +10544,7 @@ msgstr "" #. module: base #: view:ir.model:0 msgid "Fields Description" -msgstr "Descrição de campos" +msgstr "Descrição dos Campos" #. module: base #: model:ir.module.module,description:base.module_report_designer @@ -10566,12 +10567,12 @@ msgstr "Sincronização multi-DB" #. module: base #: selection:ir.module.module,complexity:0 msgid "Expert" -msgstr "Especialista" +msgstr "Avançado" #. module: base #: model:ir.module.module,shortdesc:base.module_hr_holidays msgid "Leaves Management" -msgstr "Gerenciamento de folhas" +msgstr "Gerenciamento de Folgas" #. module: base #: view:ir.actions.todo:0 @@ -10612,12 +10613,12 @@ msgstr "" #: selection:ir.translation,type:0 #: field:wizard.ir.model.menu.create.line,view_id:0 msgid "View" -msgstr "View" +msgstr "Visualizar" #. module: base #: model:ir.module.module,shortdesc:base.module_wiki_sale_faq msgid "Wiki: Sale FAQ" -msgstr "Wiki: Venda FAQ" +msgstr "Wiki: FAQ de Vendas" #. module: base #: selection:ir.module.module,state:0 @@ -10889,7 +10890,7 @@ msgstr "" #. module: base #: field:ir.cron,interval_type:0 msgid "Interval Unit" -msgstr "Intervalo de unidade" +msgstr "Unidade de Intervalo" #. module: base #: field:publisher_warranty.contract,kind:0 @@ -10957,7 +10958,7 @@ msgstr "ID do registro de destino no banco de dados" #. module: base #: model:ir.module.module,shortdesc:base.module_account_analytic_analysis msgid "Contracts Management" -msgstr "Gerenciamento de contratos" +msgstr "Gestão de Contratos" #. module: base #: selection:base.language.install,lang:0 @@ -10972,7 +10973,7 @@ msgstr "res.request" #. module: base #: view:ir.model:0 msgid "In Memory" -msgstr "Em Memória" +msgstr "Na Memória" #. module: base #: view:ir.actions.todo:0 @@ -11071,12 +11072,12 @@ msgstr "Nome do Serviço" #. module: base #: model:ir.module.module,shortdesc:base.module_import_base msgid "Framework for complex import" -msgstr "Quadro para importação complexa" +msgstr "Framework para importação complexa" #. module: base #: view:ir.actions.todo.category:0 msgid "Wizard Category" -msgstr "Assistente de Categoria" +msgstr "Categoria do Assistênte" #. module: base #: model:ir.module.module,description:base.module_account_cancel @@ -11150,11 +11151,14 @@ msgid "" "Please define BIC/Swift code on bank for bank type IBAN Account to make " "valid payments" msgstr "" +"\n" +"Por favor defina o BIC/Swift code no Banco para o tipo de conta IBAN para " +"fazer pagamentos válidos" #. module: base #: view:res.lang:0 msgid "%A - Full weekday name." -msgstr "%A - Nome da semana completo." +msgstr "%A - Dia da Semana por extenso" #. module: base #: help:ir.values,user_id:0 @@ -11532,7 +11536,7 @@ msgstr "Saint Kitts & Nevis Anguilla" #. module: base #: model:ir.module.category,name:base.module_category_point_of_sale msgid "Point of Sales" -msgstr "Ponto de vendas" +msgstr "Ponto de Vendas" #. module: base #: model:ir.module.module,description:base.module_hr_payroll_account @@ -11653,7 +11657,7 @@ msgstr "" #. module: base #: help:ir.model.fields,model_id:0 msgid "The model this field belongs to" -msgstr "O modelo pertence a este campo" +msgstr "Modelo a que este campo pertence" #. module: base #: model:res.country,name:base.mq @@ -11707,7 +11711,7 @@ msgstr "" #: model:ir.ui.menu,name:base.menu_resquest_ref #: view:res.request:0 msgid "Requests" -msgstr "Mensagens" +msgstr "Solicitações" #. module: base #: model:res.country,name:base.ye @@ -11722,7 +11726,7 @@ msgstr "Ou" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_br msgid "Brazilian - Accounting" -msgstr "Brasileiro - contabilidade" +msgstr "Brasileiro - Contabilidade" #. module: base #: model:res.country,name:base.pk @@ -11833,9 +11837,7 @@ msgstr "" #. module: base #: model:ir.actions.act_window,help:base.action_res_bank_form msgid "Manage bank records you want to be used in the system." -msgstr "" -"Gerencia os registros de bancos que você quiser que sejam usados pelo " -"sistema." +msgstr "Gerencia os registros bancários a serem usados no sistema." #. module: base #: view:base.module.import:0 @@ -11877,7 +11879,7 @@ msgstr "Ação Inicial" #. module: base #: model:ir.module.module,shortdesc:base.module_event_project msgid "Retro-Planning on Events" -msgstr "" +msgstr "Retro-Planejamento em Eventos" #. module: base #: code:addons/custom.py:555 @@ -12181,7 +12183,7 @@ msgstr "Normal" #. module: base #: model:ir.module.module,shortdesc:base.module_purchase_double_validation msgid "Double Validation on Purchases" -msgstr "Validação dupla em compras" +msgstr "Validação Dupla em Compras" #. module: base #: field:res.bank,street2:0 @@ -12321,7 +12323,7 @@ msgstr "Operações de Produção" #. module: base #: selection:publisher_warranty.contract,state:0 msgid "Terminated" -msgstr "Terminado" +msgstr "Finalizado" #. module: base #: model:res.partner.category,name:base.res_partner_category_13 @@ -12356,7 +12358,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_hr msgid "Employee Directory" -msgstr "Diretório de funcionários" +msgstr "Diretório de Funcionários" #. module: base #: view:ir.cron:0 @@ -12533,7 +12535,7 @@ msgstr "Tunísia" #. module: base #: view:ir.actions.todo:0 msgid "Wizards to be Launched" -msgstr "Assistentes de lançamento" +msgstr "Assistentes a serem Executados" #. module: base #: model:ir.module.category,name:base.module_category_manufacturing @@ -12549,7 +12551,7 @@ msgstr "Comores" #. module: base #: view:res.request:0 msgid "Draft and Active" -msgstr "Esboço e ativo" +msgstr "Provisório e Ativo" #. module: base #: model:ir.actions.act_window,name:base.action_server_action @@ -13024,7 +13026,8 @@ msgid "" "If set to true, the wizard will not be displayed on the right toolbar of a " "form view." msgstr "" -"Se marcado, o ajudante não mostrará a barra de ferramenta no formulário" +"Se selecionado, o assistente não será exibido na barra de ferramentas a " +"direita do formulário." #. module: base #: view:base.language.import:0 @@ -13175,7 +13178,7 @@ msgstr "URL do ícone" #: field:ir.actions.url,type:0 #: field:ir.actions.wizard,type:0 msgid "Action Type" -msgstr "Tipo de ação" +msgstr "Tipo de Ação" #. module: base #: model:res.country,name:base.vn @@ -13237,7 +13240,7 @@ msgstr "Costa Rica" #. module: base #: model:ir.module.module,shortdesc:base.module_base_module_doc_rst msgid "Generate Docs of Modules" -msgstr "Documentos gerais dos módulos" +msgstr "Gerar Documentos dos Módulos" #. module: base #: model:res.company,overdue_msg:base.main_company @@ -13286,7 +13289,7 @@ msgstr "ir.actions.client" #. module: base #: help:ir.values,value:0 msgid "Default value (pickled) or reference to an action" -msgstr "" +msgstr "Valor padrão (selecionado) ou referencia a uma ação" #. module: base #: sql_constraint:res.groups:0 @@ -13417,7 +13420,7 @@ msgstr "Aquisições" #. module: base #: model:ir.module.module,shortdesc:base.module_hr_payroll_account msgid "Payroll Accounting" -msgstr "Contabilização de pagamentos" +msgstr "Contabilidade da Folha de Pagamentos" #. module: base #: help:ir.attachment,type:0 @@ -13427,12 +13430,12 @@ msgstr "Arquivo Binário ou URL externa" #. module: base #: model:ir.module.module,shortdesc:base.module_sale_order_dates msgid "Dates on Sales Order" -msgstr "Datas em Pedidos" +msgstr "Datas em Pedidos de Venda" #. module: base #: view:ir.attachment:0 msgid "Creation Month" -msgstr "Mês de criação" +msgstr "Mês de Criação" #. module: base #: model:res.country,name:base.nl @@ -13533,7 +13536,7 @@ msgstr "Malayalam / മലയാളം" #: field:res.request,body:0 #: field:res.request.history,req_id:0 msgid "Request" -msgstr "Mensagem" +msgstr "Requisição" #. module: base #: model:ir.actions.act_window,help:base.act_ir_actions_todo_form @@ -13555,7 +13558,7 @@ msgstr "Retrato" #. module: base #: field:ir.cron,numbercall:0 msgid "Number of Calls" -msgstr "Numero de chamadas" +msgstr "Número de Chamadas" #. module: base #: code:addons/base/res/res_bank.py:189 @@ -13606,7 +13609,7 @@ msgstr "Aplicar" #. module: base #: field:res.request,trigger_date:0 msgid "Trigger Date" -msgstr "Data de disparo" +msgstr "Data de Disparo" #. module: base #: selection:base.language.install,lang:0 @@ -13761,13 +13764,13 @@ msgstr "" #. module: base #: field:res.request.history,body:0 msgid "Body" -msgstr "Corpo" +msgstr "Conteúdo" #. module: base #: code:addons/base/ir/ir_mail_server.py:199 #, python-format msgid "Connection test succeeded!" -msgstr "Conecção testada com sucesso!" +msgstr "Conexão bem sucedida!" #. module: base #: view:partner.massmail.wizard:0 @@ -13777,7 +13780,7 @@ msgstr "Enviar email" #. module: base #: field:res.users,menu_id:0 msgid "Menu Action" -msgstr "Menu Ação" +msgstr "Ação do Menu" #. module: base #: help:ir.model.fields,selection:0 @@ -13858,7 +13861,7 @@ msgstr "Gabão" #. module: base #: model:res.groups,name:base.group_multi_company msgid "Multi Companies" -msgstr "Multi empresas" +msgstr "Multi Empresas" #. module: base #: view:ir.model:0 @@ -13867,7 +13870,7 @@ msgstr "Multi empresas" #: model:res.groups,name:base.group_erp_manager #: view:res.users:0 msgid "Access Rights" -msgstr "Direitos de acesso" +msgstr "Permissões de Acesso" #. module: base #: model:res.country,name:base.gl @@ -13965,7 +13968,7 @@ msgstr "Consumidores" #. module: base #: view:res.company:0 msgid "Set Bank Accounts" -msgstr "Definir contas bancárias" +msgstr "Definir Contas Bancárias" #. module: base #: field:ir.actions.client,tag:0 @@ -13981,7 +13984,7 @@ msgstr "Você não pode excluir a linguagem de preferida do usuário!" #. module: base #: field:ir.values,model_id:0 msgid "Model (change only)" -msgstr "Modelo(Troca somente)" +msgstr "Modelo (apenas alterar)" #. module: base #: model:ir.module.module,description:base.module_marketing_campaign_crm_demo @@ -14014,12 +14017,12 @@ msgstr "" #. module: base #: view:ir.filters:0 msgid "Current User" -msgstr "Usuário atual" +msgstr "Usuário Atual" #. module: base #: field:res.company,company_registry:0 msgid "Company Registry" -msgstr "Registro de empresa" +msgstr "Registro da Empresa" #. module: base #: view:ir.actions.report.xml:0 @@ -14309,7 +14312,7 @@ msgstr "" #. module: base #: view:ir.actions.server:0 msgid "Action to Launch" -msgstr "Ação de Lançamento" +msgstr "Ação a ser Executada" #. module: base #: help:res.users,context_lang:0 @@ -14445,7 +14448,7 @@ msgstr "Zaire" #: field:workflow.instance,res_id:0 #: field:workflow.triggers,res_id:0 msgid "Resource ID" -msgstr "ID do recurso" +msgstr "ID do Recurso" #. module: base #: view:ir.cron:0 @@ -14518,12 +14521,12 @@ msgstr "Atividades" #. module: base #: model:ir.module.module,shortdesc:base.module_product msgid "Products & Pricelists" -msgstr "Produtos & Preços" +msgstr "Produtos & Lista de Preços" #. module: base #: field:ir.actions.act_window,auto_refresh:0 msgid "Auto-Refresh" -msgstr "Auto-atualizar" +msgstr "Atualização Automática" #. module: base #: code:addons/base/ir/ir_model.py:74 @@ -14601,7 +14604,7 @@ msgstr "Ações" #. module: base #: model:ir.module.module,shortdesc:base.module_delivery msgid "Delivery Costs" -msgstr "Custos de entrega" +msgstr "Custos de Entrega" #. module: base #: code:addons/base/ir/ir_cron.py:293 @@ -14722,7 +14725,7 @@ msgstr "A atividade destino." #. module: base #: model:ir.module.module,shortdesc:base.module_account_check_writing msgid "Check writing" -msgstr "Verificação escrita" +msgstr "Verificar gravação" #. module: base #: model:ir.module.module,description:base.module_sale_layout @@ -14754,7 +14757,7 @@ msgstr "Guia técnico" #. module: base #: view:res.company:0 msgid "Address Information" -msgstr "Informações de endereço" +msgstr "Informações de Endereço" #. module: base #: model:res.country,name:base.tz @@ -14789,7 +14792,7 @@ msgstr "Outras ações de configuração" #. module: base #: selection:ir.module.module.dependency,state:0 msgid "Uninstallable" -msgstr "Não instalado" +msgstr "Não Instalável" #. module: base #: model:ir.module.module,description:base.module_web_dashboard @@ -14805,7 +14808,7 @@ msgstr "" #. module: base #: view:res.partner:0 msgid "Supplier Partners" -msgstr "Parceiros do fornecedor" +msgstr "Parceiros Fornecedores" #. module: base #: view:res.config.installer:0 @@ -14844,12 +14847,12 @@ msgstr "Conferência de EAN" #. module: base #: view:res.partner:0 msgid "Customer Partners" -msgstr "Clientes parceiros" +msgstr "Parceiros Clientes" #. module: base #: sql_constraint:res.users:0 msgid "You can not have two users with the same login !" -msgstr "Você não pode ter dois usuários com o mesmo login !" +msgstr "Você não pode ter dois usuários com o mesmo login!" #. module: base #: model:ir.model,name:base.model_res_request_history @@ -14859,7 +14862,7 @@ msgstr "res.request.history" #. module: base #: model:ir.model,name:base.model_multi_company_default msgid "Default multi company" -msgstr "Multi-empresa por padrão" +msgstr "Multi Empresa Padrão" #. module: base #: view:res.request:0 @@ -15161,7 +15164,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_report_designer msgid "Report Designer" -msgstr "Editor de relatório" +msgstr "Editor de Relatório" #. module: base #: model:ir.ui.menu,name:base.menu_address_book @@ -15198,7 +15201,7 @@ msgstr "" #. module: base #: model:ir.ui.menu,name:base.menu_crm_config_lead msgid "Leads & Opportunities" -msgstr "Indicações & Oportunidades" +msgstr "Prospectos & Oportunidades" #. module: base #: selection:base.language.install,lang:0 @@ -15393,7 +15396,7 @@ msgstr "" #. module: base #: report:ir.module.reference.graph:0 msgid "View :" -msgstr "View :" +msgstr "Visão:" #. module: base #: field:ir.model.fields,view_load:0 @@ -15500,7 +15503,7 @@ msgstr "" #. module: base #: sql_constraint:res.country:0 msgid "The name of the country must be unique !" -msgstr "O nome do país deve ser único !" +msgstr "O nome do país deve ser único!" #. module: base #: field:base.language.export,name:0 @@ -15657,7 +15660,7 @@ msgstr "ir.model.data" #. module: base #: view:publisher_warranty.contract:0 msgid "Publisher Warranty Contract" -msgstr "Contrato de Garantia do Distribuidor" +msgstr "Contrato de Garantia do Editor" #. module: base #: selection:base.language.install,lang:0 @@ -15711,7 +15714,7 @@ msgstr "Jamaica" #: field:res.partner,color:0 #: field:res.partner.address,color:0 msgid "Color Index" -msgstr "Índice de cores" +msgstr "Índice de Cores" #. module: base #: model:ir.actions.act_window,help:base.action_partner_category_form @@ -15911,7 +15914,7 @@ msgstr "" #. module: base #: view:ir.sequence:0 msgid "Day of the week (0:Monday): %(weekday)s" -msgstr "Dia da Semana(0:Domingo): %(weekday)s" +msgstr "Dia da semana (0:Segunda): %(weekday)s" #. module: base #: model:res.country,name:base.ck @@ -16041,7 +16044,7 @@ msgstr "" #: view:res.partner:0 #: view:res.partner.address:0 msgid "Change Color" -msgstr "Alterar cor" +msgstr "Alterar Cor" #. module: base #: model:res.partner.category,name:base.res_partner_category_15 @@ -16051,7 +16054,7 @@ msgstr "Setor de TI" #. module: base #: view:ir.actions.act_window:0 msgid "Select Groups" -msgstr "Selecionar grupos" +msgstr "Selecionar Grupos" #. module: base #: view:res.lang:0 @@ -16096,7 +16099,7 @@ msgstr "Renomeie uma coluna de cada vez!" #. module: base #: selection:ir.translation,type:0 msgid "Wizard Button" -msgstr "Butão do assistente" +msgstr "Botão do Assistente" #. module: base #: selection:ir.translation,type:0 @@ -16158,7 +16161,7 @@ msgstr "Contabilidade - Canadense" #: model:ir.ui.menu,name:base.menu_ir_actions_todo_form #: model:ir.ui.menu,name:base.next_id_11 msgid "Configuration Wizards" -msgstr "Assistentes de configuração" +msgstr "Assistentes de Configuração" #. module: base #: field:res.lang,code:0 @@ -16310,7 +16313,7 @@ msgstr "Serra Leoa" #: view:res.company:0 #: view:res.partner:0 msgid "General Information" -msgstr "Informação Básica" +msgstr "Informações Gerais" #. module: base #: model:res.country,name:base.tc @@ -16434,7 +16437,7 @@ msgstr "Contexto" #. module: base #: model:ir.module.module,shortdesc:base.module_sale_mrp msgid "Sales and MRP Management" -msgstr "Vendas e Gestão de MRP" +msgstr "Gestão de Vendas e MRP" #. module: base #: model:ir.actions.act_window,name:base.action_partner_sms_send diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po index 2f82536f1ab..78b16dd9f3d 100644 --- a/openerp/addons/base/i18n/ro.po +++ b/openerp/addons/base/i18n/ro.po @@ -877,7 +877,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" "Manual: Lansat manual.\n" @@ -4414,7 +4414,7 @@ msgstr "GPL-2 sau o versiune mai noua" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "Dl." #. module: base @@ -6695,7 +6695,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Codul statului, din trei caractere.\n" #. module: base @@ -13750,7 +13750,7 @@ msgstr "Secvente" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "D-ra" #. module: base @@ -13878,7 +13878,7 @@ msgstr "Filtru" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Dna." #. module: base diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po index 92d742a292b..bf2bd97eac8 100644 --- a/openerp/addons/base/i18n/ru.po +++ b/openerp/addons/base/i18n/ru.po @@ -830,7 +830,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3865,7 +3865,7 @@ msgstr "GPL версии 2 или более поздней" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "Г-н" #. module: base @@ -5705,7 +5705,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Код области из трёх букв.\n" #. module: base @@ -11336,7 +11336,7 @@ msgstr "Нумерация" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "Г-жа" #. module: base @@ -11462,7 +11462,7 @@ msgstr "Фильтр" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Г-жа" #. module: base diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po index d6f64ab0e58..859d0b71b1a 100644 --- a/openerp/addons/base/i18n/sk.po +++ b/openerp/addons/base/i18n/sk.po @@ -792,7 +792,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3760,7 +3760,7 @@ msgstr "GPL-2 alebo novšia verzia" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "pán" #. module: base @@ -5574,7 +5574,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Kód štátu na 3 znaky.\n" #. module: base @@ -11163,7 +11163,7 @@ msgstr "Postupnosti" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "slečna" #. module: base @@ -11290,7 +11290,7 @@ msgstr "Filter" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "pani" #. module: base diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po index 7fb3aa56052..c02319720b5 100644 --- a/openerp/addons/base/i18n/sl.po +++ b/openerp/addons/base/i18n/sl.po @@ -801,7 +801,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3789,7 +3789,7 @@ msgstr "GPL-2 ali naslednja verzija" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "G." #. module: base @@ -5617,7 +5617,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Koda zvezne države v treh znakih.\n" #. module: base @@ -11220,7 +11220,7 @@ msgstr "Zaporedja" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "Gospodična" #. module: base @@ -11348,7 +11348,7 @@ msgstr "Filter" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Ga." #. module: base diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po index d7e31006f9a..ef5b0691035 100644 --- a/openerp/addons/base/i18n/sq.po +++ b/openerp/addons/base/i18n/sq.po @@ -774,7 +774,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3681,7 +3681,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5460,7 +5460,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "" #. module: base @@ -10994,7 +10994,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11114,7 +11114,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po index b409d0c1fa1..83903f64938 100644 --- a/openerp/addons/base/i18n/sr.po +++ b/openerp/addons/base/i18n/sr.po @@ -795,7 +795,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3758,8 +3758,8 @@ msgstr "GPL-2 ili novija verzija" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." -msgstr "M." +msgid "Mr." +msgstr "Mr." #. module: base #: code:addons/base/module/module.py:519 @@ -5561,7 +5561,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Šifra države u ti karaktera.\n" #. module: base @@ -11139,8 +11139,8 @@ msgstr "Sekvence" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" -msgstr "Mss" +msgid "Miss" +msgstr "Miss" #. module: base #: model:ir.model,name:base.model_ir_ui_view @@ -11259,8 +11259,8 @@ msgstr "Filter" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." -msgstr "Ms." +msgid "Mrs." +msgstr "Mrs." #. module: base #: view:base.module.import:0 diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po index 70905626277..45b5248b701 100644 --- a/openerp/addons/base/i18n/sv.po +++ b/openerp/addons/base/i18n/sv.po @@ -842,7 +842,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" "Manuell: Starta manuellt.\n" @@ -4000,8 +4000,8 @@ msgstr "GPL-2 eller senare version" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." -msgstr "M." +msgid "Mr." +msgstr "Mr." #. module: base #: code:addons/base/module/module.py:519 @@ -5862,7 +5862,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Landskod, tre tecken\n" #. module: base @@ -11651,7 +11651,7 @@ msgstr "Nummerserier" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "Fru" #. module: base @@ -11775,7 +11775,7 @@ msgstr "Filtrera" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Frk." #. module: base diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po index 95cbf8b8e7e..c8fdfff81b0 100644 --- a/openerp/addons/base/i18n/th.po +++ b/openerp/addons/base/i18n/th.po @@ -775,7 +775,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3682,7 +3682,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5461,7 +5461,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "" #. module: base @@ -10995,7 +10995,7 @@ msgstr "ลำดับ" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11115,7 +11115,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po index a01448bde57..83e71470547 100644 --- a/openerp/addons/base/i18n/tlh.po +++ b/openerp/addons/base/i18n/tlh.po @@ -774,7 +774,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3681,7 +3681,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5460,7 +5460,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "" #. module: base @@ -10994,7 +10994,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11114,7 +11114,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po index c3827b43537..9bf11b54e08 100644 --- a/openerp/addons/base/i18n/tr.po +++ b/openerp/addons/base/i18n/tr.po @@ -806,7 +806,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3824,8 +3824,8 @@ msgstr "GPL-2 veya sonraki sürümü" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." -msgstr "M." +msgid "Mr." +msgstr "Mr." #. module: base #: code:addons/base/module/module.py:519 @@ -5662,7 +5662,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Üç karakterden oluşan eyalet kodu.\n" #. module: base @@ -11280,7 +11280,7 @@ msgstr "Silsileler" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "Bayan" #. module: base @@ -11404,7 +11404,7 @@ msgstr "Süzgeç" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "Bayan" #. module: base diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po index fb53900b256..6295883b1b9 100644 --- a/openerp/addons/base/i18n/uk.po +++ b/openerp/addons/base/i18n/uk.po @@ -796,7 +796,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3717,7 +3717,7 @@ msgstr "GPL-2 або пізніша версія" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5507,7 +5507,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "Код області довжиною в три букви.\n" #. module: base @@ -11046,7 +11046,7 @@ msgstr "Послідовності" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11166,7 +11166,7 @@ msgstr "Фільтр" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/uk_UA.po b/openerp/addons/base/i18n/uk_UA.po index 8a8f1d3613f..98f0dbf024d 100644 --- a/openerp/addons/base/i18n/uk_UA.po +++ b/openerp/addons/base/i18n/uk_UA.po @@ -5424,7 +5424,7 @@ msgstr "STOCK_MEDIA_PAUSE" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." "" msgstr "" diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po index 5942b9e11a0..1e07783b95d 100644 --- a/openerp/addons/base/i18n/ur.po +++ b/openerp/addons/base/i18n/ur.po @@ -775,7 +775,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3682,7 +3682,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5461,7 +5461,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "" #. module: base @@ -10995,7 +10995,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11115,7 +11115,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po index fbf09c542a4..782faa4695b 100644 --- a/openerp/addons/base/i18n/vi.po +++ b/openerp/addons/base/i18n/vi.po @@ -799,7 +799,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3709,7 +3709,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5490,7 +5490,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "" #. module: base @@ -11028,7 +11028,7 @@ msgstr "Sequences" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11150,7 +11150,7 @@ msgstr "Bộ lọc" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po index c80e08c3c03..680504f44a2 100644 --- a/openerp/addons/base/i18n/zh_CN.po +++ b/openerp/addons/base/i18n/zh_CN.po @@ -821,7 +821,7 @@ msgstr "OpenERP的翻译在Launchpad.net网站上进行，OpenERP项目本身也 msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" "手动：手动执行\n" @@ -4083,7 +4083,7 @@ msgstr "GPL-2 或更新版本" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "先生" #. module: base @@ -5993,7 +5993,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "三个字符的省／州代码\n" #. module: base @@ -11847,8 +11847,8 @@ msgstr "序列" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" -msgstr "Mss" +msgid "Miss" +msgstr "Miss" #. module: base #: model:ir.model,name:base.model_ir_ui_view @@ -11967,7 +11967,7 @@ msgstr "过滤" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "女士" #. module: base diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po index f29b2edd59e..e0941a864f3 100644 --- a/openerp/addons/base/i18n/zh_HK.po +++ b/openerp/addons/base/i18n/zh_HK.po @@ -775,7 +775,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3682,7 +3682,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5461,7 +5461,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "" #. module: base @@ -10995,7 +10995,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11115,7 +11115,7 @@ msgstr "" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "" #. module: base diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po index 9886f689f96..5935d13e0c8 100644 --- a/openerp/addons/base/i18n/zh_TW.po +++ b/openerp/addons/base/i18n/zh_TW.po @@ -779,7 +779,7 @@ msgstr "" msgid "" "Manual: Launched manually.\n" "Automatic: Runs whenever the system is reconfigured.\n" -"Launch Manually Once: after hacing been launched manually, it sets " +"Launch Manually Once: after having been launched manually, it sets " "automatically to Done." msgstr "" @@ -3687,7 +3687,7 @@ msgstr "GPL-2 或更新版本" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_sir -msgid "M." +msgid "Mr." msgstr "" #. module: base @@ -5470,7 +5470,7 @@ msgstr "" #. module: base #: help:res.country.state,code:0 -msgid "The state code in three chars.\n" +msgid "The state code in max. three chars." msgstr "三個字元之省或州代碼\n" #. module: base @@ -11013,7 +11013,7 @@ msgstr "序列" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_miss -msgid "Mss" +msgid "Miss" msgstr "" #. module: base @@ -11133,7 +11133,7 @@ msgstr "過濾器" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_madam -msgid "Ms." +msgid "Mrs." msgstr "女士" #. module: base diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index 383f78181e9..1845707eacb 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -573,7 +573,7 @@ class actions_server(osv.osv): # ids : original ids # id : current id of the object # OUT: - # False : Finnished correctly + # False : Finished correctly # ACTION_ID : Action to launch # FIXME: refactor all the eval() calls in run()! @@ -770,7 +770,7 @@ class ir_actions_todo(osv.osv): 'type': fields.selection(TODO_TYPES, 'Type', required=True, help="""Manual: Launched manually. Automatic: Runs whenever the system is reconfigured. -Launch Manually Once: after hacing been launched manually, it sets automatically to Done."""), +Launch Manually Once: after having been launched manually, it sets automatically to Done."""), 'groups_id': fields.many2many('res.groups', 'res_groups_action_rel', 'uid', 'gid', 'Groups'), 'note': fields.text('Text', translate=True), } diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py index 3650f28d3f5..81afd857f18 100644 --- a/openerp/addons/base/ir/ir_translation.py +++ b/openerp/addons/base/ir/ir_translation.py @@ -267,7 +267,7 @@ class ir_translation(osv.osv): # FIXME: should assert that `source` is unicode and fix all callers to always pass unicode # so we can remove the string encoding/decoding. if not lang: - return u'' + return tools.ustr(source or '') if isinstance(types, basestring): types = (types,) if source: diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml index ecd5226ad89..15cbded05cd 100644 --- a/openerp/addons/base/module/module_data.xml +++ b/openerp/addons/base/module/module_data.xml @@ -134,7 +134,7 @@ - + diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py index a839afc10e4..3d6fce8113a 100644 --- a/openerp/addons/base/res/res_bank.py +++ b/openerp/addons/base/res/res_bank.py @@ -172,38 +172,35 @@ class res_partner_bank(osv.osv): ('required', field.required)] return res - def _prepare_name_get(self, cr, uid, bank_type_obj, bank_obj, context=None): + def _prepare_name_get(self, cr, uid, bank_dicts, context=None): + """ Format the name of a res.partner.bank. + This function is designed to be inherited to add replacement fields. + :param bank_dicts: a list of res.partner.bank dicts, as returned by the method read() + :return: [(id, name), ...], as returned by the method name_get() """ - Format the name of a res.partner.bank. - This function is designed to be inherited to add replacement fields. - :param browse_record bank_type_obj: res.partner.bank.type object - :param browse_record bank_obj: res.partner.bank object - :rtype: str - :return: formatted name of a res.partner.bank record - """ - return bank_type_obj.format_layout % bank_obj._data[bank_obj.id] + # prepare a mapping {code: format_layout} for all bank types + bank_type_obj = self.pool.get('res.partner.bank.type') + bank_types = bank_type_obj.browse(cr, uid, bank_type_obj.search(cr, uid, []), context=context) + bank_code_format = dict((bt.code, bt.format_layout) for bt in bank_types) + + res = [] + for data in bank_dicts: + name = data['acc_number'] + if data['state'] and bank_code_format.get(data['state']): + try: + if not data.get('bank_name'): + data['bank_name'] = _('BANK') + name = bank_code_format[data['state']] % data + except Exception: + raise osv.except_osv(_("Formating Error"), _("Invalid Bank Account Type Name format.")) + res.append((data.get('id', False), name)) + return res def name_get(self, cr, uid, ids, context=None): if not len(ids): return [] - bank_type_obj = self.pool.get('res.partner.bank.type') - res = [] - for val in self.browse(cr, uid, ids, context=context): - result = val.acc_number - if val.state: - type_ids = bank_type_obj.search(cr, uid, [('code','=',val.state)]) - if type_ids: - t = bank_type_obj.browse(cr, uid, type_ids[0], context=context) - try: - # avoid the default format_layout to result in "False: ..." - if not val._data[val.id]['bank_name']: - val._data[val.id]['bank_name'] = _('BANK') - result = self._prepare_name_get(cr, uid, t, val, context=context) - except: - result += ' [Formatting Error]' - raise - res.append((val.id, result)) - return res + bank_dicts = self.read(cr, uid, ids, context=context) + return self._prepare_name_get(cr, uid, bank_dicts, context=context) def onchange_company_id(self, cr, uid, ids, company_id, context=None): result = {} diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py index 83b24b55a93..b27476b2c92 100644 --- a/openerp/addons/base/res/res_company.py +++ b/openerp/addons/base/res/res_company.py @@ -111,8 +111,8 @@ class res_company(osv.osv): 'rml_header1': fields.char('Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents (report header)."), 'rml_header2': fields.text('RML Internal Header', required=True), 'rml_header3': fields.text('RML Internal Header for Landscape Reports', required=True), - 'rml_footer': fields.text('Report Footer', help="Footer text displayed at the bottom of all reports. Automatically set based on company details, "\ - "but may also be customized by directly editing it."), + 'rml_footer': fields.text('Report Footer', help="Footer text displayed at the bottom of all reports."), + 'rml_footer_readonly': fields.related('rml_footer', type='text', string='Report Footer', readonly=True), 'custom_footer': fields.boolean('Custom Footer', help="Check this to define the report footer manually. Otherwise it will be filled in automatically."), 'logo': fields.related('partner_id', 'image', string="Logo", type="binary"), 'currency_id': fields.many2one('res.currency', 'Currency', required=True), @@ -138,36 +138,28 @@ class res_company(osv.osv): ('name_uniq', 'unique (name)', 'The company name must be unique !') ] - def onchange_footer(self, cr, uid, ids, context=None): - # when touched, the footer becomes custom - return {'value': {'custom_footer': True}} + def onchange_footer(self, cr, uid, ids, custom_footer, phone, fax, email, website, vat, company_registry, bank_ids, context=None): + if custom_footer: + return {} - def set_auto_footer(self, cr, uid, ids, context=None): - # unset the flag 'custom_footer'; this will automatically compute the footer - return self.write(cr, uid, ids, {'custom_footer': False}, context=context) - - def compute_footer(self, cr, uid, ids, context=None): + # first line (notice that missing elements are filtered out before the join) + res = ' | '.join(filter(bool, [ + phone and '%s: %s' % (_('Phone'), phone), + fax and '%s: %s' % (_('Fax'), fax), + email and '%s: %s' % (_('Email'), email), + website and '%s: %s' % (_('Website'), website), + vat and '%s: %s' % (_('TIN'), vat), + company_registry and '%s: %s' % (_('Reg'), company_registry), + ])) + # second line: bank accounts res_partner_bank = self.pool.get('res.partner.bank') - for company in self.browse(cr, uid, ids, context): - if not company.custom_footer: - # first line (notice that missing elements are filtered out before the join) - res = ' | '.join(filter(bool, [ - company.phone and '%s: %s' % (_('Phone'), company.phone), - company.fax and '%s: %s' % (_('Fax'), company.fax), - company.email and '%s: %s' % (_('Email'), company.email), - company.website and '%s: %s' % (_('Website'), company.website), - company.vat and '%s: %s' % (_('TIN'), company.vat), - company.company_registry and '%s: %s' % (_('Reg'), company.company_registry), - ])) - # second line: bank accounts - account_ids = [acc.id for acc in company.bank_ids if acc.footer] - account_names = res_partner_bank.name_get(cr, uid, account_ids, context=context) - if account_names: - title = _('Bank Accounts') if len(account_names) > 1 else _('Bank Account') - res += '\n%s: %s' % (title, ', '.join(name for id, name in account_names)) - # update footer - self.write(cr, uid, [company.id], {'rml_footer': res}, context=context) - return True + account_data = self.resolve_2many_commands(cr, uid, 'bank_ids', bank_ids, context=context) + account_names = res_partner_bank._prepare_name_get(cr, uid, account_data, context=context) + if account_names: + title = _('Bank Accounts') if len(account_names) > 1 else _('Bank Account') + res += '\n%s: %s' % (title, ', '.join(name for id, name in account_names)) + + return {'value': {'rml_footer': res, 'rml_footer_readonly': res}} def on_change_country(self, cr, uid, ids, country_id, context=None): currency_id = self._get_euro(cr, uid, context=context) @@ -248,17 +240,11 @@ class res_company(osv.osv): self.cache_restart(cr) company_id = super(res_company, self).create(cr, uid, vals, context=context) obj_partner.write(cr, uid, partner_id, {'company_id': company_id}, context=context) - self.compute_footer(cr, uid, [company_id], context=context) return company_id def write(self, cr, uid, ids, values, context=None): self.cache_restart(cr) - if isinstance(ids, (int, long)): - ids = [ids] - super(res_company, self).write(cr, uid, ids, values, context=context) - if 'rml_footer' not in values: - self.compute_footer(cr, uid, ids, context=context) - return True + return super(res_company, self).write(cr, uid, ids, values, context=context) def _get_euro(self, cr, uid, context=None): rate_obj = self.pool.get('res.currency.rate') diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml index b92cfba19b6..cac53b7a76a 100644 --- a/openerp/addons/base/res/res_company_view.xml +++ b/openerp/addons/base/res/res_company_view.xml @@ -55,29 +55,26 @@
- + - - - - - + + + + + - + - - diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py index 7556af500d9..bd75d280e7c 100644 --- a/openerp/addons/base/res/res_config.py +++ b/openerp/addons/base/res/res_config.py @@ -553,5 +553,22 @@ class res_config_settings(osv.osv_memory): if action_ids: return act_window.read(cr, uid, action_ids[0], [], context=context) return {} + + def name_get(self, cr, uid, ids, context=None): + """ Override name_get method to return an appropriate configuration wizard + name, and not the generated name.""" + + if not ids: + return [] + # name_get may receive int id instead of an id list + if isinstance(ids, (int, long)): + ids = [ids] + + act_window = self.pool.get('ir.actions.act_window') + action_ids = act_window.search(cr, uid, [('res_model', '=', self._name)], context=context) + name = self._name + if action_ids: + name = act_window.read(cr, uid, action_ids[0], ['name'], context=context)['name'] + return [(record.id, name) for record in self.browse(cr, uid , ids, context=context)] # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/res/res_country.py b/openerp/addons/base/res/res_country.py index f1321605e5f..35fb2a29ea7 100644 --- a/openerp/addons/base/res/res_country.py +++ b/openerp/addons/base/res/res_country.py @@ -64,7 +64,7 @@ addresses belonging to this country.\n\nYou can use the python-style string pate 'The code of the country must be unique !') ] _defaults = { - 'address_format': "%(company_name)s\n%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s\n%(country_name)s", + 'address_format': "%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s", } _order='name' @@ -89,9 +89,10 @@ class CountryState(osv.osv): _columns = { 'country_id': fields.many2one('res.country', 'Country', required=True), - 'name': fields.char('State Name', size=64, required=True), + 'name': fields.char('State Name', size=64, required=True, + help='Administrative divisions of a country. E.g. Fed. State, Departement, Canton'), 'code': fields.char('State Code', size=3, - help='The state code in three chars.\n', required=True), + help='The state code in max. three chars.', required=True), } _order = 'code' diff --git a/openerp/addons/base/country_data.xml b/openerp/addons/base/res/res_country_data.xml similarity index 98% rename from openerp/addons/base/country_data.xml rename to openerp/addons/base/res/res_country_data.xml index 5731b37f382..068850727e8 100644 --- a/openerp/addons/base/country_data.xml +++ b/openerp/addons/base/res/res_country_data.xml @@ -1,7 +1,7 @@ - + + diff --git a/openerp/addons/base/res/res_lang.py b/openerp/addons/base/res/res_lang.py index 07b220a6ee3..2b135a6f34a 100644 --- a/openerp/addons/base/res/res_lang.py +++ b/openerp/addons/base/res/res_lang.py @@ -77,7 +77,7 @@ class lang(osv.osv): _logger.warning(msg, lang, lc) if not lang_name: - lang_name = tools.get_languages().get(lang, lang) + lang_name = tools.ALL_LANGUAGES.get(lang, lang) def fix_xa0(s): diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 906f4b2b6c6..008e8048a5d 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -28,18 +28,52 @@ from tools.translate import _ import logging import pooler import pytz +from lxml import etree + +class format_address(object): + def fields_view_get_address(self, cr, uid, arch, context={}): + user_obj = self.pool.get('res.users') + fmt = user_obj.browse(cr, uid, uid,context).company_id.country_id + fmt = fmt and fmt.address_format + layouts = { + '%(city)s %(state_code)s\n%(zip)s': """ +
+ + +
+ +
+ """, + '%(zip)s %(city)s': """ +
+ + +
+ +
+ """, + '%(city)s\n%(state_name)s\n%(zip)s': """ +
+ + + +
+ """ + } + for k,v in layouts.items(): + if fmt and (k in fmt): + doc = etree.fromstring(arch) + for node in doc.xpath("//div[@class='address_format']"): + tree = etree.fromstring(v) + node.getparent().replace(node, tree) + arch = etree.tostring(doc) + break + return arch + def _tz_get(self,cr,uid, context=None): return [(x, x) for x in pytz.all_timezones] -class res_payterm(osv.osv): - _description = 'Payment term' - _name = 'res.payterm' - _order = 'name' - _columns = { - 'name': fields.char('Payment Term (short name)', size=64), - } - class res_partner_category(osv.osv): def name_get(self, cr, uid, ids, context=None): @@ -127,7 +161,7 @@ def _lang_get(self, cr, uid, context=None): POSTAL_ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id') ADDRESS_FIELDS = POSTAL_ADDRESS_FIELDS + ('email', 'phone', 'fax', 'mobile', 'website', 'ref', 'lang') -class res_partner(osv.osv): +class res_partner(osv.osv, format_address): _description = 'Partner' _name = "res.partner" @@ -151,7 +185,7 @@ class res_partner(osv.osv): 'name': fields.char('Name', size=128, required=True, select=True), 'date': fields.date('Date', select=1), 'title': fields.many2one('res.partner.title', 'Title'), - 'parent_id': fields.many2one('res.partner', 'Owned by'), + 'parent_id': fields.many2one('res.partner', 'Company'), 'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'), 'ref': fields.char('Reference', size=64, select=1), 'lang': fields.selection(_lang_get, 'Language', @@ -231,6 +265,14 @@ class res_partner(osv.osv): image = tools.image_colorize(open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png')).read()) return tools.image_resize_image_big(image.encode('base64')) + def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): + if (not view_id) and (view_type=='form') and context and context.get('force_email', False): + view_id = self.pool.get('ir.model.data').get_object_reference(cr, user, 'base', 'view_partner_simple_form')[1] + res = super(res_partner,self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu) + if view_type == 'form': + res['arch'] = self.fields_view_get_address(cr, user, res['arch'], context=context) + return res + _defaults = { 'active': True, 'lang': lambda self, cr, uid, ctx: ctx.get('lang', 'en_US'), @@ -498,7 +540,7 @@ class res_partner(osv.osv): # get the information that will be injected into the display format # get the address format address_format = address.country_id and address.country_id.address_format or \ - '%(company_name)s\n%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s' + "%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s" args = { 'state_code': address.state_id and address.state_id.code or '', 'state_name': address.state_id and address.state_id.name or '', @@ -511,10 +553,10 @@ class res_partner(osv.osv): args[field] = getattr(address, field) or '' if without_company: args['company_name'] = '' + elif address.parent_id: + address_format = '%(company_name)s\n' + address_format return address_format % args - - # res.partner.address is deprecated; it is still there for backward compability only and will be removed in next version class res_partner_address(osv.osv): _table = "res_partner" diff --git a/openerp/addons/base/res/res_partner_data.xml b/openerp/addons/base/res/res_partner_data.xml index 138e44176f0..5bcb65a0461 100644 --- a/openerp/addons/base/res/res_partner_data.xml +++ b/openerp/addons/base/res/res_partner_data.xml @@ -20,17 +20,32 @@ contact Madam - Ms. + Mrs. contact Miss - Mss + Miss contact Sir - M. + Sir + + + contact + Mister + Mr. + + + contact + Doctor + Dr. + + + contact + Professor + Prof. diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index a79610b7a18..906232c86ab 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -89,9 +89,40 @@ + + res.partner.simplified.form + res.partner + +
+ +
+
+
+

+ +

+ + + + + + + + +
+ +
+ + res.partner.form res.partner +
@@ -423,25 +454,6 @@ - - res.payterm - res.payterm - - - - - - - - - - Payment term - ir.actions.act_window - res.payterm - form - - - Partner Categories diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index 5e1ea88f5ac..1f0d612468f 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -52,7 +52,19 @@ class groups(osv.osv): else: res[g.id] = g.name return res - + + def _search_group(self, cr, uid, obj, name, args, context=None): + operand = args[0][2] + operator = args[0][1] + values = operand.split('/') + group_name = values[0] + where = [('name', operator, group_name)] + if len(values) > 1: + application_name = values[0] + group_name = values[1] + where = ['|',('category_id.name', operator, application_name)] + where + return where + _columns = { 'name': fields.char('Name', size=64, required=True, translate=True), 'users': fields.many2many('res.users', 'res_groups_users_rel', 'gid', 'uid', 'Users'), @@ -62,7 +74,7 @@ class groups(osv.osv): 'menu_access': fields.many2many('ir.ui.menu', 'ir_ui_menu_group_rel', 'gid', 'menu_id', 'Access Menu'), 'comment' : fields.text('Comment', size=250, translate=True), 'category_id': fields.many2one('ir.module.category', 'Application', select=True), - 'full_name': fields.function(_get_full_name, type='char', string='Group Name'), + 'full_name': fields.function(_get_full_name, type='char', string='Group Name', fnct_search=_search_group), } _sql_constraints = [ @@ -806,7 +818,7 @@ class users_view(osv.osv): for app, kind, gs in self.pool.get('res.groups').get_groups_by_application(cr, uid, context): if kind == 'selection': # selection group field - tips = ['%s: %s' % (g.name, g.comment or '') for g in gs] + tips = ['%s: %s' % (g.name, g.comment) for g in gs if g.comment] res[name_selection_groups(map(int, gs))] = { 'type': 'selection', 'string': app and app.name or _('Other'), diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv index c340e922396..3d9d0aa93e9 100644 --- a/openerp/addons/base/security/ir.model.access.csv +++ b/openerp/addons/base/security/ir.model.access.csv @@ -107,7 +107,6 @@ "access_ir_actions_server_all","ir_actions_server_all","model_ir_actions_server",,1,0,0,0 "access_ir_actions_server_group_system","ir_actions_server_group_system","model_ir_actions_server","group_system",1,1,1,1 "access_res_bank_group_system","res_bank_group_system","model_res_bank","group_system",1,1,1,1 -"access_res_payterm_group_system","res_payterm_group_system","model_res_payterm","group_system",1,1,1,1 "access_res_bank_group_partner_manager","res_bank_group_partner_manager","model_res_bank","group_partner_manager",1,1,1,1 "access_res_bank_user","res_bank user","model_res_bank","group_user",1,0,0,0 "access_multi_company_default user","multi_company_default all","model_multi_company_default",,1,0,0,0 diff --git a/openerp/addons/base/static/src/css/modules.css b/openerp/addons/base/static/src/css/modules.css index d13f932e4f1..ec98eacfcc7 100644 --- a/openerp/addons/base/static/src/css/modules.css +++ b/openerp/addons/base/static/src/css/modules.css @@ -1,5 +1,5 @@ .oe_module_vignette { - padding: 8px; + padding: 4px; } .oe_module_icon, .oe_module_desc { display: inline-block; diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index d81833b17a6..48689c3c26e 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -1443,7 +1443,7 @@ class BaseModel(object): def _validate(self, cr, uid, ids, context=None): context = context or {} - lng = context.get('lang', False) or 'en_US' + lng = context.get('lang') trans = self.pool.get('ir.translation') error_msgs = [] for constraint in self._constraints: @@ -1459,7 +1459,7 @@ class BaseModel(object): else: translated_msg = tmp_msg else: - translated_msg = trans._get_source(cr, uid, self._name, 'constraint', lng, msg) or msg + translated_msg = trans._get_source(cr, uid, self._name, 'constraint', lng, msg) error_msgs.append( _("Error occurred while validating the field(s) %s: %s") % (','.join(fields), translated_msg) ) @@ -3412,7 +3412,8 @@ class BaseModel(object): if context is None: context = {} - write_access = self.check_access_rights(cr, user, 'write') or self.check_access_rights(cr, user, 'create') + write_access = self.check_access_rights(cr, user, 'write', raise_exception=False) \ + or self.check_access_rights(cr, user, 'create', raise_exception=False) res = {} @@ -3431,24 +3432,25 @@ class BaseModel(object): res[f]['readonly'] = True res[f]['states'] = {} - if 'string' in res[f]: - res_trans = translation_obj._get_source(cr, user, self._name + ',' + f, 'field', context.get('lang', False) or 'en_US') - if res_trans: - res[f]['string'] = res_trans - if 'help' in res[f]: - help_trans = translation_obj._get_source(cr, user, self._name + ',' + f, 'help', context.get('lang', False) or 'en_US') - if help_trans: - res[f]['help'] = help_trans - if 'selection' in res[f]: - if isinstance(field.selection, (tuple, list)): - sel = field.selection - sel2 = [] - for key, val in sel: - val2 = None - if val: - val2 = translation_obj._get_source(cr, user, self._name + ',' + f, 'selection', context.get('lang', False) or 'en_US', val) - sel2.append((key, val2 or val)) - res[f]['selection'] = sel2 + if 'lang' in context: + if 'string' in res[f]: + res_trans = translation_obj._get_source(cr, user, self._name + ',' + f, 'field', context['lang']) + if res_trans: + res[f]['string'] = res_trans + if 'help' in res[f]: + help_trans = translation_obj._get_source(cr, user, self._name + ',' + f, 'help', context['lang']) + if help_trans: + res[f]['help'] = help_trans + if 'selection' in res[f]: + if isinstance(field.selection, (tuple, list)): + sel = field.selection + sel2 = [] + for key, val in sel: + val2 = None + if val: + val2 = translation_obj._get_source(cr, user, self._name + ',' + f, 'selection', context['lang'], val) + sel2.append((key, val2 or val)) + res[f]['selection'] = sel2 return res @@ -4273,9 +4275,9 @@ class BaseModel(object): and vals[field]: self._check_selection_field_value(cr, user, field, vals[field], context=context) if self._log_access: - upd0 += ',create_uid,create_date' - upd1 += ",%s,(now() at time zone 'UTC')" - upd2.append(user) + upd0 += ',create_uid,create_date,write_uid,write_date' + upd1 += ",%s,(now() at time zone 'UTC'),%s,(now() at time zone 'UTC')" + upd2.extend((user, user)) cr.execute('insert into "'+self._table+'" (id'+upd0+") values ("+str(id_new)+upd1+')', tuple(upd2)) self.check_access_rule(cr, user, [id_new], 'create', context=context) upd_todo.sort(lambda x, y: self._columns[x].priority-self._columns[y].priority) diff --git a/openerp/release.py b/openerp/release.py index a151e939d20..50d9b8ac760 100644 --- a/openerp/release.py +++ b/openerp/release.py @@ -1,4 +1,4 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # # OpenERP, Open Source Management Solution diff --git a/openerp/report/render/rml2pdf/customfonts.py b/openerp/report/render/rml2pdf/customfonts.py index 6120b7dd412..ff46018a5e5 100644 --- a/openerp/report/render/rml2pdf/customfonts.py +++ b/openerp/report/render/rml2pdf/customfonts.py @@ -65,6 +65,7 @@ TTFSearchPath_Linux = [ '/usr/share/fonts/dejavu', '/usr/share/fonts/liberation', # Fedora, RHEL '/usr/share/fonts/truetype/*', # Ubuntu, '/usr/share/fonts/TTF/*', # at Mandriva/Mageia + '/usr/share/fonts/TTF', # Arch Linux ] TTFSearchPath_Windows = [ diff --git a/openerp/service/http_server.py b/openerp/service/http_server.py index 63e0d08fc92..20206cf147d 100644 --- a/openerp/service/http_server.py +++ b/openerp/service/http_server.py @@ -5,10 +5,10 @@ # # # WARNING: This program as such is intended to be used by professional -# programmers who take the whole responsability of assessing all potential +# programmers who take the whole responsibility of assessing all potential # consequences resulting from its eventual inadequacies and bugs # End users who are looking for a ready-to-use solution with commercial -# garantees and support are strongly adviced to contract a Free Software +# guarantees and support are strongly advised to contract a Free Software # Service Company # # This program is Free Software; you can redistribute it and/or diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py index 5bc4eb7b9aa..1eebac9a7a0 100644 --- a/openerp/service/web_services.py +++ b/openerp/service/web_services.py @@ -18,7 +18,8 @@ # along with this program. If not, see . # ############################################################################## - +from __future__ import with_statement +import contextlib import base64 import locale import logging @@ -98,8 +99,6 @@ class db(netsvc.ExportService): self.id = 0 self.id_protect = threading.Semaphore() - self._pg_psw_env_var_is_set = False # on win32, pg_dump need the PGPASSWORD env var - def dispatch(self, method, params): if method in [ 'create', 'get_progress', 'drop', 'dump', 'restore', 'rename', @@ -118,7 +117,7 @@ class db(netsvc.ExportService): return fn(*params) def _create_empty_database(self, name): - db = sql_db.db_connect('template1') + db = sql_db.db_connect('postgres') cr = db.cursor() chosen_template = tools.config['db_template'] try: @@ -179,7 +178,7 @@ class db(netsvc.ExportService): openerp.modules.registry.RegistryManager.delete(db_name) sql_db.close_db(db_name) - db = sql_db.db_connect('template1') + db = sql_db.db_connect('postgres') cr = db.cursor() cr.autocommit(True) # avoid transaction block try: @@ -205,23 +204,28 @@ class db(netsvc.ExportService): cr.close() return True + @contextlib.contextmanager + def _set_pg_password_in_environment(self): + """ On Win32, pg_dump (and pg_restore) require that + :envvar:`PGPASSWORD` be set - def _set_pg_psw_env_var(self): - # see http://www.postgresql.org/docs/8.4/static/libpq-envars.html - # FIXME: This is not thread-safe, and should never be enabled for - # SaaS (giving SaaS users the super-admin password is not a good idea - # anyway) - if tools.config['db_password'] and not os.environ.get('PGPASSWORD', ''): + This context management method handles setting + :envvar:`PGPASSWORD` iif win32 and the envvar is not already + set, and removing it afterwards. + """ + if os.name != 'nt' or os.environ.get('PGPASSWORD'): + yield + else: os.environ['PGPASSWORD'] = tools.config['db_password'] - self._pg_psw_env_var_is_set = True + try: + yield + finally: + del os.environ['PGPASSWORD'] - def _unset_pg_psw_env_var(self): - if self._pg_psw_env_var_is_set: - os.environ['PGPASSWORD'] = '' def exp_dump(self, db_name): - try: - self._set_pg_psw_env_var() + logger = logging.getLogger('openerp.service.web_services.db.dump') + with self._set_pg_password_in_environment(): cmd = ['pg_dump', '--format=c', '--no-owner'] if tools.config['db_user']: cmd.append('--username=' + tools.config['db_user']) @@ -237,23 +241,20 @@ class db(netsvc.ExportService): res = stdout.close() if not data or res: - _logger.error( + logger.error( 'DUMP DB: %s failed! Please verify the configuration of the database password on the server. ' 'It should be provided as a -w command-line option, or as `db_password` in the ' 'server configuration file.\n %s', db_name, data) raise Exception, "Couldn't dump database" - _logger.info('DUMP DB successful: %s', db_name) + logger.info('DUMP DB successful: %s', db_name) return base64.encodestring(data) - finally: - self._unset_pg_psw_env_var() def exp_restore(self, db_name, data): - try: - self._set_pg_psw_env_var() - + logger = logging.getLogger('openerp.service.web_services.db.restore') + with self._set_pg_password_in_environment(): if self.exp_db_exist(db_name): - _logger.warning('RESTORE DB: %s already exists', db_name) + logger.warning('RESTORE DB: %s already exists', db_name) raise Exception, "Database already exists" self._create_empty_database(db_name) @@ -282,17 +283,15 @@ class db(netsvc.ExportService): res = stdout.close() if res: raise Exception, "Couldn't restore database" - _logger.info('RESTORE DB: %s', db_name) + logger.info('RESTORE DB: %s', db_name) return True - finally: - self._unset_pg_psw_env_var() def exp_rename(self, old_name, new_name): openerp.modules.registry.RegistryManager.delete(old_name) sql_db.close_db(old_name) - db = sql_db.db_connect('template1') + db = sql_db.db_connect('postgres') cr = db.cursor() cr.autocommit(True) # avoid transaction block try: @@ -320,7 +319,7 @@ class db(netsvc.ExportService): raise openerp.exceptions.AccessDenied() chosen_template = tools.config['db_template'] templates_list = tuple(set(['template0', 'template1', 'postgres', chosen_template])) - db = sql_db.db_connect('template1') + db = sql_db.db_connect('postgres') cr = db.cursor() try: try: @@ -557,7 +556,7 @@ GNU Public Licence. return http_server.list_http_services() def exp_check_connectivity(self): - return bool(sql_db.db_connect('template1')) + return bool(sql_db.db_connect('postgres')) def exp_get_os_time(self): return os.times() diff --git a/openerp/service/websrv_lib.py b/openerp/service/websrv_lib.py index 4da6536ed51..d9f654f4edb 100644 --- a/openerp/service/websrv_lib.py +++ b/openerp/service/websrv_lib.py @@ -3,10 +3,10 @@ # Copyright P. Christeas 2008-2010 # # WARNING: This program as such is intended to be used by professional -# programmers who take the whole responsability of assessing all potential +# programmers who take the whole responsibility of assessing all potential # consequences resulting from its eventual inadequacies and bugs # End users who are looking for a ready-to-use solution with commercial -# garantees and support are strongly adviced to contract a Free Software +# guarantees and support are strongly advised to contract a Free Software # Service Company # # This program is Free Software; you can redistribute it and/or diff --git a/openerp/tests/addons/test_impex/tests/test_export.py b/openerp/tests/addons/test_impex/tests/test_export.py index 7e67ba581a1..26219b36d3b 100644 --- a/openerp/tests/addons/test_impex/tests/test_export.py +++ b/openerp/tests/addons/test_impex/tests/test_export.py @@ -245,7 +245,7 @@ class test_selection(CreatorCase): 'translatable': True, 'date_format': '%d.%m.%Y', 'decimal_point': ',', - 'thousand_sep': ' ', + 'thousands_sep': ' ', }) Translations = self.registry('ir.translation') for source, value in self.translations_fr: diff --git a/openerp/tests/addons/test_impex/tests/test_import.py b/openerp/tests/addons/test_impex/tests/test_import.py index 03507ee7012..9aff3704f8b 100644 --- a/openerp/tests/addons/test_impex/tests/test_import.py +++ b/openerp/tests/addons/test_impex/tests/test_import.py @@ -393,7 +393,7 @@ class test_selection(ImporterCase): 'translatable': True, 'date_format': '%d.%m.%Y', 'decimal_point': ',', - 'thousand_sep': ' ', + 'thousands_sep': ' ', }) Translations = self.registry('ir.translation') for source, value in self.translations_fr: @@ -466,7 +466,7 @@ class test_selection_function(ImporterCase): 'translatable': True, 'date_format': '%d.%m.%Y', 'decimal_point': ',', - 'thousand_sep': ' ', + 'thousands_sep': ' ', }) Translations = self.registry('ir.translation') for source, value in self.translations_fr: diff --git a/openerp/tools/config.py b/openerp/tools/config.py index 3a4329433eb..ce157c5e697 100644 --- a/openerp/tools/config.py +++ b/openerp/tools/config.py @@ -223,7 +223,7 @@ class configmanager(object): help="specify the database port", type="int") group.add_option("--db_maxconn", dest="db_maxconn", type='int', my_default=64, help="specify the the maximum number of physical connections to posgresql") - group.add_option("--db-template", dest="db_template", my_default="template0", + group.add_option("--db-template", dest="db_template", my_default="template1", help="specify a custom database template to create a new database") parser.add_option_group(group) diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py index be8465055ee..c9836d7f0c6 100644 --- a/openerp/tools/convert.py +++ b/openerp/tools/convert.py @@ -134,14 +134,14 @@ def _eval_xml(self, node, pool, cr, uid, idref, context=None): f_val = f_val[0] return f_val a_eval = node.get('eval','') - idref2 = {} if a_eval: idref2 = _get_idref(self, cr, uid, f_model, context, idref) try: return unsafe_eval(a_eval, idref2) except Exception: - _logger.warning('could not eval(%s) for %s in %s' % (a_eval, node.get('name'), context), exc_info=True) - return "" + logging.getLogger('openerp.tools.convert.init').error( + 'Could not eval(%s) for %s in %s', a_eval, node.get('name'), context) + raise def _process(s, idref): m = re.findall('[^%]%\((.*?)\)[ds]', s) for id in m: diff --git a/openerp/tools/image.py b/openerp/tools/image.py index f673906f328..e2b14f18d0d 100644 --- a/openerp/tools/image.py +++ b/openerp/tools/image.py @@ -20,6 +20,7 @@ ############################################################################## import io +import sys import StringIO from PIL import Image @@ -66,14 +67,18 @@ def image_resize_image(base64_source, size=(1024, 1024), encoding='base64', file # check image size: do not create a thumbnail if avoiding smaller images if avoid_if_small and image.size[0] <= size[0] and image.size[1] <= size[1]: return base64_source - # create a thumbnail: will resize and keep ratios - image.thumbnail(size, Image.ANTIALIAS) - image = image.filter(ImageFilter.SHARPEN) - # create a transparent image for background - background = Image.new('RGBA', size, (255, 255, 255, 0)) - # past the resized image on the background - background.paste(image, ((size[0] - image.size[0]) / 2, (size[1] - image.size[1]) / 2)) - # return an encoded image + + if (float(image.size[0])/image.size[1]) > (float(size[0]) / size[1]): + ibox = (size[1] * image.size[0] / image.size[1] , size[1]) + deltax = max((size[1] * image.size[0] / image.size[1] - size[0]) / 2, 0) + deltay = 0 + else: + ibox = (size[0],size[0] * image.size[1] / image.size[0]) + deltax = 0 + deltay = max((size[0] * image.size[1] / image.size[0] - size[1]) / 2, 0) + + im2 = image.resize(ibox, Image.ANTIALIAS) + background = im2.crop((deltax, deltay, deltax+size[0], deltay+size[1])) background_stream = StringIO.StringIO() background.save(background_stream, filetype) return background_stream.getvalue().encode(encoding) @@ -156,3 +161,4 @@ def image_get_resized_images(base64_source, return_big=False, return_medium=True if return_small: return_dict[small_name] = image_resize_image_small(base64_source, avoid_if_small=avoid_resize_small) return return_dict + diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py index 9a7b3499425..27b81489b55 100644 --- a/openerp/tools/misc.py +++ b/openerp/tools/misc.py @@ -142,6 +142,8 @@ def file_open(name, mode="r", subdir='addons', pathinfo=False): adps = addons.module.ad_paths rtp = os.path.normcase(os.path.abspath(config['root_path'])) + basename = name + if os.path.isabs(name): # It is an absolute path # Is it below 'addons_path' or 'root_path'? @@ -154,7 +156,7 @@ def file_open(name, mode="r", subdir='addons', pathinfo=False): else: # It is outside the OpenERP root: skip zipfile lookup. base, name = os.path.split(name) - return _fileopen(name, mode=mode, basedir=base, pathinfo=pathinfo) + return _fileopen(name, mode=mode, basedir=base, pathinfo=pathinfo, basename=basename) if name.replace(os.sep, '/').startswith('addons/'): subdir = 'addons' @@ -172,16 +174,19 @@ def file_open(name, mode="r", subdir='addons', pathinfo=False): for adp in adps: try: return _fileopen(name2, mode=mode, basedir=adp, - pathinfo=pathinfo) + pathinfo=pathinfo, basename=basename) except IOError: pass # Second, try to locate in root_path - return _fileopen(name, mode=mode, basedir=rtp, pathinfo=pathinfo) + return _fileopen(name, mode=mode, basedir=rtp, pathinfo=pathinfo, basename=basename) -def _fileopen(path, mode, basedir, pathinfo): +def _fileopen(path, mode, basedir, pathinfo, basename=None): name = os.path.normpath(os.path.join(basedir, path)) + + if basename is None: + basename = name # Give higher priority to module directories, which is # a more common case than zipped modules. if os.path.isfile(name): @@ -220,8 +225,8 @@ def _fileopen(path, mode, basedir, pathinfo): pass # Not found if name.endswith('.rml'): - raise IOError('Report %r doesn\'t exist or deleted' % name) - raise IOError('File not found: %s' % name) + raise IOError('Report %r doesn\'t exist or deleted' % basename) + raise IOError('File not found: %s' % basename) #---------------------------------------------------------- @@ -601,10 +606,7 @@ def get_iso_codes(lang): lang = lang.split('_')[0] return lang -def get_languages(): - # The codes below are those from Launchpad's Rosetta, with the exception - # of some trivial codes where the Launchpad code is xx and we have xx_XX. - languages={ +ALL_LANGUAGES = { 'ab_RU': u'Abkhazian / аҧсуа', 'ar_AR': u'Arabic / الْعَرَبيّة', 'bg_BG': u'Bulgarian / български език', @@ -663,8 +665,8 @@ def get_languages(): 'nl_BE': u'Flemish (BE) / Vlaams (BE)', 'oc_FR': u'Occitan (FR, post 1500) / Occitan', 'pl_PL': u'Polish / Język polski', - 'pt_BR': u'Portugese (BR) / Português (BR)', - 'pt_PT': u'Portugese / Português', + 'pt_BR': u'Portuguese (BR) / Português (BR)', + 'pt_PT': u'Portuguese / Português', 'ro_RO': u'Romanian / română', 'ru_RU': u'Russian / русский язык', 'si_LK': u'Sinhalese / සිංහල', @@ -685,15 +687,14 @@ def get_languages(): 'th_TH': u'Thai / ภาษาไทย', 'tlh_TLH': u'Klingon', } - return languages def scan_languages(): - # Now it will take all languages from get languages function without filter it with base module languages - lang_dict = get_languages() - ret = [(lang, lang_dict.get(lang, lang)) for lang in list(lang_dict)] - ret.sort(key=lambda k:k[1]) - return ret + """ Returns all languages supported by OpenERP for translation + :returns: a list of (lang_code, lang_name) pairs + :rtype: [(str, unicode)] + """ + return sorted(ALL_LANGUAGES.iteritems(), key=lambda k: k[1]) def get_user_companies(cr, user): def _get_company_children(cr, ids): diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py index f487070fea0..14b857cd658 100644 --- a/openerp/tools/yaml_import.py +++ b/openerp/tools/yaml_import.py @@ -1,4 +1,4 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- import threading import types import time # used to eval time.strftime expressions