\n" +" Хаягийн дэвтэртэй холбогч нэмэхээр бол дарна.\n" +"
\n" +" OpenERP нь захиалагчтай холбоотой бүх үйл ажиллагааг хялбар " +"хөтлөдөг, үүнд: \n" +" захиалагчтай харилцсан харилцаа, бизнес боломжийн түүх, " +"баримтууд гэх мэт.\n" +"
\n" +" " #. module: base #: model:res.partner.category,name:base.res_partner_category_2 @@ -17228,6 +17300,17 @@ msgid "" "on a supplier purchase order into several accounts and analytic plans.\n" " " msgstr "" +"\n" +"Шинжилгээний тархалт болон худалдан авалтын захиалгын менежментийг хийх " +"суурь модуль.\n" +"====================================================================\n" +"\n" +"Шинжилгээний хэд хэдэн төлөвлөгөөг үүсгэх боломжийг хэрэглэгчид олгодог. Энэ " +"нь нийлүүлэгчийн\n" +"худалдан авалтын захиалгын нэг мөр дээр олон данс болон шинжилгээний " +"төлөвлөгөөг сонгож, хуваах \n" +"боломжийг олгодог.\n" +" " #. module: base #: model:res.country,name:base.lk @@ -17247,7 +17330,7 @@ msgstr "Орос хэл / русский язык" #. module: base #: model:ir.module.module,shortdesc:base.module_auth_signup msgid "Signup" -msgstr "" +msgstr "Бүртгүүлэх" #, python-format #~ msgid "new" diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po index 66340e1d131..2482036ec37 100644 --- a/openerp/addons/base/i18n/nb.po +++ b/openerp/addons/base/i18n/nb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-10-11 04:43+0000\n" -"X-Generator: Launchpad (build 16799)\n" +"X-Launchpad-Export-Date: 2013-11-12 05:35+0000\n" +"X-Generator: Launchpad (build 16820)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po index 3fd2efaf667..ef35bb2ece2 100644 --- a/openerp/addons/base/i18n/nl.po +++ b/openerp/addons/base/i18n/nl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-10-11 04:39+0000\n" -"X-Generator: Launchpad (build 16799)\n" +"X-Launchpad-Export-Date: 2013-11-12 05:32+0000\n" +"X-Generator: Launchpad (build 16820)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -58,7 +58,7 @@ msgstr "" #: field:ir.ui.view,arch:0 #: field:ir.ui.view.custom,arch:0 msgid "View Architecture" -msgstr "Opbouw weergave" +msgstr "Hiërarchie bekijken" #. module: base #: model:ir.module.module,summary:base.module_sale_stock @@ -78,7 +78,7 @@ msgstr "Hongaars / Magyar" #. module: base #: selection:base.language.install,lang:0 msgid "Spanish (PY) / Español (PY)" -msgstr "Spaans (PY) / Spanja (PY)" +msgstr "Spaans (PY) / Español (PY)" #. module: base #: model:ir.module.category,description:base.module_category_project_management @@ -153,11 +153,12 @@ msgid "" msgstr "" "\n" "Deze module voegt een Google gebruiker toe in res.user\n" +"======================================================\n" #. module: base #: help:res.partner,employee:0 msgid "Check this box if this contact is an Employee." -msgstr "Vink dit aan als deze gebruiker een werknemer is" +msgstr "Vink dit aan als deze gebruiker een werknemer is." #. module: base #: help:ir.model.fields,domain:0 @@ -210,13 +211,14 @@ msgid "" "reports." msgstr "" "\n" -"Genereer je facturen vanuit uitgaven, tijdsregistraties.\n" +"Genereer uw facturen vanuit uitgaven, tijdsregistraties.\n" " ========================================================\n" " \n" -"Module voor het genereren van facturen op basis van uitgaven (Personen, " -"uitgaven, enz).\n" +"Module voor het genereren van facturen op basis van kosten (Personen, " +"uitgaven, ...).\n" " \n" -"Je kunt prijslijsten definieren in een grootboek rapportage." +"U kunt prijslijsten definieren in een grootboek rapportage, maak enkele " +"theoretische omzet rapportages." #. module: base #: code:addons/base/ir/ir_sequence.py:134 @@ -252,7 +254,7 @@ msgstr "ir.ui.view.custom" #: code:addons/base/ir/ir_model.py:374 #, python-format msgid "Renaming sparse field \"%s\" is not allowed" -msgstr "Hiernoenen sparse field \"%s\" is niet toegestaan" +msgstr "Hernoenen sparse veld \"%s\" is niet toegestaan" #. module: base #: model:res.country,name:base.sz @@ -319,7 +321,7 @@ msgid "" "any." msgstr "" "De interne gebruiker die verantwoordelijk is voor de communicatie met deze " -"contactpersoon indien aanwezig." +"contactpersoon indien van toepassing." #. module: base #: view:res.partner:0 @@ -491,9 +493,9 @@ msgid "" "Invalid date/time format directive specified. Please refer to the list of " "allowed directives, displayed when you edit a language." msgstr "" -"Ongeldige datum / tijd-formaat richtlijn gespecificeerd. Raadpleeg de lijst " -"met toegestane richtlijnen welke worden weergegeven wanneer u bewerken van " -"een taal." +"Ongeldige datum/tijd-formaat richtlijn gespecificeerd. Raadpleeg de lijst " +"met toegestane richtlijnen welke worden weergegeven wanneer u een taal " +"bewerkt." #. module: base #: code:addons/orm.py:4153 @@ -502,7 +504,7 @@ msgid "" "One of the records you are trying to modify has already been deleted " "(Document type: %s)." msgstr "" -"Een van de records die u probeert te wijzigen is al verwijderd )document " +"Een van de records die u probeert te wijzigen is al verwijderd (Document " "type: %s)." #. module: base @@ -541,12 +543,12 @@ msgstr "Volgende assistent" #. module: base #: field:res.lang,date_format:0 msgid "Date Format" -msgstr "Datumopmaak" +msgstr "Datumnotatie" #. module: base #: model:ir.module.module,shortdesc:base.module_base_report_designer msgid "OpenOffice Report Designer" -msgstr "OpenOffice overzicht ontwerper" +msgstr "OpenOffice Rapport Ontwerper" #. module: base #: model:res.country,name:base.an @@ -667,7 +669,7 @@ msgstr "" #. module: base #: selection:base.language.install,lang:0 msgid "Spanish (VE) / Español (VE)" -msgstr "Spaans (VE) / Spanje (VE)" +msgstr "Spaans (VE) / Español (VE)" #. module: base #: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice @@ -883,7 +885,7 @@ msgstr "De naam van het bedrijf moet uniek zijn!" #. module: base #: model:ir.ui.menu,name:base.menu_base_action_rule_admin msgid "Automated Actions" -msgstr "Automatische acties" +msgstr "Geautomatiseerde acties" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_ro @@ -1006,7 +1008,7 @@ msgstr "base.language.export" #. module: base #: model:res.country,name:base.pg msgid "Papua New Guinea" -msgstr "Papua Nieuw-Guinea" +msgstr "Papoea-Nieuw-Guinea" #. module: base #: help:ir.actions.report.xml,report_type:0 @@ -1344,7 +1346,7 @@ msgstr "Nieuwste versie" #. module: base #: view:ir.rule:0 msgid "Delete Access Right" -msgstr "Tegangsrechten verwijderen." +msgstr "Toegangsrechten verwijderen" #. module: base #: code:addons/base/ir/ir_mail_server.py:214 @@ -1452,7 +1454,7 @@ msgstr "Veld assistent" #. module: base #: selection:base.language.install,lang:0 msgid "Spanish (GT) / Español (GT)" -msgstr "Spaans (GT) / Spanje (GT)" +msgstr "Spaans (GT) / Español (GT)" #. module: base #: field:ir.mail_server,smtp_port:0 @@ -1483,7 +1485,7 @@ msgid "" "decimal number [00,53]. All days in a new year preceding the first Monday " "are considered to be in week 0." msgstr "" -"%W - Weeknummer van het jaar (Maandag als eerste dag van de maand) als " +"%W - Weeknummer van het jaar (Maandag als eerste dag van de week) als " "decimaal getal [00,53]. Alle dagen in het nieuwe jaar voorafgaande aan de " "eerste maandag vallen in week 0." @@ -1646,13 +1648,13 @@ msgid "" " " msgstr "" "\n" -"Deze module installaeert de basis voor IBAN (International Bank Account " -"Number) bank rekeningen controleert op geldigheid.\n" +"Deze module installeert de basis voor IBAN (International Bank Account " +"Number) bankrekeningen en controleert deze op geldigheid.\n" "=============================================================================" -"========================\n" +"=====================================\n" "\n" -"De mogelijkheid om correcte local rekeningen op te halen uit een IBAN " -"rekening met een een enkele opdacht.\n" +"De mogelijkheid om correcte normale rekeningnummers te halen uit een IBAN " +"rekeningnummer met een een enkele opdacht.\n" " " #. module: base @@ -1675,6 +1677,12 @@ msgid "" "=============\n" " " msgstr "" +"\n" +"Deze module voegt claim menu en features aan uw portaal toe indien claim en " +"portal zijn geïnstalleerd.\n" +"=============================================================================" +"=========================\n" +" " #. module: base #: model:ir.actions.act_window,help:base.action_res_partner_bank_account_form @@ -1812,8 +1820,8 @@ msgid "" "Helps you manage your purchase-related processes such as requests for " "quotations, supplier invoices, etc..." msgstr "" -"Helpt de inkoop-gerelateerde processen te beheren zoals inkoop " -"prijsaanvragen, inkoopfacturen, etc..." +"Helpt de inkoop-gerelateerde processen te beheren zoals aanvragen van " +"offertes, inkoopfacturen, etc..." #. module: base #: help:res.partner,website:0 @@ -1974,7 +1982,7 @@ msgstr "" #. module: base #: model:res.country,name:base.kg msgid "Kyrgyz Republic (Kyrgyzstan)" -msgstr "Kyrgyzstan" +msgstr "Kirgizië" #. module: base #: model:ir.module.module,description:base.module_account_accountant @@ -2008,8 +2016,7 @@ msgstr "" #: code:addons/base/ir/ir_fields.py:164 #, python-format msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'" -msgstr "" -"Onbekende waarde '%s' voor boolean veld'%%(field)s', ervan uitgaande dat '%s'" +msgstr "Onbekende waarde '%s' voor boolean veld '%%(field)s', neem '%s' aan" #. module: base #: model:res.country,name:base.nl @@ -2045,12 +2052,12 @@ msgstr "Voertuig, lease, verzekeringen, kosten" #: view:ir.model.access:0 #: field:ir.model.access,perm_read:0 msgid "Read Access" -msgstr "Lezen" +msgstr "Leesrechten" #. module: base #: help:ir.attachment,res_id:0 msgid "The record id this is attached to" -msgstr "Het record is waaraan dit is verbonden" +msgstr "Het record id waaraan dit is verbonden" #. module: base #: model:ir.module.module,description:base.module_share @@ -2348,12 +2355,12 @@ msgstr "Spaans / Español" #. module: base #: selection:base.language.install,lang:0 msgid "Korean (KP) / 한국어 (KP)" -msgstr "Koreans (KP) / Korea (KP)" +msgstr "Koreaans (KP) / 한국어 (KP)" #. module: base #: model:res.country,name:base.ax msgid "Åland Islands" -msgstr "Åland-eilanden" +msgstr "Ålandseilanden" #. module: base #: field:res.company,logo:0 @@ -2512,7 +2519,7 @@ msgstr "Groepen" #. module: base #: selection:base.language.install,lang:0 msgid "Spanish (CL) / Español (CL)" -msgstr "Spaans (CL) / Spanje (CL)" +msgstr "Spaans (CL) / Español (CL)" #. module: base #: model:res.country,name:base.bz @@ -2532,6 +2539,10 @@ msgid "" "=================================\n" " " msgstr "" +"\n" +"Anonieme gebruikers toegang geven tot uw Portaal.\n" +"=====================================================\n" +" " #. module: base #: model:res.country,name:base.ge @@ -2750,7 +2761,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_auth_oauth_signup msgid "Signup with OAuth2 Authentication" -msgstr "Inloggen met OAuth2 Authenticatie" +msgstr "Registreren met OAuth2 Authenticatie" #. module: base #: selection:ir.model,state:0 @@ -2804,6 +2815,10 @@ msgid "" "==================================\n" " " msgstr "" +"\n" +"Verenigde Staten - Grootboekschema.\n" +"======================================\n" +" " #. module: base #: field:ir.actions.act_url,target:0 @@ -2962,6 +2977,9 @@ msgid "" "Module to attach a google document to any model.\n" "================================================\n" msgstr "" +"\n" +"Module om een google document aan een model te koppelen.\n" +"============================================================\n" #. module: base #: code:addons/base/ir/ir_fields.py:333 @@ -3311,7 +3329,7 @@ msgstr "Norfolkeiland" #. module: base #: selection:base.language.install,lang:0 msgid "Korean (KR) / 한국어 (KR)" -msgstr "Koreans(KR) / Korea (KR)" +msgstr "Koreaans (KR) / 한국어 (KR)" #. module: base #: help:ir.model.fields,model:0 @@ -3429,7 +3447,7 @@ msgstr "Armenië" #. module: base #: model:ir.module.module,summary:base.module_hr_evaluation msgid "Periodical Evaluations, Appraisals, Surveys" -msgstr "Periodieke evaluaties, beoordelingen en enquêtes," +msgstr "Periodieke evaluaties, beoordelingen, enquêtes" #. module: base #: model:ir.actions.act_window,name:base.ir_property_form @@ -3683,7 +3701,7 @@ msgstr "Personeels enquêtes" #. module: base #: selection:base.language.install,lang:0 msgid "Spanish (DO) / Español (DO)" -msgstr "Spaans (DO) / Spanje (DO)" +msgstr "Spaans (DO) / Español (DO)" #. module: base #: model:ir.model,name:base.model_workflow_activity @@ -3717,7 +3735,7 @@ msgstr "Uruguay" #. module: base #: selection:base.language.install,lang:0 msgid "Finnish / Suomi" -msgstr "Fins / Finland" +msgstr "Fins / Suomi" #. module: base #: view:ir.config_parameter:0 @@ -3990,7 +4008,7 @@ msgstr "Recursiviteit ontdekt." #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_et msgid "Ethiopia - Accounting" -msgstr "Boekhouding - Ethiopië" +msgstr "Ethiopië - Boekhouding" #. module: base #: code:addons/base/module/module.py:366 @@ -4541,7 +4559,7 @@ msgstr "Te starten actie" #: field:ir.model.constraint,name:0 #: selection:ir.translation,type:0 msgid "Constraint" -msgstr "Begrenzing" +msgstr "Beperking" #. module: base #: selection:ir.values,key:0 @@ -4552,7 +4570,7 @@ msgstr "Standaard adres" #. module: base #: model:ir.module.module,summary:base.module_lunch msgid "Lunch Order, Meal, Food" -msgstr "Lunch orders, maaltijden en voeding" +msgstr "Lunch orders, maaltijden, consumpties" #. module: base #: view:ir.model.fields:0 @@ -4721,7 +4739,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_project_timesheet msgid "Bill Time on Tasks" -msgstr "Tijd of taken factureren" +msgstr "Tijd op taken factureren" #. module: base #: model:ir.module.category,name:base.module_category_marketing @@ -4744,11 +4762,15 @@ msgid "" "==========================\n" "\n" msgstr "" +"\n" +"OpenERP Web Kalender weergave.\n" +"==================================\n" +"\n" #. module: base #: selection:base.language.install,lang:0 msgid "Spanish (HN) / Español (HN)" -msgstr "Spaans (HN) / Spanje (HN)" +msgstr "Spaans (HN) / Español (HN)" #. module: base #: view:ir.sequence.type:0 @@ -4855,6 +4877,15 @@ msgid "" " * Commitment Date\n" " * Effective Date\n" msgstr "" +"\n" +"Extra datum informatie toevoegen aan een verkooporder.\n" +"=====================================================\n" +"\n" +"U kunt de volgende extra datums toevoegen aan een verkooporder:\n" +"-----------------------------------------------------------------------\n" +" * Datum Verzoek\n" +" * Datum Toezegging\n" +" * Datum Uitvoering\n" #. module: base #: field:ir.actions.server,srcmodel_id:0 @@ -4920,7 +4951,7 @@ msgstr "Open een venster" #. module: base #: model:res.country,name:base.gq msgid "Equatorial Guinea" -msgstr "Equatoriaal Guinea" +msgstr "Equatoriaal-Guinea" #. module: base #: model:ir.module.module,shortdesc:base.module_web_api @@ -5002,7 +5033,7 @@ msgstr "Stel in als te doen" #. module: base #: view:res.lang:0 msgid "%c - Appropriate date and time representation." -msgstr "%c - Passende weergave datum en tijd" +msgstr "%c - Passende datum en tijd weergave." #. module: base #: code:addons/base/res/res_config.py:420 @@ -5013,6 +5044,7 @@ msgid "" "Click 'Continue' and enjoy your OpenERP experience..." msgstr "" "Uw database is nu volledig geconfigureerd.\n" +"\n" "Klik op 'Doorgaan' en geniet van uw OpenERP beleving..." #. module: base @@ -5064,7 +5096,7 @@ msgstr "Rechten" #. module: base #: field:ir.mail_server,smtp_host:0 msgid "SMTP Server" -msgstr "SMTP-server" +msgstr "SMTP Server" #. module: base #: code:addons/base/module/module.py:320 @@ -5072,7 +5104,7 @@ msgstr "SMTP-server" msgid "You try to remove a module that is installed or will be installed" msgstr "" "U probeert een module te verwijderen die geïnstalleerd is of nog moet worden " -"geïnstalleerd." +"geïnstalleerd" #. module: base #: view:base.module.upgrade:0 @@ -5082,7 +5114,7 @@ msgstr "De geselecteerde modules zijn bijgewerkt / geïnstalleerd !" #. module: base #: selection:base.language.install,lang:0 msgid "Spanish (PR) / Español (PR)" -msgstr "Spaans (PR) / Spanja (PR)" +msgstr "Spaans (PR) / Español (PR)" #. module: base #: model:ir.module.module,description:base.module_crm_profiling @@ -5137,7 +5169,7 @@ msgstr "Inkoop" #. module: base #: selection:base.language.install,lang:0 msgid "Portuguese (BR) / Português (BR)" -msgstr "" +msgstr "Portugees (BR) / Português (BR)" #. module: base #: model:ir.model,name:base.model_ir_needaction_mixin @@ -5157,7 +5189,7 @@ msgstr "IT Services" #. module: base #: model:ir.module.category,name:base.module_category_specific_industry_applications msgid "Specific Industry Applications" -msgstr "Specificeer industrie toepassingen" +msgstr "Specifieke industriële toepassingen" #. module: base #: model:ir.module.module,shortdesc:base.module_google_docs @@ -5245,12 +5277,12 @@ msgstr "Kenia" #: model:ir.actions.act_window,name:base.action_translation #: model:ir.ui.menu,name:base.menu_action_translation msgid "Translated Terms" -msgstr "Vertaalde regels" +msgstr "Vertaalde uitdrukkingen" #. module: base #: selection:base.language.install,lang:0 msgid "Abkhazian / аҧсуа" -msgstr "Abchazisch / Abchazië" +msgstr "Abchazisch / аҧсуа" #. module: base #: view:base.module.configuration:0 @@ -5301,7 +5333,7 @@ msgstr "Opslaan" #. module: base #: field:ir.actions.report.xml,report_xml:0 msgid "XML Path" -msgstr "XML Path" +msgstr "XML Pad" #. module: base #: model:res.country,name:base.bj @@ -5401,14 +5433,14 @@ msgstr "Beveiliging" #. module: base #: selection:base.language.install,lang:0 msgid "Portuguese / Português" -msgstr "" +msgstr "Portugees / Português" #. module: base #: code:addons/base/ir/ir_model.py:372 #, python-format msgid "Changing the storing system for field \"%s\" is not allowed." msgstr "" -"Het veranderen van het opsla systeem voor veld \"%s\" is niet toegestaan." +"Het veranderen van het opslagsysteem voor veld \"%s\" is niet toegestaan." #. module: base #: help:res.partner.bank,company_id:0 @@ -5436,7 +5468,7 @@ msgstr "Geïnstalleerd" #. module: base #: selection:base.language.install,lang:0 msgid "Ukrainian / українська" -msgstr "Oekraïens / Oekraïne" +msgstr "Oekraïens / українська" #. module: base #: model:res.country,name:base.sn @@ -5493,7 +5525,7 @@ msgstr "Expressie om aan te voldoen om de transitie te maken." #. module: base #: selection:base.language.install,lang:0 msgid "Spanish (PA) / Español (PA)" -msgstr "Spaans (PA) / Spanja (PA)" +msgstr "Spaans (PA) / Español (PA)" #. module: base #: view:res.currency:0 @@ -5525,7 +5557,7 @@ msgstr "Ieder model moet uniek zijn!" #: model:ir.module.category,name:base.module_category_localization #: model:ir.ui.menu,name:base.menu_localisation msgid "Localization" -msgstr "Vertalingen" +msgstr "Lokalisatie" #. module: base #: model:ir.module.module,description:base.module_web_api @@ -5613,7 +5645,7 @@ msgstr "Relatie labels" #. module: base #: view:res.company:0 msgid "Preview Header/Footer" -msgstr "Bekijk kop/voet" +msgstr "Bekijk kop-/voettekst" #. module: base #: field:ir.ui.menu,parent_id:0 @@ -5624,7 +5656,7 @@ msgstr "Hoofdmenu" #. module: base #: field:res.partner.bank,owner_name:0 msgid "Account Owner Name" -msgstr "Naam eigenaar rekening" +msgstr "Naam rekeningeigenaar" #. module: base #: code:addons/base/ir/ir_model.py:420 @@ -5683,7 +5715,7 @@ msgstr "Filter Naam" #: view:res.partner:0 #: field:res.request,history:0 msgid "History" -msgstr "Historie" +msgstr "Geschiedenis" #. module: base #: model:res.country,name:base.im @@ -5704,12 +5736,12 @@ msgstr "De modulenaam moet uniek zijn !" #. module: base #: model:res.country,name:base.bv msgid "Bouvet Island" -msgstr "Bouvet-eiland" +msgstr "Bouveteiland" #. module: base #: field:ir.model.constraint,type:0 msgid "Constraint Type" -msgstr "Constraint soort" +msgstr "Soort Beperking" #. module: base #: field:res.company,child_ids:0 @@ -5939,7 +5971,7 @@ msgstr "ir.actions.act_url" #. module: base #: model:ir.ui.menu,name:base.menu_translation_app msgid "Application Terms" -msgstr "Applicatie-termen" +msgstr "Applicatie uitdrukkingen" #. module: base #: model:ir.actions.act_window,help:base.open_module_tree @@ -5973,12 +6005,12 @@ msgstr "Engels (GB)" #. module: base #: selection:base.language.install,lang:0 msgid "Japanese / 日本語" -msgstr "Japans / Japan" +msgstr "Japans / 日本語" #. module: base #: model:ir.model,name:base.model_base_language_import msgid "Language Import" -msgstr "Taal import" +msgstr "Taal Importeren" #. module: base #: help:workflow.transition,act_from:0 @@ -6090,7 +6122,7 @@ msgstr "" #. module: base #: view:ir.translation:0 msgid "Comments" -msgstr "Reacties" +msgstr "Opmerkingen" #. module: base #: model:res.country,name:base.et @@ -6196,6 +6228,12 @@ msgid "" "===============================================\n" " " msgstr "" +"\n" +"Gebruikers toestaan om te registreren en hun wachtwoord opnieuw in te " +"stellen\n" +"=============================================================================" +"\n" +" " #. module: base #: model:ir.module.category,name:base.module_category_usability @@ -6278,7 +6316,7 @@ msgstr "" #. module: base #: selection:base.language.install,lang:0 msgid "Spanish (BO) / Español (BO)" -msgstr "Spaans (BO) / Spaans (BO)" +msgstr "Spaans (BO) / Español (BO)" #. module: base #: model:ir.module.module,description:base.module_board @@ -6300,7 +6338,7 @@ msgstr "Overzicht toegangscontrole" #. module: base #: model:res.country,name:base.um msgid "USA Minor Outlying Islands" -msgstr "VS Kleine Buitengaatse Eilanden" +msgstr "Kleine afgelegen eilanden van de Verenigde Staten" #. module: base #: help:ir.cron,numbercall:0 @@ -6342,7 +6380,7 @@ msgstr "Initiële datum" #. module: base #: selection:base.language.install,lang:0 msgid "Gujarati / ગુજરાતી" -msgstr "Gujarati / India" +msgstr "Gujarati / ગુજરાતી" #. module: base #: code:addons/base/module/module.py:361 @@ -6356,7 +6394,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll msgid "Belgium - Payroll" -msgstr "Loonadministratie - België" +msgstr "België - Loonadministratie" #. module: base #: view:workflow.activity:0 @@ -6741,7 +6779,7 @@ msgstr "Prijs nauwkeurigheid" #. module: base #: selection:base.language.install,lang:0 msgid "Latvian / latviešu valoda" -msgstr "Lets / Letland" +msgstr "Lets / latviešu valoda" #. module: base #: selection:base.language.install,lang:0 @@ -7004,7 +7042,7 @@ msgstr "Soms BIC of Swift genoemd." #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_in msgid "Indian - Accounting" -msgstr "Boekhouding - India" +msgstr "India - Boekhouding" #. module: base #: field:res.lang,time_format:0 @@ -15159,7 +15197,7 @@ msgstr "Limiet" #. module: base #: model:res.groups,name:base.group_hr_user msgid "Officer" -msgstr "Manager" +msgstr "Functionaris" #. module: base #: code:addons/orm.py:787 diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po index d9cd2b2a0b1..625ec0831ee 100644 --- a/openerp/addons/base/i18n/nl_BE.po +++ b/openerp/addons/base/i18n/nl_BE.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-10-11 04:47+0000\n" -"X-Generator: Launchpad (build 16799)\n" +"X-Launchpad-Export-Date: 2013-11-12 05:40+0000\n" +"X-Generator: Launchpad (build 16820)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po index 8b5af32e358..81278aee92c 100644 --- a/openerp/addons/base/i18n/pl.po +++ b/openerp/addons/base/i18n/pl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-10-11 04:44+0000\n" -"X-Generator: Launchpad (build 16799)\n" +"X-Launchpad-Export-Date: 2013-11-12 05:36+0000\n" +"X-Generator: Launchpad (build 16820)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po index fbf23562ddf..32a09c25bf4 100644 --- a/openerp/addons/base/i18n/pt.po +++ b/openerp/addons/base/i18n/pt.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-10-11 04:44+0000\n" -"X-Generator: Launchpad (build 16799)\n" +"X-Launchpad-Export-Date: 2013-11-12 05:36+0000\n" +"X-Generator: Launchpad (build 16820)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po index 749f6afa8e9..177135777e0 100644 --- a/openerp/addons/base/i18n/pt_BR.po +++ b/openerp/addons/base/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-10-11 04:46+0000\n" -"X-Generator: Launchpad (build 16799)\n" +"X-Launchpad-Export-Date: 2013-11-12 05:39+0000\n" +"X-Generator: Launchpad (build 16820)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po index 441f1fcb778..9fcd193e9fd 100644 --- a/openerp/addons/base/i18n/ro.po +++ b/openerp/addons/base/i18n/ro.po @@ -8,13 +8,13 @@ msgstr "" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" "PO-Revision-Date: 2013-01-05 18:18+0000\n" -"Last-Translator: ERPSystems.roHello, Raoul
+
Blahble
+ bluih blouh
+
'''
+ # shorten in the quote
+ html = html_email_clean(test_str, shorten=True, max_length=25, remove=True)
+ self.assertIn('Blahble', html, 'html_email_cleaner: shorten error or too short')
+ self.assertIn('bluih', html, 'html_email_cleaner: shorten error or too short')
+ self.assertIn('blouh', html, 'html_email_cleaner: shorten error or too short')
+ self.assertNotIn('quote', html, 'html_email_cleaner: shorten error or too long')
+ self.assertIn('read more', html, 'html_email_cleaner: shorten error about read more inclusion')
+ # shorten in second word
+ html = html_email_clean(test_str, shorten=True, max_length=9, remove=True)
+ self.assertIn('Blahble', html, 'html_email_cleaner: shorten error or too short')
+ self.assertIn('bluih', html, 'html_email_cleaner: shorten error or too short')
+ self.assertNotIn('blouh', html, 'html_email_cleaner: shorten error or too short')
+ self.assertNotIn('quote', html, 'html_email_cleaner: shorten error or too long')
+ self.assertIn('read more', html, 'html_email_cleaner: shorten error about read more inclusion')
+ # shorten waaay too large
+ html = html_email_clean(test_str, shorten=True, max_length=900, remove=True)
+ self.assertIn('Blahble', html, 'html_email_cleaner: shorten error or too short')
+ self.assertIn('bluih', html, 'html_email_cleaner: shorten error or too short')
+ self.assertIn('blouh', html, 'html_email_cleaner: shorten error or too short')
+ self.assertNotIn('quote', html, 'html_email_cleaner: shorten error or too long')
+
def test_10_email_text(self):
""" html_email_clean test for text-based emails """
new_html = html_email_clean(test_mail_examples.TEXT_1, remove=True)
@@ -223,6 +280,19 @@ class TestCleaner(unittest2.TestCase):
for ext in test_mail_examples.THUNDERBIRD_1_OUT:
self.assertNotIn(ext, new_html, 'html_email_cleaner did not erase signature / quoted content')
+ def test_70_read_more(self):
+ new_html = html_email_clean(test_mail_examples.BUG1, remove=True, shorten=True, max_length=100)
+ for ext in test_mail_examples.BUG_1_IN:
+ self.assertIn(ext, new_html, 'html_email_cleaner wrongly removed valid content')
+ for ext in test_mail_examples.BUG_1_OUT:
+ self.assertNotIn(ext, new_html, 'html_email_cleaner did not removed invalid content')
+
+ new_html = html_email_clean(test_mail_examples.BUG2, remove=True, shorten=True, max_length=250)
+ for ext in test_mail_examples.BUG_2_IN:
+ self.assertIn(ext, new_html, 'html_email_cleaner wrongly removed valid content')
+ for ext in test_mail_examples.BUG_2_OUT:
+ self.assertNotIn(ext, new_html, 'html_email_cleaner did not removed invalid content')
+
def test_90_misc(self):
# False boolean for text must return empty string
new_html = html_email_clean(False)
diff --git a/openerp/tests/test_mail_examples.py b/openerp/tests/test_mail_examples.py
index 7631a28e662..54671106334 100644
--- a/openerp/tests/test_mail_examples.py
+++ b/openerp/tests/test_mail_examples.py
@@ -637,3 +637,322 @@ MSOFFICE_3 = """This is a quote + And this is quite a long quote, after all. ++
MSOFFICE_3_IN = ['I saw your boss yesterday']
MSOFFICE_3_OUT = ['I noticed you recently downloaded OpenERP.', 'You indicated that you wish', 'Belgium: +32.81.81.37.00']
+
+
+# ------------------------------------------------------------
+# Test cases coming from bugs
+# ------------------------------------------------------------
+
+# bug: read more not apparent, strange message in read more span
+BUG1 = """]*>([\s]*[\r\n]+[\s]*)<\/span>', re.IGNORECASE | re.DOTALL)
html = _replace_matching_regex(linebreaks, html, '\n')
return html
Hi Migration Team, + +Paragraph 1, blah blah blah blah blah blah blah blah blah blah blah blah +blah blah blah blah blah blah blah blah blah blah blah blah blah blah +blah blah blah blah blah blah blah blah blah blah blah blah blah blah +blah blah blah blah blah blah blah blah blah blah blah blah blah blah +blah blah blah blah blah blah blah blah blah blah blah blah blah blah +blah blah blah blah blah blah blah blah blah blah blah blah blah blah +blah blah blah blah blah blah blah blah. + +Paragraph 2, blah blah blah blah blah blah blah blah blah blah blah blah +blah blah blah blah blah blah blah blah blah blah blah blah blah blah +blah blah blah blah blah blah blah blah blah blah blah blah blah blah +blah blah blah blah blah blah blah blah blah blah blah blah blah blah +blah blah blah blah blah blah blah blah blah blah blah blah blah blah +blah blah blah blah blah blah blah blah blah blah blah blah blah blah +blah blah blah blah blah blah blah blah. + +Paragraph 3, blah blah blah blah blah blah blah blah blah blah blah blah +blah blah blah blah blah blah blah blah blah blah blah blah blah blah +blah blah blah blah blah blah blah blah blah blah blah blah blah blah +blah blah blah blah blah blah blah blah blah blah blah blah blah blah +blah blah blah blah blah blah blah blah blah blah blah blah blah blah +blah blah blah blah blah blah blah blah blah blah blah blah blah blah +blah blah blah blah blah blah blah blah. + +Thanks. + +Regards, + +-- +Olivier Laurent +Migration Manager +OpenERP SA +Chaussée de Namur, 40 +B-1367 Gérompont +Tel: +32.81.81.37.00 +Web: http://www.openerp.com""" + +BUG_1_IN = [ + 'Hi Migration Team', + 'Paragraph 1' +] +BUG_1_OUT = [ + 'Olivier Laurent', + 'Chaussée de Namur', + '81.81.37.00', + 'openerp.com', +] + + +BUG2 = """ +
+
+
+
+ -------- Original Message -------- +
+
+
+
+
+ +
+
+
+ -------- Message original -------- +
+
+
+
+
+
+ INZO services Sent by OpenERP + S.A. using OpenERP. + Access your messages and documents in + + OpenERP
+
+
+
+
+
+
+ +
"""
+
+BUG_2_IN = [
+ 'read more',
+ '...',
+]
+BUG_2_OUT = [
+ 'Fwd: TR: OpenERP S.A'
+ 'fait un mois'
+]
diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py
index 98f8869f85c..ff73a3e0c72 100644
--- a/openerp/tools/mail.py
+++ b/openerp/tools/mail.py
@@ -175,6 +175,51 @@ def html_email_clean(html, remove=False, shorten=False, max_length=300):
iteration += 1
new_node = _insert_new_node(node, -1, new_node_tag, text[idx:] + (cur_node.tail or ''), None, {})
+ def _truncate_node(node, position, simplify_whitespaces=True):
+ """ Truncate a node text at a given position. This algorithm will shorten
+ at the end of the word whose ending character exceeds position.
+
+ :param bool simplify_whitespaces: whether to try to count all successive
+ whitespaces as one character. This
+ option should not be True when trying
+ to keep 'pre' consistency.
+ """
+ if node.text is None:
+ node.text = ''
+
+ truncate_idx = -1
+ if simplify_whitespaces:
+ cur_char_nbr = 0
+ word = None
+ node_words = node.text.strip(' \t\r\n').split()
+ for word in node_words:
+ cur_char_nbr += len(word)
+ if cur_char_nbr >= position:
+ break
+ if word:
+ truncate_idx = node.text.find(word) + len(word)
+ else:
+ truncate_idx = position
+ if truncate_idx == -1 or truncate_idx > len(node.text):
+ truncate_idx = len(node.text)
+
+ # compose new text bits
+ innertext = node.text[0:truncate_idx]
+ outertext = node.text[truncate_idx:]
+ node.text = innertext
+
+ # create ... read more node
+ read_more_node = _create_node('span', ' ... ', None, {'class': 'oe_mail_expand'})
+ read_more_link_node = _create_node('a', 'read more', None, {'href': '#', 'class': 'oe_mail_expand'})
+ read_more_node.append(read_more_link_node)
+ # create outertext node
+ overtext_node = _create_node('span', outertext)
+ # tag node
+ overtext_node.set('in_overlength', '1')
+ # add newly created nodes in dom
+ node.append(read_more_node)
+ node.append(overtext_node)
+
if not html or not isinstance(html, basestring):
return html
html = ustr(html)
@@ -197,17 +242,16 @@ def html_email_clean(html, remove=False, shorten=False, max_length=300):
html = '+
+
+ -------- Original Message -------- +
| Subject: + | +Fwd: TR: OpenERP S.A. Payment Reminder | +
|---|---|
| Date: | +Wed, 16 Oct 2013 14:11:13 +0200 | +
| From: | +Christine Herrmann <che@openerp.com> | +
| To: | +online@openerp.com | +
+
+ +
+
+
+ -------- Message original -------- +
| Sujet: + | +TR: OpenERP S.A. Payment Reminder | +
|---|---|
| Date : + | +Wed, 16 Oct 2013 10:34:45 -0000 | +
| De : | +Ida Siwatala <infos@inzoservices.com> | +
| Répondre + + à : | +catchall@openerp.my.openerp.com | +
| Pour : + | +Christine Herrmann (che) <che@openerp.com> | +
+
+
+
+ --
+
+ Bonjour,
++
+
Pourriez-vous + + me faire un retour sur ce point.
++
+
Cordialement
++
+
+
+
+
+ De :
+ Ida Siwatala [mailto:infos@inzoservices.com]
+
+ Envoyé : vendredi 4 octobre 2013 20:03
+ À : 'Followers of
+ INZO-services-8-all-e-Maxime-Lisbonne-77176-Savigny-le-temple-France'
+ Objet : RE: OpenERP S.A. Payment Reminder
+
Bonsoir,
++
+
Je + + me permets de revenir vers vous par écrit , car j’ai + fait 2 appels vers votre service en exposant mon + problème, mais je n’ai pas eu de retour.
+Cela + + fait un mois que j’ai fait la souscription de votre + produit, mais je me rends compte qu’il est pas adapté à + ma situation ( fonctionnalité manquante et surtout je + n’ai pas beaucoup de temps à passer à résoudre des + bugs).
+C’est + + pourquoi , j’ai demandé qu’un accord soit trouvé avec + vous pour annuler le contrat (tout en vous payant le + mois d’utilisation de septembre).
++
+
Pourriez-vous + + me faire un retour sur ce point.
++
+
Cordialement,
++
+
Ida + + Siwatala
++
+
De :
+ che@openerp.com
+ [mailto:che@openerp.com]
+
+ Envoyé : vendredi 4 octobre 2013 17:41
+ À : infos@inzoservices.com
+ Objet : OpenERP S.A. Payment Reminder
+
+
+
+
+
+ Dear + + INZO services,
+Exception + + made if there was a mistake of ours, it seems that the + following amount stays unpaid. Please, take + appropriate measures in order to carry out this + payment in the next 8 days.
++
+
|
+ Date de facturation + |
+
+ Description + |
+
+ Reference + |
+
+ Due Date + |
+
+ Amount (€) + |
+
+ Lit. + |
+
|
+ 2013-09-24 + |
+
+ 2013/1121 + |
+
+ Enterprise - Inzo Services + - Juillet 2013 + |
+
+ 2013-09-24 + |
+
+ 420.0 + |
+ + |
+
+ |
+ + |
+ + |
+ + |
+ + |
+ + |
+
Amount + + due : 420.00 €
+Would + + your payment have been carried out after this mail was + sent, please ignore this message. Do not hesitate to + contact our accounting department.
+
+ Best Regards,
+ Aurore Lesage
+ OpenERP
+ Chaussée de Namur, 40
+ B-1367 Grand Rosières
+ Tel: +32.81.81.37.00 - Fax: +32.81.73.35.01
+ E-mail : ale@openerp.com
+ Web: http://www.openerp.com
+ INZO services Sent by OpenERP + S.A. using OpenERP. + Access your messages and documents in + + OpenERP
+
-- +Christine Herrmann + +OpenERP +Chaussée de Namur, 40 +B-1367 Grand Rosières +Tel: +32.81.81.37.00 - Fax: +32.81.73.35.01 + +Web: http://www.openerp.com+
+
+
+
+ +
%s
' % html
root = lxml.html.fromstring(html)
- # remove all tails and replace them by a span element, because managing text and tails can be a pain in the ass
- for node in root.getiterator():
+ quote_tags = re.compile(r'(\n(>)+[^\n\r]*)')
+ signature = re.compile(r'([-]{2,}[\s]?[\r\n]{1,2}[\s\S]+)')
+ for node in root.iter():
+ # remove all tails and replace them by a span element, because managing text and tails can be a pain in the ass
if node.tail:
tail_node = _create_node('span', node.tail)
node.tail = None
node.addnext(tail_node)
- # form node and tag text-based quotes and signature
- quote_tags = re.compile(r'(\n(>)+[^\n\r]*)')
- signature = re.compile(r'([-]{2,}[\s]?[\r\n]{1,2}[^.]+)')
- for node in root.getiterator():
+ # form node and tag text-based quotes and signature
_tag_matching_regex_in_text(quote_tags, node, 'span', {'text_quote': '1'})
_tag_matching_regex_in_text(signature, node, 'span', {'text_signature': '1'})
@@ -219,21 +263,26 @@ def html_email_clean(html, remove=False, shorten=False, max_length=300):
quote_begin = False
overlength = False
cur_char_nbr = 0
- for node in root.getiterator():
+ for node in root.iter():
+ # do not take into account multiple spaces that are displayed as max 1 space in html
+ node_text = ' '.join((node.text and node.text.strip(' \t\r\n') or '').split())
+
# root: try to tag the client used to write the html
if 'WordSection1' in node.get('class', '') or 'MsoNormal' in node.get('class', ''):
root.set('msoffice', '1')
if 'SkyDrivePlaceholder' in node.get('class', '') or 'SkyDrivePlaceholder' in node.get('id', ''):
root.set('hotmail', '1')
- # state of the parsing
+ # state of the parsing: flag quotes and tails to remove
if quote_begin:
node.set('in_quote', '1')
node.set('tail_remove', '1')
+ # state of the parsing: flag when being in over-length content
if overlength:
node.set('in_overlength', '1')
node.set('tail_remove', '1')
+ # find quote in msoffice / hotmail / blockquote / text quote and signatures
if root.get('msoffice') and node.tag == 'div' and 'border-top:solid' in node.get('style', ''):
quote_begin = True
node.set('in_quote', '1')
@@ -242,42 +291,37 @@ def html_email_clean(html, remove=False, shorten=False, max_length=300):
quote_begin = True
node.set('in_quote', '1')
node.set('tail_remove', '1')
+ if node.tag == 'blockquote' or node.get('text_quote') or node.get('text_signature'):
+ node.set('in_quote', '1')
# shorten:
# 1/ truncate the text at the next available space
# 2/ create a 'read more' node, next to current node
# 3/ add the truncated text in a new node, next to 'read more' node
- if shorten and not overlength and cur_char_nbr + len(node.text or '') > max_length:
+ if shorten and not overlength and cur_char_nbr + len(node_text) > max_length:
+ node_to_truncate = node
+ while node_to_truncate.get('in_quote') and node_to_truncate.getparent() is not None:
+ node_to_truncate = node_to_truncate.getparent()
overlength = True
- # truncate text
- innertext = node.text[0:(max_length - cur_char_nbr)]
- outertext = node.text[(max_length - cur_char_nbr):]
- stop_idx = outertext.find(' ')
- if stop_idx == -1:
- stop_idx = len(outertext)
- node.text = innertext + outertext[0:stop_idx]
- # create ... read more node
- read_more_node = _create_node('span', ' ... ', None, {'class': 'oe_mail_expand'})
- read_more_link_node = _create_node('a', 'read more', None, {'href': '#', 'class': 'oe_mail_expand'})
- read_more_node.append(read_more_link_node)
- # create outertext node
- new_node = _create_node('span', outertext[stop_idx:])
- # add newly created nodes in dom
- node.addnext(new_node)
- node.addnext(read_more_node)
- # tag node
- new_node.set('in_overlength', '1')
+ node_to_truncate.set('truncate', '1')
+ if node_to_truncate == node:
+ node_to_truncate.set('truncate_position', str(max_length - cur_char_nbr))
+ else:
+ node_to_truncate.set('truncate_position', str(len(node.text or '')))
+ cur_char_nbr += len(node_text)
- cur_char_nbr += len(node.text or '')
+ # Tree modification
+ # ------------------------------------------------------------
- if node.tag == 'blockquote' or node.get('text_quote') or node.get('text_signature'):
- node.set('in_quote', '1')
+ for node in root.iter():
+ if node.get('truncate'):
+ _truncate_node(node, int(node.get('truncate_position', '0')), node.tag != 'pre')
# Post processing
# ------------------------------------------------------------
to_remove = []
- for node in root.getiterator():
+ for node in root.iter():
if node.get('in_quote') or node.get('in_overlength'):
# copy the node tail into parent text
if node.tail and not node.get('tail_remove'):
@@ -286,17 +330,20 @@ def html_email_clean(html, remove=False, shorten=False, max_length=300):
to_remove.append(node)
if node.get('tail_remove'):
node.tail = ''
+ # clean node
+ for attribute_name in ['in_quote', 'tail_remove', 'in_overlength', 'msoffice', 'hotmail', 'truncate', 'truncate_position']:
+ node.attrib.pop(attribute_name, None)
for node in to_remove:
if remove:
node.getparent().remove(node)
else:
if not 'oe_mail_expand' in node.get('class', ''): # trick: read more link should be displayed even if it's in overlength
- node_class = node.get('class', '') + ' ' + 'oe_mail_cleaned'
+ node_class = node.get('class', '') + ' oe_mail_cleaned'
node.set('class', node_class)
# html: \n that were tail of elements have been encapsulated into -> back to \n
html = etree.tostring(root, pretty_print=False)
- linebreaks = re.compile(r'([\s]*[\r\n]+[\s]*)<\/span>', re.IGNORECASE | re.DOTALL)
+ linebreaks = re.compile(r'