diff --git a/.bzrignore b/.bzrignore
index 62f8a05c90f..8fcfef4d9dc 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,23 +1,18 @@
-*.pyc
 .*.swp
 .bzrignore
+.idea
+.project
+.pydevproject
+.ropeproject
+.settings
+.DS_Store
 openerp/addons/*
 openerp/filestore*
 .Python
-include
-lib
-bin/activate
-bin/activate_this.py
-bin/easy_install
-bin/easy_install-2.6
-bin/pip
-bin/python
-bin/python2.6
 *.pyc
 *.pyo
+bin/*
 build/
-bin/yolk
-bin/pil*.py
-.project
-.pydevproject
-.settings
+include/
+lib/
+share/
\ No newline at end of file
diff --git a/openerp-server b/openerp-server
index b9fcfb3b130..12b6962e4e6 100755
--- a/openerp-server
+++ b/openerp-server
@@ -165,11 +165,16 @@ def dumpstacks(sig, frame):
     """ Signal handler: dump a stack trace for each existing thread."""
     # code from http://stackoverflow.com/questions/132058/getting-stack-trace-from-a-running-python-application#answer-2569696
     # modified for python 2.5 compatibility
-    thread_map = dict(threading._active, **threading._limbo)
-    id2name = dict([(threadId, thread.getName()) for threadId, thread in thread_map.items()])
+    threads_info = dict([(th.ident, {'name': th.name,
+                                    'uid': getattr(th,'uid','n/a')})
+                                for th in threading.enumerate()])
     code = []
     for threadId, stack in sys._current_frames().items():
-        code.append("\n# Thread: %s(%d)" % (id2name[threadId], threadId))
+        thread_info = threads_info.get(threadId)
+        code.append("\n# Thread: %s (id:%s) (uid:%s)" % \
+                    (thread_info and thread_info['name'] or 'n/a',
+                     threadId,
+                     thread_info and thread_info['uid'] or 'n/a'))
         for filename, lineno, name, line in traceback.extract_stack(stack):
             code.append('File: "%s", line %d, in %s' % (filename, lineno, name))
             if line:
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index 04cb8090b73..8f1ff409ad9 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-01-08 15:06+0000\n"
-"Last-Translator: kifcaliph <Unknown>\n"
+"PO-Revision-Date: 2012-03-19 10:06+0000\n"
+"Last-Translator: Abdulwhhab A. Al-Shehri <Unknown>\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-03-10 04:46+0000\n"
-"X-Generator: Launchpad (build 14914)\n"
+"X-Launchpad-Export-Date: 2012-03-20 04:55+0000\n"
+"X-Generator: Launchpad (build 14969)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -367,7 +367,7 @@ msgstr "اسم المعالج"
 #. module: base
 #: model:res.groups,name:base.group_partner_manager
 msgid "Partner Manager"
-msgstr ""
+msgstr "إدارة الشركاء"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_customer_relationship_management
@@ -388,7 +388,7 @@ msgstr "تجميع غير ممكن"
 #. module: base
 #: field:ir.module.category,child_ids:0
 msgid "Child Applications"
-msgstr ""
+msgstr "التطبيقات الفرعية"
 
 #. module: base
 #: field:res.partner,credit_limit:0
@@ -408,7 +408,7 @@ msgstr "تاريخ التحديث"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_action_rule
 msgid "Automated Action Rules"
-msgstr ""
+msgstr "قواعد الاحداث التلقائية"
 
 #. module: base
 #: view:ir.attachment:0
@@ -473,11 +473,13 @@ msgid ""
 "The user this filter is available to. When left empty the filter is usable "
 "by the system only."
 msgstr ""
+"مرشحات المستخدم غير متوفرة. عندما يترك فارغا فان المرشح يستخدم بواسطة النظام "
+"فقط."
 
 #. module: base
 #: help:res.partner,website:0
 msgid "Website of Partner."
-msgstr ""
+msgstr "موقع إلكتروني للشريك."
 
 #. module: base
 #: help:ir.actions.act_window,views:0
@@ -506,7 +508,7 @@ msgstr "تنسيق التاريخ"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_report_designer
 msgid "OpenOffice Report Designer"
-msgstr ""
+msgstr "مصمم تقارير اوبن اوفيس"
 
 #. module: base
 #: field:res.bank,email:0
@@ -566,7 +568,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_layout
 msgid "Sales Orders Print Layout"
-msgstr ""
+msgstr "تنسيق طباعة اوامر البيع"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -576,7 +578,7 @@ msgstr "الأسبانية"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice
 msgid "Invoice on Timesheets"
-msgstr ""
+msgstr "فاتورة على جداول زمنية"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -700,7 +702,7 @@ msgstr "تمّت عملية التصدير"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_plugin_outlook
 msgid "Outlook Plug-In"
-msgstr ""
+msgstr "إضافات الاوت لوك"
 
 #. module: base
 #: view:ir.model:0
@@ -727,7 +729,7 @@ msgstr "الأردن"
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
-msgstr ""
+msgstr "تاريخ الحدث المقرر لاحقا لهذه الوظيفة."
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:139
@@ -743,7 +745,7 @@ msgstr "إريتريا"
 #. module: base
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "اسم الشركة يجب أن يكون فريداً !"
 
 #. module: base
 #: view:res.config:0
@@ -778,7 +780,7 @@ msgstr ""
 #. module: base
 #: view:ir.mail_server:0
 msgid "Security and Authentication"
-msgstr ""
+msgstr "الحماية و التحقق من الصلاحيات"
 
 #. module: base
 #: view:base.language.export:0
@@ -879,7 +881,7 @@ msgstr ""
 #. module: base
 #: view:res.users:0
 msgid "Email Preferences"
-msgstr ""
+msgstr "تفضيلات البريد الالكتروني"
 
 #. module: base
 #: model:ir.module.module,description:base.module_audittrail
@@ -971,7 +973,7 @@ msgstr "نييوي"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_membership
 msgid "Membership Management"
-msgstr ""
+msgstr "إدارة الإشتراكات"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -998,7 +1000,7 @@ msgstr "أنواع مراجع الطلبات"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_google_base_account
 msgid "Google Users"
-msgstr ""
+msgstr "مستخدمي جوجل"
 
 #. module: base
 #: help:ir.server.object.lines,value:0
@@ -1035,6 +1037,7 @@ msgstr "ملف TGZ"
 msgid ""
 "Users added to this group are automatically added in the following groups."
 msgstr ""
+"الاشخاص المضافون الى هذه المجموعة أضيفوا تلقائيا الى المجموعات التالية."
 
 #. module: base
 #: view:res.lang:0
@@ -1088,7 +1091,7 @@ msgstr "لا يمكن استخدام كلمات مرور فارغة لأسباب
 #: code:addons/base/ir/ir_mail_server.py:192
 #, python-format
 msgid "Connection test failed!"
-msgstr ""
+msgstr "فشلت محاولة الاتصال!"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -1209,7 +1212,7 @@ msgstr "الأسبانية / Español (GT)"
 #. module: base
 #: field:ir.mail_server,smtp_port:0
 msgid "SMTP Port"
-msgstr ""
+msgstr "المنفذ SMTP"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_import_sugarcrm
@@ -1231,7 +1234,7 @@ msgstr ""
 #: code:addons/base/module/wizard/base_language_install.py:55
 #, python-format
 msgid "Language Pack"
-msgstr ""
+msgstr "حزمة لغة"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_tests
@@ -1289,11 +1292,14 @@ msgid ""
 "reference it\n"
 "- creation/update: a mandatory field is not correctly set"
 msgstr ""
+"لا يمكن إكمال العملية، ربما بسبب أحد الاسباب التالية:\n"
+"-الحذف: ربما تكون تحاول حذف سجل بينما هناك سجلات اخرى تشير اليه.\n"
+"الانشاء/التحديث: حقل أساسي لم يتم ادخاله بشكل صحيح."
 
 #. module: base
 #: field:ir.module.category,parent_id:0
 msgid "Parent Application"
-msgstr ""
+msgstr "التطبيق الرئيسي"
 
 #. module: base
 #: code:addons/base/res/res_users.py:222
@@ -1310,12 +1316,12 @@ msgstr "لتصدير لغة جديدة، لا تختر أي لغة."
 #: model:ir.module.module,shortdesc:base.module_document
 #: model:ir.module.module,shortdesc:base.module_knowledge
 msgid "Document Management System"
-msgstr ""
+msgstr "نظام ادارة الوثائق"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_claim
 msgid "Claims Management"
-msgstr ""
+msgstr "إدارة المطالبات"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_purchase_root
@@ -1340,6 +1346,9 @@ msgid ""
 "use the accounting application of OpenERP, journals and accounts will be "
 "created automatically based on these data."
 msgstr ""
+"قم بتكوين الحسابات البنكية لشركتك و اختر ما تريده ان يظهر في اسفل التقارير. "
+"بإمكانك إعادة ترتيب الحسابات من قائمة العرض. إذا كنت تستخدم ملحق الحسابات, "
+"سيتم انشاء اليوميات و الحسابات تلقائيا اعتمادا على هذه البيانات."
 
 #. module: base
 #: view:ir.module.module:0
@@ -1359,6 +1368,14 @@ msgid ""
 "    * Commitment Date\n"
 "    * Effective Date\n"
 msgstr ""
+"\n"
+"أضف تواريخ اضافية الى طلب البيع.\n"
+"===============================\n"
+"\n"
+"يمكنك اضافة التواريخ التالية الى طلب البيع:\n"
+"* التاريخ المطلوب\n"
+"* التاريخ الملتزم به\n"
+"* تاريخ السريان\n"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_sequence
@@ -1804,7 +1821,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_evaluation
 msgid "Employee Appraisals"
-msgstr ""
+msgstr "تقييمات الموظف"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -1853,7 +1870,7 @@ msgstr "نموذج ملحق"
 #. module: base
 #: field:res.partner.bank,footer:0
 msgid "Display on Reports"
-msgstr ""
+msgstr "عرض على التقارير"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cn
@@ -2050,7 +2067,7 @@ msgstr "وضع العرض"
 msgid ""
 "Display this bank account on the footer of printed documents like invoices "
 "and sales orders."
-msgstr ""
+msgstr "عرض هذا الحساب البنكي على أسفل المطبوعات مثل الفواتير وطلبات البيع."
 
 #. module: base
 #: view:base.language.import:0
@@ -2159,7 +2176,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_subscription
 msgid "Recurring Documents"
-msgstr ""
+msgstr "وثائق متكررة"
 
 #. module: base
 #: model:res.country,name:base.bs
@@ -2244,7 +2261,7 @@ msgstr "المجموعات"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CL) / Español (CL)"
-msgstr ""
+msgstr "الأسبانية / Español (CL)"
 
 #. module: base
 #: model:res.country,name:base.bz
@@ -2517,7 +2534,7 @@ msgstr "استيراد / تصدير"
 #. module: base
 #: model:ir.actions.todo.category,name:base.category_tools_customization_config
 msgid "Tools / Customization"
-msgstr ""
+msgstr "أدوات / تخصيصات"
 
 #. module: base
 #: field:ir.model.data,res_id:0
@@ -2533,7 +2550,7 @@ msgstr "عنوان البريد الإلكتروني"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "French (BE) / Français (BE)"
-msgstr ""
+msgstr "الفرنسية / Français (BE)"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -2768,7 +2785,7 @@ msgstr "جزيرة نورفولك"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Korean (KR) / 한국어 (KR)"
-msgstr ""
+msgstr "الكورية / 한국어 (KR)"
 
 #. module: base
 #: help:ir.model.fields,model:0
@@ -3218,7 +3235,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Finnish / Suomi"
-msgstr ""
+msgstr "الفنلندية / Suomi"
 
 #. module: base
 #: field:ir.rule,perm_write:0
@@ -3233,7 +3250,7 @@ msgstr "اللقب"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "German / Deutsch"
-msgstr ""
+msgstr "الألمانية / Deutsch"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -3581,7 +3598,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_point_of_sale
 msgid "Point Of Sale"
-msgstr ""
+msgstr "نقطة بيع"
 
 #. module: base
 #: code:addons/base/module/module.py:302
@@ -3611,6 +3628,8 @@ msgid ""
 "Value Added Tax number. Check the box if the partner is subjected to the "
 "VAT. Used by the VAT legal statement."
 msgstr ""
+"رقم ضريبة القيمة المضافة. ضع علامة في هذا المربع اذا كان الشريك خاضع لضريبة "
+"القيمة المضافة. تستخدم بواسطة كشف ضريبة القيمة المضافة القانونية."
 
 #. module: base
 #: selection:ir.sequence,implementation:0
@@ -3708,7 +3727,7 @@ msgstr "ضريبة القيمة المضافة"
 #. module: base
 #: field:res.users,new_password:0
 msgid "Set password"
-msgstr ""
+msgstr "ضبط كلمة المرور"
 
 #. module: base
 #: view:res.lang:0
@@ -3723,7 +3742,7 @@ msgstr "خطأ! لا يمكنك إنشاء فئات متداخلة."
 #. module: base
 #: view:res.lang:0
 msgid "%x - Appropriate date representation."
-msgstr ""
+msgstr "%x - صيغة التاريخ المناسب"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_mobile
@@ -3836,7 +3855,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail
 msgid "Email Gateway"
-msgstr ""
+msgstr "بوابة البريد الالكتروني"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:439
@@ -3957,7 +3976,7 @@ msgstr "البرتغال"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_share
 msgid "Share any Document"
-msgstr ""
+msgstr "مشاركة اي مستند"
 
 #. module: base
 #: field:ir.module.module,certificate:0
@@ -4235,6 +4254,8 @@ msgid ""
 "When no specific mail server is requested for a mail, the highest priority "
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
+"حين إستداعاء البريد من الخادم، يتم اختيار الملف الملقم حسب الاولوية.\r\n"
+"القيمة الافتراضية هي 10 (الارقام الاصغر= اولوية أعلى)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
@@ -4291,7 +4312,7 @@ msgstr "\"كود\" لابد أن يكون فريداً"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_expense
 msgid "Expenses Management"
-msgstr ""
+msgstr "إدارة المصروفات و النفقات"
 
 #. module: base
 #: view:workflow.activity:0
@@ -4438,7 +4459,7 @@ msgstr "غينيا الاستوائية"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_warning
 msgid "Warning Messages and Alerts"
-msgstr ""
+msgstr "رسائل التحذير و الاشعارات"
 
 #. module: base
 #: view:base.module.import:0
@@ -4613,7 +4634,7 @@ msgstr "ليسوتو"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_vat
 msgid "VAT Number Validation"
-msgstr ""
+msgstr "التحقق من رقم ضريبة القيمة المضافة"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_partner_assign
@@ -4759,7 +4780,7 @@ msgstr "قيمة لاحقة من السجل للمسلسل"
 #. module: base
 #: help:ir.mail_server,smtp_user:0
 msgid "Optional username for SMTP authentication"
-msgstr ""
+msgstr "اختياري: اسم المستخدم للتحقق من قبل ملقم البريد"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_actions
@@ -4844,7 +4865,7 @@ msgstr ""
 #. module: base
 #: help:res.partner.bank,company_id:0
 msgid "Only if this bank account belong to your company"
-msgstr ""
+msgstr "فقط إذا كان هذا الحساب مملوكا لشركتك"
 
 #. module: base
 #: model:res.country,name:base.za
@@ -5171,7 +5192,7 @@ msgstr "حقل"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_long_term
 msgid "Long Term Projects"
-msgstr ""
+msgstr "مشروعات المدى البعيد"
 
 #. module: base
 #: model:res.country,name:base.ve
@@ -12982,7 +13003,7 @@ msgstr "الصحراء الغربية"
 #. module: base
 #: model:ir.module.category,name:base.module_category_account_voucher
 msgid "Invoicing & Payments"
-msgstr ""
+msgstr "الفواتير و المدفوعات"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_company_form
@@ -13186,7 +13207,7 @@ msgstr ""
 #. module: base
 #: field:res.partner.bank,bank_name:0
 msgid "Bank Name"
-msgstr ""
+msgstr "اسم البنك"
 
 #. module: base
 #: model:res.country,name:base.ki
@@ -13232,6 +13253,8 @@ msgid ""
 "are available. To add a new language, you can use the 'Load an Official "
 "Translation' wizard available from the 'Administration' menu."
 msgstr ""
+"اللغة الافتراضية المستخدمة في الواجهات، عندما تكون هناك ترجمات متوفرة. "
+"لإضافة لغة جديدة، يمكنك استخدام 'تحميل ترجمة رسمية' من قائمة \"إدارة\"."
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -13265,7 +13288,7 @@ msgstr "ملف CSV"
 #: code:addons/base/res/res_company.py:154
 #, python-format
 msgid "Phone: "
-msgstr ""
+msgstr "هاتف "
 
 #. module: base
 #: field:res.company,account_no:0
@@ -13304,7 +13327,7 @@ msgstr ""
 #. module: base
 #: field:res.company,vat:0
 msgid "Tax ID"
-msgstr ""
+msgstr "رقم الضرائب"
 
 #. module: base
 #: field:ir.model.fields,field_description:0
@@ -13426,7 +13449,7 @@ msgstr "الأنشطة"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product
 msgid "Products & Pricelists"
-msgstr ""
+msgstr "المنتجات و قوائم الاسعار"
 
 #. module: base
 #: field:ir.actions.act_window,auto_refresh:0
@@ -13477,7 +13500,7 @@ msgstr ""
 #. module: base
 #: field:ir.model.data,name:0
 msgid "External Identifier"
-msgstr ""
+msgstr "مُعرف خارجي"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.grant_menu_access
@@ -13542,7 +13565,7 @@ msgstr "تصدير"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_nl
 msgid "Netherlands - Accounting"
-msgstr ""
+msgstr "هولندا - محاسبة"
 
 #. module: base
 #: field:res.bank,bic:0
@@ -13651,7 +13674,7 @@ msgstr "الدليل التقني"
 #. module: base
 #: view:res.company:0
 msgid "Address Information"
-msgstr ""
+msgstr "معلومات العنوان"
 
 #. module: base
 #: model:res.country,name:base.tz
@@ -13676,7 +13699,7 @@ msgstr "جزيرة الكريسماس"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_livechat
 msgid "Live Chat Support"
-msgstr ""
+msgstr "التحدث مع الدعم الفني"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -13876,7 +13899,7 @@ msgstr ""
 #. module: base
 #: help:ir.actions.act_window,usage:0
 msgid "Used to filter menu and home actions from the user form."
-msgstr ""
+msgstr "تستخدم لتصفية القائمة و الإجراءات الرئيسية من النموذج المستخدم."
 
 #. module: base
 #: model:res.country,name:base.sa
@@ -13886,7 +13909,7 @@ msgstr "المملكة العربية السعودية"
 #. module: base
 #: help:res.company,rml_header1:0
 msgid "Appears by default on the top right corner of your printed documents."
-msgstr ""
+msgstr "يظهر إفتراضيا في أعلى الزاوية اليمنى من الوثائق المطبوعة."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail_crm_claim
@@ -13989,7 +14012,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,description:base.module_auth_openid
 msgid "Allow users to login through OpenID."
-msgstr ""
+msgstr "السماح للمستخدمين بالدخول باستخدام أوبن أي دي(OpenID)."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_payment
@@ -14036,7 +14059,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_designer
 msgid "Report Designer"
-msgstr ""
+msgstr "مصمم التقارير"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_address_book
@@ -14075,7 +14098,7 @@ msgstr "الفرص والفرص المحتملة"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Romanian / română"
-msgstr ""
+msgstr "الرومانية / română"
 
 #. module: base
 #: view:res.log:0
@@ -14129,7 +14152,7 @@ msgstr "تنفيذ للإنشاء"
 #. module: base
 #: model:res.country,name:base.vi
 msgid "Virgin Islands (USA)"
-msgstr ""
+msgstr "جزيرة فيرجين - (الولايات المتحدة اﻻمريكية)"
 
 #. module: base
 #: model:res.country,name:base.tw
@@ -14169,12 +14192,12 @@ msgstr ""
 #. module: base
 #: field:ir.ui.view,field_parent:0
 msgid "Child Field"
-msgstr ""
+msgstr "حقل فرعي."
 
 #. module: base
 #: view:ir.rule:0
 msgid "Detailed algorithm:"
-msgstr ""
+msgstr "تفاصيل الخوارزمية."
 
 #. module: base
 #: field:ir.actions.act_window,usage:0
@@ -14195,7 +14218,7 @@ msgstr "workflow.workitem"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_profile_tools
 msgid "Miscellaneous Tools"
-msgstr ""
+msgstr "أدوات متنوعة."
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_tools
@@ -14242,7 +14265,7 @@ msgstr "عرض:"
 #. module: base
 #: field:ir.model.fields,view_load:0
 msgid "View Auto-Load"
-msgstr ""
+msgstr "عرض التحميل التلقائي"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:264
@@ -14268,7 +14291,7 @@ msgstr ""
 #. module: base
 #: field:ir.ui.menu,web_icon:0
 msgid "Web Icon File"
-msgstr ""
+msgstr "ملف ايقونة الويب"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -14289,7 +14312,7 @@ msgstr "Persian / فارسي"
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "View Ordering"
-msgstr ""
+msgstr "عرض الطلبات"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_upgrade.py:95
@@ -14375,7 +14398,7 @@ msgstr "جزيرة أروبا"
 #: code:addons/base/module/wizard/base_module_import.py:60
 #, python-format
 msgid "File is not a zip file!"
-msgstr ""
+msgstr "الملف ليس ملف مضغوط(zip)!!"
 
 #. module: base
 #: model:res.country,name:base.ar
@@ -14504,7 +14527,7 @@ msgstr "عقد ضمان الناشر"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Bulgarian / български език"
-msgstr ""
+msgstr "البلغارية / български език"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_aftersale
@@ -14514,7 +14537,7 @@ msgstr "خدمات بعد البيع"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_fr
 msgid "France - Accounting"
-msgstr ""
+msgstr "فرنسا - محاسبة"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -14651,7 +14674,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Czech / Čeština"
-msgstr ""
+msgstr "التشيكية / Čeština"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_generic_modules
@@ -14778,7 +14801,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_plugin_thunderbird
 msgid "Thunderbird Plug-In"
-msgstr ""
+msgstr "اضافات -  ثندربيرد"
 
 #. module: base
 #: model:ir.model,name:base.model_res_country
@@ -14796,7 +14819,7 @@ msgstr "الدولة"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_messages
 msgid "In-Project Messaging System"
-msgstr ""
+msgstr "نظام المراسلة في المشاريع"
 
 #. module: base
 #: model:res.country,name:base.pn
@@ -14827,7 +14850,7 @@ msgstr ""
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Change Color"
-msgstr ""
+msgstr "تغيير اللون"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_15
@@ -14861,7 +14884,7 @@ msgstr ""
 #. module: base
 #: field:ir.module.module,auto_install:0
 msgid "Automatic Installation"
-msgstr ""
+msgstr "تحميل تلقائي"
 
 #. module: base
 #: model:res.country,name:base.jp
@@ -14930,7 +14953,7 @@ msgstr "ir.actions.server"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ca
 msgid "Canada - Accounting"
-msgstr ""
+msgstr "كندا - محاسبة"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index 45eba73ec83..49d9fa1b093 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-02-23 08:37+0000\n"
+"PO-Revision-Date: 2012-03-19 09:27+0000\n"
 "Last-Translator: Juha Kotamäki <Unknown>\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-03-10 04:47+0000\n"
-"X-Generator: Launchpad (build 14914)\n"
+"X-Launchpad-Export-Date: 2012-03-20 04:55+0000\n"
+"X-Generator: Launchpad (build 14969)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -399,7 +399,7 @@ msgstr "Luottoraja"
 #. module: base
 #: model:ir.module.module,description:base.module_web_graph
 msgid "Openerp web graph view"
-msgstr ""
+msgstr "Openerp Web graafinäkymä"
 
 #. module: base
 #: field:ir.model.data,date_update:0
@@ -454,6 +454,8 @@ msgid ""
 "Invalid date/time format directive specified. Please refer to the list of "
 "allowed directives, displayed when you edit a language."
 msgstr ""
+"Virheellinen päivämäärä/aika muotoilu määritelty. Ole hyvä ja tarkista "
+"sallitut muotoilut, jotka näytetään kun muokkaat kieltä."
 
 #. module: base
 #: code:addons/orm.py:3895
@@ -475,6 +477,8 @@ msgid ""
 "The user this filter is available to. When left empty the filter is usable "
 "by the system only."
 msgstr ""
+"Käyttäjän suodin on saatavilla. Jos jätetään tyhjäksi, vain järjestelmä voi "
+"käyttää suodinta."
 
 #. module: base
 #: help:res.partner,website:0
@@ -539,7 +543,7 @@ msgstr ""
 #. module: base
 #: view:ir.values:0
 msgid "Action Binding"
-msgstr ""
+msgstr "Toimintojen yhdistäminen"
 
 #. module: base
 #: model:res.country,name:base.gf
@@ -874,7 +878,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_webdav
 msgid "Shared Repositories (WebDAV)"
-msgstr ""
+msgstr "Jaetut tallennuspaikat (WebDAV)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_import_google
@@ -2678,7 +2682,7 @@ msgstr "Peritty"
 #. module: base
 #: field:ir.model.fields,serialization_field_id:0
 msgid "Serialization Field"
-msgstr ""
+msgstr "Serialisointi kenttä"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_report_designer
@@ -3135,7 +3139,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,description:base.module_web_diagram
 msgid "Openerp web Diagram view"
-msgstr ""
+msgstr "Openerp web diagramminäkymä"
 
 #. module: base
 #: model:res.groups,name:base.group_hr_user
@@ -3466,7 +3470,7 @@ msgstr "Erottimen muotoilu"
 #. module: base
 #: constraint:res.partner.bank:0
 msgid "The RIB and/or IBAN is not valid"
-msgstr ""
+msgstr "RIB tai IBAn koodi ei ole oikein"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_webkit
@@ -4104,7 +4108,7 @@ msgstr "Xor"
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
 msgid "Account Charts"
-msgstr ""
+msgstr "Tilikartat"
 
 #. module: base
 #: view:res.request:0
@@ -4184,6 +4188,7 @@ msgid ""
 "Your OpenERP Publisher's Warranty Contract unique key, also called serial "
 "number."
 msgstr ""
+"OpenERP julkaisijan takuun sopimusavain, kutsutaan myös sarjanumeroksi."
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_setup
@@ -4282,6 +4287,9 @@ msgid ""
 "When no specific mail server is requested for a mail, the highest priority "
 "one is used. Default priority is 10 (smaller number = higher priority)"
 msgstr ""
+"Kun tiettyä sähköpostipalvelinta pyydetään sähköpostia varten, korkeimman "
+"prioriteetin palvelinta käytetään. Oletusprioriteetti on 10 (pienempi numero "
+"= suurempi prioriteetti)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
@@ -4338,7 +4346,7 @@ msgstr "koodin pitää olla uniikki"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_expense
 msgid "Expenses Management"
-msgstr ""
+msgstr "Kulujenhallinta"
 
 #. module: base
 #: view:workflow.activity:0
@@ -4349,7 +4357,7 @@ msgstr "Saapuvat siirtymät"
 #. module: base
 #: field:ir.values,value_unpickle:0
 msgid "Default value or action reference"
-msgstr ""
+msgstr "Oletusarvo tai toiminnon viite"
 
 #. module: base
 #: model:res.country,name:base.sr
@@ -4396,7 +4404,7 @@ msgstr "Kustomoitu arkkitehtuuri"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_gantt
 msgid "web Gantt"
-msgstr ""
+msgstr "web Gantt kaavio"
 
 #. module: base
 #: field:ir.module.module,license:0
@@ -4406,7 +4414,7 @@ msgstr "Lisenssi"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_graph
 msgid "web Graph"
-msgstr ""
+msgstr "web graafi"
 
 #. module: base
 #: field:ir.attachment,url:0
@@ -4668,7 +4676,7 @@ msgstr "ALV numeron tarkistus"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_partner_assign
 msgid "Partners Geo-Localization"
-msgstr ""
+msgstr "Kumppaneiden Geolokaatiot"
 
 #. module: base
 #: model:res.country,name:base.ke
@@ -4799,7 +4807,7 @@ msgstr "Sopimus on jo rekisteröity järjestelmään."
 #: 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 ""
+msgstr "Pankkitilien tyypit"
 
 #. module: base
 #: help:ir.sequence,suffix:0
@@ -4868,7 +4876,7 @@ msgstr ""
 #. module: base
 #: field:res.company,rml_footer2:0
 msgid "Bank Accounts Footer"
-msgstr ""
+msgstr "Pankkitilien alaviite"
 
 #. module: base
 #: model:res.country,name:base.mu
@@ -4894,7 +4902,7 @@ msgstr "Turvallisuus"
 #: code:addons/base/ir/ir_model.py:311
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
-msgstr ""
+msgstr "Kentän \"%s\" tallennustavan muuttaminen ei ole sallittu."
 
 #. module: base
 #: help:res.partner.bank,company_id:0
@@ -5250,7 +5258,7 @@ msgstr "Sambia"
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Launch Configuration Wizard"
-msgstr ""
+msgstr "Lounaskonfiguraation velho"
 
 #. module: base
 #: help:res.partner,user_id:0
@@ -5480,7 +5488,7 @@ msgstr "Web"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_lunch
 msgid "Lunch Orders"
-msgstr ""
+msgstr "Lounastilaukset"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -5921,7 +5929,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_diagram
 msgid "OpenERP Web Diagram"
-msgstr ""
+msgstr "OpenERP web kaavio"
 
 #. module: base
 #: view:res.partner.bank:0
@@ -6166,7 +6174,7 @@ msgstr "Tietokannan anonymisointi"
 #. module: base
 #: selection:ir.mail_server,smtp_encryption:0
 msgid "SSL/TLS"
-msgstr ""
+msgstr "SSL/TLS"
 
 #. module: base
 #: field:publisher_warranty.contract,check_opw:0
@@ -6329,7 +6337,7 @@ msgstr ""
 #. module: base
 #: help:res.bank,bic:0
 msgid "Sometimes called BIC or Swift."
-msgstr ""
+msgstr "Kutsutaan myös BIC tai SWIFT koodiksi."
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_mx
@@ -6524,6 +6532,8 @@ msgid ""
 "Please check that all your lines have %d columns.Stopped around line %d "
 "having %d columns."
 msgstr ""
+"Ole hyvä ja tarkista että kaikissa riveissäsi on %d saraketta. Pysähtyminen "
+"suunnilleen erivillä %d jossa on %d saraketta."
 
 #. module: base
 #: field:base.language.export,advice:0
@@ -6601,6 +6611,8 @@ msgid ""
 "If you enable this option, existing translations (including custom ones) "
 "will be overwritten and replaced by those in this file"
 msgstr ""
+"Jos asetat tämän vaihtoehdon päälle, nykyiset käännökset (myös omat "
+"kustomoidut) ylikirjoitetaan ja korvataan tässä tiedostossa olevilla"
 
 #. module: base
 #: field:ir.ui.view,inherit_id:0
@@ -6675,6 +6687,9 @@ msgid ""
 "password, otherwise leave empty. After a change of password, the user has to "
 "login again."
 msgstr ""
+"Määrittele arvo vain kun luot käyttäjää tai vaihdat käyttäjän salasanaa, "
+"muuten jätä tyhjäksi. Salasanan vaihdon jälkeen käyttäjän pitää kirjautua "
+"uudelleen"
 
 #. module: base
 #: view:publisher_warranty.contract:0
@@ -6724,7 +6739,7 @@ msgstr "Muokkaa"
 #. module: base
 #: field:ir.actions.client,params:0
 msgid "Supplementary arguments"
-msgstr ""
+msgstr "Lisäargumentit"
 
 #. module: base
 #: field:res.users,view:0
@@ -6759,7 +6774,7 @@ msgstr "Poistettaessa"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_multilang
 msgid "Multi Language Chart of Accounts"
-msgstr ""
+msgstr "Monikielinen tilikirja"
 
 #. module: base
 #: selection:res.lang,direction:0
@@ -7073,7 +7088,7 @@ msgstr "Luodut valikot"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_analytic_default
 msgid "Account Analytic Defaults"
-msgstr ""
+msgstr "Analyyttisen kirjanpidon oletusarvot"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_contract
@@ -7138,6 +7153,7 @@ msgstr "Espanja (Mexico) / Español (MX)"
 #, python-format
 msgid "Please verify your publisher warranty serial number and validity."
 msgstr ""
+"Ole hyvä ja tarkista julkaisijan takuusopimuksen sarjanumero ja voimassaolo."
 
 #. module: base
 #: view:res.log:0
@@ -7198,7 +7214,7 @@ msgstr ""
 #. module: base
 #: help:ir.model,modules:0
 msgid "List of modules in which the object is defined or inherited"
-msgstr ""
+msgstr "Luettelo moduuleista missä objekti on määritelty tai peritty"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_payroll
@@ -7272,7 +7288,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,title:0
 msgid "Partner Firm"
-msgstr ""
+msgstr "Kumppaniyritys"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_fields
@@ -7350,7 +7366,7 @@ msgstr "Myanmar"
 #. module: base
 #: help:ir.model.fields,modules:0
 msgid "List of modules in which the field is defined"
-msgstr ""
+msgstr "Luettelo moduuleista joissa kenttä on määritelty"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -7608,6 +7624,12 @@ msgid ""
 "Contains the installer for marketing-related modules.\n"
 "    "
 msgstr ""
+"\n"
+"Markkinoinnin valikko.\n"
+"==================\n"
+"\n"
+"Sisältää asennusohjelman markkinointiin liittyville moduuleille.\n"
+"    "
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_knowledge_management
@@ -7622,7 +7644,7 @@ msgstr "Yrityksen pankkitilit"
 #. module: base
 #: help:ir.mail_server,smtp_pass:0
 msgid "Optional password for SMTP authentication"
-msgstr ""
+msgstr "Mahdollinen SMTP autentikoinnin salasana"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_mrp
@@ -7823,7 +7845,7 @@ msgstr ""
 #. module: base
 #: view:res.partner.bank:0
 msgid "Bank accounts belonging to one of your companies"
-msgstr ""
+msgstr "Pankkitilit jotka kuuluvat jollekkin yrityksistäsi"
 
 #. module: base
 #: help:res.users,action_id:0
@@ -7850,6 +7872,8 @@ msgid ""
 "The field on the current object that links to the target object record (must "
 "be a many2one, or an integer field with the record ID)"
 msgstr ""
+"Nykyisen objektin kenttä joka linkittää kohdeobjektin tietueeseen (pitää "
+"olla many2one, tai kokonaislukujenttä jossa on tietue ID)"
 
 #. module: base
 #: code:addons/base/module/module.py:423
@@ -7872,6 +7896,7 @@ msgid ""
 "Determines where the currency symbol should be placed after or before the "
 "amount."
 msgstr ""
+"Määrittelee tuleeko valuuttasymbooli ennen vai jälkeen valuttamäärän."
 
 #. module: base
 #: model:ir.model,name:base.model_base_update_translations
@@ -7918,7 +7943,7 @@ msgstr "Yhdysvallat"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_fundraising
 msgid "Fundraising"
-msgstr ""
+msgstr "Varainkeruu"
 
 #. module: base
 #: view:ir.module.module:0
@@ -7985,6 +8010,8 @@ msgid ""
 "You cannot have multiple records with the same external ID in the same "
 "module!"
 msgstr ""
+"Sinulla ei voi olla useita tietueita joissa on on sama ulkinen ID jotka "
+"sijaitsevat samassa moduulissa!"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -8009,7 +8036,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_iban
 msgid "IBAN Bank Accounts"
-msgstr ""
+msgstr "IBAN pankkitilit"
 
 #. module: base
 #: field:res.company,user_ids:0
@@ -8103,6 +8130,8 @@ msgid ""
 "The priority of the job, as an integer: 0 means higher priority, 10 means "
 "lower priority."
 msgstr ""
+"Tehtävän prioriteetti kokonaislukuna: 0 tarkoittaa korkeampaa prioriteettia, "
+"10 matalampaa prioriteettia."
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_transition
@@ -8215,7 +8244,7 @@ msgstr "Nepal"
 #. module: base
 #: help:res.groups,implied_ids:0
 msgid "Users of this group automatically inherit those groups"
-msgstr ""
+msgstr "Tämän ryhmän käyttäjät perivät automaattisesti nämä ryhmät"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_attendance
@@ -8256,7 +8285,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_values_form_action
 #: view:ir.values:0
 msgid "Action Bindings"
-msgstr ""
+msgstr "Toimintojen liitokset"
 
 #. module: base
 #: view:ir.sequence:0
@@ -8298,7 +8327,7 @@ msgstr ""
 #: code:addons/orm.py:2693
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
-msgstr ""
+msgstr "Arvo \"%s\" kentälle \"%s.%s\" ei ole valittavissa"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -8329,7 +8358,7 @@ msgstr "Slovenia / slovenščina"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_wiki
 msgid "Wiki"
-msgstr ""
+msgstr "Wiki"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_de
@@ -8632,7 +8661,7 @@ msgstr "Iteraatio"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_planning
 msgid "Resources Planing"
-msgstr ""
+msgstr "Resurssien suunnittelu"
 
 #. module: base
 #: field:ir.module.module,complexity:0
@@ -9008,7 +9037,7 @@ msgstr "Pohjois-Mariaanit"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_claim_from_delivery
 msgid "Claim on Deliveries"
-msgstr ""
+msgstr "Reklamaatio kuljetuksista"
 
 #. module: base
 #: model:res.country,name:base.sb
@@ -9089,6 +9118,9 @@ msgid ""
 "instead.If SSL is needed, an upgrade to Python 2.6 on the server-side should "
 "do the trick."
 msgstr ""
+"OpenERP palvelimesi ei tue SMTP yhteyttä SSL salauksen kanssa. Voit käyttää "
+"STARTTLS korvaamaan sitä. Jos SSL tarvitaan, Pythonin 2.6 version "
+"pavelinpuolen päivityksen pitäisi korjata asia"
 
 #. module: base
 #: model:res.country,name:base.ua
@@ -9235,7 +9267,7 @@ msgstr "Luontipäivä"
 #. module: base
 #: help:ir.actions.server,trigger_name:0
 msgid "The workflow signal to trigger"
-msgstr ""
+msgstr "Työnkulun liipaistava signaali"
 
 #. module: base
 #: model:ir.module.module,description:base.module_mrp
@@ -9389,7 +9421,7 @@ msgstr "Valuttamerkki, käytetään määrien tulostuksessa"
 #. module: base
 #: view:res.lang:0
 msgid "%H - Hour (24-hour clock) [00,23]."
-msgstr ""
+msgstr "%H - tuntia (24 tunnin kello) [00,23]."
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:451
@@ -9398,6 +9430,7 @@ msgid ""
 "Your server does not seem to support SSL, you may want to try STARTTLS "
 "instead"
 msgstr ""
+"Palvelimesi ei näytä tukevan SSL:ää, voit kokeilla STARTTLS:ää sen sijasata"
 
 #. module: base
 #: model:ir.model,name:base.model_res_widget
@@ -9427,7 +9460,7 @@ msgstr "Just in time ajoitus (JIT)"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_bank_statement_extensions
 msgid "Bank Statement extensions to support e-banking"
-msgstr ""
+msgstr "Pankkitiliotteen laajennukset e-pankkien tukemiseksi"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -9542,7 +9575,7 @@ msgstr "Ikkunatoiminnot"
 #. module: base
 #: view:res.lang:0
 msgid "%I - Hour (12-hour clock) [01,12]."
-msgstr ""
+msgstr "%I - tuntia (12-tunnin kello) [01,12]."
 
 #. module: base
 #: selection:publisher_warranty.contract.wizard,state:0
@@ -9583,7 +9616,7 @@ msgstr ""
 #. module: base
 #: sql_constraint:res.currency:0
 msgid "The currency code must be unique per company!"
-msgstr ""
+msgstr "Valuuttakoodin pitää olla uniikki yrityskohtaisesti!"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_property
@@ -9778,7 +9811,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_synchro
 msgid "Multi-DB Synchronization"
-msgstr ""
+msgstr "Monen tietokanan synkronointi"
 
 #. module: base
 #: selection:ir.module.module,complexity:0
@@ -9788,7 +9821,7 @@ msgstr "Osaaja"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_holidays
 msgid "Leaves Management"
-msgstr ""
+msgstr "Lomien hallinta"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -9819,6 +9852,9 @@ msgid ""
 "Todo list for CRM leads and opportunities.\n"
 "    "
 msgstr ""
+"\n"
+"Tehtävälista CRM liideille ja mahdollisuuksille.\n"
+"    "
 
 #. module: base
 #: field:ir.actions.act_window.view,view_id:0
@@ -9831,7 +9867,7 @@ msgstr "Näkymä"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_wiki_sale_faq
 msgid "Wiki: Sale FAQ"
-msgstr ""
+msgstr "Wiki: Myynnin UKK (FAQ)"
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -9938,7 +9974,7 @@ msgstr "Monaco"
 #. module: base
 #: view:base.module.import:0
 msgid "Please be patient, this operation may take a few minutes..."
-msgstr ""
+msgstr "Ole kärsivällinen, tämä toiminto voi kestää muutaman minuutin..."
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -9964,7 +10000,7 @@ msgstr "Jos määritelty, tämä toiminto korvaa käyttäjän vakiovalikon."
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_google_map
 msgid "Google Maps on Customers"
-msgstr ""
+msgstr "Google kartta asiakkaista"
 
 #. module: base
 #: model:ir.actions.report.xml,name:base.preview_report
@@ -9974,7 +10010,7 @@ msgstr "Esikatsele raportti"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_purchase_analytic_plans
 msgid "Purchase Analytic Plans"
-msgstr ""
+msgstr "Oston analyyttiset suunnitelmat"
 
 #. module: base
 #: model:ir.module.module,description:base.module_analytic_journal_billing_rate
@@ -10056,7 +10092,7 @@ msgstr "Viikot"
 #: code:addons/base/res/res_company.py:157
 #, python-format
 msgid "VAT: "
-msgstr ""
+msgstr "ALV: "
 
 #. module: base
 #: model:res.country,name:base.af
@@ -10073,7 +10109,7 @@ msgstr "Virhe !"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_marketing_campaign_crm_demo
 msgid "Marketing Campaign - Demo"
-msgstr ""
+msgstr "Markkinointikamppanja - Demo"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail_hr_recruitment
@@ -10105,7 +10141,7 @@ msgstr "Tätä menetelmää ei ole enää olemassa"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_import_google
 msgid "Google Import"
-msgstr ""
+msgstr "Google tuonti"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_12
@@ -10151,12 +10187,12 @@ msgstr ""
 #. module: base
 #: help:ir.model.data,res_id:0
 msgid "ID of the target record in the database"
-msgstr ""
+msgstr "Kohdetietueen ID tietokannassa"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_analytic_analysis
 msgid "Contracts Management"
-msgstr ""
+msgstr "Sopimustenhallinta"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -10181,7 +10217,7 @@ msgstr "Tehtävät"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product_visible_discount
 msgid "Prices Visible Discounts"
-msgstr ""
+msgstr "Hintojen näkyvät alennukset"
 
 #. module: base
 #: field:ir.attachment,datas:0
@@ -10274,7 +10310,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.todo.category:0
 msgid "Wizard Category"
-msgstr ""
+msgstr "Velhotyökalun luokka"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_cancel
@@ -10343,6 +10379,9 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"Ole hyvä ja määrittele BIC/SWIFT koodi IBAN tyyppiselle pankkitillle "
+"tehdäksesi hyväksyttäviä maksuja"
 
 #. module: base
 #: view:res.lang:0
@@ -10352,7 +10391,7 @@ msgstr "%A - Viikonpäivän koko nimi."
 #. module: base
 #: help:ir.values,user_id:0
 msgid "If set, action binding only applies for this user."
-msgstr ""
+msgstr "Jos asetettu, toimintojen sidokset koskevat vain tätä käyttäjää"
 
 #. module: base
 #: model:res.country,name:base.gw
@@ -10396,7 +10435,7 @@ msgstr ""
 #. module: base
 #: help:res.company,bank_ids:0
 msgid "Bank accounts related to this company"
-msgstr ""
+msgstr "Tähän tiliin liittyvät pankkitilit"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_partner
@@ -10420,6 +10459,8 @@ msgstr "Valmis"
 msgid ""
 "Specify if missed occurrences should be executed when the server restarts."
 msgstr ""
+"Määrittelee suoritetaanko väliin jääneet tapahtumat palvelimen "
+"uudelleenkäynnistyksen yhteydessä."
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_miss
@@ -10592,7 +10633,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_todo_category
 msgid "Configuration Wizard Category"
-msgstr ""
+msgstr "Konfiguraatiovelhon kategoria"
 
 #. module: base
 #: view:base.module.update:0
@@ -10678,7 +10719,7 @@ msgstr "Valtio"
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_5
 msgid "Sequences & Identifiers"
-msgstr ""
+msgstr "Järjestysnumerot ja tunnisteet"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_th
@@ -10760,6 +10801,7 @@ msgid ""
 "Checked if this is an OpenERP Publisher's Warranty contract (versus older "
 "contract types"
 msgstr ""
+"Valittu jos tämä on OpenERP julkaisijan takuusopimus (vs. muut sopimustyypit)"
 
 #. module: base
 #: field:ir.model.fields,model:0
@@ -10898,6 +10940,8 @@ msgid ""
 "Level of difficulty of module. Easy: intuitive and easy to use for everyone. "
 "Normal: easy to use for business experts. Expert: requires technical skills."
 msgstr ""
+"Moduulin vaikeus. Helppo: selkeäkyttöinen kaikille sopiva. Normaali: "
+"ammattilaisten helppo käyttää. Expertti: teknisiä taitoja vaaditaan."
 
 #. module: base
 #: code:addons/base/res/res_lang.py:191
@@ -11000,7 +11044,7 @@ msgstr "Kotitoiminto"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_event_project
 msgid "Retro-Planning on Events"
-msgstr ""
+msgstr "Retro-suunnittelu tapahtumille"
 
 #. module: base
 #: code:addons/custom.py:555
@@ -11020,7 +11064,7 @@ msgstr "Haluatko tyhjentää ID:t? "
 #. module: base
 #: view:res.partner.bank:0
 msgid "Information About the Bank"
-msgstr ""
+msgstr "Tietoja pankista"
 
 #. module: base
 #: help:ir.actions.server,condition:0
@@ -11073,7 +11117,7 @@ msgstr "Pysäytä kaikki"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_analytic_user_function
 msgid "Jobs on Contracts"
-msgstr ""
+msgstr "Työsuhteiden sopimukset"
 
 #. module: base
 #: model:ir.module.module,description:base.module_import_sugarcrm
@@ -11127,6 +11171,8 @@ msgid ""
 "Lets you install addons geared towards sharing knowledge with and between "
 "your employees."
 msgstr ""
+"Mahdollistaa lisäosien asentamisen, näiden tarkoituksena on tiedonjako "
+"henkilöstön kanssa ja henkilöstön kesken."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -11136,7 +11182,7 @@ msgstr "Arabia / الْعَرَبيّة"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
-msgstr ""
+msgstr "Terve"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -11151,7 +11197,7 @@ msgstr "Kommentti"
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 msgid "HR Manager"
-msgstr ""
+msgstr "HR päällikkö"
 
 #. module: base
 #: view:ir.filters:0
@@ -11176,7 +11222,7 @@ msgstr "Sopimuksen tarkastusvirhe"
 #. module: base
 #: field:ir.values,key2:0
 msgid "Qualifier"
-msgstr ""
+msgstr "Tarkastaja"
 
 #. module: base
 #: field:res.country.state,name:0
@@ -11186,7 +11232,7 @@ msgstr "Valtion nimi"
 #. module: base
 #: view:res.lang:0
 msgid "Update Languague Terms"
-msgstr ""
+msgstr "Päivitä kielen termit"
 
 #. module: base
 #: field:workflow.activity,join_mode:0
@@ -11201,7 +11247,7 @@ msgstr "Aikavyöhyke"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_wiki_faq
 msgid "Wiki: Internal FAQ"
-msgstr ""
+msgstr "Wiki: sisäinen FAQ"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_report_xml
@@ -11243,7 +11289,7 @@ msgstr "ir.ui.view"
 #. module: base
 #: help:res.lang,code:0
 msgid "This field is used to set/get locales for user"
-msgstr ""
+msgstr "Tämän kentän avulla haetaan asetetaan käyttäjän lokalisaatio"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_2
@@ -11465,7 +11511,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr
 msgid "Employee Directory"
-msgstr ""
+msgstr "Työntekijähakemisto"
 
 #. module: base
 #: view:ir.cron:0
@@ -11642,7 +11688,7 @@ msgstr "Tunisia"
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Wizards to be Launched"
-msgstr ""
+msgstr "Käynnistettävät velhot"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_manufacturing
@@ -11658,7 +11704,7 @@ msgstr "Komorit"
 #. module: base
 #: view:res.request:0
 msgid "Draft and Active"
-msgstr ""
+msgstr "Luonnos ja aktiivinen"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_server_action
@@ -11670,7 +11716,7 @@ msgstr "Palvelintoiminnot"
 #. module: base
 #: field:res.partner.bank.type,format_layout:0
 msgid "Format Layout"
-msgstr ""
+msgstr "Muotoile asettelu"
 
 #. module: base
 #: field:ir.model.fields,selection:0
@@ -11680,12 +11726,12 @@ msgstr "Valitaoptiot"
 #. module: base
 #: field:res.partner.category,parent_right:0
 msgid "Right parent"
-msgstr ""
+msgstr "Oikea ylätaso"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_openid
 msgid "OpenID Authentification"
-msgstr ""
+msgstr "OpenID autentikointi"
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_thunderbird
@@ -11715,12 +11761,12 @@ msgstr "Kopioi objekti"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mail
 msgid "Emails Management"
-msgstr ""
+msgstr "Sähköpostien hallinta"
 
 #. module: base
 #: field:ir.actions.server,trigger_name:0
 msgid "Trigger Signal"
-msgstr ""
+msgstr "Triggeröintisignaali"
 
 #. module: base
 #: code:addons/base/res/res_users.py:119
@@ -11751,7 +11797,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_country_state
 #: model:ir.ui.menu,name:base.menu_country_state_partner
 msgid "Fed. States"
-msgstr ""
+msgstr "Osavaltiot"
 
 #. module: base
 #: view:ir.model:0
@@ -11786,7 +11832,7 @@ msgstr "Taulukon viite"
 #: code:addons/base/ir/ir_mail_server.py:443
 #, python-format
 msgid "Mail delivery failed"
-msgstr ""
+msgstr "Sähköpostin lähetys epäonnistui"
 
 #. module: base
 #: field:ir.actions.act_window,res_model:0
@@ -12146,6 +12192,8 @@ msgid ""
 "External Key/Identifier that can be used for data integration with third-"
 "party systems"
 msgstr ""
+"Ulkoinen avain/tunniste jota voidaan käyttää ulkoisten järjestelmien "
+"tietojen integrointtiin"
 
 #. module: base
 #: model:ir.module.module,description:base.module_mrp_operations
@@ -12253,7 +12301,7 @@ msgstr "Auttaa sinua hallitsemaan tarjouksia, myyntitilauksia ja laskuja"
 #. module: base
 #: field:res.groups,implied_ids:0
 msgid "Inherits"
-msgstr ""
+msgstr "Periytyvä"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -12355,7 +12403,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_users_ldap
 msgid "Authentication via LDAP"
-msgstr ""
+msgstr "LDAP autentikointi"
 
 #. module: base
 #: view:workflow.activity:0
@@ -12383,7 +12431,7 @@ msgstr ""
 #. module: base
 #: help:ir.values,value:0
 msgid "Default value (pickled) or reference to an action"
-msgstr ""
+msgstr "Oletusarvo (valittu) tai viite toimintoon"
 
 #. module: base
 #: sql_constraint:res.groups:0
@@ -12442,7 +12490,7 @@ msgstr ""
 #. module: base
 #: view:ir.rule:0
 msgid "Rule definition (domain filter)"
-msgstr ""
+msgstr "Säännön määrittely (toimialue suodatin)"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_instance
@@ -12510,7 +12558,7 @@ msgstr "Päiväykset myyntitilauksella"
 #. module: base
 #: view:ir.attachment:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Luontikuukausi"
 
 #. module: base
 #: model:res.country,name:base.nl
@@ -12541,12 +12589,12 @@ msgstr "Matalan tason objektit"
 #. module: base
 #: help:ir.values,model:0
 msgid "Model to which this entry applies"
-msgstr ""
+msgstr "Malli mitä tämä vienti koskee"
 
 #. module: base
 #: field:res.country,address_format:0
 msgid "Address Format"
-msgstr ""
+msgstr "Osoitteen muotoilu"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_values
@@ -12556,7 +12604,7 @@ msgstr "ir.values"
 #. module: base
 #: model:res.groups,name:base.group_no_one
 msgid "Technical Features"
-msgstr ""
+msgstr "Tekniset ominaisuudet"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -12576,12 +12624,12 @@ msgstr ""
 #: view:ir.model.data:0
 #: model:ir.ui.menu,name:base.ir_model_data_menu
 msgid "External Identifiers"
-msgstr ""
+msgstr "Ulkoiset tunnisteet"
 
 #. module: base
 #: model:res.groups,name:base.group_sale_salesman
 msgid "User - Own Leads Only"
-msgstr ""
+msgstr "Käyttäjä - vain omat liidit"
 
 #. module: base
 #: model:res.country,name:base.cd
@@ -12625,7 +12673,7 @@ msgstr "Kutsujen määrä"
 #: code:addons/base/res/res_bank.py:189
 #, python-format
 msgid "BANK"
-msgstr ""
+msgstr "PANKKI"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -12827,7 +12875,7 @@ msgstr "Runko"
 #: code:addons/base/ir/ir_mail_server.py:199
 #, python-format
 msgid "Connection test succeeded!"
-msgstr ""
+msgstr "Yhteystesti onnistui!"
 
 #. module: base
 #: view:partner.massmail.wizard:0
@@ -12869,11 +12917,13 @@ msgid ""
 "Please define at least one SMTP server, or provide the SMTP parameters "
 "explicitly."
 msgstr ""
+"Ole hyvä ja määrittele ainakin yksi SMTP palvelin, tai määrittele SMTP "
+"parametrit täsmällisesti"
 
 #. module: base
 #: view:ir.attachment:0
 msgid "Filter on my documents"
-msgstr ""
+msgstr "Suodata dokumenttejani"
 
 #. module: base
 #: help:ir.actions.server,code:0
@@ -12912,7 +12962,7 @@ msgstr "Gabon"
 #. module: base
 #: model:res.groups,name:base.group_multi_company
 msgid "Multi Companies"
-msgstr ""
+msgstr "Moniyritys"
 
 #. module: base
 #: view:ir.model:0
@@ -12931,7 +12981,7 @@ msgstr "Grönlanti"
 #. module: base
 #: model:res.groups,name:base.group_sale_salesman_all_leads
 msgid "User - All Leads"
-msgstr ""
+msgstr "Käyttäjä - Kaikki liidit"
 
 #. module: base
 #: field:res.partner.bank,acc_number:0
@@ -13017,12 +13067,12 @@ msgstr "Kuluttajat"
 #. module: base
 #: view:res.company:0
 msgid "Set Bank Accounts"
-msgstr ""
+msgstr "Aseta pankkitilit"
 
 #. module: base
 #: field:ir.actions.client,tag:0
 msgid "Client action tag"
-msgstr ""
+msgstr "Asiastoiminnon tagi"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:189
@@ -13033,7 +13083,7 @@ msgstr "Et voi poistaa kieltä joka on käyttäjän asettama kieli!"
 #. module: base
 #: field:ir.values,model_id:0
 msgid "Model (change only)"
-msgstr ""
+msgstr "Malli (vain muutos)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_marketing_campaign_crm_demo
@@ -13070,7 +13120,7 @@ msgstr "Nykyinen käyttäjä"
 #. module: base
 #: field:res.company,company_registry:0
 msgid "Company Registry"
-msgstr ""
+msgstr "Yritysrekisteri"
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -13095,6 +13145,8 @@ msgid ""
 "The object that should receive the workflow signal (must have an associated "
 "workflow)"
 msgstr ""
+"Objekti jonka tulisi saada työnkulkusignaali (pitää olla yhdistetty "
+"työnkulku)"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_account_voucher
@@ -13113,7 +13165,7 @@ msgstr "Länsi-Sahara"
 #. module: base
 #: model:ir.module.category,name:base.module_category_account_voucher
 msgid "Invoicing & Payments"
-msgstr ""
+msgstr "Laskutus & maksut"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_company_form
@@ -13438,7 +13490,7 @@ msgstr ""
 #. module: base
 #: field:res.company,vat:0
 msgid "Tax ID"
-msgstr ""
+msgstr "Vero ID"
 
 #. module: base
 #: field:ir.model.fields,field_description:0
@@ -13588,7 +13640,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_no_autopicking
 msgid "Picking Before Manufacturing"
-msgstr ""
+msgstr "Keräily ennen valmistusta"
 
 #. module: base
 #: model:res.country,name:base.wf
@@ -13613,7 +13665,7 @@ msgstr "verkkokalenteri"
 #. module: base
 #: field:ir.model.data,name:0
 msgid "External Identifier"
-msgstr ""
+msgstr "Ulkoinen tunniste"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.grant_menu_access
@@ -13653,6 +13705,8 @@ msgid ""
 "This cron task is currently being executed and may not be modified, please "
 "try again in a few minutes"
 msgstr ""
+"Tätä ajastintoimintoja suoritetaan parhaillaan, eikä sitä voida nyt muuttaa. "
+"Ole hyvä ja yritä uudestaan muutaman minuutin kuluttua"
 
 #. module: base
 #: model:ir.module.module,description:base.module_product_expiry
@@ -13745,7 +13799,7 @@ msgstr "Virhe"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_crypt
 msgid "DB Password Encryption"
-msgstr ""
+msgstr "Tietokantasalasanan kryptaus"
 
 #. module: base
 #: help:workflow.transition,act_to:0
@@ -13755,7 +13809,7 @@ msgstr "Kohdeaktiviteetti"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_check_writing
 msgid "Check writing"
-msgstr ""
+msgstr "Tarkista kirjoitus"
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_layout
@@ -13787,7 +13841,7 @@ msgstr "Tekninen opas"
 #. module: base
 #: view:res.company:0
 msgid "Address Information"
-msgstr ""
+msgstr "Osoitetiedot"
 
 #. module: base
 #: model:res.country,name:base.tz
@@ -13835,7 +13889,7 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "Supplier Partners"
-msgstr ""
+msgstr "Toimittajan kumppanit"
 
 #. module: base
 #: view:res.config.installer:0
@@ -13874,7 +13928,7 @@ msgstr "EAN tarkistus"
 #. module: base
 #: view:res.partner:0
 msgid "Customer Partners"
-msgstr ""
+msgstr "Asiakkaan kumppanit"
 
 #. module: base
 #: sql_constraint:res.users:0
@@ -13939,7 +13993,7 @@ msgstr "Sisäinen ylä- / alatunniste"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm
 msgid "CRM"
-msgstr ""
+msgstr "CRM"
 
 #. module: base
 #: code:addons/base/module/wizard/base_export_language.py:59
@@ -13964,7 +14018,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_followup
 msgid "Followup Management"
-msgstr ""
+msgstr "Seuranan hallinta"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr
@@ -14015,6 +14069,7 @@ msgstr ""
 #: help:ir.actions.act_window,usage:0
 msgid "Used to filter menu and home actions from the user form."
 msgstr ""
+"Käytetään suodattamaan valikko ja kotitoimintoja käyttäjän lomakkeelta"
 
 #. module: base
 #: model:res.country,name:base.sa
@@ -14024,12 +14079,12 @@ msgstr "Saudi-Arabia"
 #. module: base
 #: help:res.company,rml_header1:0
 msgid "Appears by default on the top right corner of your printed documents."
-msgstr ""
+msgstr "Näkyy oletuksena tulostettujen dokumenttien oikeassa ylänurkassa."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail_crm_claim
 msgid "eMail Gateway for CRM Claim"
-msgstr ""
+msgstr "sähköpostin välityspalvelin CRM reklamaatiolle"
 
 #. module: base
 #: help:res.partner,supplier:0
@@ -14129,7 +14184,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,description:base.module_auth_openid
 msgid "Allow users to login through OpenID."
-msgstr ""
+msgstr "Salli käyttäjien kirjautuminen käyttäen OpenID:tä."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_payment
@@ -14210,7 +14265,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_lead
 msgid "Leads & Opportunities"
-msgstr "Mahdollisuudet"
+msgstr "Liidit ja mahdollisuudet"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -14242,7 +14297,7 @@ msgstr "Objektin suhde"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_voucher
 msgid "eInvoicing & Payments"
-msgstr ""
+msgstr "sähköinen laskutus ja maksut"
 
 #. module: base
 #: view:ir.rule:0
@@ -14314,7 +14369,7 @@ msgstr "Alakenttä"
 #. module: base
 #: view:ir.rule:0
 msgid "Detailed algorithm:"
-msgstr ""
+msgstr "Yksilöity algoritmi:"
 
 #. module: base
 #: field:ir.actions.act_window,usage:0
@@ -14395,7 +14450,7 @@ msgstr "Et voi poistaa kenttää '%s' !"
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
-msgstr ""
+msgstr "Sallitut yritykset"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_de
@@ -14421,7 +14476,7 @@ msgstr "Suorita suunnitellut päivitykset"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_journal
 msgid "Invoicing Journals"
-msgstr ""
+msgstr "Laskutuspäiväkirjat"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -14696,7 +14751,7 @@ msgstr "Jamaika"
 #: field:res.partner,color:0
 #: field:res.partner.address,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Väri-indeksi"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_category_form
@@ -14804,7 +14859,7 @@ msgstr "Tšekki / Čeština"
 #. module: base
 #: model:ir.module.category,name:base.module_category_generic_modules
 msgid "Generic Modules"
-msgstr ""
+msgstr "Yleiset moduulit"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_supplier_form
@@ -14848,7 +14903,7 @@ msgstr ""
 #. module: base
 #: help:ir.mail_server,smtp_port:0
 msgid "SMTP Port. Usually 465 for SSL, and 25 or 587 for other cases."
-msgstr ""
+msgstr "SMTP portti. Yleensä 465 (SSL) ja 25 tai 587 muissa tapauksissa."
 
 #. module: base
 #: view:ir.sequence:0
@@ -14923,6 +14978,8 @@ msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing."
 msgstr ""
+"Auttaa sinua hoitamaan kirjanpitotarpeesi, jos et ole kirjanpitäjä, "
+"suosittelemme että asennat vain laskutuksen."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_plugin_thunderbird
@@ -14963,7 +15020,7 @@ msgstr ""
 #. module: base
 #: view:ir.values:0
 msgid "Action Bindings/Defaults"
-msgstr ""
+msgstr "Toiminnon sidokset/oletusarvot"
 
 #. module: base
 #: view:ir.rule:0
@@ -14978,7 +15035,7 @@ msgstr ""
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Change Color"
-msgstr ""
+msgstr "Vaihda väriä"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_15
@@ -15016,7 +15073,7 @@ msgstr ""
 #. module: base
 #: field:ir.module.module,auto_install:0
 msgid "Automatic Installation"
-msgstr ""
+msgstr "Automaattinen asennus"
 
 #. module: base
 #: model:res.country,name:base.jp
@@ -15146,7 +15203,7 @@ msgstr "Ehto"
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
-msgstr ""
+msgstr "Valuttakurssin arvo verrattuna arvoon 1."
 
 #. module: base
 #: field:ir.ui.view,name:0
@@ -15256,7 +15313,7 @@ msgstr "Turks- ja Caicossaaret"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail_project_issue
 msgid "eMail Gateway for Project Issues"
-msgstr ""
+msgstr "Sähköpostin välityspalvein projektitapahtumille"
 
 #. module: base
 #: field:res.partner.bank,partner_id:0
@@ -15311,6 +15368,8 @@ msgid ""
 "Manage relations with prospects and customers using leads, opportunities, "
 "requests or issues."
 msgstr ""
+"Hallinnoi suhteita mahdollisten asiakkaiden kanssa käyttäen liidejä, "
+"mahdollisuuksia, pyyntöjä ja tapauksia."
 
 #. module: base
 #: selection:res.partner.address,type:0
diff --git a/openerp/addons/base/res/res_country.py b/openerp/addons/base/res/res_country.py
index f240784dc47..c32302a0783 100644
--- a/openerp/addons/base/res/res_country.py
+++ b/openerp/addons/base/res/res_country.py
@@ -21,6 +21,23 @@
 
 from osv import fields, osv
 
+def location_name_search(self, cr, user, name='', args=None, operator='ilike',
+                         context=None, limit=100):
+    if not args:
+        args = []
+
+    ids = []
+    if len(name) == 2:
+        ids = self.search(cr, user, [('code', 'ilike', name)] + args,
+                          limit=limit, context=context)
+
+    search_domain = [('name', operator, name)]
+    if ids: search_domain.append(('id', 'not in', ids))
+    ids.extend(self.search(cr, user, search_domain + args,
+                           limit=limit, context=context))
+
+    locations = self.name_get(cr, user, ids, context)
+    return sorted(locations, key=lambda (id, name): ids.index(id))
 
 class Country(osv.osv):
     _name = 'res.country'
@@ -48,23 +65,10 @@ addresses belonging to this country.\n\nYou can use the python-style string pate
     _defaults = {
         'address_format': "%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s\n%(country_name)s",
     }
-
-    def name_search(self, cr, user, name='', args=None, operator='ilike',
-            context=None, limit=100):
-        if not args:
-            args=[]
-        if not context:
-            context={}
-        ids = False
-        if len(name) == 2:
-            ids = self.search(cr, user, [('code', 'ilike', name)] + args,
-                    limit=limit, context=context)
-        if not ids:
-            ids = self.search(cr, user, [('name', operator, name)] + args,
-                    limit=limit, context=context)
-        return self.name_get(cr, user, ids, context)
     _order='name'
 
+    name_search = location_name_search
+
     def create(self, cursor, user, vals, context=None):
         if 'code' in vals:
             vals['code'] = vals['code'].upper()
@@ -77,8 +81,6 @@ addresses belonging to this country.\n\nYou can use the python-style string pate
         return super(Country, self).write(cursor, user, ids, vals,
                 context=context)
 
-Country()
-
 
 class CountryState(osv.osv):
     _description="Country state"
@@ -90,23 +92,9 @@ class CountryState(osv.osv):
         'code': fields.char('State Code', size=3,
             help='The state code in three chars.\n', required=True),
     }
-    def name_search(self, cr, user, name='', args=None, operator='ilike',
-            context=None, limit=100):
-        if not args:
-            args = []
-        if not context:
-            context = {}
-        ids = self.search(cr, user, [('code', 'ilike', name)] + args, limit=limit,
-                context=context)
-        if not ids:
-            ids = self.search(cr, user, [('name', operator, name)] + args,
-                    limit=limit, context=context)
-        return self.name_get(cr, user, ids, context)
-
     _order = 'code'
-CountryState()
-
 
+    name_search = location_name_search
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/loglevels.py b/openerp/loglevels.py
index 29bd6e5dc18..374efea8d84 100644
--- a/openerp/loglevels.py
+++ b/openerp/loglevels.py
@@ -121,17 +121,22 @@ def get_encodings(hint_encoding='utf-8'):
         if prefenc:
             yield prefenc
 
-def ustr(value, hint_encoding='utf-8'):
-    """This method is similar to the builtin `str` method, except
-       it will return unicode() string.
+def ustr(value, hint_encoding='utf-8', errors='strict'):
+    """This method is similar to the builtin `unicode`, except
+    that it may try multiple encodings to find one that works
+    for decoding `value`, and defaults to 'utf-8' first.
 
-    @param value: the value to convert
-    @param hint_encoding: an optional encoding that was detected
-                          upstream and should be tried first to
-                          decode ``value``.
-
-    @rtype: unicode
-    @return: unicode string
+    :param: value: the value to convert
+    :param: hint_encoding: an optional encoding that was detecte
+        upstream and should be tried first to decode ``value``.
+    :param str error: optional `errors` flag to pass to the unicode
+        built-in to indicate how illegal character values should be
+        treated when converting a string: 'strict', 'ignore' or 'replace'.
+        Passing anything other than 'strict' means that the first
+        encoding tried will be used, even if it's not the correct
+        one to use, so be careful! Ignore if value is not a string/unicode.
+    :rtype: unicode
+    :raise: UnicodeError if value cannot be coerced to unicode
     """
     if isinstance(value, Exception):
         return exception_to_unicode(value)
@@ -147,7 +152,7 @@ def ustr(value, hint_encoding='utf-8'):
 
     for ln in get_encodings(hint_encoding):
         try:
-            return unicode(value, ln)
+            return unicode(value, ln, errors=errors)
         except Exception:
             pass
     raise UnicodeError('unable to convert %r' % (value,))
diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index 0051fe6dea7..506c1e4bcba 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -357,6 +357,8 @@ def dispatch_rpc(service_name, method, params):
             if rpc_request and rpc_response_flag:
                 log(rpc_request,logging.DEBUG,'%s.%s'%(service_name,method), replace_request_password(params))
 
+        threading.current_thread().uid = None
+        threading.current_thread().dbname = None
         result = ExportService.getService(service_name).dispatch(method, params)
 
         if rpc_request_flag or rpc_response_flag:
diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index a7136e24269..46beaecd323 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -561,6 +561,7 @@ class objects_proxy(netsvc.ExportService):
 
     def dispatch(self, method, params):
         (db, uid, passwd ) = params[0:3]
+        threading.current_thread().uid = uid
         params = params[3:]
         if method == 'obj_list':
             raise NameError("obj_list has been discontinued via RPC as of 6.0, please query ir.model directly!")
@@ -594,6 +595,7 @@ class wizard(netsvc.ExportService):
 
     def dispatch(self, method, params):
         (db, uid, passwd ) = params[0:3]
+        threading.current_thread().uid = uid
         params = params[3:]
         if method not in ['execute','create']:
             raise KeyError("Method not supported %s" % method)
@@ -645,6 +647,7 @@ class report_spool(netsvc.ExportService):
 
     def dispatch(self, method, params):
         (db, uid, passwd ) = params[0:3]
+        threading.current_thread().uid = uid
         params = params[3:]
         if method not in ['report', 'report_get', 'render_report']:
             raise KeyError("Method not supported %s" % method)