openerp-dev-web team mailing list archive

Thread
Date

[Merge] lp:~openerp-dev/openobject-client-web/6.0-opw-4311-sma into lp:openobject-client-web

To: mp+53439@xxxxxxxxxxxxxxxxxx
From: "Sananaz \(Open ERP\)" <sma@xxxxxxxxxxx>
Date: Tue, 15 Mar 2011 13:40:57 -0000
Reply-to: mp+53439@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Sananaz (Open ERP) has proposed merging lp:~openerp-dev/openobject-client-web/6.0-opw-4311-sma into lp:openobject-client-web.

Requested reviews:
  OpenERP SA's Web Client R&D (openerp-dev-web)
Related bugs:
  Bug #726491 in OpenERP Web Client: "Wizards do not respect the existing OSV.OSV record and gets called disregard to the record exists or not."
  https://bugs.launchpad.net/openobject-client-web/+bug/726491

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-4311-sma/+merge/53439

Hello,

Please check with the sidebar actions:

Go to Product list > Click on `New` (Don't Save) > Click Procurement Request (Actions at sidebar) 
It gives traceback.
So just give the message (`You must save this record to perform the action !`) same as GTK client if form is not saved don't perform any action.

Thank you.

-- 
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-4311-sma/+merge/53439
Your team OpenERP SA's Web Client R&D is requested to review the proposed merge of lp:~openerp-dev/openobject-client-web/6.0-opw-4311-sma into lp:openobject-client-web.

=== modified file 'addons/openerp/controllers/preferences.py'
--- addons/openerp/controllers/preferences.py	2011-02-10 16:09:23 +0000
+++ addons/openerp/controllers/preferences.py	2011-03-15 13:37:09 +0000
@@ -34,7 +34,7 @@
     action = "/openerp/pref/password"
     string = _('Change your password')
 
-int_pattern = re.compile(r'\d+')
+int_pattern = re.compile(r'^-{0,1}\d+$')
 class Preferences(Form):
 
     _cp_path = "/openerp/pref"

=== added file 'addons/openerp/po/javascript/ar.po.OTHER'
--- addons/openerp/po/javascript/ar.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/javascript/ar.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,95 @@
+# Arabic translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-16 16:50+0000\n"
+"Last-Translator: kifcaliph <kifcaliph@xxxxxxxxxxx>\n"
+"Language-Team: Arabic <ar@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: static/javascript/form.js:92
+#, python-format
+msgid "You selected to open %(tabs)s tabs - do you want to continue?"
+msgstr "Ù„Ù‚Ø¯ Ø§Ø®ØªØ±Øª ÙØªØ Ø§Ù„Ù…Ø¨ÙˆØ¨Ø©  %(tabs)s - Ù‡Ù„ ØªØ±ÙŠØ¯ Ø§Ù„Ø¥ÙƒÙ…Ø§Ù„ØŸ"
+
+#: static/javascript/form.js:169
+msgid "Invalid form, correct red fields."
+msgstr "Ù†Ù…ÙˆØ°Ø¬ Ø®Ø§Ø·Ø¦ØŒ Ø±Ø¬Ø§Ø¡ ØªØµØÙŠØ Ø§Ù„ØÙ‚ÙˆÙ„ Ø§Ù„ØÙ…Ø±Ø§Ø¡."
+
+#: static/javascript/form.js:204
+msgid "Do you really want to delete this record?"
+msgstr "Ù‡Ù„ ØªØ±ÙŠØ¯ ØØ°Ù Ù‡Ø°Ø§ Ø§Ù„Ø³Ø¬Ù„ØŸ"
+
+#: static/javascript/form.js:953
+msgid "You must select one or several records !"
+msgstr "ÙŠØ¬Ø¨ Ø§Ù† ØªØ®ØªØ§Ø± Ø³Ø¬Ù„ Ø§Ùˆ Ù…Ø¬Ù…ÙˆØ¹Ø© Ù…Ù† Ø§Ù„Ø³Ø¬Ù„Ø§Øª !"
+
+#: static/javascript/form.js:1116
+msgid "Do you really want to delete the attachment"
+msgstr "Ù‡Ù„ ØªØ±ÙŠØ¯ ØØ°Ù Ø§Ù„Ù…Ø±ÙÙ‚Ø§Øª"
+
+#: static/javascript/form.js:1150
+msgid "No record selected ! You can only attach to existing record."
+msgstr "Ù„Ù… ÙŠØªÙ… Ø¥Ø®ØªÙŠØ§Ø± Ø³Ø¬Ù„ ! ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ù„Ø¥Ø±ÙØ§Ù‚ Ù…Ù† Ø®Ù„Ø§Ù„ Ø³Ø¬Ù„."
+
+#: static/javascript/form.js:1209
+msgid "OpenERP - Error"
+msgstr "Ø®Ø·Ø£ Ø¨Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬ - OpenERP"
+
+#: static/javascript/form.js:1280
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+"ØªØØ°ÙŠØ±ØŒ Ù‚Ø¯ ØªÙ… ØªØ¹Ø¯ÙŠÙ„ Ø§Ù„Ø³Ø¬Ù„ØŒ\n"
+"Ù„Ù… ØªÙØÙØ¸ Ø§Ù„ØªØ¹Ø¯ÙŠÙ„Ø§Øª."
+
+#: static/javascript/listgrid.js:499 static/javascript/o2m.js:95
+msgid "To edit Record, please first save it."
+msgstr "Ù„ØªØØ±ÙŠØ± Ø§Ù„Ø³Ø¬Ù„ØŒ Ø±Ø¬Ø§Ø¡ Ø§ØÙØ¸Ù‡."
+
+#: static/javascript/listgrid.js:607
+msgid "Do you really want to delete selected record(s) ?"
+msgstr "Ù‡Ù„ ØªØ±ÙŠØ¯ ØØ°Ù Ø§Ù„Ø³Ø¬Ù„/Ø§Ù„Ø³Ø¬Ù„Ø§ØªØŸ"
+
+#: static/javascript/m2o.js:506
+msgid "error in display::"
+msgstr "Ø®Ø·Ø£ ÙÙŠ Ø§Ù„Ø¹Ø±Ø¶::"
+
+#: static/javascript/o2m.js:54
+msgid "Do you really want to delete record ?"
+msgstr "Ù‡Ù„ ØªØ±ÙŠØ¯ ØØ°Ù Ø§Ù„Ø³Ø¬Ù„ØŸ"
+
+#: static/javascript/viewed.js:63
+msgid "Do you really want to remove this node?"
+msgstr "Ù‡Ù„ ØªØ±ÙŠØ¯ Ø¥Ø²Ø§Ù„Ø© Ù‡Ø°Ø§ Ø§Ù„Ø·Ø±ÙØŸ"
+
+#: static/javascript/viewed.js:329
+msgid "Do you really wants to create an inherited view here?"
+msgstr "Ù‡Ù„ ØªØ±ÙŠØ¯ Ø¥Ù†Ø´Ø§Ø¡ Ø¹Ø±Ø¶ Ù…Ù† Ø§Ù„Ù…ÙˆØ±ÙˆØ« Ù‡Ù†Ø§ØŸ"
+
+#: static/javascript/openerp/openerp.base.js:127
+msgid "doLoadingSuccess: Cannot parse JSON"
+msgstr "ØªÙ… Ø§Ù„ØªØÙ…ÙŠÙ„ Ø¨Ù†Ø¬Ø§Ø: Ùˆ Ù„ÙƒÙ† Ù„Ø§ ÙŠÙ…ÙƒÙ† Ù‚Ø±Ø§Ø¡Ø© Ø§Ù„Ù€ JSON"
+
+#: static/javascript/openerp/openerp.base.js:326
+msgid "Loading"
+msgstr "Ø¬Ø§Ø±ÙŠ Ø§Ù„ØªØÙ…ÙŠÙ„"
+
+#: static/javascript/openerp/openerp.ui.tips.js:51
+msgid "Object"
+msgstr "ÙƒØ§Ø¦Ù†"
+
+#: static/javascript/openerp/openerp.ui.tips.js:52
+msgid "Field"
+msgstr "ØÙ‚Ù„"

=== added file 'addons/openerp/po/javascript/bg.po.OTHER'
--- addons/openerp/po/javascript/bg.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/javascript/bg.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,95 @@
+# Bulgarian translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-27 09:25+0000\n"
+"Last-Translator: Dimitar Markov <dimitar.markov@xxxxxxxxx>\n"
+"Language-Team: Bulgarian <bg@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: static/javascript/form.js:92
+#, python-format
+msgid "You selected to open %(tabs)s tabs - do you want to continue?"
+msgstr "Ð˜Ð·Ð±Ñ€Ð°Ñ…Ñ‚Ðµ Ð´Ð° Ð¾Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ðµ %(tabs)s - Ð¸ÑÐºÐ°Ñ‚Ðµ Ð»Ð¸ Ð´Ð° Ð¿Ñ€Ð¾Ð´ÑŠÐ»Ð¶Ð¸Ñ‚Ðµ?"
+
+#: static/javascript/form.js:169
+msgid "Invalid form, correct red fields."
+msgstr "ÐÐµÐ²Ð°Ð»Ð¸Ð´Ð½Ð° Ñ„Ð¾Ñ€Ð¼Ð°, ÐºÐ¾Ñ€ÐµÐ³Ð¸Ñ€Ð°Ð¹Ñ‚Ðµ Ñ‡ÐµÑ€Ð²ÐµÐ½Ð¸Ñ‚Ðµ Ð¿Ð¾Ð»ÐµÑ‚Ð°."
+
+#: static/javascript/form.js:204
+msgid "Do you really want to delete this record?"
+msgstr "ÐÐ°Ð¸ÑÑ‚Ð¸Ð½Ð° Ð»Ð¸ Ð¶ÐµÐ»Ð°ÐµÑ‚Ðµ Ð´Ð° Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ Ñ‚Ð¾Ð·Ð¸ Ð·Ð°Ð¿Ð¸Ñ"
+
+#: static/javascript/form.js:953
+msgid "You must select one or several records !"
+msgstr "Ð’Ð¸Ðµ Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ ÐµÐ´Ð¸Ð½ Ð¸Ð»Ð¸ Ð½ÑÐºÐ¾Ð»ÐºÐ¾ Ð·Ð°Ð¿Ð¸ÑÐ° !"
+
+#: static/javascript/form.js:1116
+msgid "Do you really want to delete the attachment"
+msgstr "ÐÐ°Ð¸ÑÑ‚Ð¸Ð½Ð° Ð»Ð¸ Ð¶ÐµÐ»Ð°ÐµÑ‚Ðµ Ð´Ð° Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ Ð¿Ñ€Ð¸ÐºÑ€ÐµÐ¿ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»"
+
+#: static/javascript/form.js:1150
+msgid "No record selected ! You can only attach to existing record."
+msgstr "ÐÑÐ¼Ð° Ð·Ð°Ð¿Ð¸Ñ Ð¸Ð·Ð±Ñ€Ð°Ð½Ð¸! ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ð´Ð° Ð¿Ñ€Ð¸ÐºÐ°Ñ‡Ð¸Ñ‚Ðµ ÐºÑŠÐ¼ ÑÑŠÑ‰ÐµÑÑ‚Ð²ÑƒÐ²Ð°Ñ‰ Ð·Ð°Ð¿Ð¸Ñ."
+
+#: static/javascript/form.js:1209
+msgid "OpenERP - Error"
+msgstr "OpenERP - Ð“Ñ€ÐµÑˆÐºÐ°"
+
+#: static/javascript/form.js:1280
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+"Ð’Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ, Ð·Ð°Ð¿Ð¸ÑÑŠÑ‚ Ðµ Ð±Ð¸Ð» Ð¿Ñ€Ð¾Ð¼ÐµÐ½ÐµÐ½,\n"
+"ÐŸÑ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ Ñ‰Ðµ Ð±ÑŠÐ´Ð°Ñ‚ Ð¾Ñ‚Ñ…Ð²ÑŠÑ€Ð»ÐµÐ½Ð¸."
+
+#: static/javascript/listgrid.js:499 static/javascript/o2m.js:95
+msgid "To edit Record, please first save it."
+msgstr "Ð—Ð° Ð´Ð° Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð°Ñ‚Ðµ Ð·Ð°Ð¿Ð¸Ñ, Ð¼Ð¾Ð»Ñ Ð¿ÑŠÑ€Ð²Ð¾ Ð´Ð° Ð³Ð¾ Ð·Ð°Ð¿Ð°Ð·ÐµÑ‚Ðµ."
+
+#: static/javascript/listgrid.js:607
+msgid "Do you really want to delete selected record(s) ?"
+msgstr "ÐÐ°Ð¸ÑÑ‚Ð¸Ð½Ð° Ð»Ð¸ Ð¸ÑÐºÐ°Ñ‚Ðµ Ð´Ð° Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ Ð¸Ð·Ð±Ñ€Ð°Ð½Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñ(Ð¸)?"
+
+#: static/javascript/m2o.js:506
+msgid "error in display::"
+msgstr "Ð³Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ð¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ::"
+
+#: static/javascript/o2m.js:54
+msgid "Do you really want to delete record ?"
+msgstr "ÐÐ°Ð¸ÑÑ‚Ð¸Ð½Ð° Ð»Ð¸ Ð¸ÑÐºÐ°Ñ‚Ðµ Ð´Ð° Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ Ð·Ð°Ð¿Ð¸Ñ?"
+
+#: static/javascript/viewed.js:63
+msgid "Do you really want to remove this node?"
+msgstr "ÐÐ°Ð¸ÑÑ‚Ð¸Ð½Ð° Ð»Ð¸ Ð¸ÑÐºÐ°Ñ‚Ðµ Ð´Ð° Ð¿Ñ€ÐµÐ¼Ð°Ñ…Ð½ÐµÑ‚Ðµ Ñ‚Ð¾Ð·Ð¸ Ð²ÑŠÐ·ÐµÐ»?"
+
+#: static/javascript/viewed.js:329
+msgid "Do you really wants to create an inherited view here?"
+msgstr "ÐÐ°Ð¸ÑÑ‚Ð¸Ð½Ð° Ð»Ð¸ Ð¸ÑÐºÐ° Ð´Ð° ÑÑŠÐ·Ð´Ð°Ð´Ðµ Ð½Ð°ÑÐ»ÐµÐ´ÐµÐ½Ð½ Ð¸Ð·Ð³Ð»ÐµÐ´ Ñ‚ÑƒÐº?"
+
+#: static/javascript/openerp/openerp.base.js:127
+msgid "doLoadingSuccess: Cannot parse JSON"
+msgstr "doLoadingSuccess: Cannot parse JSON"
+
+#: static/javascript/openerp/openerp.base.js:326
+msgid "Loading"
+msgstr "Ð—Ð°Ñ€ÐµÐ¶Ð´Ð°Ð½Ðµ"
+
+#: static/javascript/openerp/openerp.ui.tips.js:51
+msgid "Object"
+msgstr "ÐžÐ±ÐµÐºÑ‚"
+
+#: static/javascript/openerp/openerp.ui.tips.js:52
+msgid "Field"
+msgstr "ÐŸÐ¾Ð»Ðµ"

=== modified file 'addons/openerp/po/javascript/ca.po'
--- addons/openerp/po/javascript/ca.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/ca.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:45+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/de.po'
--- addons/openerp/po/javascript/de.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/de.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:45+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== modified file 'addons/openerp/po/javascript/es.po'
--- addons/openerp/po/javascript/es.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/es.po	2011-03-15 13:37:09 +0000
@@ -15,8 +15,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== modified file 'addons/openerp/po/javascript/eu.po'
--- addons/openerp/po/javascript/eu.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/eu.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:45+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== added file 'addons/openerp/po/javascript/fi.po.OTHER'
--- addons/openerp/po/javascript/fi.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/javascript/fi.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,93 @@
+# Finnish translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-20 22:04+0000\n"
+"Last-Translator: Harri Luuppala <Unknown>\n"
+"Language-Team: Finnish <fi@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: static/javascript/form.js:92
+#, python-format
+msgid "You selected to open %(tabs)s tabs - do you want to continue?"
+msgstr "Valitsit avattavaksi %(tabs)s vÃ¤lilehdet - haluatko jatkaa?"
+
+#: static/javascript/form.js:169
+msgid "Invalid form, correct red fields."
+msgstr "Puutteellisesti tÃ¤ytetty lomake. Korjaa punaisella merkityt kentÃ¤t."
+
+#: static/javascript/form.js:204
+msgid "Do you really want to delete this record?"
+msgstr "Haluatko poistaa tÃ¤mÃ¤n tietueen?"
+
+#: static/javascript/form.js:953
+msgid "You must select one or several records !"
+msgstr "Valitse vÃ¤hintÃ¤Ã¤n yksi tietue!"
+
+#: static/javascript/form.js:1116
+msgid "Do you really want to delete the attachment"
+msgstr "Haluatko poistaa valitun liitteen?"
+
+#: static/javascript/form.js:1150
+msgid "No record selected ! You can only attach to existing record."
+msgstr "Tietuetta ei ole valittu! Voit liittÃ¤Ã¤ vai valittuun tietueeseen."
+
+#: static/javascript/form.js:1209
+msgid "OpenERP - Error"
+msgstr "OpenERP - Virhe"
+
+#: static/javascript/form.js:1280
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr "Varoitus: tietuetta on muutettu."
+
+#: static/javascript/listgrid.js:499 static/javascript/o2m.js:95
+msgid "To edit Record, please first save it."
+msgstr ""
+
+#: static/javascript/listgrid.js:607
+msgid "Do you really want to delete selected record(s) ?"
+msgstr "Haluako poistaa valitut tietueet?"
+
+#: static/javascript/m2o.js:506
+msgid "error in display::"
+msgstr "virhe ikkunassa::"
+
+#: static/javascript/o2m.js:54
+msgid "Do you really want to delete record ?"
+msgstr "Haluatko poistaa tietueen?"
+
+#: static/javascript/viewed.js:63
+msgid "Do you really want to remove this node?"
+msgstr "Haluatko poistaa tÃ¤mÃ¤n liitoksen?"
+
+#: static/javascript/viewed.js:329
+msgid "Do you really wants to create an inherited view here?"
+msgstr "Haluatko luoda periytyvÃ¤n nÃ¤kymÃ¤n?"
+
+#: static/javascript/openerp/openerp.base.js:127
+msgid "doLoadingSuccess: Cannot parse JSON"
+msgstr "doLoadingSuccess: Cannot parse JSON"
+
+#: static/javascript/openerp/openerp.base.js:326
+msgid "Loading"
+msgstr "Lataa"
+
+#: static/javascript/openerp/openerp.ui.tips.js:51
+msgid "Object"
+msgstr "Objekti"
+
+#: static/javascript/openerp/openerp.ui.tips.js:52
+msgid "Field"
+msgstr "KenttÃ¤"

=== modified file 'addons/openerp/po/javascript/fr.po'
--- addons/openerp/po/javascript/fr.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/fr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:45+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== modified file 'addons/openerp/po/javascript/gl.po'
--- addons/openerp/po/javascript/gl.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/gl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:45+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/hr.po'
--- addons/openerp/po/javascript/hr.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/hr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/hu.po'
--- addons/openerp/po/javascript/hu.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/hu.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:45+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== added file 'addons/openerp/po/javascript/id.po.OTHER'
--- addons/openerp/po/javascript/id.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/javascript/id.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,93 @@
+# Indonesian translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-16 02:59+0000\n"
+"Last-Translator: Homa Posniroha Harahap <Unknown>\n"
+"Language-Team: Indonesian <id@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: static/javascript/form.js:92
+#, python-format
+msgid "You selected to open %(tabs)s tabs - do you want to continue?"
+msgstr ""
+
+#: static/javascript/form.js:169
+msgid "Invalid form, correct red fields."
+msgstr ""
+
+#: static/javascript/form.js:204
+msgid "Do you really want to delete this record?"
+msgstr ""
+
+#: static/javascript/form.js:953
+msgid "You must select one or several records !"
+msgstr ""
+
+#: static/javascript/form.js:1116
+msgid "Do you really want to delete the attachment"
+msgstr ""
+
+#: static/javascript/form.js:1150
+msgid "No record selected ! You can only attach to existing record."
+msgstr ""
+
+#: static/javascript/form.js:1209
+msgid "OpenERP - Error"
+msgstr ""
+
+#: static/javascript/form.js:1280
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+
+#: static/javascript/listgrid.js:499 static/javascript/o2m.js:95
+msgid "To edit Record, please first save it."
+msgstr ""
+
+#: static/javascript/listgrid.js:607
+msgid "Do you really want to delete selected record(s) ?"
+msgstr ""
+
+#: static/javascript/m2o.js:506
+msgid "error in display::"
+msgstr ""
+
+#: static/javascript/o2m.js:54
+msgid "Do you really want to delete record ?"
+msgstr "Apakah Anda yakin untuk menghapus data?"
+
+#: static/javascript/viewed.js:63
+msgid "Do you really want to remove this node?"
+msgstr "Apakah Anda yakin untuk memindahkan node ini?"
+
+#: static/javascript/viewed.js:329
+msgid "Do you really wants to create an inherited view here?"
+msgstr "Apakah Anda yakin untuk membuat sebuah tampilan penerima disini?"
+
+#: static/javascript/openerp/openerp.base.js:127
+msgid "doLoadingSuccess: Cannot parse JSON"
+msgstr "doLoadingSuccess: JSON tidak dapat dijelaskan"
+
+#: static/javascript/openerp/openerp.base.js:326
+msgid "Loading"
+msgstr "Proses pemuatan"
+
+#: static/javascript/openerp/openerp.ui.tips.js:51
+msgid "Object"
+msgstr ""
+
+#: static/javascript/openerp/openerp.ui.tips.js:52
+msgid "Field"
+msgstr ""

=== modified file 'addons/openerp/po/javascript/it.po'
--- addons/openerp/po/javascript/it.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/it.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:45+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== modified file 'addons/openerp/po/javascript/lt.po'
--- addons/openerp/po/javascript/lt.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/lt.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:45+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/lv.po'
--- addons/openerp/po/javascript/lv.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/lv.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:45+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/mn.po'
--- addons/openerp/po/javascript/mn.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/mn.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,14 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+"Generated-By: Babel None\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/nl.po'
--- addons/openerp/po/javascript/nl.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/nl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:45+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== modified file 'addons/openerp/po/javascript/pl.po'
--- addons/openerp/po/javascript/pl.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/pl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== modified file 'addons/openerp/po/javascript/pt.po'
--- addons/openerp/po/javascript/pt.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/pt.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/pt_BR.po'
--- addons/openerp/po/javascript/pt_BR.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/pt_BR.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== modified file 'addons/openerp/po/javascript/ru.po'
--- addons/openerp/po/javascript/ru.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/ru.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/sk.po'
--- addons/openerp/po/javascript/sk.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/sk.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/sr.po'
--- addons/openerp/po/javascript/sr.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/sr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== modified file 'addons/openerp/po/javascript/sr@xxxxxxxx'
--- addons/openerp/po/javascript/sr@xxxxxxxx	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/sr@xxxxxxxx	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/sv.po'
--- addons/openerp/po/javascript/sv.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/sv.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== modified file 'addons/openerp/po/javascript/tr.po'
--- addons/openerp/po/javascript/tr.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/tr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/uk.po'
--- addons/openerp/po/javascript/uk.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/uk.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== modified file 'addons/openerp/po/javascript/zh_CN.po'
--- addons/openerp/po/javascript/zh_CN.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/javascript/zh_CN.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== added file 'addons/openerp/po/messages/ar.po.OTHER'
--- addons/openerp/po/messages/ar.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/messages/ar.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,1651 @@
+# Arabic translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-28 12:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic <ar@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: validators.py:75
+msgid "Invalid literal for float"
+msgstr "Ù‚ÙŠÙ…Ø© Ø®Ø§Ø·Ø¦Ø© Ù„Ù…ØªØºÙŠØ± Ù…Ù† Ù†ÙˆØ¹ float"
+
+#: validators.py:114 validators.py:119 validators.py:262
+msgid "Invalid datetime format"
+msgstr "Ø®Ø·Ø£ ÙÙŠ Ù‡ÙŠØ¦Ø© Ø§Ù„ØªØ§Ø±ÙŠØ®"
+
+#: validators.py:166
+msgid "Please select a file."
+msgstr "Ø§Ø®ØªØ± Ù…Ù„Ù"
+
+#: validators.py:247
+msgid "Please enter an email address"
+msgstr "Ø§Ø¯Ø®Ù„ Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ"
+
+#: validators.py:248
+msgid "An email address must contain a single @"
+msgstr "Ù„Ø§Ø¨Ø¯ Ø§Ù† ÙŠØ´ØªÙ…Ù„ Ø§Ù„Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø±Ù…Ø² @"
+
+#: validators.py:249
+#, python-format
+msgid ""
+"The username portion of the email address is invalid (the portion before the "
+"@: %(username)s)"
+msgstr "ÙŠÙˆØ¬Ø¯ Ø®Ø·Ø£ ÙÙŠ Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø¨Ø±ÙŠØ¯ØŒ Ù‚ÙŠÙ…Ø© Ø®Ø§Ø·Ø¦Ø© ÙÙŠ: %(username)s"
+
+#: validators.py:250
+#, python-format
+msgid ""
+"The domain portion of the email address is invalid (the portion after the @: "
+"%(domain)s)"
+msgstr "ÙŠÙˆØ¬Ø¯ Ø®Ø·Ø£ ÙÙŠ Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø¨Ø±ÙŠØ¯ØŒ Ù‚ÙŠÙ…Ø© Ø®Ø§Ø·Ø¦Ø© ÙÙŠ: %(domain)s"
+
+#: validators.py:254
+msgid "You must start your URL with http://, https://, etc"
+msgstr "Ø§Ø¨Ø¯Ø£ Ø§Ù„Ø¹Ù†ÙˆØ§Ù† Ø¨Ù€Ù€ http://, https://";
+
+#: validators.py:255
+msgid "That is not a valid URL"
+msgstr "Ø¹Ù†ÙˆØ§Ù† Ø®Ø§Ø·Ø¦"
+
+#: validators.py:256
+#, python-format
+msgid "You must provide a full domain name (like %(domain)s.com)"
+msgstr "Ø§Ø¯Ø®Ù„ Ø§Ù„Ø¹Ù†ÙˆØ§Ù† Ø¨Ø§Ù„ÙƒØ§Ù…Ù„ Ù…Ø«Ù„ %(domain)s.com"
+
+#: validators.py:260
+msgid "Please enter an integer value"
+msgstr "Ø±Ø¬Ø§Ø¡ Ø¥Ø¯Ø®Ø§Ù„ Ù‚ÙŠÙ…Ø© Ø±Ù‚Ù…ÙŠØ© (Integer)"
+
+#: validators.py:261
+msgid "Please enter a number"
+msgstr "Ø£Ø¯Ø®Ù„ Ø±Ù‚Ù…"
+
+#: controllers/actions.py:91
+msgid "Invalid View"
+msgstr "Ø¹Ø±Ø¶ Ø®Ø§Ø·Ø¦"
+
+#: controllers/actions.py:124
+msgid "Error no report"
+msgstr "Ø®Ø·Ø£ØŒ Ù„Ø§ ØªÙ‚Ø±ÙŠØ±"
+
+#: controllers/actions.py:150
+msgid "Nothing to print"
+msgstr "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ø´Ø¦ Ù„Ù„Ø·Ø¨Ø§Ø¹Ø©"
+
+#: controllers/actions.py:170
+msgid "Printing aborted, too long delay"
+msgstr "ØªÙˆÙ‚ÙØª Ø§Ù„Ø·Ø¨Ø§Ø¹Ø©ØŒ Ø¨Ø³Ø¨Ø¨ Ø§Ù„ØªØ£Ø®Ø±"
+
+#: controllers/actions.py:377
+msgid "Relative URLs are not supported"
+msgstr "Ø§Ù„Ø¹Ù†Ø§ÙˆÙŠÙ† Ø§Ù„Ù…ØªØ¹Ù„Ù‚Ø© ØºÙŠØ± Ù…Ù„Ø§Ø¦Ù…Ø©"
+
+#: controllers/actions.py:405
+msgid "Action not found"
+msgstr "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ø£Ù…Ø±"
+
+#: controllers/actions.py:454
+msgid "No action defined"
+msgstr "Ø£Ù…Ø± ØºÙŠØ± Ù…Ø¹Ø±Ù"
+
+#: controllers/attachment.py:54
+msgid "No record selected, You can only attach to existing record..."
+msgstr "Ù„Ù… ÙŠØªÙ… Ø¥Ø®ÙŠØ§Ø± Ø³Ø¬Ù„ØŒ Ø¨Ø¥Ù…ÙƒØ§Ù†Ùƒ Ø§Ù„Ø¥Ø±ÙØ§Ù‚ ÙÙŠ ØØ§Ù„Ø© ÙˆØ¬ÙˆØ¯ Ø³Ø¬Ù„ ÙÙ‚Ø·..."
+
+#: controllers/database.py:64
+msgid "Create database"
+msgstr "Ø¥Ù†Ø´Ø§Ø¡ Ù‚Ø§Ø¹Ø¯Ø© Ø¨ÙŠØ§Ù†Ø§Øª"
+
+#: controllers/database.py:66 controllers/templates/database.mako:52
+#: controllers/templates/search.mako:145
+msgid "Create"
+msgstr "Ø¥Ù†Ø´Ø§Ø¡"
+
+#: controllers/database.py:69
+msgid "Super admin password:"
+msgstr "ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø± Ù„Ù„Ù…Ø´Ø±Ù Ø§Ù„Ø¹Ø§Ù…:"
+
+#: controllers/database.py:69
+msgid ""
+"This is the password of the user that have the rights to administer "
+"databases. This is not a OpenERP user, just a super administrator. If you "
+"did not changed it, the password is 'admin' after installation."
+msgstr ""
+"Ù‡Ø°Ù‡ Ù‡ÙŠ ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø± Ù„Ù„Ù…Ø³ØªØ®Ø¯Ù… Ø§Ù„Ø°ÙŠ Ù„Ø¯ÙŠÙ‡ ØÙ‚ Ø§Ù„Ø¥Ø´Ø±Ø§Ù Ø¹Ù„ÙŠ Ù‚ÙˆØ§Ø¹Ø¯ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§ØªØŒ Ùˆ Ù„ÙŠØ³ "
+"Ù„Ù„Ù…Ø³ØªØ®Ø¯Ù… Ø§Ù„Ø¹Ø§Ø¯ÙŠ Ø¨Ù„ Ù„Ù„Ù…Ø´Ø±Ù Ø§Ù„Ø¹Ø§Ù…. Ø¥Ø°Ø§ Ù„Ù… ØªÙ‚Ù… Ø¨ØªØºÙŠÙŠØ±Ù‡Ø§ Ø£Ø«Ù†Ø§ ØªÙ‡ÙŠØ¦Ø© Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬ØŒ "
+"ÙÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø± ØªÙƒÙˆÙ† 'admin'"
+
+#: controllers/database.py:70 controllers/database.py:102
+msgid "New database name:"
+msgstr "Ø§Ø³Ù… Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø©:"
+
+#: controllers/database.py:70
+msgid ""
+"Choose the name of the database that will be created. The name must not "
+"contain any special character. Exemple: 'terp'."
+msgstr ""
+"Ø§Ø®ØªØ± Ø§Ø³Ù… Ù„Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„ØªÙŠ Ø³ÙŠØªÙ… Ø¥Ù†Ø´Ø§Ø¡Ù‡Ø§. Ø¹Ù„ÙŠ Ø£Ù„Ø§ ÙŠØØªÙˆÙŠ Ø§Ù„Ø§Ø³Ù… Ø±Ù…Ø² Ø®Ø§Øµ Ø§Ùˆ "
+"ÙƒÙ„Ù…Ø© Ù…ØØ¬ÙˆØ²Ø©. Ù…Ø«Ù„ 'terp'."
+
+#: controllers/database.py:71
+msgid "Load Demonstration data:"
+msgstr "ØªØÙ…ÙŠÙ„ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„ÙˆÙ‡Ù…ÙŠØ©:"
+
+#: controllers/database.py:71
+msgid ""
+"Check this box if you want demonstration data to be installed on your new "
+"database. These data will help you to understand OpenERP, with predefined "
+"products, partners, etc."
+msgstr ""
+"Ù‚Ù… Ø¨Ø§Ù„ØªØ¹Ù„ÙŠÙ… Ø¹Ù„ÙŠ Ù‡Ø°Ø§ Ø§Ù„Ù…Ø±Ø¨Ø¹ Ø¥Ø°Ø§ Ø£Ø±Ø¯Øª ØªØÙ…ÙŠÙ„ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„ÙˆÙ‡Ù…ÙŠØ© Ù„Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª "
+"Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø©. ØªØ³Ø§Ø¹Ø¯Ùƒ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„ÙˆÙ‡Ù…ÙŠØ© Ø¥Ù„ÙŠ ÙÙ‡Ù… Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬ØŒ Ù…Ø«Ù„ Ø¥Ø¶Ø§ÙØ© Ù…Ù†ØªØ¬Ø§Øª Ùˆ Ø´Ø±ÙƒØ§Ø¡."
+
+#: controllers/database.py:72
+msgid "Default Language:"
+msgstr "Ø§Ù„Ù„ØºØ© Ø§Ù„ÙØªØ±Ø§Ø¶ÙŠØ©:"
+
+#: controllers/database.py:72
+msgid ""
+"Choose the default language that will be installed for this database. You "
+"will be able to install new languages after installation through the "
+"administration menu."
+msgstr ""
+"Ø§Ø®ØªØ± Ø§Ù„Ù„ØºØ© Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠØ© Ø§Ù„ØªÙŠ Ø³ØªÙ†Ø²Ù„ Ù…Ø¹ Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª. ÙŠÙ…ÙƒÙ†Ùƒ Ø¥Ø¶Ø§ÙØ© Ù„ØºØ§Øª Ø£Ø®Ø±ÙŠ "
+"Ù„Ø§ØÙ‚Ø§Ù‹ Ù…Ù† Ø®Ù„Ø§Ù„ Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„Ù…Ø´Ø±Ù Ø§Ùˆ administration"
+
+#: controllers/database.py:73
+msgid "Administrator password:"
+msgstr "ÙƒÙ„Ù…Ø© Ù…Ø±ÙˆØ± Ø§Ù„Ù…Ø´Ø±Ù:"
+
+#: controllers/database.py:73
+msgid ""
+"This is the password of the 'admin' user that will be created in your new "
+"database."
+msgstr "Ù‡Ø°Ù‡ ÙƒÙ„Ù…Ø© Ù…Ø±ÙˆØ± Ø§Ù„Ù…Ø´Ø±Ù 'admin' Ùˆ Ø§Ù„ØªÙŠ Ø³ØªØ³ØªØ®Ø¯Ù… Ø¨Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø©"
+
+#: controllers/database.py:74
+msgid "Confirm password:"
+msgstr "ØªØ£ÙƒÙŠØ¯ ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±:"
+
+#: controllers/database.py:74
+msgid ""
+"This is the password of the 'admin' user that will be created in your new "
+"database. It has to be the same than the above field."
+msgstr ""
+"Ù‡Ø°Ù‡ ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± Ù„ØØ³Ø§Ø¨ Ø§Ù„Ù€ 'admin' Ùˆ Ø§Ù„ØªÙŠ Ø³ØªÙ†Ø´Ø£ Ø¨Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø©ØŒ ÙŠØ¬Ø¨ "
+"Ø§Ù† ØªÙƒÙˆÙ† Ù…Ù…Ø§Ø«Ù„Ø© ÙƒÙ…Ø§ ÙÙŠ Ø§Ù„ØÙ‚Ù„ Ø§Ù„Ø³Ø§Ø¨Ù‚."
+
+#: controllers/database.py:80
+msgid "Drop database"
+msgstr "Ø¥Ø²Ø§Ù„Ø© Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
+
+#: controllers/database.py:82 controllers/templates/database.mako:54
+msgid "Drop"
+msgstr "Ø¥Ø²Ø§Ù„Ø©"
+
+#: controllers/database.py:84 controllers/database.py:92
+#: controllers/templates/login.mako:39
+msgid "Database:"
+msgstr "Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª:"
+
+#: controllers/database.py:85 controllers/database.py:93
+#: controllers/database.py:101 controllers/templates/login.mako:57
+#: controllers/templates/login_ajax.mako:78
+#: controllers/templates/login_ajax.mako:98
+msgid "Password:"
+msgstr "ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±:"
+
+#: controllers/database.py:89
+msgid "Backup database"
+msgstr "Ù†Ø³Ø®Ø© Ø¥ØØªÙŠØ§Ø·ÙŠØ© Ù„Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
+
+#: controllers/database.py:91 controllers/templates/database.mako:56
+msgid "Backup"
+msgstr "Ù†Ø³Ø®Ø© Ø¥ØØªÙŠØ§Ø·ÙŠØ©"
+
+#: controllers/database.py:97
+msgid "Restore database"
+msgstr "Ø¥Ø³ØªØ¹Ø§Ø¯Ø© Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
+
+#: controllers/database.py:99 controllers/templates/database.mako:58
+msgid "Restore"
+msgstr "Ø§Ø³ØªØ¹Ø§Ø¯Ø©"
+
+#: controllers/database.py:100
+msgid "File:"
+msgstr "Ù…Ù„Ù:"
+
+#: controllers/database.py:106
+msgid "Change Administrator Password"
+msgstr "ØºÙŠÙ‘Ø± ÙƒÙ„Ù…Ø© Ù…Ø±ÙˆØ± Ø§Ù„Ù…Ø´Ø±Ù Ø§Ù„Ø¹Ø§Ù…"
+
+#: controllers/database.py:108 controllers/templates/preferences/index.mako:37
+msgid "Change Password"
+msgstr "ØºÙŠÙ‘Ø± ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±"
+
+#: controllers/database.py:109
+msgid "Old Password:"
+msgstr "ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± Ø§Ù„Ù‚Ø¯ÙŠÙ…Ø©:"
+
+#: controllers/database.py:110
+msgid "New Password:"
+msgstr "ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø©:"
+
+#: controllers/database.py:111
+msgid "Confirm Password:"
+msgstr "ØªØ£ÙƒÙŠØ¯ ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±:"
+
+#: controllers/database.py:174
+msgid "You must avoid all accents, space or special characters."
+msgstr "ØªØ¬Ù†Ø¨ Ø¥Ø³ØªØ®Ø¯Ø§Ù… Ø§Ù„Ù…Ø³Ø§ÙØ§ØªØŒ Ùˆ Ø§Ù„Ø±Ù…ÙˆØ²."
+
+#: controllers/database.py:175
+msgid "Bad database name"
+msgstr "Ø§Ø³Ù… ØºÙŠØ± Ù„Ø§Ø¦Ù‚ Ù„Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
+
+#: controllers/database.py:195
+msgid ""
+"The server crashed during installation.\n"
+"We suggest you to drop this database."
+msgstr ""
+"ØªØ¹Ø·Ù„ Ø§Ù„Ø®Ø§Ø¯Ù… Ø£Ø«Ù†Ø§Ø¡ Ø§Ù„ØªÙ†ØµÙŠØ¨.\n"
+"ÙŠØ¨Ø¯Ùˆ Ø§Ù†Ù‡ Ø¹Ù„ÙŠÙƒ Ø¥Ø³Ù‚Ø§Ø· Ù‚Ø§Ø¹Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ù‡Ø°Ù‡."
+
+#: controllers/database.py:196
+msgid "Error during database creation"
+msgstr "Ø®Ø·Ø£ Ø£Ø«Ù†Ø§Ø¡ Ø¥Ø´Ø§Ø¡ Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
+
+#: controllers/database.py:199 controllers/database.py:226
+#: controllers/database.py:272 controllers/database.py:295
+msgid "Bad super admin password"
+msgstr "ÙƒÙ„Ù…Ø© Ù…Ø±ÙˆØ± Ù„Ù„Ù€ super admin ØºÙŠØ± Ù„Ø§Ø¦Ù‚Ø©"
+
+#: controllers/database.py:203
+msgid "Could not create database."
+msgstr "Ù„Ø§ ÙŠÙ…ÙƒÙ† Ø£Ù†Ø´Ø§Ø¡ Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª."
+
+#: controllers/database.py:229
+msgid "Could not drop database"
+msgstr "Ù„Ø§ ÙŠÙ…ÙƒÙ† Ø¥Ø³Ù‚Ø§Ø· Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
+
+#: controllers/database.py:252
+msgid "Could not create backup."
+msgstr "Ù„Ø§ ÙŠÙ…ÙƒÙ† Ø¥Ù†Ø´Ø§Ø¡ Ø§Ù„Ù†Ø³Ø®Ø© Ø§Ù„Ø¥ØØªÙŠØ§Ø·ÙŠØ©."
+
+#: controllers/database.py:276
+msgid "Could not restore database"
+msgstr "Ù„Ø§ ÙŠÙ…ÙƒÙ† Ø¥Ø³ØªØ¹Ø§Ø¯Ø© Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
+
+#: controllers/database.py:299
+msgid "Error, password not changed."
+msgstr "Ø®Ø·Ø£ØŒ Ù„Ù… ÙŠØªÙ… ØªØºÙŠÙŠØ± ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±."
+
+#: controllers/error_page.py:78
+msgid ""
+"Your problem has been sent to the quality team\n"
+"We will recontact you after analysing the problem."
+msgstr ""
+"ØªÙ… Ø¥Ø±Ø³Ø§Ù„ Ø§Ù„Ø®Ø·Ø£ Ù„ÙØ±ÙŠÙ‚ Ø§Ù„Ø¬ÙˆØ¯Ø©\n"
+"Ø³Ù†Ø±Ø§Ø³Ù„Ùƒ Ø¨Ø¹Ø¯ Ø§Ù„Ø¥Ø·Ù„Ø§Ø¹ Ø¹Ù„ÙŠ Ø§Ù„Ù…Ø´ÙƒÙ„Ø©."
+
+#: controllers/error_page.py:80
+#, python-format
+msgid ""
+"Your problem could not be sent to the quality team\n"
+"Please report this error manually at %s"
+msgstr ""
+"Ù„Ù… ÙŠØªÙ… Ø¥Ø±Ø³Ø§Ù„ Ø§Ù„Ù…Ø´ÙƒÙ„Ø© Ø¥Ù„Ù„ ÙØ±ÙŠÙ‚ Ø§Ù„Ø¬ÙˆØ¯Ø©\n"
+"Ø±Ø¬Ø§Ø¡ Ø¥Ø±Ø³Ø§Ù„Ù‡Ø§ ÙŠØ¯ÙˆÙŠØ§Ù‹ Ø¹Ù„ÙŠ %s"
+
+#: controllers/form.py:553
+#, python-format
+msgid "Invalid button type \"%s\""
+msgstr "Ù†ÙˆØ¹ Ø²Ø± Ø®Ø§Ø·Ø¦ \"%s\""
+
+#: controllers/form.py:891 controllers/tree.py:233
+msgid "No record selected"
+msgstr "Ù„Ù… ÙŠØªÙ… Ø¥Ø®ØªÙŠØ§Ø± Ø³Ø¬Ù„"
+
+#: controllers/form.py:896
+msgid "Print Screen"
+msgstr "Ø§Ø·Ø¨Ø¹ Ø§Ù„Ø´Ø§Ø´Ø©"
+
+#: controllers/form.py:965 utils/rpc.py:122 utils/rpc.py:133 utils/rpc.py:136
+#: widgets/listgrid.py:289 widgets/listgrid.py:353 widgets/form/_form.py:904
+msgid "Application Error"
+msgstr "Ø®Ø·Ø£ ÙÙŠ Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬"
+
+#: controllers/form.py:965
+#, python-format
+msgid "Wrong on_change trigger: %s"
+msgstr "Ø®Ø·Ø£ ÙÙŠ ÙƒÙˆØ¯ on_change : %s"
+
+#: controllers/form.py:1073
+msgid "Open resource"
+msgstr "Ù…ØµØ¯Ø± Ù…ÙØªÙˆØ"
+
+#: controllers/form.py:1076
+msgid "Set to default value"
+msgstr "ØªØ¹ÙŠÙŠÙ† Ø¥Ù„Ù‰ Ø§Ù„Ù‚ÙŠÙ…Ø© Ø§Ù„Ø§ÙØªØ±Ø§Ø¶ÙŠØ©"
+
+#: controllers/form.py:1077
+msgid "Set as default"
+msgstr "ØªØ¹ÙŠÙŠÙ† ÙƒÙ‚ÙŠÙ…Ø© Ø¥ÙØªØ±Ø§Ø¶ÙŠØ©"
+
+#: controllers/form.py:1084
+msgid "Action"
+msgstr "Ø¥Ø¬Ø±Ø§Ø¡"
+
+#: controllers/form.py:1085
+msgid "Report"
+msgstr "ØªÙ‚Ø±ÙŠØ±"
+
+#: controllers/impex.py:66
+msgid ""
+"Operation failed\n"
+"I/O error"
+msgstr ""
+"ÙØ´Ù„Øª Ø§Ù„Ø¹Ù…Ù„ÙŠØ©\n"
+"Ø®Ø·Ø£ ÙÙŠ Ø§Ù„Ø¥Ø¯Ø®Ø§Ù„ Ùˆ Ø§Ù„Ø¥Ø®Ø±Ø§Ø¬ I/O"
+
+#: controllers/impex.py:373
+msgid "Export Error"
+msgstr "Ø®Ø·Ø£ ÙÙŠ Ø§Ù„Ø¥ØµØ¯Ø§Ø±"
+
+#: controllers/impex.py:444
+msgid "Database ID"
+msgstr "Ù…Ø¹Ø±Ù Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª (Database ID)"
+
+#: controllers/impex.py:451
+msgid "Error opening .CSV file"
+msgstr "Ø®Ø·Ø£ ÙÙŠ ÙØªØ Ø§Ù„Ù…Ù„Ù .CSV"
+
+#: controllers/impex.py:451
+msgid "Input Error."
+msgstr "Ø®Ø·Ø£ ÙÙŠ Ø§Ù„Ø¥Ø¯Ø®Ø§Ù„"
+
+#: controllers/impex.py:473
+#, python-format
+msgid "You cannot import the field '%s', because we cannot auto-detect it"
+msgstr "Ù„Ø§ ÙŠÙ…ÙƒÙ† Ø¥Ø³ØªÙ‚Ø¨Ø§Ù„ Ø§Ù„ØÙ‚Ù„  '%s', Ù„Ø£Ù†Ù‡ Ù„Ø§ ÙŠÙ…ÙƒÙ† Ø§Ù„ÙƒØ´Ù Ø§Ù„ØªÙ„Ù‚Ø§Ø¦ÙŠ Ø¹Ù†Ù‡"
+
+#: controllers/impex.py:476
+#, python-format
+msgid "Error processing the first line of the file. Field \"%s\" is unknown"
+msgstr "Ø®Ø·Ø£ ÙÙŠ Ù…Ø¹Ø§Ù„Ø¬Ø© Ø§Ù„Ø³Ø·Ø± Ø§Ù„Ø£ÙˆÙ„ Ù…Ù† Ø§Ù„Ù…Ù„Ù. Ø§Ù„ØÙ‚Ù„ \"%s\" ØºÙŠØ± Ù…Ø¹Ø±Ù"
+
+#: controllers/impex.py:476
+msgid "Import Error."
+msgstr "Ø®Ø·Ø£ ÙÙŠ Ø§Ù„Ø¥Ø³ØªÙŠØ±Ø§Ø¯."
+
+#: controllers/impex.py:515
+msgid "XML-RPC error"
+msgstr "Ø®Ø·Ø£ ÙÙŠ Ø¨ÙŠØ§Ù†Ø§Øª XML-RPC"
+
+#: controllers/impex.py:520
+#, python-format
+msgid "Imported %d objects"
+msgstr "Ø§Ù„ÙƒØ§Ø¦Ù†Ø§Øª Ø§Ù„Ù…Ø³ØªÙˆØ±Ø¯Ø© %d"
+
+#: controllers/impex.py:525
+#, python-format
+msgid "Error trying to import this record:%s. ErrorMessage:%s %s"
+msgstr "Ø®Ø·Ø£ ÙÙŠ Ø¥Ø³ØªÙŠØ±Ø§Ø¯ Ù‡Ø°Ø§ Ø§Ù„Ø³Ø¬Ù„:%s. Ø±Ø³Ø§Ù„Ø© Ø§Ù„Ø®Ø·Ø£:%s %s"
+
+#: controllers/impex.py:526
+msgid "ImportationError"
+msgstr "Ø®Ø·Ø£ ÙÙŠ Ø§Ù„Ø¥Ø³ØªÙŠØ±Ø§Ø¯"
+
+#: controllers/listgrid.py:51
+msgid "Parent record doesn't exists..."
+msgstr "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ø³Ø¬Ù„ Ø£Ø³Ø§Ø³ÙŠ..."
+
+#: controllers/preferences.py:34
+msgid "Change your password"
+msgstr "ØºÙŠÙ‘Ø± ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±"
+
+#: controllers/preferences.py:64 controllers/templates/header.mako:59
+msgid "Preferences"
+msgstr "Ø§Ù„ØªÙØ¶ÙŠÙ„Ø§Øª"
+
+#: controllers/preferences.py:91
+msgid "All passwords have to be filled."
+msgstr "ÙŠØ¬Ø¨ Ø¥Ù…Ù„Ø§Ø¡ Ø¬Ù…ÙŠØ¹ ÙƒÙ„Ù…Ø§Øª Ø§Ù„Ù…Ø±ÙˆØ±"
+
+#: controllers/preferences.py:93
+msgid "The new password and its confirmation must be identical."
+msgstr "ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø© Ùˆ ØÙ‚Ù„ ØªØ£ÙƒÙŠØ¯Ù‡Ø§ ÙŠØ¬Ø¨ Ø§Ù† ØªÙƒÙˆÙ† Ù…ØªØ·Ø§Ø¨Ù‚Ø©"
+
+#: controllers/preferences.py:102
+msgid "Could not change your password."
+msgstr "Ù„Ù… ÙŠØªÙ…ÙƒÙ† Ù…Ù† ØªØºÙŠÙŠØ± ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±"
+
+#: controllers/preferences.py:104
+msgid "Original password incorrect, your password was not changed."
+msgstr "ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ± Ø§Ù„Ø£ØµÙ„ÙŠØ© Ø®Ø§Ø·Ø¦Ø©ØŒ ÙÙ„Ù… ØªØªØºÙŠØ± ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±"
+
+#: controllers/root.py:170
+#, python-format
+msgid "Version %s"
+msgstr "Ø§Ù„Ø¥ØµØ¯Ø§Ø±Ø© %s"
+
+#: controllers/translator.py:132
+msgid "You need to save the resource before adding translations."
+msgstr "ÙŠØ¬Ø¨ ØÙØ¸ Ø§Ù„Ù…ØµØ¯Ø± Ù‚Ø¨Ù„ Ø¥Ø¶Ø§ÙØ© Ø§Ù„ØªØ±Ø¬Ù…Ø©."
+
+#: controllers/tree.py:264
+msgid "No resource selected"
+msgstr "Ù„Ù… ÙŠØªÙ… Ø¥Ø®ØªÙŠØ§Ø± Ù…ØµØ¯Ø±"
+
+#: controllers/utils.py:44
+msgid "Could not connect to server"
+msgstr "ØªØ¹Ø°Ø± Ø§Ù„Ø¥ØªØµØ§Ù„ Ø¨Ø§Ù„Ø®Ø§Ø¯Ù…"
+
+#: controllers/utils.py:131 controllers/templates/login_ajax.mako:111
+msgid "Bad username or password"
+msgstr "Ø§Ø³Ù… Ù…Ø³ØªØ®Ø¯Ù… Ø§Ùˆ ÙƒÙ„Ù…Ø© Ù…Ø±ÙˆØ± Ø®Ø§Ø·Ø¦Ø©"
+
+#: controllers/view_log.py:32
+msgid "ID"
+msgstr "Ø§Ù„Ù…Ø¹Ø±Ù‘Ù"
+
+#: controllers/view_log.py:33
+msgid "Creation User"
+msgstr "Ø¥Ù†Ø´Ø§Ø¡ Ù…Ø³ØªØ®Ø¯Ù…"
+
+#: controllers/view_log.py:34
+msgid "Creation Date"
+msgstr "ØªØ§Ø±ÙŠØ® Ø§Ù„Ø¥Ù†Ø´Ø§Ø¡"
+
+#: controllers/view_log.py:35
+msgid "Latest Modification by"
+msgstr "Ø¢Ø®Ø± ØªØ¹Ø¯ÙŠÙ„ Ø¨ÙˆØ§Ø³Ø·Ø©"
+
+#: controllers/view_log.py:36
+msgid "Latest Modification Date"
+msgstr "Ø¢Ø®Ø± ØªØ¹Ø¯ÙŠÙ„ Ø¨ØªØ§Ø±ÙŠØ®"
+
+#: controllers/view_log.py:37
+msgid "Owner"
+msgstr "Ø§Ù„Ù…Ø§Ù„Ùƒ"
+
+#: controllers/view_log.py:38
+msgid "Group Owner"
+msgstr "Ù…Ø§Ù„Ùƒ Ø§Ù„Ù…Ø¬Ù…ÙˆØ¹Ø©"
+
+#: controllers/view_log.py:39
+msgid "Access Level"
+msgstr "Ù…Ø³ØªÙˆÙŠ Ø§Ù„Ø³Ù…Ø§Ø"
+
+#: controllers/view_log.py:40
+msgid "Internal module data ID"
+msgstr "Ù…Ø¹Ø±Ù Ø§Ù„Ù€Ù€ Internal module data"
+
+#: controllers/viewed.py:220
+msgid "Invalid view id."
+msgstr "Ø®Ø·Ø£ ÙÙŠ Ø¹Ø±Ø¶ Ø§Ù„Ù…Ø¹Ø±Ù"
+
+#: controllers/viewed.py:498
+msgid "Unable to create inherited view."
+msgstr "Ù„Ù… ÙŠØªÙ…ÙƒÙ† Ù…Ù† Ø¥Ù†Ø´Ø§Ø¡ Ø¹Ø±Ø¶ Ù…ÙˆØ±ÙˆØ«"
+
+#: controllers/viewed.py:500
+msgid "Can't create inherited view here."
+msgstr "Ù„Ø§ ÙŠÙ…ÙƒÙ† Ù…Ù† Ø¥Ù†Ø´Ø§Ø¡ Ø¹Ø±Ø¶ Ù…ÙˆØ±ÙˆØ« Ù‡Ù†Ø§"
+
+#: controllers/viewed.py:503
+msgid "Not implemented yet!"
+msgstr "Ù„Ù… ØªÙ†ÙØ° ØØªÙŠ Ø§Ù„Ø£Ù†!"
+
+#: controllers/viewed.py:608
+msgid "Unable to update the view."
+msgstr "Ù„Ù… ÙŠØªÙ…ÙƒÙ† Ù…Ù† ØªØØ¯ÙŠØ« Ø§Ù„Ø¹Ø±Ø¶"
+
+#: controllers/viewed.py:859
+msgid "New Window"
+msgstr "Ù†Ø§ÙØ°Ø© Ø¬Ø¯ÙŠØ¯Ø©"
+
+#: controllers/viewed.py:871
+msgid "Save Button"
+msgstr "Ø²Ø± Ø§Ù„ØÙØ¸"
+
+#: controllers/viewed.py:871
+msgid "Cancel Button"
+msgstr "Ø²Ø± Ø§Ù„Ø¥Ù„ØºØ§Ø¡"
+
+#: controllers/viewed.py:871
+msgid "Open Button"
+msgstr "Ø²Ø± Ø§Ù„ÙØªØ"
+
+#: controllers/viewed.py:877
+msgid "Left"
+msgstr "ÙŠØ³Ø§Ø±"
+
+#: controllers/viewed.py:877
+msgid "Center"
+msgstr "ÙˆØ³Ø·"
+
+#: controllers/viewed.py:877
+msgid "Right"
+msgstr "ÙŠÙ…ÙŠÙ†"
+
+#: controllers/templates/about.mako:4
+msgid "About the OpenERP Web"
+msgstr "Ø¹Ù† ØªØ·Ø¨ÙŠÙ‚ OpenERP"
+
+#: controllers/templates/about.mako:27
+msgid "OpenERP Web"
+msgstr "OpenERP Ø¹Ø¨Ø± Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª"
+
+#: controllers/templates/about.mako:30
+msgid "Copyright &copy; 2006-TODAY OpenERP SA. All Rights Reserved."
+msgstr "ØÙ‚ÙˆÙ‚ Ø§Ù„Ø·Ø¨Ø¹ &copy; OpenERP SA . Ø¬Ù…ÙŠØ¹ Ø§Ù„ØÙ‚ÙˆÙ‚ Ù…ØÙÙˆØ¸Ø©"
+
+#: controllers/templates/about.mako:31
+msgid "OpenERP is a trademark of the OpenERP SA Company."
+msgstr "OpenERP Ù‡ÙŠ Ø¹Ù„Ø§Ù…Ø© Ù…Ø³Ø¬Ù„Ø© Ù„Ø´Ø±ÙƒØ© OpenERP SA."
+
+#: controllers/templates/about.mako:33
+#, python-format
+msgid "%(ooweb)s is jointly developed by %(tiny)s and %(axelor)s."
+msgstr "%(ooweb)s ØªÙ… Ø§Ù„ØªØµÙ…ÙŠÙ… Ø¨ÙˆØ§Ø³Ø·Ø© %(tiny)s Ùˆ %(axelor)s."
+
+#: controllers/templates/about.mako:39
+#, python-format
+msgid "Licenced under the terms of %(license)s"
+msgstr "Ù…Ø±Ø®Øµ ØªØØª Ø´Ø±ÙˆØ· %(license)s"
+
+#: controllers/templates/about.mako:42
+msgid "About OpenERP"
+msgstr "Ø¹Ù† OpenERP"
+
+#: controllers/templates/about.mako:44
+#, python-format
+msgid ""
+"%(openobject)s is a free enterprise-scale software system that is designed "
+"to boost\n"
+"                    productivity and profit through data integration. It "
+"connects, improves and\n"
+"                    manages business processes in areas such as sales, "
+"finance, supply chain,\n"
+"                    project management, production, services, CRM, etc..\n"
+"                    "
+msgstr ""
+"%(openobject)s Ù‡Ùˆ Ø¨Ø±Ù†Ø§Ù…Ø¬ Ù…Ø¬Ø§Ù†ÙŠ Ù„Ù„Ø´Ø±ÙƒØ§Øª Ùˆ Ø§Ù„Ù…Ù†Ø´Ø¢Øª Ùˆ Ù„ÙŠØ³Ø§Ø¹Ø¯Ù‡Ù…Ø§ Ø¹Ù„ÙŠ \n"
+"                        Ø§Ù„Ø£Ù†ØªØ§Ø¬ÙŠØ© Ùˆ Ø§Ù„Ø±Ø¨Ø Ù…Ù† Ø®Ù„Ø§Ù„ ØªÙƒØ§Ù…Ù„ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª. Ù‡Ø°Ø§ "
+"Ø¨Ø§Ù„Ø¥Ø¶Ø§ÙØ© Ø¥Ù„ÙŠ Ø§Ù†Ù‡ ÙŠØ±Ø¨Ø·ØŒ Ùˆ ÙŠØ¯Ø¹Ù…ØŒ\n"
+"\t\t\tÙˆ ÙŠÙ†Ø¸Ù… Ø§Ù„Ø¹Ù…Ù„ÙŠØ§Øª Ù„Ù„Ø£Ø¹Ù…Ø§Ù„ Ø§Ù„ØªØ¬Ø§Ø±ÙŠØ© ÙÙŠ Ù…Ø¬Ø§Ù„Ø§Øª Ù…Ø«Ù„ Ø§Ù„Ù…Ø¨ÙŠØ¹Ø§ØªØŒ Ø§Ù„Ù…Ø§Ù„ÙŠØ©ØŒ "
+"Ø§Ù„Ù…Ø®Ø²ÙˆÙ†ØŒ\n"
+"                        Ø¥Ø¯Ø§Ø±Ø©Ø§Ù„Ù…Ø´Ø±ÙˆØ¹Ø§ØªØŒ Ø§Ù„Ø¥Ù†ØªØ§Ø¬ØŒ Ø§Ù„Ø®Ø¯Ù…Ø§ØªØŒ CRMØŒ Ø¥Ù„Ø®..\n"
+"                    "
+
+#: controllers/templates/about.mako:51
+msgid ""
+"The system is platform-independent, and can be installed on Windows, Mac OS "
+"X,\n"
+"                    and various Linux and other Unix-based distributions. "
+"Its architecture enables\n"
+"                    new functionality to be rapidly created, modifications "
+"to be made to a\n"
+"                    production system and migration to a new version to be "
+"straightforward."
+msgstr ""
+"ÙŠØ¹ØªØ¨Ø± Ù†Ø¸Ø§Ù… Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬ Ù…Ø³ØªÙ‚Ù„ Ø¹Ù† Ø§Ù„Ø£Ù†Ø¸Ù…Ø© Ø§Ù„ØªÙŠ ÙŠØ¹Ù…Ù„ Ø¹Ù„ÙŠÙ‡Ø§ØŒ ÙÙŠÙ…ÙƒÙ† ØªÙ†ØµÙŠØ¨Ù‡ Ø¹Ù„ÙŠ Ø£Ù†Ø¸Ù…Ø© "
+"Ø§Ù„Ù…Ø§Ùƒ Ùˆ Ø§Ù„ÙˆÙŠÙ†Ø¯ÙˆØ²\n"
+"                    Ùˆ Ø§Ù„Ø¹Ø¯ÙŠØ¯ Ù…Ù† Ø£Ù†Ø¸Ù…Ø© Ø§Ù„Ù„ÙŠÙ†ÙˆÙƒØ³ Ø¨Ø§Ù„Ø¥Ø¶Ø§ÙØ© Ø¥Ù„ÙŠ ØªÙˆØ²ÙŠØ¹Ø§Øª Ø§Ù„ÙŠÙˆÙ†ÙƒØ³. "
+"ÙØªØµÙ…ÙŠÙ… Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬ ÙŠØ³Ù…Ø\n"
+"                    Ø¨Ø§Ù„Ø¥Ø¶Ø§ÙØ§Øª Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø© Ø£Ù† ØªÙ†Ø´Ø£ Ø¨Ø³Ù‡ÙˆÙ„Ø© Ùˆ Ø¨Ø§Ù„ØªØ¹Ø¯ÙŠÙ„Ø§Øª Ø§Ù„ØªÙŠ ØªØªÙ… "
+"Ø¨Ø£Ù† ØªØ¶Ø§Ù Ø¨Ø³Ø±Ø¹Ø© Ùˆ Ø°Ù„Ùƒ Ù…Ù†\n"
+"                   Ø£Ø¬Ù„ ØªÙØ¹ÙŠÙ„ Ø¥Ù†ØªØ§Ø¬ÙŠØ© Ø§Ù„Ù†Ø¸Ø§Ù… Ùˆ Ø³Ù‡ÙˆÙ„Ø© Ø¥Ù†ØªÙ‚Ø§Ù„Ù‡Ø§ ÙÙŠ Ø§Ù„Ø¥ØµØ¯Ø§Ø±Ø§Øª "
+"Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø© Ù…Ø¨Ø§Ø´Ø±Ø©."
+
+#: controllers/templates/about.mako:57
+msgid ""
+"Depending on your needs, OpenERP is available through a web or application "
+"client."
+msgstr "ÙŠÙ…ÙƒÙ† ØªÙ‡Ø¦Ø© Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬ ØØ³Ø¨ Ø¥ØØªÙŠØ§Ø¬Ùƒ."
+
+#: controllers/templates/database.mako:50 controllers/templates/login.mako:4
+#: controllers/templates/login.mako:67 controllers/templates/login_ajax.mako:85
+#: controllers/templates/login_ajax.mako:104
+msgid "Login"
+msgstr "ØªØ³Ø¬ÙŠÙ„ Ø§Ù„Ø¯Ø®ÙˆÙ„"
+
+#: controllers/templates/database.mako:60
+msgid "Password"
+msgstr "ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±"
+
+#: controllers/templates/error_page.mako:77
+#, python-format
+msgid "An %(error_type)s has been reported."
+msgstr "ØØ¯ÙˆØ« Ø®Ø·Ø£ ÙÙŠ %(error_type)s ØªÙ… ØªØ³Ø¬ÙŠÙ„Ù‡."
+
+#: controllers/templates/error_page.mako:79
+msgid "Let me fix it"
+msgstr "Ø§Ø¬Ø¹Ù„Ù†ÙŠ Ø§ØµÙ„ØÙ‡"
+
+#: controllers/templates/error_page.mako:85
+msgid "Fix it for me"
+msgstr "Ø§ØµÙ„ØÙ‡ Ù…Ù† Ø£Ø¬Ù„ÙŠ"
+
+#: controllers/templates/error_page.mako:90
+msgid "You do not have a valid OpenERP publisher warranty contract !"
+msgstr "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ù„Ø¯ÙŠÙƒ Ø¹Ù‚Ø¯ Ø¶Ù…Ø§Ù† ØµØÙŠØ Ù…Ù† Ø§Ù„Ù†Ø§Ø´Ø± Ù„Ù„Ù€ OpenERP"
+
+#: controllers/templates/error_page.mako:91
+msgid ""
+"If you are using OpenERP in production, it is recommended to have\n"
+"a publisher warranty program.\n"
+"\n"
+"The OpenERP publisher warranty contract provides you with bug fix guarantees "
+"and an\n"
+"automatic migration system so that we can start working on your problems "
+"within a few\n"
+"hours.\n"
+"\n"
+"With a publisher warranty contract, errors such as this one can be sent "
+"directly to the OpenERP\n"
+"team for review and evaluation.\n"
+"\n"
+"The publisher warranty program offers you:\n"
+"* Automatic migrations on new versions,\n"
+"* A bugfix guarantee,\n"
+"* Monthly announces of potential bugs and their fixes,\n"
+"* Security alerts by email and automatic migration,\n"
+"* Access to the customer portal.\n"
+msgstr ""
+"Ø¥Ø°Ø§ ÙƒÙ†Øª ØªØ³ØªØ®Ø¯Ù… OpenERP Ù„Ù„Ø¥Ù†ØªØ§Ø¬ØŒ ÙØ¥Ù†Ù‡ Ù…Ù† Ø§Ù„Ù…ÙØ¶Ù„ Ø§Ù„ØØµÙˆÙ„\n"
+"Ø¹Ù„ÙŠ Ø¹Ù‚Ø¯ Ø¶Ù…Ø§Ù† Ù…Ù† Ø§Ù„Ù†Ø§Ø´Ø±.\n"
+"\n"
+"ÙŠØªØ¶Ù…Ù† Ø¹Ù‚Ø¯ Ø§Ù„Ø¶Ù…Ø§Ù† Ù…Ù† Ø§Ù„Ù†Ø§Ø´Ø± ØªÙˆÙÙŠØ± ØÙ„ÙˆÙ„ Ù„Ù…Ø´Ø§ÙƒÙ„ Ø§Ù„Ù†Ø¸Ø§Ù… Ùˆ Ù†Ù‚Ù„\n"
+"ØªÙ„Ù‚Ø§Ø¦ÙŠ Ù„Ù„Ù†Ø¸Ø§Ù… Ùˆ Ø°Ù„Ùƒ Ù„Ù„Ø¨Ø¯Ø¡ ÙÙŠ ØÙ„ Ù…Ø´Ø§ÙƒÙ„Ùƒ ÙÙŠ Ø³Ø§Ø¹Ø§Øª Ù‚Ù„ÙŠÙ„Ø©.\n"
+"\n"
+"Ù…Ø¹ Ø¹Ù‚Ø¯ Ø§Ù„Ø¶Ù…Ø§Ù†ØŒ Ù…Ø«Ù„ Ù‡Ø°Ù‡ Ø§Ù„Ø£Ø®Ø·Ø§Ø¡ ÙŠØªÙ… Ø¥Ø±Ø³Ø§Ù„Ù‡Ø§ Ù…Ø¨Ø§Ø´Ø±Ø© Ø¥Ù„ÙŠ ÙØ±ÙŠÙ‚ Ø¹Ù…Ù„\n"
+"OpenERP Ù„Ù„Ù†Ø¸Ø± ÙÙŠÙ‡Ø§ Ùˆ Ø§Ù„ØªØÙ„ÙŠÙ„.\n"
+"\n"
+"Ø¥Ù† Ø¹Ù‚Ø¯ Ø§Ù„Ø¶Ù…Ø§Ù† ÙŠØªÙŠØ Ù„Ùƒ:\n"
+"* Ø§Ù„Ù†Ù‚Ù„ Ø§Ù„ØªÙ„Ù‚Ø§Ø¦ÙŠ Ù„Ù„Ø¥ØµØ¯Ø§Ø±Ø§Øª Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø©.\n"
+"* Ø¶Ù…Ø§Ù† ØªØµØÙŠØ Ø£Ø®Ø·Ø§Ø¡ Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬.\n"
+"* Ø³Ù„Ø§Ù…Ø© Ø£Ù…Ù† Ø§Ù„Ù†Ø¸Ø§Ù…\n"
+"* Ø§Ù„Ø¯Ø¹ Ù… Ø§Ù„ÙÙ†ÙŠ Ø§Ù„Ù„Ø§Ø²Ù…\n"
+
+#: controllers/templates/error_page.mako:113
+msgid ""
+"Your publisher warranty contract does not cover all modules installed in "
+"your system !\n"
+"If you are using OpenERP in production, it is highly suggested to upgrade "
+"your\n"
+"contract.\n"
+"\n"
+"If you have developed your own modules or installed third party module, we\n"
+"can provide you an additional publisher warranty contract for these modules. "
+"After\n"
+"having reviewed your modules, our quality team will ensure they will "
+"migrate\n"
+"automatically for all future stable versions of OpenERP at no extra cost.\n"
+"\n"
+"Here is the list of modules not covered by your publisher warranty contract:"
+msgstr ""
+"Ù„Ø§ ÙŠØ´Ù…Ù„ Ø¹Ù‚Ø¯ Ø§Ù„Ø¶Ù…Ø§Ù† Ø¬Ù…ÙŠØ¹ Ø§Ù„Ø£ÙƒÙˆØ§Ø¯ Ø§Ù„ØªÙŠ ØªÙ… ØªÙ†ØµÙŠØ¨Ù‡Ø§ Ø¹Ù„ÙŠ Ø§Ù„Ù†Ø¸Ø§Ù…!\n"
+"Ø¥Ø°Ø§ ÙƒÙ†Øª ØªØ³ØªØ®Ø¯Ù… OpenERP Ù„Ù„Ø¥Ù†ØªØ§Ø¬ØŒ ÙØ¥Ù†Ù‡ Ù…Ù† Ø§Ù„Ø£ÙØ¶Ù„ Ù„Ùƒ ØªØØ¯ÙŠØ«\n"
+"Ø¹Ù‚Ø¯ Ø§Ù„Ø¶Ù…Ø§Ù†.\n"
+"\n"
+"Ø¥Ø°Ø§ Ù‚Ù…Øª Ø¨ØªØ·ÙˆÙŠØ± Ø£ÙƒÙˆØ§Ø¯ Ø®Ø§ØµØ© Ù„Ùƒ Ø£Ùˆ Ø¥Ø³ØªØ®Ø¯Ù…Øª Ø£ÙƒÙˆØ§Ø¯ Ù…Ù† Ø´Ø±ÙƒØ§Øª Ø£Ø®Ø±ÙŠ ØºÙŠØ± OpenERPØŒ "
+"ÙÙ†ØÙ†\n"
+"ÙŠÙ…ÙƒÙ†Ù†Ø§ Ø£ÙŠØ¶Ø§Ù‹ ØªÙ‚Ø¯ÙŠÙ… Ø¹Ù‚Ø¯ Ø¶Ù…Ø§Ù† Ù†Ø´Ø± Ø¥Ø¶Ø§ÙÙŠ Ù„Ù‡Ø°Ù‡ Ø§Ù„Ø£ÙƒÙˆØ§Ø¯ Ø§ÙŠØ¶Ø§Ù‹ØŒ Ùˆ Ø°Ù„Ùƒ Ø¨Ø¹Ø¯\n"
+"Ø§Ù† ÙŠØªÙ… Ø¥Ø³ØªØ¹Ø±Ø§Ø¶ Ù‡Ø°Ù‡ Ø§Ù„Ø£ÙƒÙˆØ§Ø¯ØŒ Ù„ÙŠÙ‚ÙˆÙ… ÙØ±ÙŠÙ‚ Ø§Ù„Ø¬ÙˆØ¯Ø© Ù„ØªØ£ÙƒÙŠØ¯ Ùˆ Ù„Ø¯Ø¹Ù… Ø§Ù„Ù†Ù‚Ù„\n"
+"Ø§Ù„ØªÙ„Ù‚Ø§Ø¦ÙŠ Ù„ÙƒÙ„ Ø§Ù„Ø¥ØµØ¯Ø§Ø±Ø§Øª Ø§Ù„ØØ¯ÙŠØ«Ø© Ù„Ù†Ø¸Ø§Ù… OpenERP Ùˆ Ø°Ù„Ùƒ Ø¯ÙˆÙ† Ø£ÙŠ ØªÙƒÙ„ÙØ©\n"
+"\n"
+"Ù‡Ø°Ù‡ Ù‚Ø§Ø¦Ù…Ø© Ø¨Ù€ Ø¨Ø¬Ù…ÙŠØ¹ Ø§Ù„Ø£ÙƒÙˆØ§Ø¯ Ø§Ù„ØªÙŠ Ù„Ø§ ØªØ´ØªÙ…Ù„ Ø¹Ù„ÙŠ Ø¶Ù…Ø§Ù† Ø§Ù„Ù†Ø§Ø´Ø±:"
+
+#: controllers/templates/error_page.mako:135
+msgid "Publisher warranty contract."
+msgstr "Ø¹Ù‚Ø¯ Ø§Ù„Ø¶Ù…Ø§Ù† Ù„Ù„Ù†Ø§Ø´Ø±"
+
+#: controllers/templates/error_page.mako:136
+msgid ""
+"Your request will be sent to OpenERP and publisher warranty team will reply "
+"you shortly."
+msgstr "Ø³ÙŠØªÙ… Ø¥Ø±Ø³Ø§Ù„ Ø·Ù„Ø¨Ùƒ Ø¥Ù„ÙŠ ÙØ±ÙŠÙ‚ OpenERP Ùˆ Ø§Ù„Ù†Ø§Ø´Ø± Ùˆ Ø°Ù„Ùƒ Ù„Ù„Ø¥Ø¬Ø§Ø¨Ø© Ø§Ù„ÙÙˆØ±ÙŠØ©."
+
+#: controllers/templates/error_page.mako:140
+msgid "Summary of the problem:"
+msgstr "Ù…Ù„Ø®Øµ Ø§Ù„Ù…Ø´ÙƒÙ„Ø©:"
+
+#: controllers/templates/error_page.mako:147
+msgid "Explain what you did:"
+msgstr "Ø¥Ø´Ø±Ø Ù…Ø§ ÙØ¹Ù„Øª:"
+
+#: controllers/templates/error_page.mako:156
+msgid "Other Comments:"
+msgstr "ØªØ¹Ù„ÙŠÙ‚Ø§Øª Ø£Ø®Ø±ÙŠ:"
+
+#: controllers/templates/error_page.mako:168
+msgid "Send to Publisher Warranty Team"
+msgstr "Ø¥Ø±Ø³Ø§Ù„ Ø¥Ù„ÙŠ ÙØ±ÙŠÙ‚ Ø§Ù„Ø¶Ù…Ø§Ù† Ùˆ Ø§Ù„Ù†Ø´Ø±"
+
+#: controllers/templates/error_page.mako:195
+msgid "Write concurrency warning :"
+msgstr "Ø§ÙƒØªØ¨ ØªØØ°ÙŠØ± ØªØ²Ø§Ù…Ù†ÙŠ:"
+
+#: controllers/templates/error_page.mako:200
+msgid ""
+"This document has been modified while you were editing it.\n"
+"Choose:\n"
+"\n"
+"    - \"Cancel\" to cancel saving.\n"
+"    - \"Write anyway\" to save your current version."
+msgstr ""
+"Ù‡Ø°Ø§ Ø§Ù„Ù…Ù„Ù Ù‚Ø¯ ØªÙ… ØªØ¹Ø¯ÙŠÙ„Ù‡ Ø¨ÙŠÙ†Ù…Ø§ ÙƒÙ†Øª Ø§Ù†Øª ØªØØ±Ø±Ù‡.\n"
+"Ø§Ø®Ø±:\n"
+"\n"
+"    - \"Ø¥Ù„ØºØ§Ø¡\" Ùˆ Ø°Ù„Ùƒ Ù„Ø¥Ù„ØºØ§Ø¡ Ø§Ù„ØÙØ¸.\n"
+"    - \"Ø¥Ø¶Ø§ÙØ© Ø§Ù„ØªØØ±ÙŠØ±\" Ùˆ Ø°Ù„Ùƒ Ù„ØÙØ¸ Ø§Ù„Ù†Ø³Ø®Ø© Ø§Ù„ØØ§Ù„ÙŠØ©."
+
+#: controllers/templates/error_page.mako:214 controllers/templates/exp.mako:244
+#: controllers/templates/form.mako:140 controllers/templates/openo2m.mako:41
+#: controllers/templates/selection.mako:43
+#: controllers/templates/viewlist.mako:160
+#: controllers/templates/preferences/index.mako:38
+#: widgets/templates/listgrid/listgrid.mako:33
+msgid "Cancel"
+msgstr "Ø¥Ù„ØºØ§Ø¡"
+
+#: controllers/templates/error_page.mako:215
+msgid "Write Anyway"
+msgstr "Ø§Ù„ÙƒØªØ§Ø¨Ø© Ø¹Ù„Ù‰ Ø£ÙŠØ© ØØ§Ù„"
+
+#: controllers/templates/exp.mako:151
+msgid "Export Data"
+msgstr "ØªØµØ¯ÙŠØ± Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
+
+#: controllers/templates/exp.mako:166
+msgid "Export Type:"
+msgstr "Ù†ÙˆØ¹ Ø§Ù„ØªØµØ¯ÙŠØ±:"
+
+#: controllers/templates/exp.mako:169
+msgid "Import Compatible Export"
+msgstr "Ø¥Ø³ØªÙŠØ±Ø§Ø¯ Ø¨ÙŠØ§Ù†Ø§Øª Ù…Ù„Ø§Ø¦Ù…Ø© Ù„Ù„ØªØµØ¯ÙŠØ±"
+
+#: controllers/templates/exp.mako:172
+msgid "Export all Data"
+msgstr "ØªØµØ¯ÙŠØ± Ø¬Ù…ÙŠØ¹ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
+
+#: controllers/templates/exp.mako:183
+msgid "Available fields"
+msgstr "Ø§Ù„ØÙ‚ÙˆÙ„ Ø§Ù„Ù…ØªÙˆÙØ±Ø©"
+
+#: controllers/templates/exp.mako:185
+msgid "Fields to export"
+msgstr "ØÙ‚ÙˆÙ„ Ù„Ù„ØªØµØ¯ÙŠØ±"
+
+#: controllers/templates/exp.mako:187
+msgid "Save fields list"
+msgstr "ØÙØ¸ Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„ØÙ‚ÙˆÙ„"
+
+#: controllers/templates/exp.mako:189
+msgid "Save as:"
+msgstr "ØÙØ¸ Ø¨Ø§Ø³Ù…:"
+
+#: controllers/templates/exp.mako:191 controllers/templates/fieldpref.mako:102
+#: controllers/templates/selection.mako:45
+msgid "OK"
+msgstr "Ù…ÙˆØ§ÙÙ‚"
+
+#: controllers/templates/exp.mako:195
+msgid "Saved exports:"
+msgstr "Ù…ÙØµØ¯Ø±Ø© Ù…ØÙÙˆØ¸Ø©:"
+
+#: controllers/templates/exp.mako:204 controllers/templates/form.mako:135
+#: controllers/templates/image.mako:67 widgets/form/templates/one2many.mako:22
+#: widgets/templates/sidebar.mako:67
+#: widgets/templates/listgrid/listgrid.mako:105
+#: widgets/templates/listgrid/listgrid.mako:109
+#: widgets/templates/listgrid/listgrid.mako:173
+#: widgets/templates/listgrid/listgrid.mako:178
+#: widgets/templates/listgrid/listgroup.mako:131
+#: widgets/templates/listgrid/multiple_group.mako:81
+msgid "Delete"
+msgstr "ØØ°Ù"
+
+#: controllers/templates/exp.mako:217 widgets/templates/sidebar.mako:56
+#: widgets/templates/listgrid/listgrid.mako:135
+msgid "Add"
+msgstr "Ø¥Ø¶Ø§ÙØ©"
+
+#: controllers/templates/exp.mako:222 controllers/templates/viewlist.mako:125
+msgid "Remove"
+msgstr "Ø¥Ø²Ø§Ù„Ø©"
+
+#: controllers/templates/exp.mako:227
+msgid "Remove All"
+msgstr "Ø¥Ø²Ø§Ù„Ø© Ø§Ù„ÙƒÙ„"
+
+#: controllers/templates/exp.mako:245
+msgid "Export to File"
+msgstr "ØªØµØ¯ÙŠØ± Ù„Ù…Ù„Ù"
+
+#: controllers/templates/fieldpref.mako:4
+#: controllers/templates/fieldpref.mako:29
+msgid "Field Preferences"
+msgstr "Ø§Ù„ØªÙØ¶ÙŠÙ„Ø§Øª Ù„Ù„ØÙ‚ÙˆÙ„"
+
+#: controllers/templates/fieldpref.mako:39
+msgid "Field Name:"
+msgstr "Ø§Ø³Ù… Ø§Ù„ØÙ‚Ù„:"
+
+#: controllers/templates/fieldpref.mako:43
+msgid "Domain:"
+msgstr "Ø§Ù„Ù†Ø·Ø§Ù‚:"
+
+#: controllers/templates/fieldpref.mako:47
+msgid "Default Value:"
+msgstr "Ø§Ù„Ù‚ÙŠÙ…Ø© Ø§Ù„Ø¥ÙØªØ±Ø§Ø¶ÙŠØ©:"
+
+#: controllers/templates/fieldpref.mako:57
+msgid "Value applicable for:"
+msgstr "Ø§Ù„Ù‚ÙŠÙ…Ø© Ø§Ù„Ù…Ù„Ø§Ø¦Ù…Ø© Ù„Ù€:"
+
+#: controllers/templates/fieldpref.mako:63
+msgid "Only for you"
+msgstr "Ù„Ùƒ ÙÙ‚Ø·"
+
+#: controllers/templates/fieldpref.mako:67
+msgid "For all"
+msgstr "Ù„Ù„ÙƒÙ„"
+
+#: controllers/templates/fieldpref.mako:76
+msgid "Value applicable if:"
+msgstr "Ø§Ù„Ù‚ÙŠÙ…Ø© Ù…Ù„Ø§Ø¦Ù…Ø© Ù„Ùˆ:"
+
+#: controllers/templates/fieldpref.mako:79
+msgid "Always applicable!"
+msgstr "Ø¯Ø§Ø¦Ù…Ø§Ù‹!"
+
+#: controllers/templates/fieldpref.mako:99 controllers/templates/image.mako:70
+#: controllers/templates/imp.mako:205 controllers/templates/index.mako:198
+#: controllers/templates/openm2.mako:52
+#: controllers/templates/save_filter.mako:42
+#: controllers/templates/search.mako:129
+#: controllers/templates/translator.mako:41
+#: controllers/templates/translator.mako:108
+#: controllers/templates/viewed.mako:37
+#: controllers/templates/viewed_new.mako:49
+#: controllers/templates/viewed_new_model.mako:42
+#: controllers/templates/viewed_preview.mako:28
+#: controllers/templates/viewlist.mako:129 widgets/templates/sidebar.mako:67
+#: widgets/templates/viewform.mako:37
+msgid "Close"
+msgstr "Ø¥ØºÙ„Ø§Ù‚"
+
+#: controllers/templates/footer.mako:3
+#, python-format
+msgid "&copy; 2008-2010 %(ooweb)s  SA. All Rights Reserved "
+msgstr "&copy; 2008-2010 %(ooweb)s  SA. Ø¬Ù…ÙŠØ¹ Ø§Ù„ØÙ‚ÙˆÙ‚ Ù…ØÙÙˆØ¸Ø© "
+
+#: controllers/templates/footer.mako:6
+msgid "Significant contributions to the web client have been made by"
+msgstr "ØªÙ…Øª Ø§Ù„Ù…Ø³Ø§Ù‡Ù…Ø© Ø§Ù„Ø£ÙƒØ¨Ø± Ù„Ù„ÙˆÙŠØ¨ Ù…Ù† Ù‚Ø¨Ù„ Ø¨ÙˆØ§Ø³Ø·Ø© kifcaliph Ùˆ"
+
+#: controllers/templates/form.mako:63
+msgid "Disable all Tips"
+msgstr "Ø£Ù„Øº Ø§Ù„Ù†ØµØ§Ø¦Ø"
+
+#: controllers/templates/form.mako:64
+msgid "Hide this Tip"
+msgstr "Ø£Ø®Ù Ù‡Ø°Ù‡ Ø§Ù„Ù†ØµÙŠØØ©"
+
+#: controllers/templates/form.mako:82
+msgid "Add / Remove Shortcut..."
+msgstr "Ø¥Ø¶Ø§ÙØ© / Ø¥Ø²Ø§Ù„Ø© Ù…Ø®ØªÙŽØµÙŽØ±"
+
+#: controllers/templates/form.mako:86
+#, python-format
+msgid "Search: %s"
+msgstr "Ø¨ØØ«: %s"
+
+#: controllers/templates/form.mako:93
+msgid "Corporate Intelligence..."
+msgstr "Ø§Ù„Ø§Ø³ØªØ®Ø¨Ø§Ø±Ø§Øª Ø§Ù„ØªÙ†Ø§ÙØ³ÙŠØ©..."
+
+#: controllers/templates/form.mako:99
+msgid "Show Logs..."
+msgstr "Ø¹Ø±Ø¶ Ø§Ù„Ø³Ø¬Ù„Ø§Øª..."
+
+#: controllers/templates/form.mako:111
+msgid "Create a new resource"
+msgstr "Ø¥Ù†Ø´Ø§Ø¡ Ù…ØµØ¯Ø± Ø¬Ø¯ÙŠØ¯"
+
+#: controllers/templates/form.mako:112 controllers/templates/search.mako:128
+#: controllers/templates/viewed_new_model.mako:36
+#: controllers/templates/viewlist.mako:119 widgets/form/_o2m.py:73
+#: widgets/form/templates/one2many.mako:20
+#: widgets/templates/listgrid/listgrid.mako:140
+#: widgets/templates/listgrid/listgrid.mako:144
+#: widgets/templates/listgrid/listgroup.mako:20
+msgid "New"
+msgstr "Ø¬Ø¯ÙŠØ¯"
+
+#: controllers/templates/form.mako:116
+msgid "Edit this resource"
+msgstr "ØØ±Ø± Ù‡Ø°Ø§ Ø§Ù„Ù…ØµØ¯Ø±"
+
+#: controllers/templates/form.mako:117 controllers/templates/viewlist.mako:122
+#: widgets/templates/listgrid/listgrid.mako:75
+#: widgets/templates/listgrid/listgrid.mako:79
+#: widgets/templates/listgrid/listgroup.mako:112
+#: widgets/templates/listgrid/multiple_group.mako:63
+msgid "Edit"
+msgstr "ØªØØ±ÙŠØ±"
+
+#: controllers/templates/form.mako:121
+msgid "Save this resource"
+msgstr "ØÙØ¸ Ù‡Ø°Ø§ Ø§Ù„Ù…Ø¸Ù‡Ø±"
+
+#: controllers/templates/form.mako:122 controllers/templates/image.mako:65
+#: controllers/templates/openm2.mako:48
+#: controllers/templates/save_filter.mako:41
+#: controllers/templates/translator.mako:39
+#: controllers/templates/translator.mako:106
+#: controllers/templates/viewed_new.mako:46
+#: controllers/templates/viewed_new_model.mako:39
+#: controllers/templates/viewlist.mako:157
+#: controllers/templates/preferences/index.mako:39
+msgid "Save"
+msgstr "ØÙÙ€Ø¸"
+
+#: controllers/templates/form.mako:124
+msgid "Save & Edit this resource"
+msgstr "ØÙØ¸ Ùˆ ØªØØ±ÙŠØ± Ù‡Ø°Ø§ Ø§Ù„Ù…ØµØ¯Ø±"
+
+#: controllers/templates/form.mako:125
+msgid "Save & Edit"
+msgstr "ØÙØ¸ Ùˆ ØªØØ±ÙŠØ±"
+
+#: controllers/templates/form.mako:129
+msgid "Duplicate this resource"
+msgstr "ØªÙƒØ±Ø§Ø± Ù‡Ø°Ø§ Ø§Ù„Ù…ØµØ¯Ø±"
+
+#: controllers/templates/form.mako:130
+msgid "Duplicate"
+msgstr "ØªÙƒØ±Ø§Ø±"
+
+#: controllers/templates/form.mako:134
+msgid "Delete this resource"
+msgstr "ØØ°Ù Ù‡Ø°Ø§ Ø§Ù„Ù…ØµØ¯Ø±"
+
+#: controllers/templates/form.mako:139
+msgid "Cancel editing the current resource"
+msgstr "Ø¥Ù„ØºØ§Ø¡ ØªØØ±ÙŠØ± Ø§Ù„Ù…ØµØ¯Ø± Ø§Ù„ØØ§Ù„ÙŠ"
+
+#: controllers/templates/form.mako:144
+msgid "Create new node"
+msgstr "Ø¥Ù†Ø´Ø§Ø¡ Ø·Ø±Ù Ø¬Ø¯ÙŠØ¯"
+
+#: controllers/templates/form.mako:145
+msgid "New Node"
+msgstr "Ø·Ø±Ù Ø¬Ø¯ÙŠØ¯"
+
+#: controllers/templates/form.mako:149
+msgid "Show grid in workflow canvas"
+msgstr "Ø¥Ø¸Ù‡Ø§Ø± Ø§Ù„Ø´Ø¨ÙƒÙŠØ© Ù„Ø®Ù„ÙÙŠØ© Ù…Ø³Ø§Ø± Ø§Ù„Ø¹Ù…Ù„"
+
+#: controllers/templates/form.mako:150
+msgid "Show grid"
+msgstr "Ø¥Ø¸Ù‡Ø§Ø± Ø§Ù„Ø´Ø¨ÙƒÙŠØ©"
+
+#: controllers/templates/header.mako:33
+#, python-format
+msgid "%(company)s"
+msgstr "%(company)s"
+
+#: controllers/templates/header.mako:34 controllers/templates/index.mako:218
+#, python-format
+msgid "%(user)s"
+msgstr "%(user)s"
+
+#: controllers/templates/header.mako:45 controllers/templates/header.mako:47
+msgid "Home"
+msgstr "Ø§Ù„ØµÙØØ© Ø§Ù„Ø±Ø¦ÙŠØ³ÙŠØ©"
+
+#: controllers/templates/header.mako:53
+msgid "Requests"
+msgstr "Ø·Ù„Ø¨Ø§Øª"
+
+#: controllers/templates/header.mako:62
+msgid "Edit Preferences"
+msgstr "ØªØØ±ÙŠØ± Ø§Ù„ØªÙØ¶ÙŠÙ„Ø§Øª"
+
+#: controllers/templates/header.mako:66 controllers/templates/header.mako:69
+msgid "About"
+msgstr "Ø¹Ù†"
+
+#: controllers/templates/header.mako:73 controllers/templates/header.mako:75
+msgid "Help"
+msgstr "Ù…Ø³Ø§Ø¹Ø¯Ø©"
+
+#: controllers/templates/header.mako:81 controllers/templates/header.mako:84
+msgid "Clear Cache"
+msgstr "Ù…Ø³Ø Ø§Ù„Ø°Ø§ÙƒØ±Ø© Ø§Ù„Ù…Ø®Ø¨Ø¦Ø©"
+
+#: controllers/templates/header.mako:89
+msgid "Logout"
+msgstr "ØªØ³Ø¬ÙŠÙ„ Ø§Ù„Ø®Ø±ÙˆØ¬"
+
+#: controllers/templates/image.mako:4 controllers/templates/image.mako:39
+msgid "Image"
+msgstr "ØµÙˆØ±Ù‡"
+
+#: controllers/templates/image.mako:55
+msgid "Add Resource:"
+msgstr "Ø¥Ø¶Ø§ÙØ© Ù…ØµØ¯Ø±:"
+
+#: controllers/templates/image.mako:66 widgets/form/templates/binary.mako:28
+msgid "Save As"
+msgstr "ØÙØ¸ ÙƒÙ€"
+
+#: controllers/templates/imp.mako:80
+msgid "Import Data"
+msgstr "Ø§Ø³ØªÙŠØ±Ø§Ø¯ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
+
+#: controllers/templates/imp.mako:90
+msgid "1. Import a .CSV file"
+msgstr "Ø¥Ø³ØªÙŠØ±Ø§Ø¯ Ù…Ù„Ù .CSV"
+
+#: controllers/templates/imp.mako:106
+msgid "CSV File:"
+msgstr "Ù…Ù„Ù CSV :"
+
+#: controllers/templates/imp.mako:124
+msgid "2. Check your file format"
+msgstr "ØªØ£ÙƒØ¯ Ù…Ù† Ø¥Ù…ØªØ¯Ø§Ø¯ Ø§Ù„Ù…Ù„Ù"
+
+#: controllers/templates/imp.mako:131
+#, python-format
+msgid "The import failed due to: %(message)s"
+msgstr "Ø¹Ù…Ù„ÙŠØ© Ø§Ù„Ø¥Ø³ØªÙŠØ±Ø§Ø¯ ÙØ´Ù„Øª Ù„Ø³Ø¨Ø¨: %(message)s"
+
+#: controllers/templates/imp.mako:133
+msgid "Here is a preview of the file we could not import:"
+msgstr "Ù‡Ø°Ù‡ Ù…Ø¹Ø§ÙŠÙ†Ø© Ù„Ù…Ù„Ù Ù„Ù… ÙŠØªÙ…ÙƒÙ† Ù…Ù† Ø¥Ø³ØªÙŠØ±Ø§Ø¯Ù‡:"
+
+#: controllers/templates/imp.mako:158
+msgid "CSV Options"
+msgstr "Ø®ÙŠØ§Ø±Ø§Øª Ø§Ù„Ù€Ù€ CSV"
+
+#: controllers/templates/imp.mako:161
+msgid "Separator:"
+msgstr "ÙØ§ØµÙ„ :"
+
+#: controllers/templates/imp.mako:163
+msgid "Delimiter:"
+msgstr "Ù…ØØ¯Ø¯:"
+
+#: controllers/templates/imp.mako:167
+msgid "Encoding:"
+msgstr "ØªØ±Ù…ÙŠØ²:"
+
+#: controllers/templates/imp.mako:174
+msgid "Lines to skip:"
+msgstr "Ø§Ù„Ø®Ø·ÙˆØ· Ù„Ù„ØªØ®Ø·ÙŠ:"
+
+#: controllers/templates/imp.mako:188
+msgid "3. File imported"
+msgstr "Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ù…Ø³ØªÙˆØ±Ø¯Ø©"
+
+#: controllers/templates/imp.mako:206
+msgid "Import File"
+msgstr "Ø¥Ø³ØªÙŠØ±Ø§Ø¯ Ù…Ù„Ù"
+
+#: controllers/templates/index.mako:164
+msgid "System Logs"
+msgstr "Ø³Ø¬Ù„Ø§Øª Ø§Ù„Ù†Ø¸Ø§Ù…"
+
+#: controllers/templates/index.mako:189
+msgid "More"
+msgstr "Ù…Ø²ÙŠØ¯"
+
+#: controllers/templates/index.mako:190
+msgid "Widgets"
+msgstr "Ø¹Ù†Ø§ØµØ± Ù…Ø±Ø¦ÙŠØ©"
+
+#: controllers/templates/index.mako:221 controllers/templates/index.mako:226
+#, python-format
+msgid "Powered by %(openerp)s "
+msgstr "Ù…Ø¯Ø¹ÙˆÙ… Ø¨Ù€ %(openerp)s Ùˆ kifcaliph "
+
+#: controllers/templates/login.mako:53 controllers/templates/login_ajax.mako:72
+#: controllers/templates/login_ajax.mako:94
+msgid "User:"
+msgstr "Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…:"
+
+#: controllers/templates/login.mako:64
+msgid "Databases"
+msgstr "Ù‚ÙˆØ§Ø¹Ø¯ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
+
+#: controllers/templates/login.mako:84
+msgid "Top Contributor:"
+msgstr "Ø§Ù„Ø£ÙƒØ«Ø± Ø¥Ø³Ù‡Ø§Ù…Ø§Ù‹:"
+
+#: controllers/templates/login.mako:94
+msgid ""
+"We think that daily job activities can be more intuitive, efficient, "
+"automated, .. and even fun."
+msgstr "Ù†Ø¤Ù…Ù† Ø¨Ø£Ù† Ù†Ø´Ø§Ø· Ø§Ù„Ø¹Ù…Ù„ Ø§Ù„ÙŠÙˆÙ…ÙŠ ÙŠÙ…ÙƒÙ† Ø£Ù† ÙŠÙƒÙˆÙ† Ø¨Ø¯ÙŠÙ‡ÙŠØŒ ÙØ¹Ø§Ù„ØŒ Ø³Ø±ÙŠØ¹ Ùˆ Ù…Ù…ØªØ¹"
+
+#: controllers/templates/login.mako:95
+msgid "OpenERP's vision to be:"
+msgstr "Ø±Ø¤ÙŠ Ø¨Ø±Ù†Ø§Ù…Ø¬ OpenERP Ù‡ÙŠ:"
+
+#: controllers/templates/login.mako:103
+msgid "Full featured"
+msgstr "ÙƒØ§Ù…Ù„ Ø§Ù„Ø£ÙˆØµØ§Ù"
+
+#: controllers/templates/login.mako:104
+msgid ""
+"Today's enterprise challenges are multiple. We provide one module for each "
+"need."
+msgstr ""
+"ØªØªØ¹Ø¯Ø¯ ØªØØ¯ÙŠØ§Øª Ø§Ù„Ù…Ù†Ø´Ø¢Øª Ø§Ù„ÙŠÙˆÙ…ØŒ Ùˆ Ù„Ø°Ù„Ùƒ Ù†ÙˆÙØ± Ø§Ù„Ø¹Ø¯ÙŠØ¯ Ù…Ù† ÙˆØØ¯Ø§Øª Ø§Ù„Ø£ÙƒÙˆØ§Ø¯ Ù„ÙƒÙ„ Ø¥ØØªÙŠØ§Ø¬."
+
+#: controllers/templates/login.mako:112
+msgid "Open Source"
+msgstr "Ù…ÙØªÙˆØ Ø§Ù„Ù…ØµØ¯Ø±"
+
+#: controllers/templates/login.mako:113
+msgid ""
+"To Build a great product, we rely on the knowledge of thousands of "
+"contributors."
+msgstr "Ù„Ø¨Ù†Ø§Ø¡ Ù…Ù†ØªØ¬ Ù‚ÙˆÙŠØŒ Ù†ØÙ† Ù†Ø¹ØªÙ…Ø¯ Ø¹Ù„ÙŠ Ù…Ø¹Ø±ÙØ© Ø£Ù„Ø§Ù Ø§Ù„Ù…Ø³Ø§Ù‡Ù…ÙŠÙ†."
+
+#: controllers/templates/login.mako:121
+msgid "User Friendly"
+msgstr "Ø³Ù‡Ù„Ø© Ø§Ù„Ø¥Ø³ØªØ®Ø¯Ø§Ù…"
+
+#: controllers/templates/login.mako:122
+msgid ""
+"In order to be productive, people need clean and easy to use interface."
+msgstr "ØªØªÙ…Ø«Ù„ Ø§Ù„Ø¥Ù†ØªØ§Ø¬ÙŠØ© ÙÙŠ ØØ§Ø¬Ø© Ø§Ù„Ø£ÙØ±Ø§Ø¯ Ø¥Ù„ÙŠØ¥Ø³ØªØ®Ø¯Ø§Ù… ÙˆØ§Ø¬Ù‡Ø© Ø³Ù‡Ù„Ø© Ùˆ Ù„Ø§Ø¦Ù‚Ø©."
+
+#: controllers/templates/modules.mako:4
+msgid "Module Management"
+msgstr "Ø¥Ø¯Ø§Ø±Ø© ÙˆØØ¯Ø§Øª Ø§Ù„Ø£ÙƒÙˆØ§Ø¯"
+
+#: controllers/templates/modules.mako:17
+msgid "Web Modules"
+msgstr "ÙˆØØ¯Ø© ÙƒÙˆØ¯ Ù„Ù„Ø¥Ù†ØªØ±Ù†Øª"
+
+#: controllers/templates/openo2m.mako:34
+msgid "Save & Close"
+msgstr "ØÙØ¸ Ùˆ Ø¥ØºÙ„Ø§Ù‚"
+
+#: controllers/templates/openo2m.mako:37
+msgid "Save & New"
+msgstr "ØÙØ¸ Ùˆ Ø¬Ø¯ÙŠØ¯"
+
+#: controllers/templates/save_filter.mako:18
+msgid "Save as Filter"
+msgstr "ØÙØ¸ ÙƒÙ…Ø±Ø´Ø"
+
+#: controllers/templates/save_filter.mako:30
+msgid "Filter Name"
+msgstr "Ø§Ø³Ù… Ù…Ø±Ø´Ø"
+
+#: controllers/templates/search.mako:110
+#, python-format
+msgid "Search %(name)s"
+msgstr "Ø¨ØØ« %(name)s"
+
+#: controllers/templates/search.mako:125 widgets/form/templates/datetime.mako:8
+msgid "Select"
+msgstr "Ø§Ø®ØªØ±"
+
+#: controllers/templates/search.mako:127 widgets/_views.py:83
+#: widgets/form/templates/many2one.mako:22
+#: widgets/form/templates/reference.mako:27 widgets/templates/viewform.mako:26
+msgid "Search"
+msgstr "Ø¨ØØ«"
+
+#: controllers/templates/search.mako:143
+#, python-format
+msgid "No record found : '%(searched_string)s'."
+msgstr "Ù„Ù… ÙŠØªÙ… Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„ÙŠ Ø§Ù„Ø³Ø¬Ù„: '%(searched_string)s'."
+
+#: controllers/templates/selection.mako:4
+msgid "Select action"
+msgstr "Ø§Ø®ØªØ± Ø¥Ø¬Ø±Ø§Ø¡"
+
+#: controllers/templates/selection.mako:23
+msgid "Select your action"
+msgstr "Ø§Ø®ØªØ± Ø¥Ø¬Ø±Ø§Ø¡Ùƒ"
+
+#: controllers/templates/server_log.mako:4
+msgid "Server Actions..."
+msgstr "Ø¥Ø¬Ø±Ø§Ø¡Ø§Øª Ø§Ù„Ø®Ø§Ø¯Ù…..."
+
+#: controllers/templates/server_log.mako:14
+msgid "Server Actions"
+msgstr "Ø¥Ø¬Ø±Ø§Ø¡Ø§Øª Ø§Ù„Ø®Ø§Ø¯Ù…"
+
+#: controllers/templates/translator.mako:4
+msgid "Add Translations"
+msgstr "Ø£Ø¶Ù ØªØ±Ø¬Ù…Ø§Øª"
+
+#: controllers/templates/translator.mako:17
+msgid "Add Translation"
+msgstr "Ø¥Ø¶Ø§ÙØ© ØªØ±Ø¬Ù…Ø©"
+
+#: controllers/templates/translator.mako:27
+msgid "Add Translation for:"
+msgstr "Ø£Ø¶Ù ØªØ±Ø¬Ù…Ø© Ù„Ù€Ù€"
+
+#: controllers/templates/translator.mako:31
+msgid "Fields"
+msgstr "ØÙ‚ÙˆÙ„"
+
+#: controllers/templates/translator.mako:32
+msgid "Labels"
+msgstr "ØªØ³Ù…ÙŠØ§Øª"
+
+#: controllers/templates/translator.mako:33
+msgid "Relates"
+msgstr "Ù…ØªØ¹Ù„Ù‚Ø§Øª"
+
+#: controllers/templates/translator.mako:34
+msgid "View"
+msgstr "Ø¹Ø±Ø¶"
+
+#: controllers/templates/translator.mako:53
+msgid "Field"
+msgstr "ØÙ‚Ù„"
+
+#: controllers/templates/view_log.mako:4 controllers/templates/view_log.mako:12
+#: utils/common.py:47
+msgid "Information"
+msgstr "Ù…Ø¹Ù„ÙˆÙ…Ø§Øª"
+
+#: controllers/templates/viewed.mako:17
+#, python-format
+msgid "View Editor %s - %s"
+msgstr "Ø¹Ø±Ø¶ Ø§Ù„Ù…ØØ±Ø± %s - %s"
+
+#: controllers/templates/viewed.mako:31
+msgid "Create a new inherited view"
+msgstr "Ø¥Ù†Ø´Ø§Ø¡ Ø¹Ø±Ø¶ Ù…ÙˆØ±ÙˆØ« Ø¬Ø¯ÙŠØ¯"
+
+#: controllers/templates/viewed.mako:31
+msgid "Inherited View"
+msgstr "Ø¹Ø±Ø¶ Ù…ÙˆØ±ÙˆØ«"
+
+#: controllers/templates/viewed.mako:34
+msgid "Preview"
+msgstr "Ù…Ø¹Ø§ÙŠÙ†Ø©"
+
+#: controllers/templates/viewed_add.mako:6
+msgid "Node Type:"
+msgstr "Ù†ÙˆØ¹ Ø§Ù„Ø·Ø±Ù:"
+
+#: controllers/templates/viewed_add.mako:23
+msgid "New Field"
+msgstr "ØÙ‚Ù„ Ø¬Ø¯ÙŠØ¯"
+
+#: controllers/templates/viewed_add.mako:27
+msgid "Position:"
+msgstr "Ù…ÙˆØ¶Ø¹"
+
+#: controllers/templates/viewlist.mako:4
+#: controllers/templates/viewlist.mako:108
+#, python-format
+msgid "Manage Views (%s)"
+msgstr "Ø¥Ø¯Ø§Ø±Ø© Ø¹Ø±ÙˆØ¶ (%s)"
+
+#: controllers/templates/viewlist.mako:146
+#, python-format
+msgid "Create a view (%s)"
+msgstr "Ø¥Ù†Ø´Ø§Ø¡ Ø¹Ø±Ø¶ (%s)"
+
+#: controllers/templates/viewlist.mako:174
+msgid "View Name:"
+msgstr "Ø§Ø³Ù… Ø§Ù„Ø¹Ø±Ø¶:"
+
+#: controllers/templates/viewlist.mako:178
+msgid "View Type:"
+msgstr "Ù†ÙˆØ¹ Ø§Ù„Ø¹Ø±Ø¶:"
+
+#: controllers/templates/viewlist.mako:189
+msgid "Priority:"
+msgstr "Ø§Ù„Ø£ÙˆÙ„ÙˆÙŠØ©:"
+
+#: utils/common.py:37 utils/common.py:66
+msgid "Error"
+msgstr "Ø®Ø·Ø£"
+
+#: utils/common.py:42 utils/common.py:69
+msgid "Warning"
+msgstr "ØªØØ°ÙŠØ±"
+
+#: utils/rpc.py:131
+msgid "Access Denied"
+msgstr "Ø§Ù„Ø³Ù…Ø§Ø Ù…Ø±ÙÙˆØ¶"
+
+#: utils/rpc.py:238
+msgid "Unsupported protocol."
+msgstr "Ø¨Ø±ÙˆØªÙˆÙƒÙˆÙ„ ØºÙŠØ± Ù…Ø¯Ø¹Ù…"
+
+#: utils/rpc.py:342
+msgid ""
+"You select a timezone but OpenERP could not find pytz library!\n"
+"The timezone functionality will be disable."
+msgstr ""
+"Ù„Ù‚Ø¯ Ø§Ø®ØªØ±Øª Ø§Ù„Ù…Ù†Ø·Ù‚Ø© Ø§Ù„Ø²Ù…Ù†ÙŠØ© Ùˆ Ù„ÙƒÙ† Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬ Ù„Ù… ÙŠØªÙ…ÙƒÙ† Ù…Ù† Ø¥ÙŠØ¬Ø§Ø¯ Ù…ÙƒØªØ¨Ø© pytz\n"
+"Ø³ÙŠØªÙ… Ø¥ÙŠÙ‚Ø§Ù ÙˆØ¸ÙŠÙØ© Ø§Ù„Ù…Ù†Ø·Ù‚Ø© Ø§Ù„Ø²Ù…Ù†ÙŠØ©."
+
+#: utils/rpc.py:355
+msgid "Not logged..."
+msgstr "Ù„Ù… ÙŠØªÙ… Ø§Ù„Ø¯Ø®ÙˆÙ„..."
+
+#: utils/rpc.py:355
+msgid "Authorization Error"
+msgstr "Ø®Ø·Ø£ ÙÙŠ Ø§Ù„ØªØ®ÙˆÙŠÙ„"
+
+#: utils/rpc.py:437
+msgid "== Access Denied =="
+msgstr "== Ù…Ø±ÙÙˆØ¶ Ø§Ù„Ø³Ù…Ø§Ø =="
+
+#: widgets/_views.py:52
+msgid "Form"
+msgstr "Ù†Ù…ÙˆØ°Ø¬"
+
+#: widgets/_views.py:53
+msgid "Form view..."
+msgstr "Ø¹Ø±Ø¶ Ø§Ù„Ù†Ù…ÙˆØ°Ø¬..."
+
+#: widgets/_views.py:84
+msgid "Search view..."
+msgstr "Ø¹Ø±Ø¶ Ø§Ù„Ø¨ØØ«..."
+
+#: widgets/listgrid.py:289
+msgid "Wrong on_change trigger"
+msgstr "Ø®Ø·Ø£ Ø¨ÙƒÙˆØ¯ on_change"
+
+#: widgets/listgrid.py:353 widgets/form/_form.py:904
+#, python-format
+msgid "Invalid view, duplicate field: %s"
+msgstr "Ø¹Ø±Ø¶ Ø®Ø§Ø·Ø¦ØŒ ØÙ‚ÙˆÙ„ Ù…ØªÙƒØ±Ø±Ø©: %s"
+
+#: widgets/pager.py:56
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: widgets/pager.py:68
+#, python-format
+msgid "%s - %s"
+msgstr "%s - %s"
+
+#: widgets/search.py:282
+msgid "contains"
+msgstr "ÙŠØØªÙˆÙ‰ Ø¹Ù„Ù‰"
+
+#: widgets/search.py:282
+msgid "doesn't contain"
+msgstr "Ù„Ø§ ÙŠØØªÙˆÙŠ Ø¹Ù„ÙŠ"
+
+#: widgets/search.py:283
+msgid "is equal to"
+msgstr "Ù…Ø³Ø§ÙˆÙ Ù„Ù€"
+
+#: widgets/search.py:283
+msgid "is not equal to"
+msgstr "Ù„ÙŠØ³ Ù…Ø³Ø§ÙˆÙŠÙ‹Ø§ Ù„Ù€"
+
+#: widgets/search.py:284
+msgid "greater than"
+msgstr "Ø£ÙƒØ¨Ø± Ù…Ù†"
+
+#: widgets/search.py:284
+msgid "less than"
+msgstr "Ø£Ù‚Ù„ Ù…Ù†"
+
+#: widgets/search.py:285
+msgid "in"
+msgstr "ÙÙŠ"
+
+#: widgets/search.py:285
+msgid "not in"
+msgstr "Ù„ÙŠØ³ ÙÙŠ"
+
+#: widgets/search.py:392
+msgid "Yes"
+msgstr "Ù†Ø¹Ù…"
+
+#: widgets/search.py:392
+msgid "No"
+msgstr "ï»»"
+
+#: widgets/form/_action.py:46
+msgid "Action not found!"
+msgstr "Ù„Ù… ÙŠØªÙ… Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„ÙŠ Ø§Ù„Ø¥Ø¬Ø±Ø§Ø¡!"
+
+#: widgets/form/_o2m.py:73 widgets/templates/listgrid/listgrid.mako:138
+#: widgets/templates/listgrid/listgrid.mako:144
+#: widgets/templates/listgrid/listgroup.mako:20
+msgid "Create new record."
+msgstr "Ø¥Ù†Ø´Ø§Ø¡ Ø³Ø¬Ù„ Ø¬Ø¯ÙŠØ¯"
+
+#: widgets/form/_o2m.py:86
+msgid "Save/New"
+msgstr "ØÙØ¸/Ø¬Ø¯ÙŠØ¯"
+
+#: widgets/form/_o2m.py:86
+msgid "Save parent record."
+msgstr "ØÙØ¸ Ø§Ù„Ø³Ø¬Ù„ Ø§Ù„Ø±Ø¦ÙŠØ³ÙŠ."
+
+#: widgets/form/_o2m.py:216
+#, python-format
+msgid "%d of %d"
+msgstr "%d Ù…Ù† %d"
+
+#: widgets/form/_o2m.py:218
+#, python-format
+msgid "- of %d"
+msgstr "- Ù…Ù† %d"
+
+#: widgets/form/templates/binary.mako:31
+msgid "add attachment"
+msgstr "Ø¥Ø¶Ø§ÙØ© Ù…Ø±ÙÙ‚Ø©"
+
+#: widgets/form/templates/image.mako:7 widgets/form/templates/image.mako:39
+msgid "Click here to add new image."
+msgstr "Ø¥Ø¶ØºØ· Ù„Ø¥Ø¶Ø§ÙØ© ØµÙˆØ±Ø© Ø¬Ø¯ÙŠØ¯Ø©"
+
+#: widgets/form/templates/many2one.mako:2
+#: widgets/form/templates/reference.mako:30
+msgid "Open"
+msgstr "ÙØªØ"
+
+#: widgets/form/templates/many2one.mako:2
+#: widgets/form/templates/reference.mako:30
+msgid "Open a resource"
+msgstr "ÙØªØ Ù…ØµØ¯Ø±"
+
+#: widgets/form/templates/one2many.mako:20
+msgid "Create new record..."
+msgstr "Ø¥Ù†Ø´Ø§Ø¡ Ø³Ø¬Ù„ Ø¬Ø¯ÙŠØ¯..."
+
+#: widgets/form/templates/one2many.mako:22
+msgid "Delete record..."
+msgstr "ØØ°Ù Ø³Ø¬Ù„..."
+
+#: widgets/form/templates/one2many.mako:28
+msgid "Translate me."
+msgstr "ØªØ±Ø¬Ù…Ù†ÙŠ."
+
+#: widgets/form/templates/one2many.mako:47
+msgid "Previous record..."
+msgstr "Ø³Ø¬Ù„ Ø³Ø§Ø¨Ù‚..."
+
+#: widgets/form/templates/one2many.mako:49
+msgid "Next record..."
+msgstr "Ø³Ø¬Ù„ ØªØ§Ù„ÙŠ..."
+
+#: widgets/templates/logs.mako:22
+msgid "More..."
+msgstr "Ø§Ù„Ù…Ø²ÙŠØ¯..."
+
+#: widgets/templates/logs.mako:35
+msgid "Less..."
+msgstr "ØªÙ‚Ù„ÙŠÙ„..."
+
+#: widgets/templates/pager.mako:9
+msgid "<< First"
+msgstr "Ø§Ù„Ø£ÙˆÙ„ >>"
+
+#: widgets/templates/pager.mako:14
+msgid "< Previous"
+msgstr "Ø§Ù„Ø³Ø§Ø¨Ù‚ >"
+
+#: widgets/templates/pager.mako:19
+msgid "of"
+msgstr "Ù…Ù†"
+
+#: widgets/templates/pager.mako:24
+msgid "Next >"
+msgstr "Ø§Ù„ØªØ§Ù„ÙŠ >"
+
+#: widgets/templates/pager.mako:29
+msgid "Last >>"
+msgstr "Ø§Ù„Ø£Ø®ÙŠØ± >>"
+
+#: widgets/templates/pager.mako:37
+msgid "Change Limit:"
+msgstr "ØªØºÙŠÙŠØ± Ø§Ù„Ù…Ø³Ù…ÙˆØ:"
+
+#: widgets/templates/sidebar.mako:37
+msgid "Reports"
+msgstr "ØªÙ‚Ø§Ø±ÙŠØ±"
+
+#: widgets/templates/sidebar.mako:41 widgets/templates/viewform.mako:51
+msgid "Actions"
+msgstr "Ø¥Ø¬Ø±Ø§Ø¡Ø§Øª"
+
+#: widgets/templates/sidebar.mako:45
+msgid "Links"
+msgstr "Ø±ÙˆØ§Ø¨Ø·"
+
+#: widgets/templates/sidebar.mako:49
+msgid "Submenu"
+msgstr "Ù‚Ø§Ø¦Ù…Ø© ÙØ±Ø¹ÙŠØ©"
+
+#: widgets/templates/sidebar.mako:54
+msgid "Attachments"
+msgstr "Ù…Ø±ÙÙ‚Ø§Øª"
+
+#: widgets/templates/sidebar.mako:74
+msgid "File"
+msgstr "Ù…Ù„Ù"
+
+#: widgets/templates/sidebar.mako:83
+msgid "Customize"
+msgstr "ØªØ®ØµÙŠØµ"
+
+#: widgets/templates/sidebar.mako:87
+msgid "Manage views of the current object"
+msgstr "ØªØ±ØªÙŠØ¨ Ø¹Ø±ÙˆØ¶ Ø§Ù„ÙƒØ§Ø¦Ù† Ø§Ù„ØØ§Ù„ÙŠ"
+
+#: widgets/templates/sidebar.mako:89
+msgid "Manage Views"
+msgstr "ØªØ±ØªÙŠØ¨ Ø§Ù„Ø¹Ø±ÙˆØ¶"
+
+#: widgets/templates/sidebar.mako:93
+msgid "Edit workflow of the current object"
+msgstr "ØØ±Ø± Ù…Ø³Ø§Ø± Ø§Ù„Ø¹Ù…Ù„ Ù„Ù„ÙƒØ§Ø¦Ù† Ø§Ù„ØØ§Ù„ÙŠ"
+
+#: widgets/templates/sidebar.mako:94
+msgid "Edit Workflow"
+msgstr "ØØ±Ø± Ù…Ø³Ø§Ø± Ø§Ù„Ø¹Ù…Ù„"
+
+#: widgets/templates/sidebar.mako:98
+msgid "Customize current object or create a new object"
+msgstr "ØªØ¹Ø¯ÙŠÙ„ Ù‡ÙŠØ¦Ø© Ø§Ù„ÙƒØ§Ø¦Ù† Ø§Ù„ØØ§Ù„ÙŠ Ø§Ùˆ Ø¹Ù…Ù„ ÙƒØ§Ø¦Ù† Ø¬Ø¯ÙŠØ¯"
+
+#: widgets/templates/sidebar.mako:100
+msgid "Customize Object"
+msgstr "ØªØ¹Ø¯ÙŠÙ„ Ù‡ÙŠØ¦Ø© Ø§Ù„ÙƒØ§Ø¦Ù†"
+
+#: widgets/templates/sidebar.mako:106
+msgid "Other Options"
+msgstr "Ø®ÙŠØ§Ø±Ø§Øª Ø£Ø®Ø±Ù‰"
+
+#: widgets/templates/sidebar.mako:111
+msgid "Import"
+msgstr "Ø¥Ø³ØªÙŠØ±Ø§Ø¯"
+
+#: widgets/templates/sidebar.mako:114
+msgid "Export"
+msgstr "ØªØµØ¯ÙŠØ±"
+
+#: widgets/templates/sidebar.mako:118
+msgid "Translate"
+msgstr "ØªØ±Ø¬Ù…"
+
+#: widgets/templates/sidebar.mako:123
+msgid "View Log"
+msgstr "Ø¹Ø±Ø¶ Ø§Ù„Ø³Ø¬Ù„"
+
+#: widgets/templates/viewform.mako:25
+msgid "Filter records."
+msgstr "ØªØ±Ø´ÙŠØ Ø§Ù„Ø³Ø¬Ù„Ø§Øª"
+
+#: widgets/templates/viewform.mako:33
+msgid "Clear all."
+msgstr "Ù…Ø³Ø Ø§Ù„ÙƒÙ„."
+
+#: widgets/templates/viewform.mako:35
+msgid "Clear"
+msgstr "Ù…Ø³Ø"
+
+#: widgets/templates/viewform.mako:43
+msgid "Filters"
+msgstr "Ù…Ø±Ø´ØØ§Øª Ø§Ù„ÙØ±Ø²"
+
+#: widgets/templates/viewform.mako:45
+msgid "Saved Filters"
+msgstr "Ù…Ø±Ø´ØØ§Øª Ù…ØÙÙˆØ¸Ø©"
+
+#: widgets/templates/viewform.mako:52
+msgid "New Filter"
+msgstr "Ù…Ø±Ø´Ø Ø¬Ø¯ÙŠØ¯Ø©"
+
+#: widgets/templates/viewform.mako:53
+msgid "Save Filter"
+msgstr "ØÙØ¸ Ø§Ù„Ù…Ø±Ø´Ø"
+
+#: widgets/templates/viewform.mako:54
+msgid "Manage Filters"
+msgstr "Ø¥Ø¯Ø§Ø±Ø© Ø§Ù„Ù…Ø±Ø´ØØ§Øª"
+
+#: widgets/templates/listgrid/listgrid.mako:19
+msgid "Update"
+msgstr "ØªØØ¯ÙŠØ«"
+
+#: widgets/templates/listgrid/listgrid.mako:134
+msgid "Add records..."
+msgstr "Ø¥Ø¶Ø§ÙØ© Ø³Ø¬Ù„..."
+
+#: widgets/templates/listgrid/listgrid.mako:172
+#: widgets/templates/listgrid/listgrid.mako:176
+msgid "Delete record(s)."
+msgstr "ØØ°Ù Ø§Ù„Ø³Ø¬Ù„ Ø§Ùˆ Ø§Ù„Ø³Ø¬Ù„Ø§Øª."

=== modified file 'addons/openerp/po/messages/ca.po'
--- addons/openerp/po/messages/ca.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/ca.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"

=== added file 'addons/openerp/po/messages/da.po'
--- addons/openerp/po/messages/da.po	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/messages/da.po	2011-03-15 13:37:09 +0000
@@ -0,0 +1,1584 @@
+# Danish translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-03-12 18:06+0000\n"
+"Last-Translator: Lars Dige <Unknown>\n"
+"Language-Team: Danish <da@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-13 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: validators.py:75
+msgid "Invalid literal for float"
+msgstr ""
+
+#: validators.py:114 validators.py:119 validators.py:262
+msgid "Invalid datetime format"
+msgstr "Forkert dato/tid format"
+
+#: validators.py:166
+msgid "Please select a file."
+msgstr "VÃ¦lg en fil."
+
+#: validators.py:247
+msgid "Please enter an email address"
+msgstr "Indtast email adresse"
+
+#: validators.py:248
+msgid "An email address must contain a single @"
+msgstr ""
+
+#: validators.py:249
+#, python-format
+msgid ""
+"The username portion of the email address is invalid (the portion before the "
+"@: %(username)s)"
+msgstr ""
+
+#: validators.py:250
+#, python-format
+msgid ""
+"The domain portion of the email address is invalid (the portion after the @: "
+"%(domain)s)"
+msgstr ""
+
+#: validators.py:254
+msgid "You must start your URL with http://, https://, etc"
+msgstr ""
+
+#: validators.py:255
+msgid "That is not a valid URL"
+msgstr ""
+
+#: validators.py:256
+#, python-format
+msgid "You must provide a full domain name (like %(domain)s.com)"
+msgstr ""
+
+#: validators.py:260
+msgid "Please enter an integer value"
+msgstr ""
+
+#: validators.py:261
+msgid "Please enter a number"
+msgstr ""
+
+#: controllers/actions.py:91
+msgid "Invalid View"
+msgstr ""
+
+#: controllers/actions.py:124
+msgid "Error no report"
+msgstr ""
+
+#: controllers/actions.py:150
+msgid "Nothing to print"
+msgstr ""
+
+#: controllers/actions.py:170
+msgid "Printing aborted, too long delay"
+msgstr ""
+
+#: controllers/actions.py:377
+msgid "Relative URLs are not supported"
+msgstr ""
+
+#: controllers/actions.py:405
+msgid "Action not found"
+msgstr ""
+
+#: controllers/actions.py:454
+msgid "No action defined"
+msgstr ""
+
+#: controllers/attachment.py:54
+msgid "No record selected, You can only attach to existing record..."
+msgstr ""
+
+#: controllers/database.py:64
+msgid "Create database"
+msgstr ""
+
+#: controllers/database.py:66 controllers/templates/database.mako:52
+#: controllers/templates/search.mako:145
+msgid "Create"
+msgstr ""
+
+#: controllers/database.py:69
+msgid "Super admin password:"
+msgstr ""
+
+#: controllers/database.py:69
+msgid ""
+"This is the password of the user that have the rights to administer "
+"databases. This is not a OpenERP user, just a super administrator. If you "
+"did not changed it, the password is 'admin' after installation."
+msgstr ""
+
+#: controllers/database.py:70 controllers/database.py:102
+msgid "New database name:"
+msgstr ""
+
+#: controllers/database.py:70
+msgid ""
+"Choose the name of the database that will be created. The name must not "
+"contain any special character. Exemple: 'terp'."
+msgstr ""
+
+#: controllers/database.py:71
+msgid "Load Demonstration data:"
+msgstr ""
+
+#: controllers/database.py:71
+msgid ""
+"Check this box if you want demonstration data to be installed on your new "
+"database. These data will help you to understand OpenERP, with predefined "
+"products, partners, etc."
+msgstr ""
+
+#: controllers/database.py:72
+msgid "Default Language:"
+msgstr ""
+
+#: controllers/database.py:72
+msgid ""
+"Choose the default language that will be installed for this database. You "
+"will be able to install new languages after installation through the "
+"administration menu."
+msgstr ""
+
+#: controllers/database.py:73
+msgid "Administrator password:"
+msgstr ""
+
+#: controllers/database.py:73
+msgid ""
+"This is the password of the 'admin' user that will be created in your new "
+"database."
+msgstr ""
+
+#: controllers/database.py:74
+msgid "Confirm password:"
+msgstr ""
+
+#: controllers/database.py:74
+msgid ""
+"This is the password of the 'admin' user that will be created in your new "
+"database. It has to be the same than the above field."
+msgstr ""
+
+#: controllers/database.py:80
+msgid "Drop database"
+msgstr ""
+
+#: controllers/database.py:82 controllers/templates/database.mako:54
+msgid "Drop"
+msgstr ""
+
+#: controllers/database.py:84 controllers/database.py:92
+#: controllers/templates/login.mako:39
+msgid "Database:"
+msgstr ""
+
+#: controllers/database.py:85 controllers/database.py:93
+#: controllers/database.py:101 controllers/templates/login.mako:57
+#: controllers/templates/login_ajax.mako:78
+#: controllers/templates/login_ajax.mako:98
+msgid "Password:"
+msgstr ""
+
+#: controllers/database.py:89
+msgid "Backup database"
+msgstr ""
+
+#: controllers/database.py:91 controllers/templates/database.mako:56
+msgid "Backup"
+msgstr ""
+
+#: controllers/database.py:97
+msgid "Restore database"
+msgstr ""
+
+#: controllers/database.py:99 controllers/templates/database.mako:58
+msgid "Restore"
+msgstr ""
+
+#: controllers/database.py:100
+msgid "File:"
+msgstr ""
+
+#: controllers/database.py:106
+msgid "Change Administrator Password"
+msgstr ""
+
+#: controllers/database.py:108 controllers/templates/preferences/index.mako:37
+msgid "Change Password"
+msgstr ""
+
+#: controllers/database.py:109
+msgid "Old Password:"
+msgstr ""
+
+#: controllers/database.py:110
+msgid "New Password:"
+msgstr ""
+
+#: controllers/database.py:111
+msgid "Confirm Password:"
+msgstr ""
+
+#: controllers/database.py:174
+msgid "You must avoid all accents, space or special characters."
+msgstr ""
+
+#: controllers/database.py:175
+msgid "Bad database name"
+msgstr ""
+
+#: controllers/database.py:195
+msgid ""
+"The server crashed during installation.\n"
+"We suggest you to drop this database."
+msgstr ""
+
+#: controllers/database.py:196
+msgid "Error during database creation"
+msgstr ""
+
+#: controllers/database.py:199 controllers/database.py:226
+#: controllers/database.py:272 controllers/database.py:295
+msgid "Bad super admin password"
+msgstr ""
+
+#: controllers/database.py:203
+msgid "Could not create database."
+msgstr ""
+
+#: controllers/database.py:229
+msgid "Could not drop database"
+msgstr ""
+
+#: controllers/database.py:252
+msgid "Could not create backup."
+msgstr ""
+
+#: controllers/database.py:276
+msgid "Could not restore database"
+msgstr ""
+
+#: controllers/database.py:299
+msgid "Error, password not changed."
+msgstr ""
+
+#: controllers/error_page.py:78
+msgid ""
+"Your problem has been sent to the quality team\n"
+"We will recontact you after analysing the problem."
+msgstr ""
+
+#: controllers/error_page.py:80
+#, python-format
+msgid ""
+"Your problem could not be sent to the quality team\n"
+"Please report this error manually at %s"
+msgstr ""
+
+#: controllers/form.py:553
+#, python-format
+msgid "Invalid button type \"%s\""
+msgstr ""
+
+#: controllers/form.py:891 controllers/tree.py:233
+msgid "No record selected"
+msgstr ""
+
+#: controllers/form.py:896
+msgid "Print Screen"
+msgstr ""
+
+#: controllers/form.py:965 utils/rpc.py:122 utils/rpc.py:133 utils/rpc.py:136
+#: widgets/listgrid.py:289 widgets/listgrid.py:353 widgets/form/_form.py:904
+msgid "Application Error"
+msgstr ""
+
+#: controllers/form.py:965
+#, python-format
+msgid "Wrong on_change trigger: %s"
+msgstr ""
+
+#: controllers/form.py:1073
+msgid "Open resource"
+msgstr ""
+
+#: controllers/form.py:1076
+msgid "Set to default value"
+msgstr ""
+
+#: controllers/form.py:1077
+msgid "Set as default"
+msgstr ""
+
+#: controllers/form.py:1084
+msgid "Action"
+msgstr ""
+
+#: controllers/form.py:1085
+msgid "Report"
+msgstr ""
+
+#: controllers/impex.py:66
+msgid ""
+"Operation failed\n"
+"I/O error"
+msgstr ""
+
+#: controllers/impex.py:373
+msgid "Export Error"
+msgstr ""
+
+#: controllers/impex.py:444
+msgid "Database ID"
+msgstr ""
+
+#: controllers/impex.py:451
+msgid "Error opening .CSV file"
+msgstr ""
+
+#: controllers/impex.py:451
+msgid "Input Error."
+msgstr ""
+
+#: controllers/impex.py:473
+#, python-format
+msgid "You cannot import the field '%s', because we cannot auto-detect it"
+msgstr ""
+
+#: controllers/impex.py:476
+#, python-format
+msgid "Error processing the first line of the file. Field \"%s\" is unknown"
+msgstr ""
+
+#: controllers/impex.py:476
+msgid "Import Error."
+msgstr ""
+
+#: controllers/impex.py:515
+msgid "XML-RPC error"
+msgstr ""
+
+#: controllers/impex.py:520
+#, python-format
+msgid "Imported %d objects"
+msgstr ""
+
+#: controllers/impex.py:525
+#, python-format
+msgid "Error trying to import this record:%s. ErrorMessage:%s %s"
+msgstr ""
+
+#: controllers/impex.py:526
+msgid "ImportationError"
+msgstr ""
+
+#: controllers/listgrid.py:51
+msgid "Parent record doesn't exists..."
+msgstr ""
+
+#: controllers/preferences.py:34
+msgid "Change your password"
+msgstr ""
+
+#: controllers/preferences.py:64 controllers/templates/header.mako:59
+msgid "Preferences"
+msgstr ""
+
+#: controllers/preferences.py:91
+msgid "All passwords have to be filled."
+msgstr ""
+
+#: controllers/preferences.py:93
+msgid "The new password and its confirmation must be identical."
+msgstr ""
+
+#: controllers/preferences.py:102
+msgid "Could not change your password."
+msgstr ""
+
+#: controllers/preferences.py:104
+msgid "Original password incorrect, your password was not changed."
+msgstr ""
+
+#: controllers/root.py:170
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#: controllers/translator.py:132
+msgid "You need to save the resource before adding translations."
+msgstr ""
+
+#: controllers/tree.py:264
+msgid "No resource selected"
+msgstr ""
+
+#: controllers/utils.py:44
+msgid "Could not connect to server"
+msgstr ""
+
+#: controllers/utils.py:131 controllers/templates/login_ajax.mako:111
+msgid "Bad username or password"
+msgstr ""
+
+#: controllers/view_log.py:32
+msgid "ID"
+msgstr ""
+
+#: controllers/view_log.py:33
+msgid "Creation User"
+msgstr ""
+
+#: controllers/view_log.py:34
+msgid "Creation Date"
+msgstr ""
+
+#: controllers/view_log.py:35
+msgid "Latest Modification by"
+msgstr ""
+
+#: controllers/view_log.py:36
+msgid "Latest Modification Date"
+msgstr ""
+
+#: controllers/view_log.py:37
+msgid "Owner"
+msgstr ""
+
+#: controllers/view_log.py:38
+msgid "Group Owner"
+msgstr ""
+
+#: controllers/view_log.py:39
+msgid "Access Level"
+msgstr ""
+
+#: controllers/view_log.py:40
+msgid "Internal module data ID"
+msgstr ""
+
+#: controllers/viewed.py:220
+msgid "Invalid view id."
+msgstr ""
+
+#: controllers/viewed.py:498
+msgid "Unable to create inherited view."
+msgstr ""
+
+#: controllers/viewed.py:500
+msgid "Can't create inherited view here."
+msgstr ""
+
+#: controllers/viewed.py:503
+msgid "Not implemented yet!"
+msgstr ""
+
+#: controllers/viewed.py:608
+msgid "Unable to update the view."
+msgstr ""
+
+#: controllers/viewed.py:859
+msgid "New Window"
+msgstr ""
+
+#: controllers/viewed.py:871
+msgid "Save Button"
+msgstr ""
+
+#: controllers/viewed.py:871
+msgid "Cancel Button"
+msgstr ""
+
+#: controllers/viewed.py:871
+msgid "Open Button"
+msgstr ""
+
+#: controllers/viewed.py:877
+msgid "Left"
+msgstr ""
+
+#: controllers/viewed.py:877
+msgid "Center"
+msgstr ""
+
+#: controllers/viewed.py:877
+msgid "Right"
+msgstr ""
+
+#: controllers/templates/about.mako:4
+msgid "About the OpenERP Web"
+msgstr ""
+
+#: controllers/templates/about.mako:27
+msgid "OpenERP Web"
+msgstr ""
+
+#: controllers/templates/about.mako:30
+msgid "Copyright &copy; 2006-TODAY OpenERP SA. All Rights Reserved."
+msgstr ""
+
+#: controllers/templates/about.mako:31
+msgid "OpenERP is a trademark of the OpenERP SA Company."
+msgstr ""
+
+#: controllers/templates/about.mako:33
+#, python-format
+msgid "%(ooweb)s is jointly developed by %(tiny)s and %(axelor)s."
+msgstr ""
+
+#: controllers/templates/about.mako:39
+#, python-format
+msgid "Licenced under the terms of %(license)s"
+msgstr ""
+
+#: controllers/templates/about.mako:42
+msgid "About OpenERP"
+msgstr ""
+
+#: controllers/templates/about.mako:44
+#, python-format
+msgid ""
+"%(openobject)s is a free enterprise-scale software system that is designed "
+"to boost\n"
+"                    productivity and profit through data integration. It "
+"connects, improves and\n"
+"                    manages business processes in areas such as sales, "
+"finance, supply chain,\n"
+"                    project management, production, services, CRM, etc..\n"
+"                    "
+msgstr ""
+
+#: controllers/templates/about.mako:51
+msgid ""
+"The system is platform-independent, and can be installed on Windows, Mac OS "
+"X,\n"
+"                    and various Linux and other Unix-based distributions. "
+"Its architecture enables\n"
+"                    new functionality to be rapidly created, modifications "
+"to be made to a\n"
+"                    production system and migration to a new version to be "
+"straightforward."
+msgstr ""
+
+#: controllers/templates/about.mako:57
+msgid ""
+"Depending on your needs, OpenERP is available through a web or application "
+"client."
+msgstr ""
+
+#: controllers/templates/database.mako:50 controllers/templates/login.mako:4
+#: controllers/templates/login.mako:67 controllers/templates/login_ajax.mako:85
+#: controllers/templates/login_ajax.mako:104
+msgid "Login"
+msgstr ""
+
+#: controllers/templates/database.mako:60
+msgid "Password"
+msgstr ""
+
+#: controllers/templates/error_page.mako:77
+#, python-format
+msgid "An %(error_type)s has been reported."
+msgstr ""
+
+#: controllers/templates/error_page.mako:79
+msgid "Let me fix it"
+msgstr ""
+
+#: controllers/templates/error_page.mako:85
+msgid "Fix it for me"
+msgstr ""
+
+#: controllers/templates/error_page.mako:90
+msgid "You do not have a valid OpenERP publisher warranty contract !"
+msgstr ""
+
+#: controllers/templates/error_page.mako:91
+msgid ""
+"If you are using OpenERP in production, it is recommended to have\n"
+"a publisher warranty program.\n"
+"\n"
+"The OpenERP publisher warranty contract provides you with bug fix guarantees "
+"and an\n"
+"automatic migration system so that we can start working on your problems "
+"within a few\n"
+"hours.\n"
+"\n"
+"With a publisher warranty contract, errors such as this one can be sent "
+"directly to the OpenERP\n"
+"team for review and evaluation.\n"
+"\n"
+"The publisher warranty program offers you:\n"
+"* Automatic migrations on new versions,\n"
+"* A bugfix guarantee,\n"
+"* Monthly announces of potential bugs and their fixes,\n"
+"* Security alerts by email and automatic migration,\n"
+"* Access to the customer portal.\n"
+msgstr ""
+
+#: controllers/templates/error_page.mako:113
+msgid ""
+"Your publisher warranty contract does not cover all modules installed in "
+"your system !\n"
+"If you are using OpenERP in production, it is highly suggested to upgrade "
+"your\n"
+"contract.\n"
+"\n"
+"If you have developed your own modules or installed third party module, we\n"
+"can provide you an additional publisher warranty contract for these modules. "
+"After\n"
+"having reviewed your modules, our quality team will ensure they will "
+"migrate\n"
+"automatically for all future stable versions of OpenERP at no extra cost.\n"
+"\n"
+"Here is the list of modules not covered by your publisher warranty contract:"
+msgstr ""
+
+#: controllers/templates/error_page.mako:135
+msgid "Publisher warranty contract."
+msgstr ""
+
+#: controllers/templates/error_page.mako:136
+msgid ""
+"Your request will be sent to OpenERP and publisher warranty team will reply "
+"you shortly."
+msgstr ""
+
+#: controllers/templates/error_page.mako:140
+msgid "Summary of the problem:"
+msgstr ""
+
+#: controllers/templates/error_page.mako:147
+msgid "Explain what you did:"
+msgstr ""
+
+#: controllers/templates/error_page.mako:156
+msgid "Other Comments:"
+msgstr ""
+
+#: controllers/templates/error_page.mako:168
+msgid "Send to Publisher Warranty Team"
+msgstr ""
+
+#: controllers/templates/error_page.mako:195
+msgid "Write concurrency warning :"
+msgstr ""
+
+#: controllers/templates/error_page.mako:200
+msgid ""
+"This document has been modified while you were editing it.\n"
+"Choose:\n"
+"\n"
+"    - \"Cancel\" to cancel saving.\n"
+"    - \"Write anyway\" to save your current version."
+msgstr ""
+
+#: controllers/templates/error_page.mako:214 controllers/templates/exp.mako:244
+#: controllers/templates/form.mako:140 controllers/templates/openo2m.mako:41
+#: controllers/templates/selection.mako:43
+#: controllers/templates/viewlist.mako:160
+#: controllers/templates/preferences/index.mako:38
+#: widgets/templates/listgrid/listgrid.mako:33
+msgid "Cancel"
+msgstr ""
+
+#: controllers/templates/error_page.mako:215
+msgid "Write Anyway"
+msgstr ""
+
+#: controllers/templates/exp.mako:151
+msgid "Export Data"
+msgstr ""
+
+#: controllers/templates/exp.mako:166
+msgid "Export Type:"
+msgstr ""
+
+#: controllers/templates/exp.mako:169
+msgid "Import Compatible Export"
+msgstr ""
+
+#: controllers/templates/exp.mako:172
+msgid "Export all Data"
+msgstr ""
+
+#: controllers/templates/exp.mako:183
+msgid "Available fields"
+msgstr ""
+
+#: controllers/templates/exp.mako:185
+msgid "Fields to export"
+msgstr ""
+
+#: controllers/templates/exp.mako:187
+msgid "Save fields list"
+msgstr ""
+
+#: controllers/templates/exp.mako:189
+msgid "Save as:"
+msgstr ""
+
+#: controllers/templates/exp.mako:191 controllers/templates/fieldpref.mako:102
+#: controllers/templates/selection.mako:45
+msgid "OK"
+msgstr ""
+
+#: controllers/templates/exp.mako:195
+msgid "Saved exports:"
+msgstr ""
+
+#: controllers/templates/exp.mako:204 controllers/templates/form.mako:135
+#: controllers/templates/image.mako:67 widgets/form/templates/one2many.mako:22
+#: widgets/templates/sidebar.mako:67
+#: widgets/templates/listgrid/listgrid.mako:105
+#: widgets/templates/listgrid/listgrid.mako:109
+#: widgets/templates/listgrid/listgrid.mako:173
+#: widgets/templates/listgrid/listgrid.mako:178
+#: widgets/templates/listgrid/listgroup.mako:131
+#: widgets/templates/listgrid/multiple_group.mako:81
+msgid "Delete"
+msgstr ""
+
+#: controllers/templates/exp.mako:217 widgets/templates/sidebar.mako:56
+#: widgets/templates/listgrid/listgrid.mako:135
+msgid "Add"
+msgstr ""
+
+#: controllers/templates/exp.mako:222 controllers/templates/viewlist.mako:125
+msgid "Remove"
+msgstr ""
+
+#: controllers/templates/exp.mako:227
+msgid "Remove All"
+msgstr ""
+
+#: controllers/templates/exp.mako:245
+msgid "Export to File"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:4
+#: controllers/templates/fieldpref.mako:29
+msgid "Field Preferences"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:39
+msgid "Field Name:"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:43
+msgid "Domain:"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:47
+msgid "Default Value:"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:57
+msgid "Value applicable for:"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:63
+msgid "Only for you"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:67
+msgid "For all"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:76
+msgid "Value applicable if:"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:79
+msgid "Always applicable!"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:99 controllers/templates/image.mako:70
+#: controllers/templates/imp.mako:205 controllers/templates/index.mako:198
+#: controllers/templates/openm2.mako:52
+#: controllers/templates/save_filter.mako:42
+#: controllers/templates/search.mako:129
+#: controllers/templates/translator.mako:41
+#: controllers/templates/translator.mako:108
+#: controllers/templates/viewed.mako:37
+#: controllers/templates/viewed_new.mako:49
+#: controllers/templates/viewed_new_model.mako:42
+#: controllers/templates/viewed_preview.mako:28
+#: controllers/templates/viewlist.mako:129 widgets/templates/sidebar.mako:67
+#: widgets/templates/viewform.mako:37
+msgid "Close"
+msgstr ""
+
+#: controllers/templates/footer.mako:3
+#, python-format
+msgid "&copy; 2008-2010 %(ooweb)s  SA. All Rights Reserved "
+msgstr ""
+
+#: controllers/templates/footer.mako:6
+msgid "Significant contributions to the web client have been made by"
+msgstr ""
+
+#: controllers/templates/form.mako:63
+msgid "Disable all Tips"
+msgstr ""
+
+#: controllers/templates/form.mako:64
+msgid "Hide this Tip"
+msgstr ""
+
+#: controllers/templates/form.mako:82
+msgid "Add / Remove Shortcut..."
+msgstr ""
+
+#: controllers/templates/form.mako:86
+#, python-format
+msgid "Search: %s"
+msgstr ""
+
+#: controllers/templates/form.mako:93
+msgid "Corporate Intelligence..."
+msgstr ""
+
+#: controllers/templates/form.mako:99
+msgid "Show Logs..."
+msgstr ""
+
+#: controllers/templates/form.mako:111
+msgid "Create a new resource"
+msgstr ""
+
+#: controllers/templates/form.mako:112 controllers/templates/search.mako:128
+#: controllers/templates/viewed_new_model.mako:36
+#: controllers/templates/viewlist.mako:119 widgets/form/_o2m.py:73
+#: widgets/form/templates/one2many.mako:20
+#: widgets/templates/listgrid/listgrid.mako:140
+#: widgets/templates/listgrid/listgrid.mako:144
+#: widgets/templates/listgrid/listgroup.mako:20
+msgid "New"
+msgstr ""
+
+#: controllers/templates/form.mako:116
+msgid "Edit this resource"
+msgstr ""
+
+#: controllers/templates/form.mako:117 controllers/templates/viewlist.mako:122
+#: widgets/templates/listgrid/listgrid.mako:75
+#: widgets/templates/listgrid/listgrid.mako:79
+#: widgets/templates/listgrid/listgroup.mako:112
+#: widgets/templates/listgrid/multiple_group.mako:63
+msgid "Edit"
+msgstr ""
+
+#: controllers/templates/form.mako:121
+msgid "Save this resource"
+msgstr ""
+
+#: controllers/templates/form.mako:122 controllers/templates/image.mako:65
+#: controllers/templates/openm2.mako:48
+#: controllers/templates/save_filter.mako:41
+#: controllers/templates/translator.mako:39
+#: controllers/templates/translator.mako:106
+#: controllers/templates/viewed_new.mako:46
+#: controllers/templates/viewed_new_model.mako:39
+#: controllers/templates/viewlist.mako:157
+#: controllers/templates/preferences/index.mako:39
+msgid "Save"
+msgstr ""
+
+#: controllers/templates/form.mako:124
+msgid "Save & Edit this resource"
+msgstr ""
+
+#: controllers/templates/form.mako:125
+msgid "Save & Edit"
+msgstr ""
+
+#: controllers/templates/form.mako:129
+msgid "Duplicate this resource"
+msgstr ""
+
+#: controllers/templates/form.mako:130
+msgid "Duplicate"
+msgstr ""
+
+#: controllers/templates/form.mako:134
+msgid "Delete this resource"
+msgstr ""
+
+#: controllers/templates/form.mako:139
+msgid "Cancel editing the current resource"
+msgstr ""
+
+#: controllers/templates/form.mako:144
+msgid "Create new node"
+msgstr ""
+
+#: controllers/templates/form.mako:145
+msgid "New Node"
+msgstr ""
+
+#: controllers/templates/form.mako:149
+msgid "Show grid in workflow canvas"
+msgstr ""
+
+#: controllers/templates/form.mako:150
+msgid "Show grid"
+msgstr ""
+
+#: controllers/templates/header.mako:33
+#, python-format
+msgid "%(company)s"
+msgstr ""
+
+#: controllers/templates/header.mako:34 controllers/templates/index.mako:218
+#, python-format
+msgid "%(user)s"
+msgstr ""
+
+#: controllers/templates/header.mako:45 controllers/templates/header.mako:47
+msgid "Home"
+msgstr ""
+
+#: controllers/templates/header.mako:53
+msgid "Requests"
+msgstr ""
+
+#: controllers/templates/header.mako:62
+msgid "Edit Preferences"
+msgstr ""
+
+#: controllers/templates/header.mako:66 controllers/templates/header.mako:69
+msgid "About"
+msgstr ""
+
+#: controllers/templates/header.mako:73 controllers/templates/header.mako:75
+msgid "Help"
+msgstr ""
+
+#: controllers/templates/header.mako:81 controllers/templates/header.mako:84
+msgid "Clear Cache"
+msgstr ""
+
+#: controllers/templates/header.mako:89
+msgid "Logout"
+msgstr ""
+
+#: controllers/templates/image.mako:4 controllers/templates/image.mako:39
+msgid "Image"
+msgstr ""
+
+#: controllers/templates/image.mako:55
+msgid "Add Resource:"
+msgstr ""
+
+#: controllers/templates/image.mako:66 widgets/form/templates/binary.mako:28
+msgid "Save As"
+msgstr ""
+
+#: controllers/templates/imp.mako:80
+msgid "Import Data"
+msgstr ""
+
+#: controllers/templates/imp.mako:90
+msgid "1. Import a .CSV file"
+msgstr ""
+
+#: controllers/templates/imp.mako:106
+msgid "CSV File:"
+msgstr ""
+
+#: controllers/templates/imp.mako:124
+msgid "2. Check your file format"
+msgstr ""
+
+#: controllers/templates/imp.mako:131
+#, python-format
+msgid "The import failed due to: %(message)s"
+msgstr ""
+
+#: controllers/templates/imp.mako:133
+msgid "Here is a preview of the file we could not import:"
+msgstr ""
+
+#: controllers/templates/imp.mako:158
+msgid "CSV Options"
+msgstr ""
+
+#: controllers/templates/imp.mako:161
+msgid "Separator:"
+msgstr ""
+
+#: controllers/templates/imp.mako:163
+msgid "Delimiter:"
+msgstr ""
+
+#: controllers/templates/imp.mako:167
+msgid "Encoding:"
+msgstr ""
+
+#: controllers/templates/imp.mako:174
+msgid "Lines to skip:"
+msgstr ""
+
+#: controllers/templates/imp.mako:188
+msgid "3. File imported"
+msgstr ""
+
+#: controllers/templates/imp.mako:206
+msgid "Import File"
+msgstr ""
+
+#: controllers/templates/index.mako:164
+msgid "System Logs"
+msgstr ""
+
+#: controllers/templates/index.mako:189
+msgid "More"
+msgstr ""
+
+#: controllers/templates/index.mako:190
+msgid "Widgets"
+msgstr ""
+
+#: controllers/templates/index.mako:221 controllers/templates/index.mako:226
+#, python-format
+msgid "Powered by %(openerp)s "
+msgstr ""
+
+#: controllers/templates/login.mako:53 controllers/templates/login_ajax.mako:72
+#: controllers/templates/login_ajax.mako:94
+msgid "User:"
+msgstr ""
+
+#: controllers/templates/login.mako:64
+msgid "Databases"
+msgstr ""
+
+#: controllers/templates/login.mako:84
+msgid "Top Contributor:"
+msgstr ""
+
+#: controllers/templates/login.mako:94
+msgid ""
+"We think that daily job activities can be more intuitive, efficient, "
+"automated, .. and even fun."
+msgstr ""
+
+#: controllers/templates/login.mako:95
+msgid "OpenERP's vision to be:"
+msgstr ""
+
+#: controllers/templates/login.mako:103
+msgid "Full featured"
+msgstr ""
+
+#: controllers/templates/login.mako:104
+msgid ""
+"Today's enterprise challenges are multiple. We provide one module for each "
+"need."
+msgstr ""
+
+#: controllers/templates/login.mako:112
+msgid "Open Source"
+msgstr ""
+
+#: controllers/templates/login.mako:113
+msgid ""
+"To Build a great product, we rely on the knowledge of thousands of "
+"contributors."
+msgstr ""
+
+#: controllers/templates/login.mako:121
+msgid "User Friendly"
+msgstr ""
+
+#: controllers/templates/login.mako:122
+msgid ""
+"In order to be productive, people need clean and easy to use interface."
+msgstr ""
+
+#: controllers/templates/modules.mako:4
+msgid "Module Management"
+msgstr ""
+
+#: controllers/templates/modules.mako:17
+msgid "Web Modules"
+msgstr ""
+
+#: controllers/templates/openo2m.mako:34
+msgid "Save & Close"
+msgstr ""
+
+#: controllers/templates/openo2m.mako:37
+msgid "Save & New"
+msgstr ""
+
+#: controllers/templates/save_filter.mako:18
+msgid "Save as Filter"
+msgstr ""
+
+#: controllers/templates/save_filter.mako:30
+msgid "Filter Name"
+msgstr ""
+
+#: controllers/templates/search.mako:110
+#, python-format
+msgid "Search %(name)s"
+msgstr ""
+
+#: controllers/templates/search.mako:125 widgets/form/templates/datetime.mako:8
+msgid "Select"
+msgstr ""
+
+#: controllers/templates/search.mako:127 widgets/_views.py:83
+#: widgets/form/templates/many2one.mako:22
+#: widgets/form/templates/reference.mako:27 widgets/templates/viewform.mako:26
+msgid "Search"
+msgstr ""
+
+#: controllers/templates/search.mako:143
+#, python-format
+msgid "No record found : '%(searched_string)s'."
+msgstr ""
+
+#: controllers/templates/selection.mako:4
+msgid "Select action"
+msgstr ""
+
+#: controllers/templates/selection.mako:23
+msgid "Select your action"
+msgstr ""
+
+#: controllers/templates/server_log.mako:4
+msgid "Server Actions..."
+msgstr ""
+
+#: controllers/templates/server_log.mako:14
+msgid "Server Actions"
+msgstr ""
+
+#: controllers/templates/translator.mako:4
+msgid "Add Translations"
+msgstr ""
+
+#: controllers/templates/translator.mako:17
+msgid "Add Translation"
+msgstr ""
+
+#: controllers/templates/translator.mako:27
+msgid "Add Translation for:"
+msgstr ""
+
+#: controllers/templates/translator.mako:31
+msgid "Fields"
+msgstr ""
+
+#: controllers/templates/translator.mako:32
+msgid "Labels"
+msgstr ""
+
+#: controllers/templates/translator.mako:33
+msgid "Relates"
+msgstr ""
+
+#: controllers/templates/translator.mako:34
+msgid "View"
+msgstr ""
+
+#: controllers/templates/translator.mako:53
+msgid "Field"
+msgstr ""
+
+#: controllers/templates/view_log.mako:4 controllers/templates/view_log.mako:12
+#: utils/common.py:47
+msgid "Information"
+msgstr ""
+
+#: controllers/templates/viewed.mako:17
+#, python-format
+msgid "View Editor %s - %s"
+msgstr ""
+
+#: controllers/templates/viewed.mako:31
+msgid "Create a new inherited view"
+msgstr ""
+
+#: controllers/templates/viewed.mako:31
+msgid "Inherited View"
+msgstr ""
+
+#: controllers/templates/viewed.mako:34
+msgid "Preview"
+msgstr ""
+
+#: controllers/templates/viewed_add.mako:6
+msgid "Node Type:"
+msgstr ""
+
+#: controllers/templates/viewed_add.mako:23
+msgid "New Field"
+msgstr ""
+
+#: controllers/templates/viewed_add.mako:27
+msgid "Position:"
+msgstr ""
+
+#: controllers/templates/viewlist.mako:4
+#: controllers/templates/viewlist.mako:108
+#, python-format
+msgid "Manage Views (%s)"
+msgstr ""
+
+#: controllers/templates/viewlist.mako:146
+#, python-format
+msgid "Create a view (%s)"
+msgstr ""
+
+#: controllers/templates/viewlist.mako:174
+msgid "View Name:"
+msgstr ""
+
+#: controllers/templates/viewlist.mako:178
+msgid "View Type:"
+msgstr ""
+
+#: controllers/templates/viewlist.mako:189
+msgid "Priority:"
+msgstr ""
+
+#: utils/common.py:37 utils/common.py:66
+msgid "Error"
+msgstr ""
+
+#: utils/common.py:42 utils/common.py:69
+msgid "Warning"
+msgstr ""
+
+#: utils/rpc.py:131
+msgid "Access Denied"
+msgstr ""
+
+#: utils/rpc.py:238
+msgid "Unsupported protocol."
+msgstr ""
+
+#: utils/rpc.py:342
+msgid ""
+"You select a timezone but OpenERP could not find pytz library!\n"
+"The timezone functionality will be disable."
+msgstr ""
+
+#: utils/rpc.py:355
+msgid "Not logged..."
+msgstr ""
+
+#: utils/rpc.py:355
+msgid "Authorization Error"
+msgstr ""
+
+#: utils/rpc.py:437
+msgid "== Access Denied =="
+msgstr ""
+
+#: widgets/_views.py:52
+msgid "Form"
+msgstr ""
+
+#: widgets/_views.py:53
+msgid "Form view..."
+msgstr ""
+
+#: widgets/_views.py:84
+msgid "Search view..."
+msgstr ""
+
+#: widgets/listgrid.py:289
+msgid "Wrong on_change trigger"
+msgstr ""
+
+#: widgets/listgrid.py:353 widgets/form/_form.py:904
+#, python-format
+msgid "Invalid view, duplicate field: %s"
+msgstr ""
+
+#: widgets/pager.py:56
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: widgets/pager.py:68
+#, python-format
+msgid "%s - %s"
+msgstr ""
+
+#: widgets/search.py:282
+msgid "contains"
+msgstr ""
+
+#: widgets/search.py:282
+msgid "doesn't contain"
+msgstr ""
+
+#: widgets/search.py:283
+msgid "is equal to"
+msgstr ""
+
+#: widgets/search.py:283
+msgid "is not equal to"
+msgstr ""
+
+#: widgets/search.py:284
+msgid "greater than"
+msgstr ""
+
+#: widgets/search.py:284
+msgid "less than"
+msgstr ""
+
+#: widgets/search.py:285
+msgid "in"
+msgstr ""
+
+#: widgets/search.py:285
+msgid "not in"
+msgstr ""
+
+#: widgets/search.py:392
+msgid "Yes"
+msgstr ""
+
+#: widgets/search.py:392
+msgid "No"
+msgstr ""
+
+#: widgets/form/_action.py:46
+msgid "Action not found!"
+msgstr ""
+
+#: widgets/form/_o2m.py:73 widgets/templates/listgrid/listgrid.mako:138
+#: widgets/templates/listgrid/listgrid.mako:144
+#: widgets/templates/listgrid/listgroup.mako:20
+msgid "Create new record."
+msgstr ""
+
+#: widgets/form/_o2m.py:86
+msgid "Save/New"
+msgstr ""
+
+#: widgets/form/_o2m.py:86
+msgid "Save parent record."
+msgstr ""
+
+#: widgets/form/_o2m.py:216
+#, python-format
+msgid "%d of %d"
+msgstr ""
+
+#: widgets/form/_o2m.py:218
+#, python-format
+msgid "- of %d"
+msgstr ""
+
+#: widgets/form/templates/binary.mako:31
+msgid "add attachment"
+msgstr ""
+
+#: widgets/form/templates/image.mako:7 widgets/form/templates/image.mako:39
+msgid "Click here to add new image."
+msgstr ""
+
+#: widgets/form/templates/many2one.mako:2
+#: widgets/form/templates/reference.mako:30
+msgid "Open"
+msgstr ""
+
+#: widgets/form/templates/many2one.mako:2
+#: widgets/form/templates/reference.mako:30
+msgid "Open a resource"
+msgstr ""
+
+#: widgets/form/templates/one2many.mako:20
+msgid "Create new record..."
+msgstr ""
+
+#: widgets/form/templates/one2many.mako:22
+msgid "Delete record..."
+msgstr ""
+
+#: widgets/form/templates/one2many.mako:28
+msgid "Translate me."
+msgstr ""
+
+#: widgets/form/templates/one2many.mako:47
+msgid "Previous record..."
+msgstr ""
+
+#: widgets/form/templates/one2many.mako:49
+msgid "Next record..."
+msgstr ""
+
+#: widgets/templates/logs.mako:22
+msgid "More..."
+msgstr ""
+
+#: widgets/templates/logs.mako:35
+msgid "Less..."
+msgstr ""
+
+#: widgets/templates/pager.mako:9
+msgid "<< First"
+msgstr ""
+
+#: widgets/templates/pager.mako:14
+msgid "< Previous"
+msgstr ""
+
+#: widgets/templates/pager.mako:19
+msgid "of"
+msgstr ""
+
+#: widgets/templates/pager.mako:24
+msgid "Next >"
+msgstr ""
+
+#: widgets/templates/pager.mako:29
+msgid "Last >>"
+msgstr ""
+
+#: widgets/templates/pager.mako:37
+msgid "Change Limit:"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:37
+msgid "Reports"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:41 widgets/templates/viewform.mako:51
+msgid "Actions"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:45
+msgid "Links"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:49
+msgid "Submenu"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:54
+msgid "Attachments"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:74
+msgid "File"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:83
+msgid "Customize"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:87
+msgid "Manage views of the current object"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:89
+msgid "Manage Views"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:93
+msgid "Edit workflow of the current object"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:94
+msgid "Edit Workflow"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:98
+msgid "Customize current object or create a new object"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:100
+msgid "Customize Object"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:106
+msgid "Other Options"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:111
+msgid "Import"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:114
+msgid "Export"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:118
+msgid "Translate"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:123
+msgid "View Log"
+msgstr ""
+
+#: widgets/templates/viewform.mako:25
+msgid "Filter records."
+msgstr ""
+
+#: widgets/templates/viewform.mako:33
+msgid "Clear all."
+msgstr ""
+
+#: widgets/templates/viewform.mako:35
+msgid "Clear"
+msgstr ""
+
+#: widgets/templates/viewform.mako:43
+msgid "Filters"
+msgstr ""
+
+#: widgets/templates/viewform.mako:45
+msgid "Saved Filters"
+msgstr ""
+
+#: widgets/templates/viewform.mako:52
+msgid "New Filter"
+msgstr ""
+
+#: widgets/templates/viewform.mako:53
+msgid "Save Filter"
+msgstr ""
+
+#: widgets/templates/viewform.mako:54
+msgid "Manage Filters"
+msgstr ""
+
+#: widgets/templates/listgrid/listgrid.mako:19
+msgid "Update"
+msgstr ""
+
+#: widgets/templates/listgrid/listgrid.mako:134
+msgid "Add records..."
+msgstr ""
+
+#: widgets/templates/listgrid/listgrid.mako:172
+#: widgets/templates/listgrid/listgrid.mako:176
+msgid "Delete record(s)."
+msgstr ""

=== renamed file 'addons/openerp/po/messages/da.po' => 'addons/openerp/po/messages/da.po.moved'
=== modified file 'addons/openerp/po/messages/de.po'
--- addons/openerp/po/messages/de.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/de.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: validators.py:75

=== added file 'addons/openerp/po/messages/en_CA.po.OTHER'
--- addons/openerp/po/messages/en_CA.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/messages/en_CA.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,1678 @@
+# English (Canada) translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-28 12:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (Canada) <en_CA@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:15+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: validators.py:75
+msgid "Invalid literal for float"
+msgstr "Invalid literal for float"
+
+#: validators.py:114 validators.py:119 validators.py:262
+msgid "Invalid datetime format"
+msgstr "Invalid datetime format"
+
+#: validators.py:166
+msgid "Please select a file."
+msgstr "Please select a file."
+
+#: validators.py:247
+msgid "Please enter an email address"
+msgstr "Please enter an email address"
+
+#: validators.py:248
+msgid "An email address must contain a single @"
+msgstr "An email address must contain a single @"
+
+#: validators.py:249
+#, python-format
+msgid ""
+"The username portion of the email address is invalid (the portion before the "
+"@: %(username)s)"
+msgstr ""
+"The username portion of the email address is invalid (the portion before the "
+"@: %(username)s)"
+
+#: validators.py:250
+#, python-format
+msgid ""
+"The domain portion of the email address is invalid (the portion after the @: "
+"%(domain)s)"
+msgstr ""
+"The domain portion of the email address is invalid (the portion after the @: "
+"%(domain)s)"
+
+#: validators.py:254
+msgid "You must start your URL with http://, https://, etc"
+msgstr "You must start your URL with http://, https://, etc."
+
+#: validators.py:255
+msgid "That is not a valid URL"
+msgstr "That is not a valid URL"
+
+#: validators.py:256
+#, python-format
+msgid "You must provide a full domain name (like %(domain)s.com)"
+msgstr "You must provide a full domain name (like %(domain)s.com)"
+
+#: validators.py:260
+msgid "Please enter an integer value"
+msgstr "Please enter an integer value"
+
+#: validators.py:261
+msgid "Please enter a number"
+msgstr "Please enter a number"
+
+#: controllers/actions.py:91
+msgid "Invalid View"
+msgstr "Invalid View"
+
+#: controllers/actions.py:124
+msgid "Error no report"
+msgstr "Error no report"
+
+#: controllers/actions.py:150
+msgid "Nothing to print"
+msgstr "Nothing to print"
+
+#: controllers/actions.py:170
+msgid "Printing aborted, too long delay"
+msgstr "Printing aborted, too long delay"
+
+#: controllers/actions.py:377
+msgid "Relative URLs are not supported"
+msgstr "Relative URLs are not supported"
+
+#: controllers/actions.py:405
+msgid "Action not found"
+msgstr "Action not found"
+
+#: controllers/actions.py:454
+msgid "No action defined"
+msgstr "No action defined"
+
+#: controllers/attachment.py:54
+msgid "No record selected, You can only attach to existing record..."
+msgstr "No record selected, You can only attach to existing record..."
+
+#: controllers/database.py:64
+msgid "Create database"
+msgstr "Create database"
+
+#: controllers/database.py:66 controllers/templates/database.mako:52
+#: controllers/templates/search.mako:145
+msgid "Create"
+msgstr "Create"
+
+#: controllers/database.py:69
+msgid "Super admin password:"
+msgstr "Super admin password:"
+
+#: controllers/database.py:69
+msgid ""
+"This is the password of the user that have the rights to administer "
+"databases. This is not a OpenERP user, just a super administrator. If you "
+"did not changed it, the password is 'admin' after installation."
+msgstr ""
+"This is the password of the user that has the rights to administer "
+"databases. This is not an OpenERP user, just a super administrator. If you "
+"did not change it, the password is 'admin' after installation."
+
+#: controllers/database.py:70 controllers/database.py:102
+msgid "New database name:"
+msgstr "New database name:"
+
+#: controllers/database.py:70
+msgid ""
+"Choose the name of the database that will be created. The name must not "
+"contain any special character. Exemple: 'terp'."
+msgstr ""
+"Choose the name of the database that will be created. The name must not "
+"contain any special characters. Example: 'terp'."
+
+#: controllers/database.py:71
+msgid "Load Demonstration data:"
+msgstr "Load Demonstration data:"
+
+#: controllers/database.py:71
+msgid ""
+"Check this box if you want demonstration data to be installed on your new "
+"database. These data will help you to understand OpenERP, with predefined "
+"products, partners, etc."
+msgstr ""
+"Check this box if you want demonstration data to be installed on your new "
+"database. These data will help you to understand OpenERP with predefined "
+"products, partners, etc."
+
+#: controllers/database.py:72
+msgid "Default Language:"
+msgstr "Default Language:"
+
+#: controllers/database.py:72
+msgid ""
+"Choose the default language that will be installed for this database. You "
+"will be able to install new languages after installation through the "
+"administration menu."
+msgstr ""
+"Choose the default language that will be installed for this database. You "
+"will be able to install new languages after installation through the "
+"administration menu."
+
+#: controllers/database.py:73
+msgid "Administrator password:"
+msgstr "Administrator password:"
+
+#: controllers/database.py:73
+msgid ""
+"This is the password of the 'admin' user that will be created in your new "
+"database."
+msgstr ""
+"This is the password of the 'admin' user that will be created in your new "
+"database."
+
+#: controllers/database.py:74
+msgid "Confirm password:"
+msgstr "Confirm password:"
+
+#: controllers/database.py:74
+msgid ""
+"This is the password of the 'admin' user that will be created in your new "
+"database. It has to be the same than the above field."
+msgstr ""
+"This is the password of the 'admin' user that will be created in your new "
+"database. It has to be the same than the above field."
+
+#: controllers/database.py:80
+msgid "Drop database"
+msgstr "Drop database"
+
+#: controllers/database.py:82 controllers/templates/database.mako:54
+msgid "Drop"
+msgstr "Drop"
+
+#: controllers/database.py:84 controllers/database.py:92
+#: controllers/templates/login.mako:39
+msgid "Database:"
+msgstr "Database:"
+
+#: controllers/database.py:85 controllers/database.py:93
+#: controllers/database.py:101 controllers/templates/login.mako:57
+#: controllers/templates/login_ajax.mako:78
+#: controllers/templates/login_ajax.mako:98
+msgid "Password:"
+msgstr "Password:"
+
+#: controllers/database.py:89
+msgid "Backup database"
+msgstr "Backup database"
+
+#: controllers/database.py:91 controllers/templates/database.mako:56
+msgid "Backup"
+msgstr "Backup"
+
+#: controllers/database.py:97
+msgid "Restore database"
+msgstr "Restore database"
+
+#: controllers/database.py:99 controllers/templates/database.mako:58
+msgid "Restore"
+msgstr "Restore"
+
+#: controllers/database.py:100
+msgid "File:"
+msgstr "File:"
+
+#: controllers/database.py:106
+msgid "Change Administrator Password"
+msgstr "Change Administrator Password"
+
+#: controllers/database.py:108 controllers/templates/preferences/index.mako:37
+msgid "Change Password"
+msgstr "Change Password"
+
+#: controllers/database.py:109
+msgid "Old Password:"
+msgstr "Old Password:"
+
+#: controllers/database.py:110
+msgid "New Password:"
+msgstr "New Password:"
+
+#: controllers/database.py:111
+msgid "Confirm Password:"
+msgstr "Confirm Password:"
+
+#: controllers/database.py:174
+msgid "You must avoid all accents, space or special characters."
+msgstr "You must avoid all accents, spaces or special characters."
+
+#: controllers/database.py:175
+msgid "Bad database name"
+msgstr "Bad database name"
+
+#: controllers/database.py:195
+msgid ""
+"The server crashed during installation.\n"
+"We suggest you to drop this database."
+msgstr ""
+"The server crashed during installation.\n"
+"We suggest you drop this database."
+
+#: controllers/database.py:196
+msgid "Error during database creation"
+msgstr "Error during database creation"
+
+#: controllers/database.py:199 controllers/database.py:226
+#: controllers/database.py:272 controllers/database.py:295
+msgid "Bad super admin password"
+msgstr "Bad super admin password"
+
+#: controllers/database.py:203
+msgid "Could not create database."
+msgstr "Could not create database."
+
+#: controllers/database.py:229
+msgid "Could not drop database"
+msgstr "Could not drop database"
+
+#: controllers/database.py:252
+msgid "Could not create backup."
+msgstr "Could not create backup."
+
+#: controllers/database.py:276
+msgid "Could not restore database"
+msgstr "Could not restore database"
+
+#: controllers/database.py:299
+msgid "Error, password not changed."
+msgstr "Error, password not changed."
+
+#: controllers/error_page.py:78
+msgid ""
+"Your problem has been sent to the quality team\n"
+"We will recontact you after analysing the problem."
+msgstr ""
+"Your problem has been sent to the quality team\n"
+"We will recontact you after analysing the problem."
+
+#: controllers/error_page.py:80
+#, python-format
+msgid ""
+"Your problem could not be sent to the quality team\n"
+"Please report this error manually at %s"
+msgstr ""
+"Your problem could not be sent to the quality team\n"
+"Please report this error manually at %s"
+
+#: controllers/form.py:553
+#, python-format
+msgid "Invalid button type \"%s\""
+msgstr "Invalid button type \"%s\""
+
+#: controllers/form.py:891 controllers/tree.py:233
+msgid "No record selected"
+msgstr "No record selected"
+
+#: controllers/form.py:896
+msgid "Print Screen"
+msgstr "Print Screen"
+
+#: controllers/form.py:965 utils/rpc.py:122 utils/rpc.py:133 utils/rpc.py:136
+#: widgets/listgrid.py:289 widgets/listgrid.py:353 widgets/form/_form.py:904
+msgid "Application Error"
+msgstr "Application Error"
+
+#: controllers/form.py:965
+#, python-format
+msgid "Wrong on_change trigger: %s"
+msgstr "Wrong on_change trigger: %s"
+
+#: controllers/form.py:1073
+msgid "Open resource"
+msgstr "Open resource"
+
+#: controllers/form.py:1076
+msgid "Set to default value"
+msgstr "Set to default value"
+
+#: controllers/form.py:1077
+msgid "Set as default"
+msgstr "Set as default"
+
+#: controllers/form.py:1084
+msgid "Action"
+msgstr "Action"
+
+#: controllers/form.py:1085
+msgid "Report"
+msgstr "Report"
+
+#: controllers/impex.py:66
+msgid ""
+"Operation failed\n"
+"I/O error"
+msgstr ""
+"Operation failed\n"
+"I/O error"
+
+#: controllers/impex.py:373
+msgid "Export Error"
+msgstr "Export Error"
+
+#: controllers/impex.py:444
+msgid "Database ID"
+msgstr "Database ID"
+
+#: controllers/impex.py:451
+msgid "Error opening .CSV file"
+msgstr "Error opening .CSV file"
+
+#: controllers/impex.py:451
+msgid "Input Error."
+msgstr "Input Error."
+
+#: controllers/impex.py:473
+#, python-format
+msgid "You cannot import the field '%s', because we cannot auto-detect it"
+msgstr "You cannot import the field '%s', because we cannot auto-detect it"
+
+#: controllers/impex.py:476
+#, python-format
+msgid "Error processing the first line of the file. Field \"%s\" is unknown"
+msgstr "Error processing the first line of the file. Field \"%s\" is unknown"
+
+#: controllers/impex.py:476
+msgid "Import Error."
+msgstr "Import Error."
+
+#: controllers/impex.py:515
+msgid "XML-RPC error"
+msgstr "XML-RPC error"
+
+#: controllers/impex.py:520
+#, python-format
+msgid "Imported %d objects"
+msgstr "Imported %d objects"
+
+#: controllers/impex.py:525
+#, python-format
+msgid "Error trying to import this record:%s. ErrorMessage:%s %s"
+msgstr "Error trying to import this record:%s. ErrorMessage:%s %s"
+
+#: controllers/impex.py:526
+msgid "ImportationError"
+msgstr "ImportationError"
+
+#: controllers/listgrid.py:51
+msgid "Parent record doesn't exists..."
+msgstr "Parent record doesn't exist..."
+
+#: controllers/preferences.py:34
+msgid "Change your password"
+msgstr "Change your password"
+
+#: controllers/preferences.py:64 controllers/templates/header.mako:59
+msgid "Preferences"
+msgstr "Preferences"
+
+#: controllers/preferences.py:91
+msgid "All passwords have to be filled."
+msgstr "All passwords have to be filled."
+
+#: controllers/preferences.py:93
+msgid "The new password and its confirmation must be identical."
+msgstr "The new password and its confirmation must be identical."
+
+#: controllers/preferences.py:102
+msgid "Could not change your password."
+msgstr "Could not change your password."
+
+#: controllers/preferences.py:104
+msgid "Original password incorrect, your password was not changed."
+msgstr "Original password incorrect, your password was not changed."
+
+#: controllers/root.py:170
+#, python-format
+msgid "Version %s"
+msgstr "Version %s"
+
+#: controllers/translator.py:132
+msgid "You need to save the resource before adding translations."
+msgstr "You need to save the resource before adding translations."
+
+#: controllers/tree.py:264
+msgid "No resource selected"
+msgstr "No resource selected"
+
+#: controllers/utils.py:44
+msgid "Could not connect to server"
+msgstr "Could not connect to server"
+
+#: controllers/utils.py:131 controllers/templates/login_ajax.mako:111
+msgid "Bad username or password"
+msgstr "Bad username or password"
+
+#: controllers/view_log.py:32
+msgid "ID"
+msgstr "ID"
+
+#: controllers/view_log.py:33
+msgid "Creation User"
+msgstr "Creation User"
+
+#: controllers/view_log.py:34
+msgid "Creation Date"
+msgstr "Creation Date"
+
+#: controllers/view_log.py:35
+msgid "Latest Modification by"
+msgstr "Latest Modification by"
+
+#: controllers/view_log.py:36
+msgid "Latest Modification Date"
+msgstr "Latest Modification Date"
+
+#: controllers/view_log.py:37
+msgid "Owner"
+msgstr "Owner"
+
+#: controllers/view_log.py:38
+msgid "Group Owner"
+msgstr "Group Owner"
+
+#: controllers/view_log.py:39
+msgid "Access Level"
+msgstr "Access Level"
+
+#: controllers/view_log.py:40
+msgid "Internal module data ID"
+msgstr "Internal module data ID"
+
+#: controllers/viewed.py:220
+msgid "Invalid view id."
+msgstr "Invalid view id."
+
+#: controllers/viewed.py:498
+msgid "Unable to create inherited view."
+msgstr "Unable to create inherited view."
+
+#: controllers/viewed.py:500
+msgid "Can't create inherited view here."
+msgstr "Can't create inherited view here."
+
+#: controllers/viewed.py:503
+msgid "Not implemented yet!"
+msgstr "Not implemented yet!"
+
+#: controllers/viewed.py:608
+msgid "Unable to update the view."
+msgstr "Unable to update the view."
+
+#: controllers/viewed.py:859
+msgid "New Window"
+msgstr "New Window"
+
+#: controllers/viewed.py:871
+msgid "Save Button"
+msgstr "Save Button"
+
+#: controllers/viewed.py:871
+msgid "Cancel Button"
+msgstr "Cancel Button"
+
+#: controllers/viewed.py:871
+msgid "Open Button"
+msgstr "Open Button"
+
+#: controllers/viewed.py:877
+msgid "Left"
+msgstr "Left"
+
+#: controllers/viewed.py:877
+msgid "Center"
+msgstr "Center"
+
+#: controllers/viewed.py:877
+msgid "Right"
+msgstr "Right"
+
+#: controllers/templates/about.mako:4
+msgid "About the OpenERP Web"
+msgstr "About the OpenERP Web"
+
+#: controllers/templates/about.mako:27
+msgid "OpenERP Web"
+msgstr "OpenERP Web"
+
+#: controllers/templates/about.mako:30
+msgid "Copyright &copy; 2006-TODAY OpenERP SA. All Rights Reserved."
+msgstr "Copyright &copy; 2006-TODAY OpenERP SA. All Rights Reserved."
+
+#: controllers/templates/about.mako:31
+msgid "OpenERP is a trademark of the OpenERP SA Company."
+msgstr "OpenERP is a trademark of the OpenERP SA Company."
+
+#: controllers/templates/about.mako:33
+#, python-format
+msgid "%(ooweb)s is jointly developed by %(tiny)s and %(axelor)s."
+msgstr "%(ooweb)s is jointly developed by %(tiny)s and %(axelor)s."
+
+#: controllers/templates/about.mako:39
+#, python-format
+msgid "Licenced under the terms of %(license)s"
+msgstr "Licenced under the terms of %(license)s"
+
+#: controllers/templates/about.mako:42
+msgid "About OpenERP"
+msgstr "About OpenERP"
+
+#: controllers/templates/about.mako:44
+#, python-format
+msgid ""
+"%(openobject)s is a free enterprise-scale software system that is designed "
+"to boost\n"
+"                    productivity and profit through data integration. It "
+"connects, improves and\n"
+"                    manages business processes in areas such as sales, "
+"finance, supply chain,\n"
+"                    project management, production, services, CRM, etc..\n"
+"                    "
+msgstr ""
+"%(openobject)s is a free enterprise-scale software system that is designed "
+"to boost\n"
+"                    productivity and profit through data integration. It "
+"connects, improves and\n"
+"                    manages business processes in areas such as sales, "
+"finance, supply chain,\n"
+"                    project management, production, services, CRM, etc..\n"
+"                    "
+
+#: controllers/templates/about.mako:51
+msgid ""
+"The system is platform-independent, and can be installed on Windows, Mac OS "
+"X,\n"
+"                    and various Linux and other Unix-based distributions. "
+"Its architecture enables\n"
+"                    new functionality to be rapidly created, modifications "
+"to be made to a\n"
+"                    production system and migration to a new version to be "
+"straightforward."
+msgstr ""
+"The system is platform-independent, and can be installed on Windows, Mac OS "
+"X,\n"
+"                    and various Linux and other Unix-based distributions. "
+"Its architecture enables\n"
+"                    new functionality to be rapidly created, modifications "
+"to be made to a\n"
+"                    production system and migration to a new version to be "
+"straightforward."
+
+#: controllers/templates/about.mako:57
+msgid ""
+"Depending on your needs, OpenERP is available through a web or application "
+"client."
+msgstr ""
+"Depending on your needs, OpenERP is available through a web or application "
+"client."
+
+#: controllers/templates/database.mako:50 controllers/templates/login.mako:4
+#: controllers/templates/login.mako:67 controllers/templates/login_ajax.mako:85
+#: controllers/templates/login_ajax.mako:104
+msgid "Login"
+msgstr "Log in"
+
+#: controllers/templates/database.mako:60
+msgid "Password"
+msgstr "Password"
+
+#: controllers/templates/error_page.mako:77
+#, python-format
+msgid "An %(error_type)s has been reported."
+msgstr "An %(error_type)s has been reported."
+
+#: controllers/templates/error_page.mako:79
+msgid "Let me fix it"
+msgstr "Let me fix it"
+
+#: controllers/templates/error_page.mako:85
+msgid "Fix it for me"
+msgstr "Fix it for me"
+
+#: controllers/templates/error_page.mako:90
+msgid "You do not have a valid OpenERP publisher warranty contract !"
+msgstr "You do not have a valid OpenERP publisher warranty contract !"
+
+#: controllers/templates/error_page.mako:91
+msgid ""
+"If you are using OpenERP in production, it is recommended to have\n"
+"a publisher warranty program.\n"
+"\n"
+"The OpenERP publisher warranty contract provides you with bug fix guarantees "
+"and an\n"
+"automatic migration system so that we can start working on your problems "
+"within a few\n"
+"hours.\n"
+"\n"
+"With a publisher warranty contract, errors such as this one can be sent "
+"directly to the OpenERP\n"
+"team for review and evaluation.\n"
+"\n"
+"The publisher warranty program offers you:\n"
+"* Automatic migrations on new versions,\n"
+"* A bugfix guarantee,\n"
+"* Monthly announces of potential bugs and their fixes,\n"
+"* Security alerts by email and automatic migration,\n"
+"* Access to the customer portal.\n"
+msgstr ""
+"If you are using OpenERP in production, it is recommended to have\n"
+"a publisher warranty program.\n"
+"\n"
+"The OpenERP publisher warranty contract provides you with bug fix guarantees "
+"and an\n"
+"automatic migration system so that we can start working on your problems "
+"within a few\n"
+"hours.\n"
+"\n"
+"With a publisher warranty contract, errors such as this one can be sent "
+"directly to the OpenERP\n"
+"team for review and evaluation.\n"
+"\n"
+"The publisher warranty program offers you:\n"
+"* Automatic migrations on new versions,\n"
+"* A bug fix guarantee,\n"
+"* Monthly announcements of potential bugs and their fixes,\n"
+"* Security alerts by email and automatic migration,\n"
+"* Access to the customer portal.\n"
+
+#: controllers/templates/error_page.mako:113
+msgid ""
+"Your publisher warranty contract does not cover all modules installed in "
+"your system !\n"
+"If you are using OpenERP in production, it is highly suggested to upgrade "
+"your\n"
+"contract.\n"
+"\n"
+"If you have developed your own modules or installed third party module, we\n"
+"can provide you an additional publisher warranty contract for these modules. "
+"After\n"
+"having reviewed your modules, our quality team will ensure they will "
+"migrate\n"
+"automatically for all future stable versions of OpenERP at no extra cost.\n"
+"\n"
+"Here is the list of modules not covered by your publisher warranty contract:"
+msgstr ""
+"Your publisher warranty contract does not cover all modules installed in "
+"your system !\n"
+"If you are using OpenERP in production, it is highly suggested to upgrade "
+"your\n"
+"contract.\n"
+"\n"
+"If you have developed your own modules or installed third party modules, we\n"
+"can provide you an additional publisher warranty contract for these modules. "
+"After\n"
+"having reviewed your modules, our quality team will ensure they will "
+"migrate\n"
+"automatically for all future stable versions of OpenERP at no extra cost.\n"
+"\n"
+"Here is the list of modules not covered by your publisher warranty contract:"
+
+#: controllers/templates/error_page.mako:135
+msgid "Publisher warranty contract."
+msgstr "Publisher warranty contract."
+
+#: controllers/templates/error_page.mako:136
+msgid ""
+"Your request will be sent to OpenERP and publisher warranty team will reply "
+"you shortly."
+msgstr ""
+"Your request will be sent to OpenERP and the publisher warranty team will "
+"reply to you shortly."
+
+#: controllers/templates/error_page.mako:140
+msgid "Summary of the problem:"
+msgstr "Summary of the problem:"
+
+#: controllers/templates/error_page.mako:147
+msgid "Explain what you did:"
+msgstr "Explain what you did:"
+
+#: controllers/templates/error_page.mako:156
+msgid "Other Comments:"
+msgstr "Other Comments:"
+
+#: controllers/templates/error_page.mako:168
+msgid "Send to Publisher Warranty Team"
+msgstr "Send to the Publisher Warranty Team"
+
+#: controllers/templates/error_page.mako:195
+msgid "Write concurrency warning :"
+msgstr "Write concurrency warning :"
+
+#: controllers/templates/error_page.mako:200
+msgid ""
+"This document has been modified while you were editing it.\n"
+"Choose:\n"
+"\n"
+"    - \"Cancel\" to cancel saving.\n"
+"    - \"Write anyway\" to save your current version."
+msgstr ""
+"This document has been modified while you were editing it.\n"
+"Choose:\n"
+"\n"
+"    - \"Cancel\" to cancel saving.\n"
+"    - \"Write anyway\" to save your current version."
+
+#: controllers/templates/error_page.mako:214 controllers/templates/exp.mako:244
+#: controllers/templates/form.mako:140 controllers/templates/openo2m.mako:41
+#: controllers/templates/selection.mako:43
+#: controllers/templates/viewlist.mako:160
+#: controllers/templates/preferences/index.mako:38
+#: widgets/templates/listgrid/listgrid.mako:33
+msgid "Cancel"
+msgstr "Cancel"
+
+#: controllers/templates/error_page.mako:215
+msgid "Write Anyway"
+msgstr "Write Anyway"
+
+#: controllers/templates/exp.mako:151
+msgid "Export Data"
+msgstr "Export Data"
+
+#: controllers/templates/exp.mako:166
+msgid "Export Type:"
+msgstr "Export Type:"
+
+#: controllers/templates/exp.mako:169
+msgid "Import Compatible Export"
+msgstr "Import Compatible Export"
+
+#: controllers/templates/exp.mako:172
+msgid "Export all Data"
+msgstr ""
+
+#: controllers/templates/exp.mako:183
+msgid "Available fields"
+msgstr "Available fields"
+
+#: controllers/templates/exp.mako:185
+msgid "Fields to export"
+msgstr "Fields to export"
+
+#: controllers/templates/exp.mako:187
+msgid "Save fields list"
+msgstr "Save fields list"
+
+#: controllers/templates/exp.mako:189
+msgid "Save as:"
+msgstr "Save as:"
+
+#: controllers/templates/exp.mako:191 controllers/templates/fieldpref.mako:102
+#: controllers/templates/selection.mako:45
+msgid "OK"
+msgstr "OK"
+
+#: controllers/templates/exp.mako:195
+msgid "Saved exports:"
+msgstr "Saved exports:"
+
+#: controllers/templates/exp.mako:204 controllers/templates/form.mako:135
+#: controllers/templates/image.mako:67 widgets/form/templates/one2many.mako:22
+#: widgets/templates/sidebar.mako:67
+#: widgets/templates/listgrid/listgrid.mako:105
+#: widgets/templates/listgrid/listgrid.mako:109
+#: widgets/templates/listgrid/listgrid.mako:173
+#: widgets/templates/listgrid/listgrid.mako:178
+#: widgets/templates/listgrid/listgroup.mako:131
+#: widgets/templates/listgrid/multiple_group.mako:81
+msgid "Delete"
+msgstr "Delete"
+
+#: controllers/templates/exp.mako:217 widgets/templates/sidebar.mako:56
+#: widgets/templates/listgrid/listgrid.mako:135
+msgid "Add"
+msgstr "Add"
+
+#: controllers/templates/exp.mako:222 controllers/templates/viewlist.mako:125
+msgid "Remove"
+msgstr "Remove"
+
+#: controllers/templates/exp.mako:227
+msgid "Remove All"
+msgstr "Remove All"
+
+#: controllers/templates/exp.mako:245
+msgid "Export to File"
+msgstr "Export to File"
+
+#: controllers/templates/fieldpref.mako:4
+#: controllers/templates/fieldpref.mako:29
+msgid "Field Preferences"
+msgstr "Field Preferences"
+
+#: controllers/templates/fieldpref.mako:39
+msgid "Field Name:"
+msgstr "Field Name:"
+
+#: controllers/templates/fieldpref.mako:43
+msgid "Domain:"
+msgstr "Domain:"
+
+#: controllers/templates/fieldpref.mako:47
+msgid "Default Value:"
+msgstr "Default Value:"
+
+#: controllers/templates/fieldpref.mako:57
+msgid "Value applicable for:"
+msgstr "Value applicable for:"
+
+#: controllers/templates/fieldpref.mako:63
+msgid "Only for you"
+msgstr "Only for you"
+
+#: controllers/templates/fieldpref.mako:67
+msgid "For all"
+msgstr "For all"
+
+#: controllers/templates/fieldpref.mako:76
+msgid "Value applicable if:"
+msgstr "Value applicable if:"
+
+#: controllers/templates/fieldpref.mako:79
+msgid "Always applicable!"
+msgstr "Always applicable!"
+
+#: controllers/templates/fieldpref.mako:99 controllers/templates/image.mako:70
+#: controllers/templates/imp.mako:205 controllers/templates/index.mako:198
+#: controllers/templates/openm2.mako:52
+#: controllers/templates/save_filter.mako:42
+#: controllers/templates/search.mako:129
+#: controllers/templates/translator.mako:41
+#: controllers/templates/translator.mako:108
+#: controllers/templates/viewed.mako:37
+#: controllers/templates/viewed_new.mako:49
+#: controllers/templates/viewed_new_model.mako:42
+#: controllers/templates/viewed_preview.mako:28
+#: controllers/templates/viewlist.mako:129 widgets/templates/sidebar.mako:67
+#: widgets/templates/viewform.mako:37
+msgid "Close"
+msgstr "Close"
+
+#: controllers/templates/footer.mako:3
+#, python-format
+msgid "&copy; 2008-2010 %(ooweb)s  SA. All Rights Reserved "
+msgstr "&copy; 2008-2010 %(ooweb)s  SA. All Rights Reserved "
+
+#: controllers/templates/footer.mako:6
+msgid "Significant contributions to the web client have been made by"
+msgstr "Significant contributions to the web client have been made by"
+
+#: controllers/templates/form.mako:63
+msgid "Disable all Tips"
+msgstr "Disable all Tips"
+
+#: controllers/templates/form.mako:64
+msgid "Hide this Tip"
+msgstr "Hide this Tip"
+
+#: controllers/templates/form.mako:82
+msgid "Add / Remove Shortcut..."
+msgstr "Add / Remove Shortcut..."
+
+#: controllers/templates/form.mako:86
+#, python-format
+msgid "Search: %s"
+msgstr "Search: %s"
+
+#: controllers/templates/form.mako:93
+msgid "Corporate Intelligence..."
+msgstr "Corporate Intelligence..."
+
+#: controllers/templates/form.mako:99
+msgid "Show Logs..."
+msgstr "Show Logs..."
+
+#: controllers/templates/form.mako:111
+msgid "Create a new resource"
+msgstr "Create a new resource"
+
+#: controllers/templates/form.mako:112 controllers/templates/search.mako:128
+#: controllers/templates/viewed_new_model.mako:36
+#: controllers/templates/viewlist.mako:119 widgets/form/_o2m.py:73
+#: widgets/form/templates/one2many.mako:20
+#: widgets/templates/listgrid/listgrid.mako:140
+#: widgets/templates/listgrid/listgrid.mako:144
+#: widgets/templates/listgrid/listgroup.mako:20
+msgid "New"
+msgstr "New"
+
+#: controllers/templates/form.mako:116
+msgid "Edit this resource"
+msgstr "Edit this resource"
+
+#: controllers/templates/form.mako:117 controllers/templates/viewlist.mako:122
+#: widgets/templates/listgrid/listgrid.mako:75
+#: widgets/templates/listgrid/listgrid.mako:79
+#: widgets/templates/listgrid/listgroup.mako:112
+#: widgets/templates/listgrid/multiple_group.mako:63
+msgid "Edit"
+msgstr "Edit"
+
+#: controllers/templates/form.mako:121
+msgid "Save this resource"
+msgstr "Save this resource"
+
+#: controllers/templates/form.mako:122 controllers/templates/image.mako:65
+#: controllers/templates/openm2.mako:48
+#: controllers/templates/save_filter.mako:41
+#: controllers/templates/translator.mako:39
+#: controllers/templates/translator.mako:106
+#: controllers/templates/viewed_new.mako:46
+#: controllers/templates/viewed_new_model.mako:39
+#: controllers/templates/viewlist.mako:157
+#: controllers/templates/preferences/index.mako:39
+msgid "Save"
+msgstr "Save"
+
+#: controllers/templates/form.mako:124
+msgid "Save & Edit this resource"
+msgstr "Save & Edit this resource"
+
+#: controllers/templates/form.mako:125
+msgid "Save & Edit"
+msgstr "Save & Edit"
+
+#: controllers/templates/form.mako:129
+msgid "Duplicate this resource"
+msgstr "Duplicate this resource"
+
+#: controllers/templates/form.mako:130
+msgid "Duplicate"
+msgstr "Duplicate"
+
+#: controllers/templates/form.mako:134
+msgid "Delete this resource"
+msgstr "Delete this resource"
+
+#: controllers/templates/form.mako:139
+msgid "Cancel editing the current resource"
+msgstr "Cancel editing the current resource"
+
+#: controllers/templates/form.mako:144
+msgid "Create new node"
+msgstr "Create new node"
+
+#: controllers/templates/form.mako:145
+msgid "New Node"
+msgstr "New Node"
+
+#: controllers/templates/form.mako:149
+msgid "Show grid in workflow canvas"
+msgstr "Show grid in workflow canvas"
+
+#: controllers/templates/form.mako:150
+msgid "Show grid"
+msgstr "Show grid"
+
+#: controllers/templates/header.mako:33
+#, python-format
+msgid "%(company)s"
+msgstr "%(company)s"
+
+#: controllers/templates/header.mako:34 controllers/templates/index.mako:218
+#, python-format
+msgid "%(user)s"
+msgstr "%(user)s"
+
+#: controllers/templates/header.mako:45 controllers/templates/header.mako:47
+msgid "Home"
+msgstr "Home"
+
+#: controllers/templates/header.mako:53
+msgid "Requests"
+msgstr "Requests"
+
+#: controllers/templates/header.mako:62
+msgid "Edit Preferences"
+msgstr "Edit Preferences"
+
+#: controllers/templates/header.mako:66 controllers/templates/header.mako:69
+msgid "About"
+msgstr "About"
+
+#: controllers/templates/header.mako:73 controllers/templates/header.mako:75
+msgid "Help"
+msgstr "Help"
+
+#: controllers/templates/header.mako:81 controllers/templates/header.mako:84
+msgid "Clear Cache"
+msgstr "Clear Cache"
+
+#: controllers/templates/header.mako:89
+msgid "Logout"
+msgstr "Log out"
+
+#: controllers/templates/image.mako:4 controllers/templates/image.mako:39
+msgid "Image"
+msgstr "Image"
+
+#: controllers/templates/image.mako:55
+msgid "Add Resource:"
+msgstr "Add Resource:"
+
+#: controllers/templates/image.mako:66 widgets/form/templates/binary.mako:28
+msgid "Save As"
+msgstr "Save As"
+
+#: controllers/templates/imp.mako:80
+msgid "Import Data"
+msgstr "Import Data"
+
+#: controllers/templates/imp.mako:90
+msgid "1. Import a .CSV file"
+msgstr "1. Import a .CSV file"
+
+#: controllers/templates/imp.mako:106
+msgid "CSV File:"
+msgstr "CSV File:"
+
+#: controllers/templates/imp.mako:124
+msgid "2. Check your file format"
+msgstr "2. Check your file format"
+
+#: controllers/templates/imp.mako:131
+#, python-format
+msgid "The import failed due to: %(message)s"
+msgstr "The import failed due to: %(message)s"
+
+#: controllers/templates/imp.mako:133
+msgid "Here is a preview of the file we could not import:"
+msgstr "Here is a preview of the file we could not import:"
+
+#: controllers/templates/imp.mako:158
+msgid "CSV Options"
+msgstr "CSV Options"
+
+#: controllers/templates/imp.mako:161
+msgid "Separator:"
+msgstr "Separator:"
+
+#: controllers/templates/imp.mako:163
+msgid "Delimiter:"
+msgstr "Delimiter:"
+
+#: controllers/templates/imp.mako:167
+msgid "Encoding:"
+msgstr "Encoding:"
+
+#: controllers/templates/imp.mako:174
+msgid "Lines to skip:"
+msgstr "Lines to skip:"
+
+#: controllers/templates/imp.mako:188
+msgid "3. File imported"
+msgstr "3. File imported"
+
+#: controllers/templates/imp.mako:206
+msgid "Import File"
+msgstr "Import File"
+
+#: controllers/templates/index.mako:164
+msgid "System Logs"
+msgstr "System Logs"
+
+#: controllers/templates/index.mako:189
+msgid "More"
+msgstr "More"
+
+#: controllers/templates/index.mako:190
+msgid "Widgets"
+msgstr "Widgets"
+
+#: controllers/templates/index.mako:221 controllers/templates/index.mako:226
+#, python-format
+msgid "Powered by %(openerp)s "
+msgstr "Powered by %(openerp)s "
+
+#: controllers/templates/login.mako:53 controllers/templates/login_ajax.mako:72
+#: controllers/templates/login_ajax.mako:94
+msgid "User:"
+msgstr "User:"
+
+#: controllers/templates/login.mako:64
+msgid "Databases"
+msgstr "Databases"
+
+#: controllers/templates/login.mako:84
+msgid "Top Contributor:"
+msgstr "Top Contributor:"
+
+#: controllers/templates/login.mako:94
+msgid ""
+"We think that daily job activities can be more intuitive, efficient, "
+"automated, .. and even fun."
+msgstr ""
+"We think that daily job activities can be more intuitive, efficient, "
+"automated...and even fun."
+
+#: controllers/templates/login.mako:95
+msgid "OpenERP's vision to be:"
+msgstr "OpenERP's vision to be:"
+
+#: controllers/templates/login.mako:103
+msgid "Full featured"
+msgstr "Full featured"
+
+#: controllers/templates/login.mako:104
+msgid ""
+"Today's enterprise challenges are multiple. We provide one module for each "
+"need."
+msgstr ""
+"Today's enterprise challenges are multiple. We provide a module for each "
+"need."
+
+#: controllers/templates/login.mako:112
+msgid "Open Source"
+msgstr "Open Source"
+
+#: controllers/templates/login.mako:113
+msgid ""
+"To Build a great product, we rely on the knowledge of thousands of "
+"contributors."
+msgstr ""
+"To Build a great product, we rely on the knowledge of thousands of "
+"contributors."
+
+#: controllers/templates/login.mako:121
+msgid "User Friendly"
+msgstr "User Friendly"
+
+#: controllers/templates/login.mako:122
+msgid ""
+"In order to be productive, people need clean and easy to use interface."
+msgstr ""
+"In order to be productive, people need a clean and easy to use interface."
+
+#: controllers/templates/modules.mako:4
+msgid "Module Management"
+msgstr "Module Management"
+
+#: controllers/templates/modules.mako:17
+msgid "Web Modules"
+msgstr "Web Modules"
+
+#: controllers/templates/openo2m.mako:34
+msgid "Save & Close"
+msgstr "Save & Close"
+
+#: controllers/templates/openo2m.mako:37
+msgid "Save & New"
+msgstr "Save & New"
+
+#: controllers/templates/save_filter.mako:18
+msgid "Save as Filter"
+msgstr "Save as Filter"
+
+#: controllers/templates/save_filter.mako:30
+msgid "Filter Name"
+msgstr "Filter Name"
+
+#: controllers/templates/search.mako:110
+#, python-format
+msgid "Search %(name)s"
+msgstr "Search %(name)s"
+
+#: controllers/templates/search.mako:125 widgets/form/templates/datetime.mako:8
+msgid "Select"
+msgstr "Select"
+
+#: controllers/templates/search.mako:127 widgets/_views.py:83
+#: widgets/form/templates/many2one.mako:22
+#: widgets/form/templates/reference.mako:27 widgets/templates/viewform.mako:26
+msgid "Search"
+msgstr "Search"
+
+#: controllers/templates/search.mako:143
+#, python-format
+msgid "No record found : '%(searched_string)s'."
+msgstr "No record found : '%(searched_string)s'."
+
+#: controllers/templates/selection.mako:4
+msgid "Select action"
+msgstr "Select action"
+
+#: controllers/templates/selection.mako:23
+msgid "Select your action"
+msgstr "Select your action"
+
+#: controllers/templates/server_log.mako:4
+msgid "Server Actions..."
+msgstr "Server Actions..."
+
+#: controllers/templates/server_log.mako:14
+msgid "Server Actions"
+msgstr "Server Actions"
+
+#: controllers/templates/translator.mako:4
+msgid "Add Translations"
+msgstr "Add Translations"
+
+#: controllers/templates/translator.mako:17
+msgid "Add Translation"
+msgstr "Add Translation"
+
+#: controllers/templates/translator.mako:27
+msgid "Add Translation for:"
+msgstr "Add Translation for:"
+
+#: controllers/templates/translator.mako:31
+msgid "Fields"
+msgstr "Fields"
+
+#: controllers/templates/translator.mako:32
+msgid "Labels"
+msgstr "Labels"
+
+#: controllers/templates/translator.mako:33
+msgid "Relates"
+msgstr "Relates"
+
+#: controllers/templates/translator.mako:34
+msgid "View"
+msgstr "View"
+
+#: controllers/templates/translator.mako:53
+msgid "Field"
+msgstr "Field"
+
+#: controllers/templates/view_log.mako:4 controllers/templates/view_log.mako:12
+#: utils/common.py:47
+msgid "Information"
+msgstr "Information"
+
+#: controllers/templates/viewed.mako:17
+#, python-format
+msgid "View Editor %s - %s"
+msgstr "View Editor %s - %s"
+
+#: controllers/templates/viewed.mako:31
+msgid "Create a new inherited view"
+msgstr "Create a new inherited view"
+
+#: controllers/templates/viewed.mako:31
+msgid "Inherited View"
+msgstr "Inherited View"
+
+#: controllers/templates/viewed.mako:34
+msgid "Preview"
+msgstr "Preview"
+
+#: controllers/templates/viewed_add.mako:6
+msgid "Node Type:"
+msgstr "Node Type:"
+
+#: controllers/templates/viewed_add.mako:23
+msgid "New Field"
+msgstr "New Field"
+
+#: controllers/templates/viewed_add.mako:27
+msgid "Position:"
+msgstr "Position:"
+
+#: controllers/templates/viewlist.mako:4
+#: controllers/templates/viewlist.mako:108
+#, python-format
+msgid "Manage Views (%s)"
+msgstr "Manage Views (%s)"
+
+#: controllers/templates/viewlist.mako:146
+#, python-format
+msgid "Create a view (%s)"
+msgstr "Create a view (%s)"
+
+#: controllers/templates/viewlist.mako:174
+msgid "View Name:"
+msgstr "View Name:"
+
+#: controllers/templates/viewlist.mako:178
+msgid "View Type:"
+msgstr "View Type:"
+
+#: controllers/templates/viewlist.mako:189
+msgid "Priority:"
+msgstr "Priority:"
+
+#: utils/common.py:37 utils/common.py:66
+msgid "Error"
+msgstr "Error"
+
+#: utils/common.py:42 utils/common.py:69
+msgid "Warning"
+msgstr "Warning"
+
+#: utils/rpc.py:131
+msgid "Access Denied"
+msgstr "Access Denied"
+
+#: utils/rpc.py:238
+msgid "Unsupported protocol."
+msgstr "Unsupported protocol."
+
+#: utils/rpc.py:342
+msgid ""
+"You select a timezone but OpenERP could not find pytz library!\n"
+"The timezone functionality will be disable."
+msgstr ""
+"You select a timezone but OpenERP could not find pytz library!\n"
+"The timezone functionality will be disabled."
+
+#: utils/rpc.py:355
+msgid "Not logged..."
+msgstr "Not logged..."
+
+#: utils/rpc.py:355
+msgid "Authorization Error"
+msgstr "Authorization Error"
+
+#: utils/rpc.py:437
+msgid "== Access Denied =="
+msgstr "== Access Denied =="
+
+#: widgets/_views.py:52
+msgid "Form"
+msgstr "Form"
+
+#: widgets/_views.py:53
+msgid "Form view..."
+msgstr "Form view..."
+
+#: widgets/_views.py:84
+msgid "Search view..."
+msgstr "Search view..."
+
+#: widgets/listgrid.py:289
+msgid "Wrong on_change trigger"
+msgstr "Wrong on_change trigger"
+
+#: widgets/listgrid.py:353 widgets/form/_form.py:904
+#, python-format
+msgid "Invalid view, duplicate field: %s"
+msgstr "Invalid view, duplicate field: %s"
+
+#: widgets/pager.py:56
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: widgets/pager.py:68
+#, python-format
+msgid "%s - %s"
+msgstr "%s - %s"
+
+#: widgets/search.py:282
+msgid "contains"
+msgstr "contains"
+
+#: widgets/search.py:282
+msgid "doesn't contain"
+msgstr "doesn't contain"
+
+#: widgets/search.py:283
+msgid "is equal to"
+msgstr "is equal to"
+
+#: widgets/search.py:283
+msgid "is not equal to"
+msgstr "is not equal to"
+
+#: widgets/search.py:284
+msgid "greater than"
+msgstr "greater than"
+
+#: widgets/search.py:284
+msgid "less than"
+msgstr "less than"
+
+#: widgets/search.py:285
+msgid "in"
+msgstr "in"
+
+#: widgets/search.py:285
+msgid "not in"
+msgstr "not in"
+
+#: widgets/search.py:392
+msgid "Yes"
+msgstr "Yes"
+
+#: widgets/search.py:392
+msgid "No"
+msgstr "No"
+
+#: widgets/form/_action.py:46
+msgid "Action not found!"
+msgstr "Action not found!"
+
+#: widgets/form/_o2m.py:73 widgets/templates/listgrid/listgrid.mako:138
+#: widgets/templates/listgrid/listgrid.mako:144
+#: widgets/templates/listgrid/listgroup.mako:20
+msgid "Create new record."
+msgstr "Create new record."
+
+#: widgets/form/_o2m.py:86
+msgid "Save/New"
+msgstr "Save/New"
+
+#: widgets/form/_o2m.py:86
+msgid "Save parent record."
+msgstr "Save parent record."
+
+#: widgets/form/_o2m.py:216
+#, python-format
+msgid "%d of %d"
+msgstr "%d of %d"
+
+#: widgets/form/_o2m.py:218
+#, python-format
+msgid "- of %d"
+msgstr "- of %d"
+
+#: widgets/form/templates/binary.mako:31
+msgid "add attachment"
+msgstr "add attachment"
+
+#: widgets/form/templates/image.mako:7 widgets/form/templates/image.mako:39
+msgid "Click here to add new image."
+msgstr "Click here to add new image."
+
+#: widgets/form/templates/many2one.mako:2
+#: widgets/form/templates/reference.mako:30
+msgid "Open"
+msgstr "Open"
+
+#: widgets/form/templates/many2one.mako:2
+#: widgets/form/templates/reference.mako:30
+msgid "Open a resource"
+msgstr "Open a resource"
+
+#: widgets/form/templates/one2many.mako:20
+msgid "Create new record..."
+msgstr "Create new record..."
+
+#: widgets/form/templates/one2many.mako:22
+msgid "Delete record..."
+msgstr "Delete record..."
+
+#: widgets/form/templates/one2many.mako:28
+msgid "Translate me."
+msgstr "Translate me."
+
+#: widgets/form/templates/one2many.mako:47
+msgid "Previous record..."
+msgstr "Previous record..."
+
+#: widgets/form/templates/one2many.mako:49
+msgid "Next record..."
+msgstr "Next record..."
+
+#: widgets/templates/logs.mako:22
+msgid "More..."
+msgstr "More..."
+
+#: widgets/templates/logs.mako:35
+msgid "Less..."
+msgstr "Less..."
+
+#: widgets/templates/pager.mako:9
+msgid "<< First"
+msgstr "<< First"
+
+#: widgets/templates/pager.mako:14
+msgid "< Previous"
+msgstr "< Previous"
+
+#: widgets/templates/pager.mako:19
+msgid "of"
+msgstr "of"
+
+#: widgets/templates/pager.mako:24
+msgid "Next >"
+msgstr "Next >"
+
+#: widgets/templates/pager.mako:29
+msgid "Last >>"
+msgstr "Last >>"
+
+#: widgets/templates/pager.mako:37
+msgid "Change Limit:"
+msgstr "Change Limit:"
+
+#: widgets/templates/sidebar.mako:37
+msgid "Reports"
+msgstr "Reports"
+
+#: widgets/templates/sidebar.mako:41 widgets/templates/viewform.mako:51
+msgid "Actions"
+msgstr "Actions"
+
+#: widgets/templates/sidebar.mako:45
+msgid "Links"
+msgstr "Links"
+
+#: widgets/templates/sidebar.mako:49
+msgid "Submenu"
+msgstr "Submenu"
+
+#: widgets/templates/sidebar.mako:54
+msgid "Attachments"
+msgstr "Attachments"
+
+#: widgets/templates/sidebar.mako:74
+msgid "File"
+msgstr "File"
+
+#: widgets/templates/sidebar.mako:83
+msgid "Customize"
+msgstr "Customise"
+
+#: widgets/templates/sidebar.mako:87
+msgid "Manage views of the current object"
+msgstr "Manage views of the current object"
+
+#: widgets/templates/sidebar.mako:89
+msgid "Manage Views"
+msgstr "Manage Views"
+
+#: widgets/templates/sidebar.mako:93
+msgid "Edit workflow of the current object"
+msgstr "Edit workflow of the current object"
+
+#: widgets/templates/sidebar.mako:94
+msgid "Edit Workflow"
+msgstr "Edit Workflow"
+
+#: widgets/templates/sidebar.mako:98
+msgid "Customize current object or create a new object"
+msgstr "Customise current object or create a new object"
+
+#: widgets/templates/sidebar.mako:100
+msgid "Customize Object"
+msgstr "Customise Object"
+
+#: widgets/templates/sidebar.mako:106
+msgid "Other Options"
+msgstr "Other Options"
+
+#: widgets/templates/sidebar.mako:111
+msgid "Import"
+msgstr "Import"
+
+#: widgets/templates/sidebar.mako:114
+msgid "Export"
+msgstr "Export"
+
+#: widgets/templates/sidebar.mako:118
+msgid "Translate"
+msgstr "Translate"
+
+#: widgets/templates/sidebar.mako:123
+msgid "View Log"
+msgstr "View Log"
+
+#: widgets/templates/viewform.mako:25
+msgid "Filter records."
+msgstr "Filter records."
+
+#: widgets/templates/viewform.mako:33
+msgid "Clear all."
+msgstr "Clear all."
+
+#: widgets/templates/viewform.mako:35
+msgid "Clear"
+msgstr "Clear"
+
+#: widgets/templates/viewform.mako:43
+msgid "Filters"
+msgstr "Filters"
+
+#: widgets/templates/viewform.mako:45
+msgid "Saved Filters"
+msgstr "Saved Filters"
+
+#: widgets/templates/viewform.mako:52
+msgid "New Filter"
+msgstr "New Filter"
+
+#: widgets/templates/viewform.mako:53
+msgid "Save Filter"
+msgstr "Save Filter"
+
+#: widgets/templates/viewform.mako:54
+msgid "Manage Filters"
+msgstr "Manage Filters"
+
+#: widgets/templates/listgrid/listgrid.mako:19
+msgid "Update"
+msgstr "Update"
+
+#: widgets/templates/listgrid/listgrid.mako:134
+msgid "Add records..."
+msgstr "Add records..."
+
+#: widgets/templates/listgrid/listgrid.mako:172
+#: widgets/templates/listgrid/listgrid.mako:176
+msgid "Delete record(s)."
+msgstr "Delete record(s)."

=== modified file 'addons/openerp/po/messages/es.po'
--- addons/openerp/po/messages/es.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/es.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: validators.py:75

=== modified file 'addons/openerp/po/messages/es_CL.po'
--- addons/openerp/po/messages/es_CL.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/es_CL.po	2011-03-15 13:37:09 +0000
@@ -15,9 +15,14 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 "Generated-By: Babel None\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"

=== modified file 'addons/openerp/po/messages/et.po'
--- addons/openerp/po/messages/et.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/et.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"

=== modified file 'addons/openerp/po/messages/eu.po'
--- addons/openerp/po/messages/eu.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/eu.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"

=== added file 'addons/openerp/po/messages/fi.po.OTHER'
--- addons/openerp/po/messages/fi.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/messages/fi.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,1590 @@
+# Finnish translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-03-01 09:28+0000\n"
+"Last-Translator: Jussi Mikkola <Unknown>\n"
+"Language-Team: Finnish <fi@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: validators.py:75
+msgid "Invalid literal for float"
+msgstr ""
+
+#: validators.py:114 validators.py:119 validators.py:262
+msgid "Invalid datetime format"
+msgstr ""
+
+#: validators.py:166
+msgid "Please select a file."
+msgstr "Valitse tiedosto."
+
+#: validators.py:247
+msgid "Please enter an email address"
+msgstr ""
+
+#: validators.py:248
+msgid "An email address must contain a single @"
+msgstr ""
+
+#: validators.py:249
+#, python-format
+msgid ""
+"The username portion of the email address is invalid (the portion before the "
+"@: %(username)s)"
+msgstr ""
+
+#: validators.py:250
+#, python-format
+msgid ""
+"The domain portion of the email address is invalid (the portion after the @: "
+"%(domain)s)"
+msgstr ""
+
+#: validators.py:254
+msgid "You must start your URL with http://, https://, etc"
+msgstr ""
+
+#: validators.py:255
+msgid "That is not a valid URL"
+msgstr ""
+
+#: validators.py:256
+#, python-format
+msgid "You must provide a full domain name (like %(domain)s.com)"
+msgstr ""
+
+#: validators.py:260
+msgid "Please enter an integer value"
+msgstr ""
+
+#: validators.py:261
+msgid "Please enter a number"
+msgstr ""
+
+#: controllers/actions.py:91
+msgid "Invalid View"
+msgstr ""
+
+#: controllers/actions.py:124
+msgid "Error no report"
+msgstr ""
+
+#: controllers/actions.py:150
+msgid "Nothing to print"
+msgstr "Ei tulostettavaa"
+
+#: controllers/actions.py:170
+msgid "Printing aborted, too long delay"
+msgstr ""
+
+#: controllers/actions.py:377
+msgid "Relative URLs are not supported"
+msgstr ""
+
+#: controllers/actions.py:405
+msgid "Action not found"
+msgstr ""
+
+#: controllers/actions.py:454
+msgid "No action defined"
+msgstr ""
+
+#: controllers/attachment.py:54
+msgid "No record selected, You can only attach to existing record..."
+msgstr ""
+
+#: controllers/database.py:64
+msgid "Create database"
+msgstr ""
+
+#: controllers/database.py:66 controllers/templates/database.mako:52
+#: controllers/templates/search.mako:145
+msgid "Create"
+msgstr "Luo"
+
+#: controllers/database.py:69
+msgid "Super admin password:"
+msgstr ""
+
+#: controllers/database.py:69
+msgid ""
+"This is the password of the user that have the rights to administer "
+"databases. This is not a OpenERP user, just a super administrator. If you "
+"did not changed it, the password is 'admin' after installation."
+msgstr ""
+
+#: controllers/database.py:70 controllers/database.py:102
+msgid "New database name:"
+msgstr "Uuden tietokannan nimi:"
+
+#: controllers/database.py:70
+msgid ""
+"Choose the name of the database that will be created. The name must not "
+"contain any special character. Exemple: 'terp'."
+msgstr ""
+"Valitse tietokannan nimi, joka luodaan. Nimi ei saa sisÃ¤ltÃ¤Ã¤ "
+"erikoismerkkejÃ¤. Esimerkiksi: 'terp'."
+
+#: controllers/database.py:71
+msgid "Load Demonstration data:"
+msgstr ""
+
+#: controllers/database.py:71
+msgid ""
+"Check this box if you want demonstration data to be installed on your new "
+"database. These data will help you to understand OpenERP, with predefined "
+"products, partners, etc."
+msgstr ""
+
+#: controllers/database.py:72
+msgid "Default Language:"
+msgstr ""
+
+#: controllers/database.py:72
+msgid ""
+"Choose the default language that will be installed for this database. You "
+"will be able to install new languages after installation through the "
+"administration menu."
+msgstr ""
+"Valitse oletuskieli joka asennetaan tÃ¤hÃ¤n tietokantaan. Voit asentaa lisÃ¤Ã¤ "
+"kieliÃ¤ asennuksen jÃ¤lkeen yllÃ¤pitÃ¤jÃ¤n valikosta."
+
+#: controllers/database.py:73
+msgid "Administrator password:"
+msgstr "YllÃ¤pitÃ¤jÃ¤n salasana:"
+
+#: controllers/database.py:73
+msgid ""
+"This is the password of the 'admin' user that will be created in your new "
+"database."
+msgstr ""
+
+#: controllers/database.py:74
+msgid "Confirm password:"
+msgstr "Vahvista salasana:"
+
+#: controllers/database.py:74
+msgid ""
+"This is the password of the 'admin' user that will be created in your new "
+"database. It has to be the same than the above field."
+msgstr ""
+
+#: controllers/database.py:80
+msgid "Drop database"
+msgstr ""
+
+#: controllers/database.py:82 controllers/templates/database.mako:54
+msgid "Drop"
+msgstr "Poista"
+
+#: controllers/database.py:84 controllers/database.py:92
+#: controllers/templates/login.mako:39
+msgid "Database:"
+msgstr "Tietokanta:"
+
+#: controllers/database.py:85 controllers/database.py:93
+#: controllers/database.py:101 controllers/templates/login.mako:57
+#: controllers/templates/login_ajax.mako:78
+#: controllers/templates/login_ajax.mako:98
+msgid "Password:"
+msgstr "Salasana:"
+
+#: controllers/database.py:89
+msgid "Backup database"
+msgstr ""
+
+#: controllers/database.py:91 controllers/templates/database.mako:56
+msgid "Backup"
+msgstr ""
+
+#: controllers/database.py:97
+msgid "Restore database"
+msgstr ""
+
+#: controllers/database.py:99 controllers/templates/database.mako:58
+msgid "Restore"
+msgstr "Palauta"
+
+#: controllers/database.py:100
+msgid "File:"
+msgstr "Tiedosto:"
+
+#: controllers/database.py:106
+msgid "Change Administrator Password"
+msgstr ""
+
+#: controllers/database.py:108 controllers/templates/preferences/index.mako:37
+msgid "Change Password"
+msgstr "Vaihda salasana"
+
+#: controllers/database.py:109
+msgid "Old Password:"
+msgstr ""
+
+#: controllers/database.py:110
+msgid "New Password:"
+msgstr "Uusi salasana:"
+
+#: controllers/database.py:111
+msgid "Confirm Password:"
+msgstr "Vahvista salasana:"
+
+#: controllers/database.py:174
+msgid "You must avoid all accents, space or special characters."
+msgstr ""
+
+#: controllers/database.py:175
+msgid "Bad database name"
+msgstr ""
+
+#: controllers/database.py:195
+msgid ""
+"The server crashed during installation.\n"
+"We suggest you to drop this database."
+msgstr ""
+"Palvelin sammui virheen vuoksi asennuksen aikana.\n"
+"Suosittelemme poistamaan tietokannan."
+
+#: controllers/database.py:196
+msgid "Error during database creation"
+msgstr "Virhe luotaessa tietokantaa"
+
+#: controllers/database.py:199 controllers/database.py:226
+#: controllers/database.py:272 controllers/database.py:295
+msgid "Bad super admin password"
+msgstr ""
+
+#: controllers/database.py:203
+msgid "Could not create database."
+msgstr "Tietokannan luominen epÃ¤onnistui."
+
+#: controllers/database.py:229
+msgid "Could not drop database"
+msgstr ""
+
+#: controllers/database.py:252
+msgid "Could not create backup."
+msgstr ""
+
+#: controllers/database.py:276
+msgid "Could not restore database"
+msgstr ""
+
+#: controllers/database.py:299
+msgid "Error, password not changed."
+msgstr "Virhe! Salasanaa ei vaihdettu."
+
+#: controllers/error_page.py:78
+msgid ""
+"Your problem has been sent to the quality team\n"
+"We will recontact you after analysing the problem."
+msgstr ""
+
+#: controllers/error_page.py:80
+#, python-format
+msgid ""
+"Your problem could not be sent to the quality team\n"
+"Please report this error manually at %s"
+msgstr ""
+
+#: controllers/form.py:553
+#, python-format
+msgid "Invalid button type \"%s\""
+msgstr ""
+
+#: controllers/form.py:891 controllers/tree.py:233
+msgid "No record selected"
+msgstr ""
+
+#: controllers/form.py:896
+msgid "Print Screen"
+msgstr ""
+
+#: controllers/form.py:965 utils/rpc.py:122 utils/rpc.py:133 utils/rpc.py:136
+#: widgets/listgrid.py:289 widgets/listgrid.py:353 widgets/form/_form.py:904
+msgid "Application Error"
+msgstr ""
+
+#: controllers/form.py:965
+#, python-format
+msgid "Wrong on_change trigger: %s"
+msgstr ""
+
+#: controllers/form.py:1073
+msgid "Open resource"
+msgstr ""
+
+#: controllers/form.py:1076
+msgid "Set to default value"
+msgstr ""
+
+#: controllers/form.py:1077
+msgid "Set as default"
+msgstr ""
+
+#: controllers/form.py:1084
+msgid "Action"
+msgstr ""
+
+#: controllers/form.py:1085
+msgid "Report"
+msgstr ""
+
+#: controllers/impex.py:66
+msgid ""
+"Operation failed\n"
+"I/O error"
+msgstr ""
+
+#: controllers/impex.py:373
+msgid "Export Error"
+msgstr ""
+
+#: controllers/impex.py:444
+msgid "Database ID"
+msgstr ""
+
+#: controllers/impex.py:451
+msgid "Error opening .CSV file"
+msgstr ""
+
+#: controllers/impex.py:451
+msgid "Input Error."
+msgstr ""
+
+#: controllers/impex.py:473
+#, python-format
+msgid "You cannot import the field '%s', because we cannot auto-detect it"
+msgstr ""
+
+#: controllers/impex.py:476
+#, python-format
+msgid "Error processing the first line of the file. Field \"%s\" is unknown"
+msgstr ""
+
+#: controllers/impex.py:476
+msgid "Import Error."
+msgstr ""
+
+#: controllers/impex.py:515
+msgid "XML-RPC error"
+msgstr ""
+
+#: controllers/impex.py:520
+#, python-format
+msgid "Imported %d objects"
+msgstr ""
+
+#: controllers/impex.py:525
+#, python-format
+msgid "Error trying to import this record:%s. ErrorMessage:%s %s"
+msgstr ""
+
+#: controllers/impex.py:526
+msgid "ImportationError"
+msgstr ""
+
+#: controllers/listgrid.py:51
+msgid "Parent record doesn't exists..."
+msgstr ""
+
+#: controllers/preferences.py:34
+msgid "Change your password"
+msgstr ""
+
+#: controllers/preferences.py:64 controllers/templates/header.mako:59
+msgid "Preferences"
+msgstr ""
+
+#: controllers/preferences.py:91
+msgid "All passwords have to be filled."
+msgstr ""
+
+#: controllers/preferences.py:93
+msgid "The new password and its confirmation must be identical."
+msgstr ""
+
+#: controllers/preferences.py:102
+msgid "Could not change your password."
+msgstr ""
+
+#: controllers/preferences.py:104
+msgid "Original password incorrect, your password was not changed."
+msgstr ""
+
+#: controllers/root.py:170
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#: controllers/translator.py:132
+msgid "You need to save the resource before adding translations."
+msgstr ""
+
+#: controllers/tree.py:264
+msgid "No resource selected"
+msgstr ""
+
+#: controllers/utils.py:44
+msgid "Could not connect to server"
+msgstr ""
+
+#: controllers/utils.py:131 controllers/templates/login_ajax.mako:111
+msgid "Bad username or password"
+msgstr ""
+
+#: controllers/view_log.py:32
+msgid "ID"
+msgstr ""
+
+#: controllers/view_log.py:33
+msgid "Creation User"
+msgstr ""
+
+#: controllers/view_log.py:34
+msgid "Creation Date"
+msgstr ""
+
+#: controllers/view_log.py:35
+msgid "Latest Modification by"
+msgstr ""
+
+#: controllers/view_log.py:36
+msgid "Latest Modification Date"
+msgstr ""
+
+#: controllers/view_log.py:37
+msgid "Owner"
+msgstr ""
+
+#: controllers/view_log.py:38
+msgid "Group Owner"
+msgstr ""
+
+#: controllers/view_log.py:39
+msgid "Access Level"
+msgstr ""
+
+#: controllers/view_log.py:40
+msgid "Internal module data ID"
+msgstr ""
+
+#: controllers/viewed.py:220
+msgid "Invalid view id."
+msgstr ""
+
+#: controllers/viewed.py:498
+msgid "Unable to create inherited view."
+msgstr ""
+
+#: controllers/viewed.py:500
+msgid "Can't create inherited view here."
+msgstr ""
+
+#: controllers/viewed.py:503
+msgid "Not implemented yet!"
+msgstr ""
+
+#: controllers/viewed.py:608
+msgid "Unable to update the view."
+msgstr ""
+
+#: controllers/viewed.py:859
+msgid "New Window"
+msgstr ""
+
+#: controllers/viewed.py:871
+msgid "Save Button"
+msgstr ""
+
+#: controllers/viewed.py:871
+msgid "Cancel Button"
+msgstr ""
+
+#: controllers/viewed.py:871
+msgid "Open Button"
+msgstr ""
+
+#: controllers/viewed.py:877
+msgid "Left"
+msgstr ""
+
+#: controllers/viewed.py:877
+msgid "Center"
+msgstr ""
+
+#: controllers/viewed.py:877
+msgid "Right"
+msgstr ""
+
+#: controllers/templates/about.mako:4
+msgid "About the OpenERP Web"
+msgstr ""
+
+#: controllers/templates/about.mako:27
+msgid "OpenERP Web"
+msgstr ""
+
+#: controllers/templates/about.mako:30
+msgid "Copyright &copy; 2006-TODAY OpenERP SA. All Rights Reserved."
+msgstr ""
+
+#: controllers/templates/about.mako:31
+msgid "OpenERP is a trademark of the OpenERP SA Company."
+msgstr ""
+
+#: controllers/templates/about.mako:33
+#, python-format
+msgid "%(ooweb)s is jointly developed by %(tiny)s and %(axelor)s."
+msgstr ""
+
+#: controllers/templates/about.mako:39
+#, python-format
+msgid "Licenced under the terms of %(license)s"
+msgstr ""
+
+#: controllers/templates/about.mako:42
+msgid "About OpenERP"
+msgstr ""
+
+#: controllers/templates/about.mako:44
+#, python-format
+msgid ""
+"%(openobject)s is a free enterprise-scale software system that is designed "
+"to boost\n"
+"                    productivity and profit through data integration. It "
+"connects, improves and\n"
+"                    manages business processes in areas such as sales, "
+"finance, supply chain,\n"
+"                    project management, production, services, CRM, etc..\n"
+"                    "
+msgstr ""
+
+#: controllers/templates/about.mako:51
+msgid ""
+"The system is platform-independent, and can be installed on Windows, Mac OS "
+"X,\n"
+"                    and various Linux and other Unix-based distributions. "
+"Its architecture enables\n"
+"                    new functionality to be rapidly created, modifications "
+"to be made to a\n"
+"                    production system and migration to a new version to be "
+"straightforward."
+msgstr ""
+
+#: controllers/templates/about.mako:57
+msgid ""
+"Depending on your needs, OpenERP is available through a web or application "
+"client."
+msgstr ""
+
+#: controllers/templates/database.mako:50 controllers/templates/login.mako:4
+#: controllers/templates/login.mako:67 controllers/templates/login_ajax.mako:85
+#: controllers/templates/login_ajax.mako:104
+msgid "Login"
+msgstr ""
+
+#: controllers/templates/database.mako:60
+msgid "Password"
+msgstr ""
+
+#: controllers/templates/error_page.mako:77
+#, python-format
+msgid "An %(error_type)s has been reported."
+msgstr ""
+
+#: controllers/templates/error_page.mako:79
+msgid "Let me fix it"
+msgstr ""
+
+#: controllers/templates/error_page.mako:85
+msgid "Fix it for me"
+msgstr ""
+
+#: controllers/templates/error_page.mako:90
+msgid "You do not have a valid OpenERP publisher warranty contract !"
+msgstr ""
+
+#: controllers/templates/error_page.mako:91
+msgid ""
+"If you are using OpenERP in production, it is recommended to have\n"
+"a publisher warranty program.\n"
+"\n"
+"The OpenERP publisher warranty contract provides you with bug fix guarantees "
+"and an\n"
+"automatic migration system so that we can start working on your problems "
+"within a few\n"
+"hours.\n"
+"\n"
+"With a publisher warranty contract, errors such as this one can be sent "
+"directly to the OpenERP\n"
+"team for review and evaluation.\n"
+"\n"
+"The publisher warranty program offers you:\n"
+"* Automatic migrations on new versions,\n"
+"* A bugfix guarantee,\n"
+"* Monthly announces of potential bugs and their fixes,\n"
+"* Security alerts by email and automatic migration,\n"
+"* Access to the customer portal.\n"
+msgstr ""
+
+#: controllers/templates/error_page.mako:113
+msgid ""
+"Your publisher warranty contract does not cover all modules installed in "
+"your system !\n"
+"If you are using OpenERP in production, it is highly suggested to upgrade "
+"your\n"
+"contract.\n"
+"\n"
+"If you have developed your own modules or installed third party module, we\n"
+"can provide you an additional publisher warranty contract for these modules. "
+"After\n"
+"having reviewed your modules, our quality team will ensure they will "
+"migrate\n"
+"automatically for all future stable versions of OpenERP at no extra cost.\n"
+"\n"
+"Here is the list of modules not covered by your publisher warranty contract:"
+msgstr ""
+
+#: controllers/templates/error_page.mako:135
+msgid "Publisher warranty contract."
+msgstr ""
+
+#: controllers/templates/error_page.mako:136
+msgid ""
+"Your request will be sent to OpenERP and publisher warranty team will reply "
+"you shortly."
+msgstr ""
+
+#: controllers/templates/error_page.mako:140
+msgid "Summary of the problem:"
+msgstr ""
+
+#: controllers/templates/error_page.mako:147
+msgid "Explain what you did:"
+msgstr ""
+
+#: controllers/templates/error_page.mako:156
+msgid "Other Comments:"
+msgstr ""
+
+#: controllers/templates/error_page.mako:168
+msgid "Send to Publisher Warranty Team"
+msgstr ""
+
+#: controllers/templates/error_page.mako:195
+msgid "Write concurrency warning :"
+msgstr ""
+
+#: controllers/templates/error_page.mako:200
+msgid ""
+"This document has been modified while you were editing it.\n"
+"Choose:\n"
+"\n"
+"    - \"Cancel\" to cancel saving.\n"
+"    - \"Write anyway\" to save your current version."
+msgstr ""
+
+#: controllers/templates/error_page.mako:214 controllers/templates/exp.mako:244
+#: controllers/templates/form.mako:140 controllers/templates/openo2m.mako:41
+#: controllers/templates/selection.mako:43
+#: controllers/templates/viewlist.mako:160
+#: controllers/templates/preferences/index.mako:38
+#: widgets/templates/listgrid/listgrid.mako:33
+msgid "Cancel"
+msgstr ""
+
+#: controllers/templates/error_page.mako:215
+msgid "Write Anyway"
+msgstr ""
+
+#: controllers/templates/exp.mako:151
+msgid "Export Data"
+msgstr ""
+
+#: controllers/templates/exp.mako:166
+msgid "Export Type:"
+msgstr ""
+
+#: controllers/templates/exp.mako:169
+msgid "Import Compatible Export"
+msgstr ""
+
+#: controllers/templates/exp.mako:172
+msgid "Export all Data"
+msgstr ""
+
+#: controllers/templates/exp.mako:183
+msgid "Available fields"
+msgstr ""
+
+#: controllers/templates/exp.mako:185
+msgid "Fields to export"
+msgstr ""
+
+#: controllers/templates/exp.mako:187
+msgid "Save fields list"
+msgstr ""
+
+#: controllers/templates/exp.mako:189
+msgid "Save as:"
+msgstr ""
+
+#: controllers/templates/exp.mako:191 controllers/templates/fieldpref.mako:102
+#: controllers/templates/selection.mako:45
+msgid "OK"
+msgstr ""
+
+#: controllers/templates/exp.mako:195
+msgid "Saved exports:"
+msgstr ""
+
+#: controllers/templates/exp.mako:204 controllers/templates/form.mako:135
+#: controllers/templates/image.mako:67 widgets/form/templates/one2many.mako:22
+#: widgets/templates/sidebar.mako:67
+#: widgets/templates/listgrid/listgrid.mako:105
+#: widgets/templates/listgrid/listgrid.mako:109
+#: widgets/templates/listgrid/listgrid.mako:173
+#: widgets/templates/listgrid/listgrid.mako:178
+#: widgets/templates/listgrid/listgroup.mako:131
+#: widgets/templates/listgrid/multiple_group.mako:81
+msgid "Delete"
+msgstr ""
+
+#: controllers/templates/exp.mako:217 widgets/templates/sidebar.mako:56
+#: widgets/templates/listgrid/listgrid.mako:135
+msgid "Add"
+msgstr ""
+
+#: controllers/templates/exp.mako:222 controllers/templates/viewlist.mako:125
+msgid "Remove"
+msgstr ""
+
+#: controllers/templates/exp.mako:227
+msgid "Remove All"
+msgstr ""
+
+#: controllers/templates/exp.mako:245
+msgid "Export to File"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:4
+#: controllers/templates/fieldpref.mako:29
+msgid "Field Preferences"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:39
+msgid "Field Name:"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:43
+msgid "Domain:"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:47
+msgid "Default Value:"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:57
+msgid "Value applicable for:"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:63
+msgid "Only for you"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:67
+msgid "For all"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:76
+msgid "Value applicable if:"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:79
+msgid "Always applicable!"
+msgstr ""
+
+#: controllers/templates/fieldpref.mako:99 controllers/templates/image.mako:70
+#: controllers/templates/imp.mako:205 controllers/templates/index.mako:198
+#: controllers/templates/openm2.mako:52
+#: controllers/templates/save_filter.mako:42
+#: controllers/templates/search.mako:129
+#: controllers/templates/translator.mako:41
+#: controllers/templates/translator.mako:108
+#: controllers/templates/viewed.mako:37
+#: controllers/templates/viewed_new.mako:49
+#: controllers/templates/viewed_new_model.mako:42
+#: controllers/templates/viewed_preview.mako:28
+#: controllers/templates/viewlist.mako:129 widgets/templates/sidebar.mako:67
+#: widgets/templates/viewform.mako:37
+msgid "Close"
+msgstr ""
+
+#: controllers/templates/footer.mako:3
+#, python-format
+msgid "&copy; 2008-2010 %(ooweb)s  SA. All Rights Reserved "
+msgstr ""
+
+#: controllers/templates/footer.mako:6
+msgid "Significant contributions to the web client have been made by"
+msgstr ""
+
+#: controllers/templates/form.mako:63
+msgid "Disable all Tips"
+msgstr ""
+
+#: controllers/templates/form.mako:64
+msgid "Hide this Tip"
+msgstr ""
+
+#: controllers/templates/form.mako:82
+msgid "Add / Remove Shortcut..."
+msgstr ""
+
+#: controllers/templates/form.mako:86
+#, python-format
+msgid "Search: %s"
+msgstr ""
+
+#: controllers/templates/form.mako:93
+msgid "Corporate Intelligence..."
+msgstr ""
+
+#: controllers/templates/form.mako:99
+msgid "Show Logs..."
+msgstr ""
+
+#: controllers/templates/form.mako:111
+msgid "Create a new resource"
+msgstr ""
+
+#: controllers/templates/form.mako:112 controllers/templates/search.mako:128
+#: controllers/templates/viewed_new_model.mako:36
+#: controllers/templates/viewlist.mako:119 widgets/form/_o2m.py:73
+#: widgets/form/templates/one2many.mako:20
+#: widgets/templates/listgrid/listgrid.mako:140
+#: widgets/templates/listgrid/listgrid.mako:144
+#: widgets/templates/listgrid/listgroup.mako:20
+msgid "New"
+msgstr ""
+
+#: controllers/templates/form.mako:116
+msgid "Edit this resource"
+msgstr ""
+
+#: controllers/templates/form.mako:117 controllers/templates/viewlist.mako:122
+#: widgets/templates/listgrid/listgrid.mako:75
+#: widgets/templates/listgrid/listgrid.mako:79
+#: widgets/templates/listgrid/listgroup.mako:112
+#: widgets/templates/listgrid/multiple_group.mako:63
+msgid "Edit"
+msgstr ""
+
+#: controllers/templates/form.mako:121
+msgid "Save this resource"
+msgstr ""
+
+#: controllers/templates/form.mako:122 controllers/templates/image.mako:65
+#: controllers/templates/openm2.mako:48
+#: controllers/templates/save_filter.mako:41
+#: controllers/templates/translator.mako:39
+#: controllers/templates/translator.mako:106
+#: controllers/templates/viewed_new.mako:46
+#: controllers/templates/viewed_new_model.mako:39
+#: controllers/templates/viewlist.mako:157
+#: controllers/templates/preferences/index.mako:39
+msgid "Save"
+msgstr ""
+
+#: controllers/templates/form.mako:124
+msgid "Save & Edit this resource"
+msgstr ""
+
+#: controllers/templates/form.mako:125
+msgid "Save & Edit"
+msgstr ""
+
+#: controllers/templates/form.mako:129
+msgid "Duplicate this resource"
+msgstr ""
+
+#: controllers/templates/form.mako:130
+msgid "Duplicate"
+msgstr ""
+
+#: controllers/templates/form.mako:134
+msgid "Delete this resource"
+msgstr ""
+
+#: controllers/templates/form.mako:139
+msgid "Cancel editing the current resource"
+msgstr ""
+
+#: controllers/templates/form.mako:144
+msgid "Create new node"
+msgstr ""
+
+#: controllers/templates/form.mako:145
+msgid "New Node"
+msgstr ""
+
+#: controllers/templates/form.mako:149
+msgid "Show grid in workflow canvas"
+msgstr ""
+
+#: controllers/templates/form.mako:150
+msgid "Show grid"
+msgstr ""
+
+#: controllers/templates/header.mako:33
+#, python-format
+msgid "%(company)s"
+msgstr ""
+
+#: controllers/templates/header.mako:34 controllers/templates/index.mako:218
+#, python-format
+msgid "%(user)s"
+msgstr ""
+
+#: controllers/templates/header.mako:45 controllers/templates/header.mako:47
+msgid "Home"
+msgstr ""
+
+#: controllers/templates/header.mako:53
+msgid "Requests"
+msgstr ""
+
+#: controllers/templates/header.mako:62
+msgid "Edit Preferences"
+msgstr ""
+
+#: controllers/templates/header.mako:66 controllers/templates/header.mako:69
+msgid "About"
+msgstr ""
+
+#: controllers/templates/header.mako:73 controllers/templates/header.mako:75
+msgid "Help"
+msgstr ""
+
+#: controllers/templates/header.mako:81 controllers/templates/header.mako:84
+msgid "Clear Cache"
+msgstr ""
+
+#: controllers/templates/header.mako:89
+msgid "Logout"
+msgstr ""
+
+#: controllers/templates/image.mako:4 controllers/templates/image.mako:39
+msgid "Image"
+msgstr ""
+
+#: controllers/templates/image.mako:55
+msgid "Add Resource:"
+msgstr ""
+
+#: controllers/templates/image.mako:66 widgets/form/templates/binary.mako:28
+msgid "Save As"
+msgstr ""
+
+#: controllers/templates/imp.mako:80
+msgid "Import Data"
+msgstr ""
+
+#: controllers/templates/imp.mako:90
+msgid "1. Import a .CSV file"
+msgstr ""
+
+#: controllers/templates/imp.mako:106
+msgid "CSV File:"
+msgstr ""
+
+#: controllers/templates/imp.mako:124
+msgid "2. Check your file format"
+msgstr ""
+
+#: controllers/templates/imp.mako:131
+#, python-format
+msgid "The import failed due to: %(message)s"
+msgstr ""
+
+#: controllers/templates/imp.mako:133
+msgid "Here is a preview of the file we could not import:"
+msgstr ""
+
+#: controllers/templates/imp.mako:158
+msgid "CSV Options"
+msgstr ""
+
+#: controllers/templates/imp.mako:161
+msgid "Separator:"
+msgstr ""
+
+#: controllers/templates/imp.mako:163
+msgid "Delimiter:"
+msgstr ""
+
+#: controllers/templates/imp.mako:167
+msgid "Encoding:"
+msgstr ""
+
+#: controllers/templates/imp.mako:174
+msgid "Lines to skip:"
+msgstr ""
+
+#: controllers/templates/imp.mako:188
+msgid "3. File imported"
+msgstr ""
+
+#: controllers/templates/imp.mako:206
+msgid "Import File"
+msgstr ""
+
+#: controllers/templates/index.mako:164
+msgid "System Logs"
+msgstr ""
+
+#: controllers/templates/index.mako:189
+msgid "More"
+msgstr ""
+
+#: controllers/templates/index.mako:190
+msgid "Widgets"
+msgstr ""
+
+#: controllers/templates/index.mako:221 controllers/templates/index.mako:226
+#, python-format
+msgid "Powered by %(openerp)s "
+msgstr ""
+
+#: controllers/templates/login.mako:53 controllers/templates/login_ajax.mako:72
+#: controllers/templates/login_ajax.mako:94
+msgid "User:"
+msgstr ""
+
+#: controllers/templates/login.mako:64
+msgid "Databases"
+msgstr ""
+
+#: controllers/templates/login.mako:84
+msgid "Top Contributor:"
+msgstr ""
+
+#: controllers/templates/login.mako:94
+msgid ""
+"We think that daily job activities can be more intuitive, efficient, "
+"automated, .. and even fun."
+msgstr ""
+
+#: controllers/templates/login.mako:95
+msgid "OpenERP's vision to be:"
+msgstr ""
+
+#: controllers/templates/login.mako:103
+msgid "Full featured"
+msgstr ""
+
+#: controllers/templates/login.mako:104
+msgid ""
+"Today's enterprise challenges are multiple. We provide one module for each "
+"need."
+msgstr ""
+
+#: controllers/templates/login.mako:112
+msgid "Open Source"
+msgstr ""
+
+#: controllers/templates/login.mako:113
+msgid ""
+"To Build a great product, we rely on the knowledge of thousands of "
+"contributors."
+msgstr ""
+
+#: controllers/templates/login.mako:121
+msgid "User Friendly"
+msgstr ""
+
+#: controllers/templates/login.mako:122
+msgid ""
+"In order to be productive, people need clean and easy to use interface."
+msgstr ""
+
+#: controllers/templates/modules.mako:4
+msgid "Module Management"
+msgstr ""
+
+#: controllers/templates/modules.mako:17
+msgid "Web Modules"
+msgstr ""
+
+#: controllers/templates/openo2m.mako:34
+msgid "Save & Close"
+msgstr ""
+
+#: controllers/templates/openo2m.mako:37
+msgid "Save & New"
+msgstr ""
+
+#: controllers/templates/save_filter.mako:18
+msgid "Save as Filter"
+msgstr ""
+
+#: controllers/templates/save_filter.mako:30
+msgid "Filter Name"
+msgstr ""
+
+#: controllers/templates/search.mako:110
+#, python-format
+msgid "Search %(name)s"
+msgstr ""
+
+#: controllers/templates/search.mako:125 widgets/form/templates/datetime.mako:8
+msgid "Select"
+msgstr ""
+
+#: controllers/templates/search.mako:127 widgets/_views.py:83
+#: widgets/form/templates/many2one.mako:22
+#: widgets/form/templates/reference.mako:27 widgets/templates/viewform.mako:26
+msgid "Search"
+msgstr ""
+
+#: controllers/templates/search.mako:143
+#, python-format
+msgid "No record found : '%(searched_string)s'."
+msgstr ""
+
+#: controllers/templates/selection.mako:4
+msgid "Select action"
+msgstr ""
+
+#: controllers/templates/selection.mako:23
+msgid "Select your action"
+msgstr ""
+
+#: controllers/templates/server_log.mako:4
+msgid "Server Actions..."
+msgstr ""
+
+#: controllers/templates/server_log.mako:14
+msgid "Server Actions"
+msgstr ""
+
+#: controllers/templates/translator.mako:4
+msgid "Add Translations"
+msgstr ""
+
+#: controllers/templates/translator.mako:17
+msgid "Add Translation"
+msgstr ""
+
+#: controllers/templates/translator.mako:27
+msgid "Add Translation for:"
+msgstr ""
+
+#: controllers/templates/translator.mako:31
+msgid "Fields"
+msgstr ""
+
+#: controllers/templates/translator.mako:32
+msgid "Labels"
+msgstr ""
+
+#: controllers/templates/translator.mako:33
+msgid "Relates"
+msgstr ""
+
+#: controllers/templates/translator.mako:34
+msgid "View"
+msgstr ""
+
+#: controllers/templates/translator.mako:53
+msgid "Field"
+msgstr ""
+
+#: controllers/templates/view_log.mako:4 controllers/templates/view_log.mako:12
+#: utils/common.py:47
+msgid "Information"
+msgstr ""
+
+#: controllers/templates/viewed.mako:17
+#, python-format
+msgid "View Editor %s - %s"
+msgstr ""
+
+#: controllers/templates/viewed.mako:31
+msgid "Create a new inherited view"
+msgstr ""
+
+#: controllers/templates/viewed.mako:31
+msgid "Inherited View"
+msgstr ""
+
+#: controllers/templates/viewed.mako:34
+msgid "Preview"
+msgstr ""
+
+#: controllers/templates/viewed_add.mako:6
+msgid "Node Type:"
+msgstr ""
+
+#: controllers/templates/viewed_add.mako:23
+msgid "New Field"
+msgstr ""
+
+#: controllers/templates/viewed_add.mako:27
+msgid "Position:"
+msgstr ""
+
+#: controllers/templates/viewlist.mako:4
+#: controllers/templates/viewlist.mako:108
+#, python-format
+msgid "Manage Views (%s)"
+msgstr ""
+
+#: controllers/templates/viewlist.mako:146
+#, python-format
+msgid "Create a view (%s)"
+msgstr ""
+
+#: controllers/templates/viewlist.mako:174
+msgid "View Name:"
+msgstr ""
+
+#: controllers/templates/viewlist.mako:178
+msgid "View Type:"
+msgstr ""
+
+#: controllers/templates/viewlist.mako:189
+msgid "Priority:"
+msgstr ""
+
+#: utils/common.py:37 utils/common.py:66
+msgid "Error"
+msgstr ""
+
+#: utils/common.py:42 utils/common.py:69
+msgid "Warning"
+msgstr ""
+
+#: utils/rpc.py:131
+msgid "Access Denied"
+msgstr ""
+
+#: utils/rpc.py:238
+msgid "Unsupported protocol."
+msgstr ""
+
+#: utils/rpc.py:342
+msgid ""
+"You select a timezone but OpenERP could not find pytz library!\n"
+"The timezone functionality will be disable."
+msgstr ""
+
+#: utils/rpc.py:355
+msgid "Not logged..."
+msgstr ""
+
+#: utils/rpc.py:355
+msgid "Authorization Error"
+msgstr ""
+
+#: utils/rpc.py:437
+msgid "== Access Denied =="
+msgstr ""
+
+#: widgets/_views.py:52
+msgid "Form"
+msgstr ""
+
+#: widgets/_views.py:53
+msgid "Form view..."
+msgstr ""
+
+#: widgets/_views.py:84
+msgid "Search view..."
+msgstr ""
+
+#: widgets/listgrid.py:289
+msgid "Wrong on_change trigger"
+msgstr ""
+
+#: widgets/listgrid.py:353 widgets/form/_form.py:904
+#, python-format
+msgid "Invalid view, duplicate field: %s"
+msgstr ""
+
+#: widgets/pager.py:56
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: widgets/pager.py:68
+#, python-format
+msgid "%s - %s"
+msgstr ""
+
+#: widgets/search.py:282
+msgid "contains"
+msgstr ""
+
+#: widgets/search.py:282
+msgid "doesn't contain"
+msgstr ""
+
+#: widgets/search.py:283
+msgid "is equal to"
+msgstr ""
+
+#: widgets/search.py:283
+msgid "is not equal to"
+msgstr ""
+
+#: widgets/search.py:284
+msgid "greater than"
+msgstr ""
+
+#: widgets/search.py:284
+msgid "less than"
+msgstr ""
+
+#: widgets/search.py:285
+msgid "in"
+msgstr ""
+
+#: widgets/search.py:285
+msgid "not in"
+msgstr ""
+
+#: widgets/search.py:392
+msgid "Yes"
+msgstr ""
+
+#: widgets/search.py:392
+msgid "No"
+msgstr ""
+
+#: widgets/form/_action.py:46
+msgid "Action not found!"
+msgstr ""
+
+#: widgets/form/_o2m.py:73 widgets/templates/listgrid/listgrid.mako:138
+#: widgets/templates/listgrid/listgrid.mako:144
+#: widgets/templates/listgrid/listgroup.mako:20
+msgid "Create new record."
+msgstr ""
+
+#: widgets/form/_o2m.py:86
+msgid "Save/New"
+msgstr ""
+
+#: widgets/form/_o2m.py:86
+msgid "Save parent record."
+msgstr ""
+
+#: widgets/form/_o2m.py:216
+#, python-format
+msgid "%d of %d"
+msgstr ""
+
+#: widgets/form/_o2m.py:218
+#, python-format
+msgid "- of %d"
+msgstr ""
+
+#: widgets/form/templates/binary.mako:31
+msgid "add attachment"
+msgstr ""
+
+#: widgets/form/templates/image.mako:7 widgets/form/templates/image.mako:39
+msgid "Click here to add new image."
+msgstr ""
+
+#: widgets/form/templates/many2one.mako:2
+#: widgets/form/templates/reference.mako:30
+msgid "Open"
+msgstr ""
+
+#: widgets/form/templates/many2one.mako:2
+#: widgets/form/templates/reference.mako:30
+msgid "Open a resource"
+msgstr ""
+
+#: widgets/form/templates/one2many.mako:20
+msgid "Create new record..."
+msgstr ""
+
+#: widgets/form/templates/one2many.mako:22
+msgid "Delete record..."
+msgstr ""
+
+#: widgets/form/templates/one2many.mako:28
+msgid "Translate me."
+msgstr ""
+
+#: widgets/form/templates/one2many.mako:47
+msgid "Previous record..."
+msgstr ""
+
+#: widgets/form/templates/one2many.mako:49
+msgid "Next record..."
+msgstr ""
+
+#: widgets/templates/logs.mako:22
+msgid "More..."
+msgstr ""
+
+#: widgets/templates/logs.mako:35
+msgid "Less..."
+msgstr ""
+
+#: widgets/templates/pager.mako:9
+msgid "<< First"
+msgstr ""
+
+#: widgets/templates/pager.mako:14
+msgid "< Previous"
+msgstr ""
+
+#: widgets/templates/pager.mako:19
+msgid "of"
+msgstr ""
+
+#: widgets/templates/pager.mako:24
+msgid "Next >"
+msgstr ""
+
+#: widgets/templates/pager.mako:29
+msgid "Last >>"
+msgstr ""
+
+#: widgets/templates/pager.mako:37
+msgid "Change Limit:"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:37
+msgid "Reports"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:41 widgets/templates/viewform.mako:51
+msgid "Actions"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:45
+msgid "Links"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:49
+msgid "Submenu"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:54
+msgid "Attachments"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:74
+msgid "File"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:83
+msgid "Customize"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:87
+msgid "Manage views of the current object"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:89
+msgid "Manage Views"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:93
+msgid "Edit workflow of the current object"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:94
+msgid "Edit Workflow"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:98
+msgid "Customize current object or create a new object"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:100
+msgid "Customize Object"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:106
+msgid "Other Options"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:111
+msgid "Import"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:114
+msgid "Export"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:118
+msgid "Translate"
+msgstr ""
+
+#: widgets/templates/sidebar.mako:123
+msgid "View Log"
+msgstr ""
+
+#: widgets/templates/viewform.mako:25
+msgid "Filter records."
+msgstr ""
+
+#: widgets/templates/viewform.mako:33
+msgid "Clear all."
+msgstr ""
+
+#: widgets/templates/viewform.mako:35
+msgid "Clear"
+msgstr ""
+
+#: widgets/templates/viewform.mako:43
+msgid "Filters"
+msgstr ""
+
+#: widgets/templates/viewform.mako:45
+msgid "Saved Filters"
+msgstr ""
+
+#: widgets/templates/viewform.mako:52
+msgid "New Filter"
+msgstr ""
+
+#: widgets/templates/viewform.mako:53
+msgid "Save Filter"
+msgstr ""
+
+#: widgets/templates/viewform.mako:54
+msgid "Manage Filters"
+msgstr ""
+
+#: widgets/templates/listgrid/listgrid.mako:19
+msgid "Update"
+msgstr ""
+
+#: widgets/templates/listgrid/listgrid.mako:134
+msgid "Add records..."
+msgstr ""
+
+#: widgets/templates/listgrid/listgrid.mako:172
+#: widgets/templates/listgrid/listgrid.mako:176
+msgid "Delete record(s)."
+msgstr ""

=== modified file 'addons/openerp/po/messages/fr.po'
--- addons/openerp/po/messages/fr.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/fr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: validators.py:75

=== modified file 'addons/openerp/po/messages/gl.po'
--- addons/openerp/po/messages/gl.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/gl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"

=== modified file 'addons/openerp/po/messages/he.po'
--- addons/openerp/po/messages/he.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/he.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"

=== modified file 'addons/openerp/po/messages/hr.po'
--- addons/openerp/po/messages/hr.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/hr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"

=== modified file 'addons/openerp/po/messages/hu.po'
--- addons/openerp/po/messages/hu.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/hu.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"

=== modified file 'addons/openerp/po/messages/it.po'
--- addons/openerp/po/messages/it.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/it.po	2011-03-15 13:37:09 +0000
@@ -15,8 +15,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: validators.py:75

=== modified file 'addons/openerp/po/messages/lt.po'
--- addons/openerp/po/messages/lt.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/lt.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"

=== modified file 'addons/openerp/po/messages/lv.po'
--- addons/openerp/po/messages/lv.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/lv.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"

=== modified file 'addons/openerp/po/messages/mn.po'
--- addons/openerp/po/messages/mn.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/mn.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: validators.py:75

=== modified file 'addons/openerp/po/messages/nl.po'
--- addons/openerp/po/messages/nl.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/nl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: validators.py:75

=== modified file 'addons/openerp/po/messages/pl.po'
--- addons/openerp/po/messages/pl.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/pl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: validators.py:75

=== modified file 'addons/openerp/po/messages/pt.po'
--- addons/openerp/po/messages/pt.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/pt.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"

=== modified file 'addons/openerp/po/messages/pt_BR.po'
--- addons/openerp/po/messages/pt_BR.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/pt_BR.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: validators.py:75

=== modified file 'addons/openerp/po/messages/ru.po'
--- addons/openerp/po/messages/ru.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/ru.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"

=== modified file 'addons/openerp/po/messages/sk.po'
--- addons/openerp/po/messages/sk.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/sk.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"

=== modified file 'addons/openerp/po/messages/sr.po'
--- addons/openerp/po/messages/sr.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/sr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: validators.py:75

=== modified file 'addons/openerp/po/messages/sr@xxxxxxxx'
--- addons/openerp/po/messages/sr@xxxxxxxx	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/sr@xxxxxxxx	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:15+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"

=== modified file 'addons/openerp/po/messages/sv.po'
--- addons/openerp/po/messages/sv.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/sv.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: validators.py:75

=== modified file 'addons/openerp/po/messages/tr.po'
--- addons/openerp/po/messages/tr.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/tr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"

=== added file 'addons/openerp/po/messages/uk.po.OTHER'
--- addons/openerp/po/messages/uk.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/messages/uk.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,1637 @@
+# Ukrainian translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-28 12:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian <uk@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: validators.py:75
+msgid "Invalid literal for float"
+msgstr "ÐÐµÐ²Ñ–Ñ€Ð½Ð¸Ð¹ Ð»Ñ–Ñ‚ÐµÑ€Ð°Ð» Ð´Ð»Ñ Ð´Ñ€Ð¾Ð±Ð¾Ð²Ð¾Ð³Ð¾ Ñ‡Ð¸ÑÐ»Ð°"
+
+#: validators.py:114 validators.py:119 validators.py:262
+msgid "Invalid datetime format"
+msgstr "ÐÐµÐ²Ñ–Ñ€Ð½Ð¸Ð¹ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ Ð´Ð°Ñ‚Ð¸ Ñ‚Ð° Ñ‡Ð°ÑÑƒ"
+
+#: validators.py:166
+msgid "Please select a file."
+msgstr "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¾Ð±ÐµÑ€Ñ–Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»."
+
+#: validators.py:247
+msgid "Please enter an email address"
+msgstr "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ° Ð²Ð²ÐµÐ´Ñ–Ñ‚ÑŒ Ð°Ð´Ñ€ÐµÑÑƒ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ñ— Ð¿Ð¾ÑˆÑ‚Ð¸"
+
+#: validators.py:248
+msgid "An email address must contain a single @"
+msgstr "ÐÐ´Ñ€ÐµÑÐ° ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ñ— Ð¿Ð¾ÑˆÑ‚Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð° Ð¼Ñ–ÑÑ‚Ð¸Ñ‚Ð¸ Ð¾Ð´Ð½Ñƒ @"
+
+#: validators.py:249
+#, python-format
+msgid ""
+"The username portion of the email address is invalid (the portion before the "
+"@: %(username)s)"
+msgstr ""
+"Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° Ñƒ Ð°Ð´Ñ€ÐµÑÑ– ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ñ— Ð¿Ð¾ÑˆÑ‚Ð¸ Ð½Ðµ Ð´Ñ–Ð¹ÑÐ½Ð¾ (Ñ‡Ð°ÑÑ‚Ð¸Ð½Ð° Ð¿ÐµÑ€ÐµÐ´ "
+"@:%(username)s)"
+
+#: validators.py:250
+#, python-format
+msgid ""
+"The domain portion of the email address is invalid (the portion after the @: "
+"%(domain)s)"
+msgstr ""
+"Ð§Ð°ÑÑ‚Ð¸Ð½Ð° Ð°Ð´Ñ€ÐµÑÐ¸ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ñ— Ð¿Ð¾ÑˆÑ‚Ð¸ - Ð´Ð¾Ð¼ÐµÐ½, Ð½Ðµ Ð²Ñ–Ñ€Ð½Ð° (Ñ‡Ð°ÑÑ‚Ð¸Ð½Ð° Ð¿Ñ–ÑÐ»Ñ "
+"@:%(domain)s)"
+
+#: validators.py:254
+msgid "You must start your URL with http://, https://, etc"
+msgstr "Ð’Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð½Ð° Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ URL http://, https://, Ð¸ Ñ‚Ð´."
+
+#: validators.py:255
+msgid "That is not a valid URL"
+msgstr "Ð¦Ðµ Ð½ÐµÐ²Ñ–Ñ€Ð½Ð¸Ð¹ URL"
+
+#: validators.py:256
+#, python-format
+msgid "You must provide a full domain name (like %(domain)s.com)"
+msgstr "Ð’Ñ‹ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– Ð²ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð¿Ð¾Ð²Ð½Ðµ Ð´Ð¾Ð¼ÐµÐ½Ð½Ðµ Ð¸Ð¼â€™Ñ (Ð´ÐµÑ‚Ð°Ð»ÑŒÐ½Ð¾ %(domain)s.com)"
+
+#: validators.py:260
+msgid "Please enter an integer value"
+msgstr "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð²Ð²ÐµÐ´Ñ–Ñ‚ÑŒ Ñ†Ñ–Ð»Ðµ Ñ‡Ð¸ÑÐ»Ð¾"
+
+#: validators.py:261
+msgid "Please enter a number"
+msgstr "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð²Ð²ÐµÐ´Ñ–Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾"
+
+#: controllers/actions.py:91
+msgid "Invalid View"
+msgstr "ÐÐµÐ²Ñ–Ñ€Ð½Ð¸Ð¹ Ð²Ð¸Ð³Ð»ÑÐ´"
+
+#: controllers/actions.py:124
+msgid "Error no report"
+msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð½Ðµ Ð·Ð²Ñ–Ñ‚Ð¾Ð²Ð°Ð½Ð°"
+
+#: controllers/actions.py:150
+msgid "Nothing to print"
+msgstr "ÐÐµÐ¼Ð°Ñ” Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð² Ð´Ð»Ñ Ð´Ñ€ÑƒÐºÑƒ"
+
+#: controllers/actions.py:170
+msgid "Printing aborted, too long delay"
+msgstr "Ð”Ñ€ÑƒÐº Ð¿ÐµÑ€ÐµÑ€Ð²Ð°Ð½Ð¾, Ð½Ð°Ð´Ñ‚Ð¾ Ð´Ð¾Ð²Ð³Ð° Ð·Ð°Ñ‚Ñ€Ð¸Ð¼ÐºÐ°"
+
+#: controllers/actions.py:377
+msgid "Relative URLs are not supported"
+msgstr "Ð’Ñ–Ð´Ð½Ð¾ÑÐ½Ñ– URL Ð½Ðµ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÑƒÑŽÑ‚ÑŒÑÑ"
+
+#: controllers/actions.py:405
+msgid "Action not found"
+msgstr "ÐÐµ Ð¼Ð¾Ð¶Ñƒ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð´Ñ–ÑŽ"
+
+#: controllers/actions.py:454
+msgid "No action defined"
+msgstr "Ð”Ñ–Ñ Ð½Ðµ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð°"
+
+#: controllers/attachment.py:54
+msgid "No record selected, You can only attach to existing record..."
+msgstr "ÐÐµ Ð¾Ð±Ñ€Ð°Ð½Ð¾ Ð·Ð°Ð¿Ð¸Ñ, Ð²Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ñ€Ð¸ÐºÑ€Ñ–Ð¿Ð¸Ñ‚Ð¸ Ñ‚Ñ–Ð»ÑŒÐºÐ¸ Ð´Ð¾ Ñ–ÑÐ½ÑƒÑŽÑ‡Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑƒ..."
+
+#: controllers/database.py:64
+msgid "Create database"
+msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ Ð±Ð°Ð·Ñƒ Ð´Ð°Ð½Ð¸Ñ…"
+
+#: controllers/database.py:66 controllers/templates/database.mako:52
+#: controllers/templates/search.mako:145
+msgid "Create"
+msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸"
+
+#: controllers/database.py:69
+msgid "Super admin password:"
+msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ ÑÑƒÐ¿ÐµÑ€ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°:"
+
+#: controllers/database.py:69
+msgid ""
+"This is the password of the user that have the rights to administer "
+"databases. This is not a OpenERP user, just a super administrator. If you "
+"did not changed it, the password is 'admin' after installation."
+msgstr ""
+"Ð¦Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°, Ñ‰Ð¾ Ð¼Ð°Ñ” Ð¿Ñ€Ð°Ð²Ð¾ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€ÑƒÐ²Ð°Ñ‚Ð¸ Ð±Ð°Ð·Ñƒ Ð´Ð°Ð½Ð¸Ñ…. Ð¦Ðµ Ð½Ðµ "
+"ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ OpenERP, Ð° Ð¿Ñ€Ð¾ÑÑ‚Ð¾ ÑÑƒÐ¿ÐµÑ€ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€. Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð½Ðµ Ð·Ð¼Ñ–Ð½ÑŽÐ²Ð°Ð»Ð¸ Ð¹Ð¾Ð³Ð¾, "
+"ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ¹Ñ‚ÐµÑÑ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¼ 'admin' Ð¿Ñ–ÑÐ»Ñ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ."
+
+#: controllers/database.py:70 controllers/database.py:102
+msgid "New database name:"
+msgstr "Ð†Ð¼'Ñ Ð½Ð¾Ð²Ð¾Ñ— Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…:"
+
+#: controllers/database.py:70
+msgid ""
+"Choose the name of the database that will be created. The name must not "
+"contain any special character. Exemple: 'terp'."
+msgstr ""
+"ÐžÐ±ÐµÑ€Ñ–Ñ‚ÑŒ Ñ–Ð¼'Ñ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…, ÑÐºÐ° Ð±ÑƒÐ´Ðµ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð°. Ð†Ð¼'Ñ Ð½Ðµ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ð¾ Ð¼Ñ–ÑÑ‚Ð¸Ñ‚Ð¸ "
+"ÑÐ¿ÐµÑ†ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ–Ð². ÐŸÑ€Ð¸ÐºÐ»Ð°Ð´: 'terp'."
+
+#: controllers/database.py:71
+msgid "Load Demonstration data:"
+msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ Ð´ÐµÐ¼Ð¾Ð½ÑÑ‚Ñ€Ð°Ñ†Ñ–Ð¹Ð½Ñ– Ð´Ð°Ð½Ñ–:"
+
+#: controllers/database.py:71
+msgid ""
+"Check this box if you want demonstration data to be installed on your new "
+"database. These data will help you to understand OpenERP, with predefined "
+"products, partners, etc."
+msgstr ""
+"Ð’Ñ–Ð´Ð¼Ñ–Ñ‚ÑŒÑ‚Ðµ Ñ†Ðµ Ð¿Ð¾Ð»Ðµ, ÑÐºÑ‰Ð¾ Ð²Ð¸ Ð±Ð°Ð¶Ð°Ñ”Ñ‚Ðµ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð´ÐµÐ¼Ð¾Ð½ÑÑ‚Ñ€Ð°Ñ†Ñ–Ð¹Ð½Ñ– Ð´Ð°Ð½Ñ– Ñƒ Ð½Ð¾Ð²Ñƒ "
+"Ð±Ð°Ð·Ñƒ Ð´Ð°Ð½Ð¸Ñ…. Ð¦Ñ– Ð´Ð°Ð½Ñ– Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð¶ÑƒÑ‚ÑŒ Ð·Ñ€Ð¾Ð·ÑƒÐ¼Ñ–Ñ‚Ð¸ OpenERP Ð· Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½ÑŒÐ¾ Ð½Ð°Ð»Ð°ÑˆÑ‚Ð¾Ð²Ð°Ð½Ð¸Ð¼Ð¸ "
+"Ð¿Ñ€Ð¾Ð´ÑƒÐºÑ‚Ð°Ð¼Ð¸, Ð¿Ð°Ñ€Ñ‚Ð½ÐµÑ€Ð°Ð¼Ð¸ Ñ– Ñ‚.Ð¿."
+
+#: controllers/database.py:72
+msgid "Default Language:"
+msgstr "ÐœÐ¾Ð²Ð° Ð·Ð° Ð·Ð°Ð¼Ð¾Ð²Ñ‡Ð°Ð½Ð½ÑÐ¼:"
+
+#: controllers/database.py:72
+msgid ""
+"Choose the default language that will be installed for this database. You "
+"will be able to install new languages after installation through the "
+"administration menu."
+msgstr ""
+"ÐžÐ±ÐµÑ€Ñ–Ñ‚ÑŒ Ñ‚Ð¸Ð¿Ð¾Ð²Ñƒ Ð¼Ð¾Ð²Ñƒ, ÑÐºÐ° Ð±ÑƒÐ´Ðµ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð° Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…. Ð’Ð¸ Ð±ÑƒÐ´ÐµÑ‚Ðµ "
+"Ð¼Ð°Ñ‚Ð¸ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ñ–ÑÑ‚ÑŒ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÑŽÐ²Ð°Ñ‚Ð¸ Ð½Ð¾Ð²Ñ– Ð¼Ð¾Ð²Ð¸ Ð¿Ñ–Ð·Ð½Ñ–ÑˆÐµ, Ñ‡ÐµÑ€ÐµÐ· Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¸Ð²Ð½Ðµ Ð¼ÐµÐ½ÑŽ."
+
+#: controllers/database.py:73
+msgid "Administrator password:"
+msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°:"
+
+#: controllers/database.py:73
+msgid ""
+"This is the password of the 'admin' user that will be created in your new "
+"database."
+msgstr ""
+"Ð¦Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° 'admin', ÑÐºÐ¾Ð³Ð¾ Ð±ÑƒÐ´Ðµ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð¾ Ñƒ Ñƒ Ð’Ð°ÑˆÑ–Ð¹ Ð½Ð¾Ð²Ñ–Ð¹ Ð±Ð°Ð·Ñ– "
+"Ð´Ð°Ð½Ð¸Ñ…."
+
+#: controllers/database.py:74
+msgid "Confirm password:"
+msgstr "ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ñ–Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ:"
+
+#: controllers/database.py:74
+msgid ""
+"This is the password of the 'admin' user that will be created in your new "
+"database. It has to be the same than the above field."
+msgstr ""
+"Ð¦Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° 'admin', ÑÐºÐ¾Ð³Ð¾ Ð±ÑƒÐ´Ðµ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð¾ Ñƒ Ñƒ Ð’Ð°ÑˆÑ–Ð¹ Ð½Ð¾Ð²Ñ–Ð¹ Ð±Ð°Ð·Ñ– "
+"Ð´Ð°Ð½Ð¸Ñ…. Ð’Ñ–Ð½ Ð¿Ð¾Ð²Ð¸Ð½ÐµÐ½ ÑÐ¿Ñ–Ð²Ð¿Ð°Ð´Ð°Ñ‚Ð¸ Ð·Ð° Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¼ Ñƒ Ð¿Ð¾Ð»Ñ– Ð²Ð¸Ñ‰Ðµ."
+
+#: controllers/database.py:80
+msgid "Drop database"
+msgstr "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð±Ð°Ð·Ñƒ Ð´Ð°Ð½Ð¸Ñ…"
+
+#: controllers/database.py:82 controllers/templates/database.mako:54
+msgid "Drop"
+msgstr "Ð—Ð½Ð¸Ñ‰Ð¸Ñ‚Ð¸"
+
+#: controllers/database.py:84 controllers/database.py:92
+#: controllers/templates/login.mako:39
+msgid "Database:"
+msgstr "Ð‘Ð°Ð·Ð° Ð´Ð°Ð½Ð¸Ñ…:"
+
+#: controllers/database.py:85 controllers/database.py:93
+#: controllers/database.py:101 controllers/templates/login.mako:57
+#: controllers/templates/login_ajax.mako:78
+#: controllers/templates/login_ajax.mako:98
+msgid "Password:"
+msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ:"
+
+#: controllers/database.py:89
+msgid "Backup database"
+msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ñƒ ÐºÐ¾Ð¿Ñ–ÑŽ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…"
+
+#: controllers/database.py:91 controllers/templates/database.mako:56
+msgid "Backup"
+msgstr "Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð° ÐºÐ¾Ð¿Ñ–Ñ"
+
+#: controllers/database.py:97
+msgid "Restore database"
+msgstr "Ð’Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð±Ð°Ð·Ñƒ Ð´Ð°Ð½Ð¸Ñ… Ð· Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¾Ñ— ÐºÐ¾Ð¿Ñ–Ñ—"
+
+#: controllers/database.py:99 controllers/templates/database.mako:58
+msgid "Restore"
+msgstr "Ð’Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸"
+
+#: controllers/database.py:100
+msgid "File:"
+msgstr "Ð¤Ð°Ð¸Ì†Ð»:"
+
+#: controllers/database.py:106
+msgid "Change Administrator Password"
+msgstr "Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°"
+
+#: controllers/database.py:108 controllers/templates/preferences/index.mako:37
+msgid "Change Password"
+msgstr "Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
+
+#: controllers/database.py:109
+msgid "Old Password:"
+msgstr "Ð¡Ñ‚Ð°Ñ€Ð¸Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ:"
+
+#: controllers/database.py:110
+msgid "New Password:"
+msgstr "ÐÐ¾Ð²Ð¸Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ:"
+
+#: controllers/database.py:111
+msgid "Confirm Password:"
+msgstr "ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´ÑŒÑ‚Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ:"
+
+#: controllers/database.py:174
+msgid "You must avoid all accents, space or special characters."
+msgstr "Ð’Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– ÑƒÐ½Ð¸ÐºÐ°Ñ‚Ð¸ Ð²ÑÑ– Ð°ÐºÑ†ÐµÐ½Ñ‚Ð¸, Ð¿Ñ€Ð¾Ð±Ñ–Ð» Ð°Ð±Ð¾ ÑÐ¿ÐµÑ†Ñ–Ð°Ð»ÑŒÐ½Ñ– ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¸."
+
+#: controllers/database.py:175
+msgid "Bad database name"
+msgstr "ÐÐµ Ð²Ñ–Ñ€Ð½Ðµ Ñ–Ð¼â€™Ñ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…"
+
+#: controllers/database.py:195
+msgid ""
+"The server crashed during installation.\n"
+"We suggest you to drop this database."
+msgstr ""
+"Ð’Ð¸Ð½Ð¸ÐºÐ»Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° ÑÐµÑ€Ð²ÐµÑ€Ð° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ñ–Ð½ÑÑ‚Ð°Ð»ÑÑ†Ñ–Ñ—.\n"
+"ÐœÐ¸ Ñ€Ð°Ð´Ð¸Ð¼Ð¾ Ð’Ð°Ð¼ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ñ†ÑŽ Ð±Ð°Ð·Ñƒ Ð´Ð°Ð½Ð¸Ñ…."
+
+#: controllers/database.py:196
+msgid "Error during database creation"
+msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ– Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…"
+
+#: controllers/database.py:199 controllers/database.py:226
+#: controllers/database.py:272 controllers/database.py:295
+msgid "Bad super admin password"
+msgstr "ÐÐµ Ð²Ñ–Ñ€Ð½Ð¸Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ ÑÑƒÐ¿ÐµÑ€ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°"
+
+#: controllers/database.py:203
+msgid "Could not create database."
+msgstr "ÐÐµ Ð¼Ð¾Ð¶Ñƒ ÑÑ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ Ð±Ð°Ð·Ñƒ Ð´Ð°Ð½Ð¸Ñ…."
+
+#: controllers/database.py:229
+msgid "Could not drop database"
+msgstr "ÐÐµ Ð¼Ð¾Ð¶Ñƒ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð±Ð°Ð·Ñƒ Ð´Ð°Ð½Ð¸Ñ…"
+
+#: controllers/database.py:252
+msgid "Could not create backup."
+msgstr "ÐÐµ Ð¼Ð¾Ð¶Ñƒ ÑÑ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ñƒ ÐºÐ¾Ð¿Ñ–ÑŽ."
+
+#: controllers/database.py:276
+msgid "Could not restore database"
+msgstr "ÐÐµ Ð¼Ð¾Ð¶Ñƒ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð±Ð°Ð·Ñƒ Ð´Ð°Ð½Ð¸Ñ…"
+
+#: controllers/database.py:299
+msgid "Error, password not changed."
+msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ°, Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð½Ðµ Ð·Ð¼Ñ–Ð½ÐµÐ½Ð¾."
+
+#: controllers/error_page.py:78
+msgid ""
+"Your problem has been sent to the quality team\n"
+"We will recontact you after analysing the problem."
+msgstr ""
+"Ð’Ð°ÑˆÐ° Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð° Ð´Ð¾ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŽ ÑÐºÐ¾ÑÑ‚Ñ–.\n"
+"ÐœÐ¸ Ð·Ð²â€™ÑÐ¶ÐµÐ¼Ð¾ÑÑ Ð· Ð²Ð°Ð¼Ð¸ Ð¿Ñ–ÑÐ»Ñ Ð°Ð½Ð°Ð»Ñ–Ð·Ñƒ  Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð¸."
+
+#: controllers/error_page.py:80
+#, python-format
+msgid ""
+"Your problem could not be sent to the quality team\n"
+"Please report this error manually at %s"
+msgstr ""
+"Ð’Ð°ÑˆÐ° Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑƒÑ‚Ð¸ Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð°\n"
+"Ð´Ð¾ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŽ ÑÐºÐ¾ÑÑ‚Ñ–.\n"
+"Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ° Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ñ‚Ðµ Ð¿Ñ€Ð¾ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñƒ ÑÐ°Ð¼Ð¾ÑÑ‚Ñ–Ð¹Ð½Ð¾ Ð½Ð° %s"
+
+#: controllers/form.py:553
+#, python-format
+msgid "Invalid button type \"%s\""
+msgstr "ÐÐµ Ð²Ñ–Ñ€Ð½Ð¸Ð¹ Ñ‚Ð¸Ð¿ ÐºÐ½Ð¾Ð¿ÐºÐ¸ \"%s\""
+
+#: controllers/form.py:891 controllers/tree.py:233
+msgid "No record selected"
+msgstr "ÐÐµ Ð¾Ð±Ñ€Ð°Ð½Ð¾ Ð¶Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑƒ"
+
+#: controllers/form.py:896
+msgid "Print Screen"
+msgstr "Ð”Ñ€ÑƒÐº ÐµÐºÑ€Ð°Ð½Ñƒ"
+
+#: controllers/form.py:965 utils/rpc.py:122 utils/rpc.py:133 utils/rpc.py:136
+#: widgets/listgrid.py:289 widgets/listgrid.py:353 widgets/form/_form.py:904
+msgid "Application Error"
+msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸"
+
+#: controllers/form.py:965
+#, python-format
+msgid "Wrong on_change trigger: %s"
+msgstr "ÐÐµ Ð²Ñ–Ñ€Ð½Ð¸Ð¹ on_change Ñ‚Ñ€Ð¸Ð³Ð³ÐµÑ€: %s"
+
+#: controllers/form.py:1073
+msgid "Open resource"
+msgstr "Ð’Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ñ€ÐµÑÑƒÑ€Ñ"
+
+#: controllers/form.py:1076
+msgid "Set to default value"
+msgstr "Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ñ‚Ð¸Ð¿Ð¾Ð²Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ"
+
+#: controllers/form.py:1077
+msgid "Set as default"
+msgstr "Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ ÑÐº Ñ‚Ð¸Ð¿Ð¾Ð²Ðµ"
+
+#: controllers/form.py:1084
+msgid "Action"
+msgstr "Ð”Ñ–Ñ"
+
+#: controllers/form.py:1085
+msgid "Report"
+msgstr "Ð—Ð²Ñ–Ñ‚"
+
+#: controllers/impex.py:66
+msgid ""
+"Operation failed\n"
+"I/O error"
+msgstr ""
+"ÐÐµÐ²Ð´Ð°Ð»Ð° Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ,\n"
+"Ð¿Ð¾Ð¼Ð¸Ð»Ð° Ð²Ð²Ð¾Ð´Ñƒ/Ð²Ð¸Ð²Ð¾Ð´Ñƒ"
+
+#: controllers/impex.py:373
+msgid "Export Error"
+msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° ÐµÐºÑÐ¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ"
+
+#: controllers/impex.py:444
+msgid "Database ID"
+msgstr "Ð˜Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð¾Ñ€ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…"
+
+#: controllers/impex.py:451
+msgid "Error opening .CSV file"
+msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ .CSV Ñ„Ð°Ð¹Ð»Ñƒ"
+
+#: controllers/impex.py:451
+msgid "Input Error."
+msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð²Ð²Ð¾Ð´Ñƒ."
+
+#: controllers/impex.py:473
+#, python-format
+msgid "You cannot import the field '%s', because we cannot auto-detect it"
+msgstr ""
+"Ð’Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ð¾Ð»Ðµ '%s', Ñ‚Ð¾Ð¼Ñƒ Ñ‰Ð¾ Ð¹Ð¾Ð³Ð¾ Ð½Ðµ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ð¸ÑÐ²Ð¸Ñ‚Ð¸ "
+"Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾"
+
+#: controllers/impex.py:476
+#, python-format
+msgid "Error processing the first line of the file. Field \"%s\" is unknown"
+msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¾Ð±Ñ€Ð¾Ð±ÐºÐ¸ Ð¿ÐµÑ€ÑˆÐ¾Ñ— ÑÑ‚Ñ€Ð¾ÐºÐ¸ Ñ„Ð°Ð¹Ð»Ñƒ. ÐŸÐ¾Ð»Ðµ \"%s\" Ð½Ðµ Ð²Ñ–Ð´Ð¾Ð¼Ðµ"
+
+#: controllers/impex.py:476
+msgid "Import Error."
+msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚Ñƒ"
+
+#: controllers/impex.py:515
+msgid "XML-RPC error"
+msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° XML-RPC"
+
+#: controllers/impex.py:520
+#, python-format
+msgid "Imported %d objects"
+msgstr "Ð†Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¾Ð²Ð°Ð½Ð¾ %d Ð¾Ð±â€™Ñ”ÐºÑ‚Ñ–Ð²"
+
+#: controllers/impex.py:525
+#, python-format
+msgid "Error trying to import this record:%s. ErrorMessage:%s %s"
+msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ ÑÐ¿Ñ€Ð¾Ð±Ñ– Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ: %s. ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ°: %s %s"
+
+#: controllers/impex.py:526
+msgid "ImportationError"
+msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚Ñƒ"
+
+#: controllers/listgrid.py:51
+msgid "Parent record doesn't exists..."
+msgstr "Ð‘Ð°Ñ‚ÑŒÐºÑ–Ð²ÑÑŒÐºÐ¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ Ð½Ðµ Ñ–ÑÐ½ÑƒÑ” ..."
+
+#: controllers/preferences.py:34
+msgid "Change your password"
+msgstr "Ð—Ð¼Ñ–Ð½Ñ–Ñ‚ÑŒ Ð²Ð°Ñˆ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
+
+#: controllers/preferences.py:64 controllers/templates/header.mako:59
+msgid "Preferences"
+msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ"
+
+#: controllers/preferences.py:91
+msgid "All passwords have to be filled."
+msgstr "Ð£ÑÑ– Ð¿Ð°Ñ€Ð¾Ð»Ñ– Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– Ð±ÑƒÑ‚Ð¸ Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ñ–."
+
+#: controllers/preferences.py:93
+msgid "The new password and its confirmation must be identical."
+msgstr "ÐÐ¾Ð²Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ñ‚Ð° Ð¹Ð¾Ð³Ð¾ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– ÑÐ¿Ñ–Ð²Ð¿Ð°Ð´Ð°Ñ‚Ð¸."
+
+#: controllers/preferences.py:102
+msgid "Could not change your password."
+msgstr "ÐÐµÐ²Ð´Ð°Ñ‡Ð° Ð¿Ñ€Ð¸ Ð·Ð¼Ñ–Ð½Ñ– Ð¿Ð°Ñ€Ð¾Ð»ÑŽ."
+
+#: controllers/preferences.py:104
+msgid "Original password incorrect, your password was not changed."
+msgstr "ÐžÑ€Ð¸Ð³Ñ–Ð½Ð°Ð»ÑŒÐ½Ð¸Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð²Ð²ÐµÐ´ÐµÐ½Ð¾ Ð½Ðµ Ð²Ñ–Ñ€Ð½Ð¾, Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð½Ðµ Ð·Ð¼Ñ–Ð½ÐµÐ½Ð¾."
+
+#: controllers/root.py:170
+#, python-format
+msgid "Version %s"
+msgstr "Ð’ÐµÑ€ÑÑ–Ñ %s"
+
+#: controllers/translator.py:132
+msgid "You need to save the resource before adding translations."
+msgstr "Ð’Ð°Ð¼ Ð½ÐµÐ¾Ð±Ñ…Ñ–Ð´Ð½Ð¾ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ñ€ÐµÑÑƒÑ€Ñ Ð¿ÐµÑ€ÐµÐ´ Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½ÑÐ¼ Ð¿ÐµÑ€ÐµÐºÐ»Ð°Ð´Ñ–Ð²."
+
+#: controllers/tree.py:264
+msgid "No resource selected"
+msgstr "ÐÐµ Ð¾Ð±Ñ€Ð°Ð½Ð¾ Ð¶Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ñ€ÐµÑÑƒÑ€ÑÑƒ"
+
+#: controllers/utils.py:44
+msgid "Could not connect to server"
+msgstr "ÐÐµ Ð²Ð´Ð°Ñ”Ñ‚ÑŒÑÑ Ð·'Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑŒ Ð· ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð¼"
+
+#: controllers/utils.py:131 controllers/templates/login_ajax.mako:111
+msgid "Bad username or password"
+msgstr "ÐÐµÐ²Ñ–Ñ€Ð½Ðµ Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° Ð°Ð±Ð¾ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
+
+#: controllers/view_log.py:32
+msgid "ID"
+msgstr "ID"
+
+#: controllers/view_log.py:33
+msgid "Creation User"
+msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€Ð¸Ð² ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡"
+
+#: controllers/view_log.py:34
+msgid "Creation Date"
+msgstr "Ð”Ð°Ñ‚Ð° ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ"
+
+#: controllers/view_log.py:35
+msgid "Latest Modification by"
+msgstr "ÐžÑÑ‚Ð°Ð½Ð½Ñ–Ð¼ Ð·Ð¼Ñ–Ð½Ð¸Ð²"
+
+#: controllers/view_log.py:36
+msgid "Latest Modification Date"
+msgstr "Ð”Ð°Ñ‚Ð° Ð¾ÑÑ‚Ð°Ð½Ð½ÑŒÐ¾Ñ— Ð·Ð¼Ñ–Ð½Ð¸"
+
+#: controllers/view_log.py:37
+msgid "Owner"
+msgstr "Ð’Ð»Ð°ÑÐ½Ð¸Ðº"
+
+#: controllers/view_log.py:38
+msgid "Group Owner"
+msgstr "Ð’Ð»Ð°ÑÐ½Ð¸Ðº Ð³Ñ€ÑƒÐ¿Ñ‹"
+
+#: controllers/view_log.py:39
+msgid "Access Level"
+msgstr "Ð Ñ–Ð²ÐµÐ½ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ"
+
+#: controllers/view_log.py:40
+msgid "Internal module data ID"
+msgstr "Ð’Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ–Ð¹ Ñ–Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€ Ð´Ð°Ð½Ð¸Ñ… Ð¼Ð¾Ð´ÑƒÐ»Ñ"
+
+#: controllers/viewed.py:220
+msgid "Invalid view id."
+msgstr "ÐÐµÐ²Ñ–Ñ€Ð½Ð¸Ð¹ Ñ–Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð¾Ñ€ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ñƒ"
+
+#: controllers/viewed.py:498
+msgid "Unable to create inherited view."
+msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ ÑÑ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ ÑƒÑÐ¿Ð°Ð´ÐºÐ¾Ð²Ð°Ð½Ð¸Ð¹ Ð²Ð¸Ð³Ð»ÑÐ´"
+
+#: controllers/viewed.py:500
+msgid "Can't create inherited view here."
+msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ ÑÑ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ ÑƒÑÐ¿Ð°Ð´ÐºÐ¾Ð²Ð°Ð½Ð¸Ð¹ Ð²Ð¸Ð³Ð»ÑÐ´ Ñ‚ÑƒÑ‚"
+
+#: controllers/viewed.py:503
+msgid "Not implemented yet!"
+msgstr "Ð©Ðµ Ð½Ðµ Ñ€ÐµÐ°Ð»Ñ–Ð·Ð¾Ð²Ð°Ð½Ð¾!"
+
+#: controllers/viewed.py:608
+msgid "Unable to update the view."
+msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð²Ð¸Ð³Ð»ÑÐ´"
+
+#: controllers/viewed.py:859
+msgid "New Window"
+msgstr "ÐÐ¾Ð²Ðµ Ð²Ñ–ÐºÐ½Ð¾"
+
+#: controllers/viewed.py:871
+msgid "Save Button"
+msgstr "ÐšÐ½Ð¾Ð¿ÐºÐ° Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ"
+
+#: controllers/viewed.py:871
+msgid "Cancel Button"
+msgstr "ÐšÐ½Ð¾Ð¿ÐºÐ° ÑÐºÐ°ÑÑƒÐ²Ð°Ð½Ð½Ñ"
+
+#: controllers/viewed.py:871
+msgid "Open Button"
+msgstr "ÐšÐ½Ð¾Ð¿ÐºÐ° Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ"
+
+#: controllers/viewed.py:877
+msgid "Left"
+msgstr "Ð›Ñ–Ð²Ð¾Ñ€ÑƒÑ‡"
+
+#: controllers/viewed.py:877
+msgid "Center"
+msgstr "Ð£ Ñ†ÐµÐ½Ñ‚Ñ€Ñ–"
+
+#: controllers/viewed.py:877
+msgid "Right"
+msgstr "ÐŸÑ€Ð°Ð²Ð¾Ñ€ÑƒÑ‡"
+
+#: controllers/templates/about.mako:4
+msgid "About the OpenERP Web"
+msgstr "ÐŸÑ€Ð¾ OpenERP Web"
+
+#: controllers/templates/about.mako:27
+msgid "OpenERP Web"
+msgstr "OpenERP Web"
+
+#: controllers/templates/about.mako:30
+msgid "Copyright &copy; 2006-TODAY OpenERP SA. All Rights Reserved."
+msgstr "ÐÐ²Ñ‚Ð¾Ñ€ÑÑŒÐºÑ– Ð¿Ñ€Ð°Ð²Ð° &copy; 2006-TODAY OpenERP SA. Ð£ÑÑ– Ð¿Ñ€Ð°Ð²Ð° Ð·Ð°Ñ…Ð¸Ñ‰ÐµÐ½Ð¾."
+
+#: controllers/templates/about.mako:31
+msgid "OpenERP is a trademark of the OpenERP SA Company."
+msgstr "OpenERP - Ñ‚Ð¾Ñ€Ð³Ð¾Ð²Ð° Ð¼Ð°Ñ€ÐºÐ° ÐºÐ¾Ð¼Ð¿Ð°Ð½Ñ–Ñ— OpenERP SA."
+
+#: controllers/templates/about.mako:33
+#, python-format
+msgid "%(ooweb)s is jointly developed by %(tiny)s and %(axelor)s."
+msgstr "%(ooweb)s Ñ€Ð¾Ð·Ñ€Ð¾Ð±Ð»ÐµÐ½Ñ–  %(tiny)s Ñ‚Ð° %(axelor)s."
+
+#: controllers/templates/about.mako:39
+#, python-format
+msgid "Licenced under the terms of %(license)s"
+msgstr "Ð›Ñ–Ñ†ÐµÐ½Ð·Ð¾Ð²Ð°Ð½Ð¾ Ð·Ð³Ñ–Ð´Ð½Ð¾ Ð· ÑƒÐ¼Ð¾Ð² %(license)s"
+
+#: controllers/templates/about.mako:42
+msgid "About OpenERP"
+msgstr "ÐŸÑ€Ð¾ OpenERP"
+
+#: controllers/templates/about.mako:44
+#, python-format
+msgid ""
+"%(openobject)s is a free enterprise-scale software system that is designed "
+"to boost\n"
+"                    productivity and profit through data integration. It "
+"connects, improves and\n"
+"                    manages business processes in areas such as sales, "
+"finance, supply chain,\n"
+"                    project management, production, services, CRM, etc..\n"
+"                    "
+msgstr ""
+"%(openobject)s - Ñ†Ðµ Ð±ÐµÐ·ÐºÐ¾ÑˆÑ‚Ð¾Ð²Ð½Ð° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð½Ð° ÑÐ¸ÑÑ‚ÐµÐ¼Ð° Ñ€Ñ–Ð²Ð½Ñ Ð¿Ñ–Ð´Ð¿Ñ€Ð¸Ñ”Ð¼ÑÑ‚Ð²Ð°, ÑÐºÐ° "
+"Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð° Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð¿Ñ–Ð´Ð²Ð¸Ñ‰Ð¸Ñ‚Ð¸\n"
+"                    Ð¿Ñ€Ð¾Ð´ÑƒÐºÑ‚Ð¸Ð²Ð½Ñ–ÑÑ‚ÑŒ Ñ‚Ð° Ð¿Ñ€Ð¸Ð±ÑƒÑ‚Ð¾Ðº Ð·Ð°Ð²Ð´ÑÐºÐ¸ Ñ–Ð½Ñ‚ÐµÐ³Ñ€Ð°Ñ†Ñ–Ñ— Ð´Ð°Ð½Ð¸Ñ…. "
+"Ð’Ð¾Ð½Ð° Ð·Ð²â€™ÑÐ·ÑƒÑ”, ÑƒÐ´Ð¾ÑÐºÐ¾Ð½Ð°Ð»ÑŽÑ” Ñ‚Ð°\n"
+"                    ÐºÐµÑ€ÑƒÑ” Ð±Ñ–Ð·Ð½ÐµÑ-Ð¿Ñ€Ð¾Ñ†ÐµÑÐ°Ð¼Ð¸ Ñƒ Ñ‚Ð°ÐºÐ¸Ñ… Ð¾Ð±Ð»Ð°ÑÑ‚ÑÑ… ÑÐº Ð¿Ñ€Ð¾Ð´Ð°Ð¶, "
+"Ñ„Ñ–Ð½Ð°Ð½ÑÐ¸, Ð»Ð¾Ð³Ñ–ÑÑ‚Ð¸ÐºÐ°,\n"
+"                    ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ð°Ð¼Ð¸, Ð²Ð¸Ñ€Ð¾Ð±Ð½Ð¸Ñ†Ñ‚Ð²Ð¾, Ð¿Ð¾ÑÐ»ÑƒÐ³Ð¸, CRM Ñ‚Ð° Ñ–Ð½ÑˆÐµ\n"
+"                    "
+
+#: controllers/templates/about.mako:51
+msgid ""
+"The system is platform-independent, and can be installed on Windows, Mac OS "
+"X,\n"
+"                    and various Linux and other Unix-based distributions. "
+"Its architecture enables\n"
+"                    new functionality to be rapidly created, modifications "
+"to be made to a\n"
+"                    production system and migration to a new version to be "
+"straightforward."
+msgstr ""
+
+#: controllers/templates/about.mako:57
+msgid ""
+"Depending on your needs, OpenERP is available through a web or application "
+"client."
+msgstr ""
+
+#: controllers/templates/database.mako:50 controllers/templates/login.mako:4
+#: controllers/templates/login.mako:67 controllers/templates/login_ajax.mako:85
+#: controllers/templates/login_ajax.mako:104
+msgid "Login"
+msgstr "Ð›Ð¾Ð³Ñ–Ð½"
+
+#: controllers/templates/database.mako:60
+msgid "Password"
+msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
+
+#: controllers/templates/error_page.mako:77
+#, python-format
+msgid "An %(error_type)s has been reported."
+msgstr "Ð’Ð¸Ð½Ð¸ÐºÐ»Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° %(error_type)s."
+
+#: controllers/templates/error_page.mako:79
+msgid "Let me fix it"
+msgstr "Ð”Ð¾Ð·Ð²Ð¾Ð»ÑŒÑ‚Ðµ Ð²Ð¸Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ð¸ Ñ†Ðµ"
+
+#: controllers/templates/error_page.mako:85
+msgid "Fix it for me"
+msgstr "Ð’Ð¸Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ð¸ Ñ†Ðµ"
+
+#: controllers/templates/error_page.mako:90
+msgid "You do not have a valid OpenERP publisher warranty contract !"
+msgstr "Ð’Ð¸ Ð½Ðµ Ð¼Ð°Ñ”Ñ‚Ðµ Ð´Ñ–Ð¹ÑÐ½Ð¾Ð³Ð¾ ÐºÐ¾Ð½Ñ‚Ñ€Ð°ÐºÑ‚Ñƒ Ð· Ð²Ð¸Ð´Ð°Ð²Ñ†ÐµÐ¼ OpenERP !"
+
+#: controllers/templates/error_page.mako:91
+msgid ""
+"If you are using OpenERP in production, it is recommended to have\n"
+"a publisher warranty program.\n"
+"\n"
+"The OpenERP publisher warranty contract provides you with bug fix guarantees "
+"and an\n"
+"automatic migration system so that we can start working on your problems "
+"within a few\n"
+"hours.\n"
+"\n"
+"With a publisher warranty contract, errors such as this one can be sent "
+"directly to the OpenERP\n"
+"team for review and evaluation.\n"
+"\n"
+"The publisher warranty program offers you:\n"
+"* Automatic migrations on new versions,\n"
+"* A bugfix guarantee,\n"
+"* Monthly announces of potential bugs and their fixes,\n"
+"* Security alerts by email and automatic migration,\n"
+"* Access to the customer portal.\n"
+msgstr ""
+
+#: controllers/templates/error_page.mako:113
+msgid ""
+"Your publisher warranty contract does not cover all modules installed in "
+"your system !\n"
+"If you are using OpenERP in production, it is highly suggested to upgrade "
+"your\n"
+"contract.\n"
+"\n"
+"If you have developed your own modules or installed third party module, we\n"
+"can provide you an additional publisher warranty contract for these modules. "
+"After\n"
+"having reviewed your modules, our quality team will ensure they will "
+"migrate\n"
+"automatically for all future stable versions of OpenERP at no extra cost.\n"
+"\n"
+"Here is the list of modules not covered by your publisher warranty contract:"
+msgstr ""
+
+#: controllers/templates/error_page.mako:135
+msgid "Publisher warranty contract."
+msgstr "Ð“Ð°Ñ€Ð°Ð½Ñ‚Ñ–Ð¹Ð½Ð¸Ð¹ ÐºÐ¾Ð½Ñ‚Ñ€Ð°ÐºÑ‚ Ð²Ð¸Ð´Ð°Ð²Ñ†Ñ"
+
+#: controllers/templates/error_page.mako:136
+msgid ""
+"Your request will be sent to OpenERP and publisher warranty team will reply "
+"you shortly."
+msgstr ""
+"Ð’Ð°Ñˆ Ð·Ð°Ð¿Ð¸Ñ‚ Ð±ÑƒÐ´Ðµ Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¾ Ð´Ð¾ OpenERP Ñ‚Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð²Ð¸Ð´Ð°Ð²Ñ†Ñ Ð³Ð°Ñ€Ð°Ð½Ñ‚ÑƒÑ” Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´ÑŒ "
+"Ñƒ Ð½Ð°Ð¹Ð±Ð»Ð¸Ð¶Ñ‡Ð¸Ð¹ Ñ‡Ð°Ñ."
+
+#: controllers/templates/error_page.mako:140
+msgid "Summary of the problem:"
+msgstr "Ð ÐµÐ·ÑŽÐ¼Ðµ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð¸:"
+
+#: controllers/templates/error_page.mako:147
+msgid "Explain what you did:"
+msgstr "ÐŸÐ¾ÑÑÐ½Ñ–Ñ‚ÑŒ, Ñ‰Ð¾ Ð²Ð¸ Ñ€Ð¾Ð±Ð¸Ð»Ð¸:"
+
+#: controllers/templates/error_page.mako:156
+msgid "Other Comments:"
+msgstr "Ð†Ð½ÑˆÑ– ÐºÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ñ–:"
+
+#: controllers/templates/error_page.mako:168
+msgid "Send to Publisher Warranty Team"
+msgstr "Ð’Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ð¸ Ð´Ð¾ ÑÐ»ÑƒÐ¶Ð±Ð¸ Ð³Ð°Ñ€Ð°Ð½Ñ‚Ñ–Ð¹Ð½Ð¾Ñ— Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÐºÐ¸"
+
+#: controllers/templates/error_page.mako:195
+msgid "Write concurrency warning :"
+msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð¾Ð´Ð½Ð¾Ñ‡Ð°ÑÐ½Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ."
+
+#: controllers/templates/error_page.mako:200
+msgid ""
+"This document has been modified while you were editing it.\n"
+"Choose:\n"
+"\n"
+"    - \"Cancel\" to cancel saving.\n"
+"    - \"Write anyway\" to save your current version."
+msgstr ""
+"Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚ Ð±ÑƒÐ»Ð¾ Ð·Ð¼Ñ–Ð½ÐµÐ½Ð¾ Ñ–Ð½ÑˆÐ¸Ð¼ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ÐµÐ¼ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ.\n"
+"ÐžÐ±ÐµÑ€Ñ–Ñ‚ÑŒ:\n"
+"\n"
+"    - \"Ð’Ñ–Ð´Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸\" Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð½Ðµ Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ñ‚Ð¸ Ð²Ð°ÑˆÑ– Ð·Ð¼Ñ–Ð½Ð¸.\n"
+"    - \"Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ñƒ Ð±ÑƒÐ´ÑŒ-ÑÐºÐ¾Ð¼Ñƒ Ð²Ð¸Ð¿Ð°Ð´ÐºÑƒ\" Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ð²Ð°ÑˆÑ– Ð·Ð¼Ñ–Ð½Ð¸."
+
+#: controllers/templates/error_page.mako:214 controllers/templates/exp.mako:244
+#: controllers/templates/form.mako:140 controllers/templates/openo2m.mako:41
+#: controllers/templates/selection.mako:43
+#: controllers/templates/viewlist.mako:160
+#: controllers/templates/preferences/index.mako:38
+#: widgets/templates/listgrid/listgrid.mako:33
+msgid "Cancel"
+msgstr "Ð’Ñ–Ð´Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸"
+
+#: controllers/templates/error_page.mako:215
+msgid "Write Anyway"
+msgstr "Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ñƒ Ð±ÑƒÐ´ÑŒ-ÑÐºÐ¾Ð¼Ñƒ Ð²Ð¸Ð¿Ð°Ð´ÐºÑƒ"
+
+#: controllers/templates/exp.mako:151
+msgid "Export Data"
+msgstr "Ð•ÐºÑÐ¿Ð¾Ñ€Ñ‚ Ð´Ð°Ð½Ð¸Ñ…"
+
+#: controllers/templates/exp.mako:166
+msgid "Export Type:"
+msgstr "Ð¢Ð¸Ð¿ ÐµÐºÑÐ¿Ð¾Ñ€Ñ‚Ñƒ:"
+
+#: controllers/templates/exp.mako:169
+msgid "Import Compatible Export"
+msgstr "Ð¡ÑƒÐ¼Ñ–ÑÐ½Ñ–ÑÑ‚ÑŒ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚Ñƒ Ð· ÐµÐºÑÐ¿Ð¾Ñ€Ñ‚Ð¾Ð¼"
+
+#: controllers/templates/exp.mako:172
+msgid "Export all Data"
+msgstr "Ð•ÐºÑÐ¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸ ÑƒÑÑ– Ð´Ð°Ð½Ñ–"
+
+#: controllers/templates/exp.mako:183
+msgid "Available fields"
+msgstr "ÐÐ°ÑÐ²Ð½Ñ– Ð¿Ð¾Ð»Ñ"
+
+#: controllers/templates/exp.mako:185
+msgid "Fields to export"
+msgstr "ÐŸÐ¾Ð»Ñ Ð´Ð»Ñ ÐµÐºÑÐ¿Ð¾Ñ€Ñ‚Ñƒ"
+
+#: controllers/templates/exp.mako:187
+msgid "Save fields list"
+msgstr "Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿Ð¾Ð»Ñ–Ð²"
+
+#: controllers/templates/exp.mako:189
+msgid "Save as:"
+msgstr "Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ ÑÐº:"
+
+#: controllers/templates/exp.mako:191 controllers/templates/fieldpref.mako:102
+#: controllers/templates/selection.mako:45
+msgid "OK"
+msgstr "Ð¢Ð°Ðº"
+
+#: controllers/templates/exp.mako:195
+msgid "Saved exports:"
+msgstr "Ð—Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ñ– ÐµÐºÑÐ¿Ð¾Ñ€Ñ‚Ð¸:"
+
+#: controllers/templates/exp.mako:204 controllers/templates/form.mako:135
+#: controllers/templates/image.mako:67 widgets/form/templates/one2many.mako:22
+#: widgets/templates/sidebar.mako:67
+#: widgets/templates/listgrid/listgrid.mako:105
+#: widgets/templates/listgrid/listgrid.mako:109
+#: widgets/templates/listgrid/listgrid.mako:173
+#: widgets/templates/listgrid/listgrid.mako:178
+#: widgets/templates/listgrid/listgroup.mako:131
+#: widgets/templates/listgrid/multiple_group.mako:81
+msgid "Delete"
+msgstr "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸"
+
+#: controllers/templates/exp.mako:217 widgets/templates/sidebar.mako:56
+#: widgets/templates/listgrid/listgrid.mako:135
+msgid "Add"
+msgstr "Ð”Ð¾Ð´Ð°Ñ‚Ð¸"
+
+#: controllers/templates/exp.mako:222 controllers/templates/viewlist.mako:125
+msgid "Remove"
+msgstr "Ð’Ð¸Ð»ÑƒÑ‡Ð¸Ñ‚Ð¸"
+
+#: controllers/templates/exp.mako:227
+msgid "Remove All"
+msgstr "Ð’Ð¸Ð»ÑƒÑ‡Ð¸Ñ‚Ð¸ Ð²ÑÑ–"
+
+#: controllers/templates/exp.mako:245
+msgid "Export to File"
+msgstr "ÐÐºÑÐ¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸ Ñƒ Ñ„Ð°Ð¹Ð»"
+
+#: controllers/templates/fieldpref.mako:4
+#: controllers/templates/fieldpref.mako:29
+msgid "Field Preferences"
+msgstr "Ð’Ð»Ð°ÑÑ‚Ð¸Ð²Ð¾ÑÑ‚Ñ– Ð¿Ð¾Ð»Ñ"
+
+#: controllers/templates/fieldpref.mako:39
+msgid "Field Name:"
+msgstr "ÐÐ°Ð·Ð²Ð° Ð¿Ð¾Ð»Ñ:"
+
+#: controllers/templates/fieldpref.mako:43
+msgid "Domain:"
+msgstr "Ð”Ð¾Ð¼ÐµÐ½:"
+
+#: controllers/templates/fieldpref.mako:47
+msgid "Default Value:"
+msgstr "Ð¢Ð¸Ð¿Ð¾Ð²Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ:"
+
+#: controllers/templates/fieldpref.mako:57
+msgid "Value applicable for:"
+msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ Ð´Ð»Ñ:"
+
+#: controllers/templates/fieldpref.mako:63
+msgid "Only for you"
+msgstr "Ð¢Ñ–Ð»ÑŒÐºÐ¸ Ð´Ð»Ñ Ð²Ð°Ñ"
+
+#: controllers/templates/fieldpref.mako:67
+msgid "For all"
+msgstr "Ð”Ð»Ñ ÑƒÑÑ–Ñ…"
+
+#: controllers/templates/fieldpref.mako:76
+msgid "Value applicable if:"
+msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ ÑÐºÑ‰Ð¾:"
+
+#: controllers/templates/fieldpref.mako:79
+msgid "Always applicable!"
+msgstr "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ Ð·Ð°Ð²Ð¶Ð´Ð¸!"
+
+#: controllers/templates/fieldpref.mako:99 controllers/templates/image.mako:70
+#: controllers/templates/imp.mako:205 controllers/templates/index.mako:198
+#: controllers/templates/openm2.mako:52
+#: controllers/templates/save_filter.mako:42
+#: controllers/templates/search.mako:129
+#: controllers/templates/translator.mako:41
+#: controllers/templates/translator.mako:108
+#: controllers/templates/viewed.mako:37
+#: controllers/templates/viewed_new.mako:49
+#: controllers/templates/viewed_new_model.mako:42
+#: controllers/templates/viewed_preview.mako:28
+#: controllers/templates/viewlist.mako:129 widgets/templates/sidebar.mako:67
+#: widgets/templates/viewform.mako:37
+msgid "Close"
+msgstr "Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸"
+
+#: controllers/templates/footer.mako:3
+#, python-format
+msgid "&copy; 2008-2010 %(ooweb)s  SA. All Rights Reserved "
+msgstr "&copy; 2008-2010 %(ooweb)s  SA. Ð£ÑÑ– Ð¿Ñ€Ð°Ð²Ð° Ð·Ð°Ñ…Ð¸Ñ‰ÐµÐ½Ñ– "
+
+#: controllers/templates/footer.mako:6
+msgid "Significant contributions to the web client have been made by"
+msgstr "Ð—Ð½Ð°Ñ‡Ð½Ð¸Ð¹ Ð²Ð½ÐµÑÐ¾Ðº Ñƒ web-ÐºÐ»Ð¸ÐµÐ½Ñ‚ Ð±ÑƒÐ² Ð·Ñ€Ð¾Ð±Ð»ÐµÐ½"
+
+#: controllers/templates/form.mako:63
+msgid "Disable all Tips"
+msgstr "Ð’Ñ–Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸ ÑƒÑÑ– Ð¿Ñ–Ð´ÐºÐ°Ð·ÐºÐ¸"
+
+#: controllers/templates/form.mako:64
+msgid "Hide this Tip"
+msgstr "Ð¡Ñ…Ð¾Ð²Ð°Ñ‚Ð¸ Ñ†ÑŽ Ð¿Ñ–Ð´ÐºÐ°Ð·ÐºÑƒ"
+
+#: controllers/templates/form.mako:82
+msgid "Add / Remove Shortcut..."
+msgstr "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ / Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ ÑÑ€Ð»Ð¸Ðº..."
+
+#: controllers/templates/form.mako:86
+#, python-format
+msgid "Search: %s"
+msgstr "ÐŸÐ¾ÑˆÑƒÐº: %s"
+
+#: controllers/templates/form.mako:93
+msgid "Corporate Intelligence..."
+msgstr "ÐšÐ¾Ñ€Ð¿Ð¾Ñ€Ð°Ñ‚Ð¸Ð²Ð½Ð¸Ð¹ Ñ–Ð½Ñ‚ÐµÐ»ÐµÐºÑ‚ ..."
+
+#: controllers/templates/form.mako:99
+msgid "Show Logs..."
+msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð¶ÑƒÑ€Ð½Ð°Ð»Ð¸..."
+
+#: controllers/templates/form.mako:111
+msgid "Create a new resource"
+msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ Ð½Ð¾Ð²Ð¸Ð¹ Ñ€ÐµÑÑƒÑ€Ñ"
+
+#: controllers/templates/form.mako:112 controllers/templates/search.mako:128
+#: controllers/templates/viewed_new_model.mako:36
+#: controllers/templates/viewlist.mako:119 widgets/form/_o2m.py:73
+#: widgets/form/templates/one2many.mako:20
+#: widgets/templates/listgrid/listgrid.mako:140
+#: widgets/templates/listgrid/listgrid.mako:144
+#: widgets/templates/listgrid/listgroup.mako:20
+msgid "New"
+msgstr "ÐÐ¾Ð²Ð¸Ð¹"
+
+#: controllers/templates/form.mako:116
+msgid "Edit this resource"
+msgstr "Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ Ñ†ÐµÐ¹ Ñ€ÐµÑÑƒÑ€Ñ"
+
+#: controllers/templates/form.mako:117 controllers/templates/viewlist.mako:122
+#: widgets/templates/listgrid/listgrid.mako:75
+#: widgets/templates/listgrid/listgrid.mako:79
+#: widgets/templates/listgrid/listgroup.mako:112
+#: widgets/templates/listgrid/multiple_group.mako:63
+msgid "Edit"
+msgstr "Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸"
+
+#: controllers/templates/form.mako:121
+msgid "Save this resource"
+msgstr "Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ñ†ÐµÐ¹ Ñ€ÐµÑÑƒÑ€Ñ"
+
+#: controllers/templates/form.mako:122 controllers/templates/image.mako:65
+#: controllers/templates/openm2.mako:48
+#: controllers/templates/save_filter.mako:41
+#: controllers/templates/translator.mako:39
+#: controllers/templates/translator.mako:106
+#: controllers/templates/viewed_new.mako:46
+#: controllers/templates/viewed_new_model.mako:39
+#: controllers/templates/viewlist.mako:157
+#: controllers/templates/preferences/index.mako:39
+msgid "Save"
+msgstr "Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸"
+
+#: controllers/templates/form.mako:124
+msgid "Save & Edit this resource"
+msgstr "Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ñ‚Ð° Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ Ñ†ÐµÐ¹ Ñ€ÐµÑÑƒÑ€Ñ"
+
+#: controllers/templates/form.mako:125
+msgid "Save & Edit"
+msgstr "Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ñ‚Ð° Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸"
+
+#: controllers/templates/form.mako:129
+msgid "Duplicate this resource"
+msgstr "Ð”ÑƒÐ±Ð»ÑŽÐ²Ð°Ñ‚Ð¸ Ñ†ÐµÐ¹ Ñ€ÐµÑÑƒÑ€Ñ"
+
+#: controllers/templates/form.mako:130
+msgid "Duplicate"
+msgstr "Ð”ÑƒÐ±Ð»ÑŽÐ²Ð°Ñ‚Ð¸"
+
+#: controllers/templates/form.mako:134
+msgid "Delete this resource"
+msgstr "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ñ†ÐµÐ¹ Ñ€ÐµÑÑƒÑ€Ñ"
+
+#: controllers/templates/form.mako:139
+msgid "Cancel editing the current resource"
+msgstr "Ð’Ñ–Ð´Ð¼Ñ–Ð½Ñ‚Ð¸ Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ñ†ÑŒÐ¾Ð³Ð¾ Ñ€ÐµÑÑƒÑ€ÑÑƒ"
+
+#: controllers/templates/form.mako:144
+msgid "Create new node"
+msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ Ð½Ð¾Ð²Ð¸Ð¹ Ð²ÑƒÐ·ÐµÐ»"
+
+#: controllers/templates/form.mako:145
+msgid "New Node"
+msgstr "ÐÐ¾Ð²Ð¸Ð¹ Ð²ÑƒÐ·ÐµÐ»"
+
+#: controllers/templates/form.mako:149
+msgid "Show grid in workflow canvas"
+msgstr "Ð’Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚Ð¸ Ð³Ñ€Ñ–Ð´ Ð½Ð° Ñ‚Ð»Ñ– Ñ€Ð¾Ð±Ð¾Ñ‡Ð¾Ð³Ð¾ Ð¿Ñ€Ð¾Ñ†ÐµÑÑÑƒ"
+
+#: controllers/templates/form.mako:150
+msgid "Show grid"
+msgstr "Ð’Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚Ð¸ Ð³Ñ€Ñ–Ð´"
+
+#: controllers/templates/header.mako:33
+#, python-format
+msgid "%(company)s"
+msgstr "%(company)s"
+
+#: controllers/templates/header.mako:34 controllers/templates/index.mako:218
+#, python-format
+msgid "%(user)s"
+msgstr "%(user)s"
+
+#: controllers/templates/header.mako:45 controllers/templates/header.mako:47
+msgid "Home"
+msgstr "Ð”Ð¾Ð¼Ñ–Ð²Ñ–ÐºÐ°"
+
+#: controllers/templates/header.mako:53
+msgid "Requests"
+msgstr "Ð—Ð°Ð¿Ð¸Ñ‚Ð¸"
+
+#: controllers/templates/header.mako:62
+msgid "Edit Preferences"
+msgstr "Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ"
+
+#: controllers/templates/header.mako:66 controllers/templates/header.mako:69
+msgid "About"
+msgstr "ÐŸÑ€Ð¾ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ñƒ"
+
+#: controllers/templates/header.mako:73 controllers/templates/header.mako:75
+msgid "Help"
+msgstr "Ð”Ð¾Ð²Ñ–Ð´ÐºÐ°"
+
+#: controllers/templates/header.mako:81 controllers/templates/header.mako:84
+msgid "Clear Cache"
+msgstr "ÐžÑ‡Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ ÐºÐµÑˆ"
+
+#: controllers/templates/header.mako:89
+msgid "Logout"
+msgstr "Ð’Ð¸Ñ…Ñ–Ð´"
+
+#: controllers/templates/image.mako:4 controllers/templates/image.mako:39
+msgid "Image"
+msgstr "Ð—Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ"
+
+#: controllers/templates/image.mako:55
+msgid "Add Resource:"
+msgstr "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ñ€ÐµÑÑƒÑ€Ñ"
+
+#: controllers/templates/image.mako:66 widgets/form/templates/binary.mako:28
+msgid "Save As"
+msgstr "Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ ÑÐº"
+
+#: controllers/templates/imp.mako:80
+msgid "Import Data"
+msgstr "Ð†Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸ Ð´Ð°Ð½Ñ–"
+
+#: controllers/templates/imp.mako:90
+msgid "1. Import a .CSV file"
+msgstr "Ð†Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸ Ð· Ñ„Ð°Ð¹Ð»Ñƒ .CSV"
+
+#: controllers/templates/imp.mako:106
+msgid "CSV File:"
+msgstr "Ð¤Ð°Ð¹Ð» CSV:"
+
+#: controllers/templates/imp.mako:124
+msgid "2. Check your file format"
+msgstr "ÐŸÐµÑ€ÐµÐ²Ñ–Ñ€Ñ‚Ðµ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ Ñ„Ð°Ð¹Ð»Ñƒ"
+
+#: controllers/templates/imp.mako:131
+#, python-format
+msgid "The import failed due to: %(message)s"
+msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚Ñƒ Ñƒ Ð·Ð²'ÑÐ·ÐºÑƒ Ð·: %(message)s"
+
+#: controllers/templates/imp.mako:133
+msgid "Here is a preview of the file we could not import:"
+msgstr "Ð¢ÑƒÑ‚ Ð²Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ½ÑƒÑ‚Ð¸ Ñ„Ð°Ð¹Ð», ÑÐºÐ¸Ð¹ Ð¼Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÐ¼Ð¾ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸:"
+
+#: controllers/templates/imp.mako:158
+msgid "CSV Options"
+msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¸ CSV"
+
+#: controllers/templates/imp.mako:161
+msgid "Separator:"
+msgstr "Ð¡ÐµÐ¿Ð°Ñ€Ð°Ñ‚Ð¾Ñ€:"
+
+#: controllers/templates/imp.mako:163
+msgid "Delimiter:"
+msgstr "Ð Ð¾Ð·Ð´Ñ–Ð»ÑŒÐ½Ð¸Ðº:"
+
+#: controllers/templates/imp.mako:167
+msgid "Encoding:"
+msgstr "ÐšÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ:"
+
+#: controllers/templates/imp.mako:174
+msgid "Lines to skip:"
+msgstr "ÐŸÑ€Ð¾Ð¿ÑƒÑÑ‚Ð¸Ñ‚Ð¸ ÑÑ‚Ñ€Ð¾Ðº:"
+
+#: controllers/templates/imp.mako:188
+msgid "3. File imported"
+msgstr "Ð¤Ð°Ð¹Ð» Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¾Ð²Ð°Ð½Ð¾"
+
+#: controllers/templates/imp.mako:206
+msgid "Import File"
+msgstr "Ð†Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸ Ñ„Ð°Ð¹Ð»"
+
+#: controllers/templates/index.mako:164
+msgid "System Logs"
+msgstr "Ð¡Ð¸ÑÑ‚ÐµÐ¼Ð½Ñ– Ð¶ÑƒÑ€Ð½Ð°Ð»Ð¸"
+
+#: controllers/templates/index.mako:189
+msgid "More"
+msgstr "Ð©Ðµ"
+
+#: controllers/templates/index.mako:190
+msgid "Widgets"
+msgstr "Ð’Ñ–Ð´Ð¶ÐµÑ‚Ð¸"
+
+#: controllers/templates/index.mako:221 controllers/templates/index.mako:226
+#, python-format
+msgid "Powered by %(openerp)s "
+msgstr "Ð Ð¾Ð·Ñ€Ð¾Ð±Ð»ÐµÐ½Ð¾ %(openerp)s "
+
+#: controllers/templates/login.mako:53 controllers/templates/login_ajax.mako:72
+#: controllers/templates/login_ajax.mako:94
+msgid "User:"
+msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡:"
+
+#: controllers/templates/login.mako:64
+msgid "Databases"
+msgstr "Ð‘Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…"
+
+#: controllers/templates/login.mako:84
+msgid "Top Contributor:"
+msgstr "ÐŸÑ€Ð¾Ð²Ñ–Ð´Ð½Ð¸Ð¹ Ð°Ð²Ñ‚Ð¾Ñ€:"
+
+#: controllers/templates/login.mako:94
+msgid ""
+"We think that daily job activities can be more intuitive, efficient, "
+"automated, .. and even fun."
+msgstr ""
+"ÐœÐ¸ Ð²Ð²Ð°Ð¶Ð°Ñ”Ð¼Ð¾, Ñ‰Ð¾ Ð¿Ð¾Ð²ÑÑÐºÐ´ÐµÐ½Ð½Ð° Ñ€Ð¾Ð±Ð¾Ñ‚Ð° Ð¼Ð¾Ð¶Ðµ Ð±ÑƒÑ‚Ð¸ Ð±Ñ–Ð»ÑŒÑˆ Ð¿Ñ€Ð¾ÑÑ‚Ð¾ÑŽ, ÐµÑ„ÐµÐºÑ‚Ð¸Ð²Ð½Ð¾ÑŽ, "
+"Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ð·Ð¾Ð²Ð°Ð½Ð¾ÑŽ, .. Ñ‚Ð° Ð½Ð°Ð²Ñ–Ñ‚ÑŒ Ð²ÐµÑÐµÐ»Ð¾ÑŽ."
+
+#: controllers/templates/login.mako:95
+msgid "OpenERP's vision to be:"
+msgstr "Ð±Ð°Ñ‡ÐµÐ½Ð½Ñ OpenERP:"
+
+#: controllers/templates/login.mako:103
+msgid "Full featured"
+msgstr "ÐŸÐ¾Ð²Ð½Ð¾Ñ„ÑƒÐ½ÐºÑ†Ñ–Ð¾Ð½Ð°Ð»ÑŒÐ½Ð¸Ð¹"
+
+#: controllers/templates/login.mako:104
+msgid ""
+"Today's enterprise challenges are multiple. We provide one module for each "
+"need."
+msgstr ""
+"Ð¡ÑŒÐ¾Ð³Ð¾Ð´ÐµÐ½Ð½Ñ– Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð¸ Ð¿Ñ–Ð´Ð¿Ñ€Ð¸Ñ”Ð¼ÑÑ‚Ð²Ð° - Ñ€Ð¾Ð·Ð´Ñ€Ð¾Ð±Ð»ÐµÐ½Ð½Ñ–. ÐœÐ¸ Ð½Ð°Ð´Ð°Ñ”Ð¼Ð¾ Ð¾Ð´Ð¸Ð½ Ð¼Ð¾Ð´ÑƒÐ»ÑŒ Ð´Ð»Ñ "
+"ÐºÐ¾Ð¶Ð½Ð¾Ñ— Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸."
+
+#: controllers/templates/login.mako:112
+msgid "Open Source"
+msgstr "Open Source"
+
+#: controllers/templates/login.mako:113
+msgid ""
+"To Build a great product, we rely on the knowledge of thousands of "
+"contributors."
+msgstr ""
+"ÐŸÑ€Ð¸ Ð¿Ð¾Ð±ÑƒÐ´Ð¾Ð²Ñ– Ð²ÐµÐ»Ð¸ÐºÐ¾Ð³Ð¾ Ð¿Ñ€Ð¾Ð´ÑƒÐºÑ‚Ñƒ, Ð¼Ð¸ ÑÐ¿Ð¸Ñ€Ð°Ñ”Ð¼Ð¾ÑÑ Ð½Ð° Ð·Ð½Ð°Ð½Ð½Ñ Ñ‚Ð¸ÑÑÑ‡ ÑƒÑ‡Ð°ÑÐ½Ð¸ÐºÑ–Ð²."
+
+#: controllers/templates/login.mako:121
+msgid "User Friendly"
+msgstr "Ð”Ñ€ÑƒÐ¶Ð½Ñ–Ð¹"
+
+#: controllers/templates/login.mako:122
+msgid ""
+"In order to be productive, people need clean and easy to use interface."
+msgstr ""
+"Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð¿Ñ€Ð°Ñ†ÑŽÐ²Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¾Ð´ÑƒÐºÑ‚Ð¸Ð²Ð½Ð¾, Ð»ÑŽÐ´Ð¸ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±ÑƒÑŽÑ‚ÑŒ Ð·Ñ€ÑƒÑ‡Ð½Ð¸Ð¹ Ñ‚Ð° Ð¿Ñ€Ð¾ÑÑ‚Ð¸Ð¹ Ñƒ "
+"Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ– Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ."
+
+#: controllers/templates/modules.mako:4
+msgid "Module Management"
+msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¼Ð¾Ð´ÑƒÐ»ÑÐ¼Ð¸"
+
+#: controllers/templates/modules.mako:17
+msgid "Web Modules"
+msgstr "Ð’ÐµÐ±-Ð¼Ð¾Ð´ÑƒÐ»Ñ–"
+
+#: controllers/templates/openo2m.mako:34
+msgid "Save & Close"
+msgstr "Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ñ‚Ð° Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸"
+
+#: controllers/templates/openo2m.mako:37
+msgid "Save & New"
+msgstr "Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ñ‚Ð° ÑÑ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ Ð½Ð¾Ð²Ð¸Ð¹"
+
+#: controllers/templates/save_filter.mako:18
+msgid "Save as Filter"
+msgstr "Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ ÑÐº Ñ„Ñ–Ð»ÑŒÑ‚Ñ€"
+
+#: controllers/templates/save_filter.mako:30
+msgid "Filter Name"
+msgstr "ÐÐ°Ð·Ð²Ð° Ð¤Ñ–Ð»ÑŒÑ‚Ñ€Ð°"
+
+#: controllers/templates/search.mako:110
+#, python-format
+msgid "Search %(name)s"
+msgstr "ÐŸÐ¾ÑˆÑƒÐº %(name)s"
+
+#: controllers/templates/search.mako:125 widgets/form/templates/datetime.mako:8
+msgid "Select"
+msgstr "Ð’Ð¸Ð±Ñ€Ð°Ñ‚Ð¸"
+
+#: controllers/templates/search.mako:127 widgets/_views.py:83
+#: widgets/form/templates/many2one.mako:22
+#: widgets/form/templates/reference.mako:27 widgets/templates/viewform.mako:26
+msgid "Search"
+msgstr "Ð—Ð½Ð°Ð¹Ñ‚Ð¸"
+
+#: controllers/templates/search.mako:143
+#, python-format
+msgid "No record found : '%(searched_string)s'."
+msgstr "Ð—Ð°Ð¿Ð¸Ñ Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾: '%(searched_string)s'."
+
+#: controllers/templates/selection.mako:4
+msgid "Select action"
+msgstr "ÐžÐ±ÐµÑ€Ñ–Ñ‚ÑŒ Ð´Ñ–ÑŽ"
+
+#: controllers/templates/selection.mako:23
+msgid "Select your action"
+msgstr "ÐžÐ±ÐµÑ€Ñ–Ñ‚ÑŒ Ð²Ð°ÑˆÑƒ Ð´Ñ–ÑŽ"
+
+#: controllers/templates/server_log.mako:4
+msgid "Server Actions..."
+msgstr "Ð”Ñ–Ñ— ÑÐµÑ€Ð²ÐµÑ€Ð°..."
+
+#: controllers/templates/server_log.mako:14
+msgid "Server Actions"
+msgstr "Ð”Ñ–Ñ— ÑÐµÑ€Ð²ÐµÑ€Ð°"
+
+#: controllers/templates/translator.mako:4
+msgid "Add Translations"
+msgstr "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ð¿ÐµÑ€ÐµÐºÐ»Ð°Ð´Ð¸"
+
+#: controllers/templates/translator.mako:17
+msgid "Add Translation"
+msgstr "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ð¿ÐµÑ€ÐµÐºÐ»Ð°Ð´"
+
+#: controllers/templates/translator.mako:27
+msgid "Add Translation for:"
+msgstr "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ð¿ÐµÑ€ÐµÐºÐ»Ð°Ð´ Ð´Ð»Ñ:"
+
+#: controllers/templates/translator.mako:31
+msgid "Fields"
+msgstr "ÐŸÐ¾Ð»Ñ"
+
+#: controllers/templates/translator.mako:32
+msgid "Labels"
+msgstr "ÐœÑ–Ñ‚ÐºÐ¸"
+
+#: controllers/templates/translator.mako:33
+msgid "Relates"
+msgstr "Ð’Ñ–Ð´Ð½Ð¾ÑÐ¸Ð½Ð¸"
+
+#: controllers/templates/translator.mako:34
+msgid "View"
+msgstr "Ð’Ð¸Ð³Ð»ÑÐ´"
+
+#: controllers/templates/translator.mako:53
+msgid "Field"
+msgstr "ÐŸÐ¾Ð»Ðµ"
+
+#: controllers/templates/view_log.mako:4 controllers/templates/view_log.mako:12
+#: utils/common.py:47
+msgid "Information"
+msgstr "Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ"
+
+#: controllers/templates/viewed.mako:17
+#, python-format
+msgid "View Editor %s - %s"
+msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¾Ñ€ Ð²Ð¸Ð´Ñƒ %s - %s"
+
+#: controllers/templates/viewed.mako:31
+msgid "Create a new inherited view"
+msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ ÑƒÑÐ¿Ð°Ð´ÐºÐ¾Ð²Ð°Ð½Ð¸Ð¹ Ð²Ð¸Ð´"
+
+#: controllers/templates/viewed.mako:31
+msgid "Inherited View"
+msgstr "Ð£ÑÐ¿Ð°Ð´ÐºÐ¾Ð²Ð°Ð½Ð¸Ð¹ Ð²Ð¸Ð´"
+
+#: controllers/templates/viewed.mako:34
+msgid "Preview"
+msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¸Ì† Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´"
+
+#: controllers/templates/viewed_add.mako:6
+msgid "Node Type:"
+msgstr "Ð¢Ð¸Ð¿ Ð²ÑƒÐ·Ð»Ð°:"
+
+#: controllers/templates/viewed_add.mako:23
+msgid "New Field"
+msgstr "ÐÐ¾Ð²Ðµ Ð¿Ð¾Ð»Ðµ"
+
+#: controllers/templates/viewed_add.mako:27
+msgid "Position:"
+msgstr "ÐŸÐ¾Ð·Ð¸Ñ†Ñ–Ñ:"
+
+#: controllers/templates/viewlist.mako:4
+#: controllers/templates/viewlist.mako:108
+#, python-format
+msgid "Manage Views (%s)"
+msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ð´Ð°Ð¼Ð¸ (%s)"
+
+#: controllers/templates/viewlist.mako:146
+#, python-format
+msgid "Create a view (%s)"
+msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ Ð²Ð¸Ð´ (%s)"
+
+#: controllers/templates/viewlist.mako:174
+msgid "View Name:"
+msgstr "ÐÐ°Ð·Ð²Ð° Ð²Ð¸Ð´Ñƒ:"
+
+#: controllers/templates/viewlist.mako:178
+msgid "View Type:"
+msgstr "Ð¢Ð¸Ð¿ Ð²Ð¸Ð´Ñƒ:"
+
+#: controllers/templates/viewlist.mako:189
+msgid "Priority:"
+msgstr "ÐŸÑ€Ñ–Ð¾Ñ€Ð¸Ñ‚ÐµÑ‚:"
+
+#: utils/common.py:37 utils/common.py:66
+msgid "Error"
+msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ°"
+
+#: utils/common.py:42 utils/common.py:69
+msgid "Warning"
+msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ"
+
+#: utils/rpc.py:131
+msgid "Access Denied"
+msgstr "Ð”Ð¾ÑÑ‚ÑƒÐ¿ Ð·Ð°Ð±Ð¾Ñ€Ð¾Ð½ÐµÐ½Ð¾"
+
+#: utils/rpc.py:238
+msgid "Unsupported protocol."
+msgstr "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð» Ð½Ðµ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÑƒÑ”Ñ‚ÑŒÑÑ"
+
+#: utils/rpc.py:342
+msgid ""
+"You select a timezone but OpenERP could not find pytz library!\n"
+"The timezone functionality will be disable."
+msgstr ""
+"Ð’Ð¸ Ð¾Ð±Ñ€Ð°Ð»Ð¸ Ñ‡Ð°ÑÐ¾Ð²Ð¸Ð¹ Ð¿Ð¾ÑÑ, Ð°Ð»Ðµ OpenERP Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð±Ñ–Ð±Ð»Ñ–Ð¾Ñ‚ÐµÐºÑƒ pytz!\n"
+"Ð¤ÑƒÐ½ÐºÑ†Ñ–Ñ—, Ð¿Ð¾Ð²â€™ÑÐ·Ð°Ð½Ñ– Ð· Ñ‡Ð°ÑÐ¾Ð²Ð¸Ð¼Ð¸ Ð¿Ð¾ÑÑÐ°Ð¼Ð¸, Ð±ÑƒÐ´ÑƒÑ‚ÑŒ Ð²Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ñ–."
+
+#: utils/rpc.py:355
+msgid "Not logged..."
+msgstr "ÐÐµ Ð·Ð°Ñ€ÐµÑ”ÑÑ‚Ñ€Ð¾Ð²Ð°Ð½..."
+
+#: utils/rpc.py:355
+msgid "Authorization Error"
+msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ—"
+
+#: utils/rpc.py:437
+msgid "== Access Denied =="
+msgstr "== Ð£ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñ– Ð²Ñ–Ð´Ð¼Ð¾Ð²Ð»ÐµÐ½Ð¾ =="
+
+#: widgets/_views.py:52
+msgid "Form"
+msgstr "Ð¤Ð¾Ñ€Ð¼Ð°"
+
+#: widgets/_views.py:53
+msgid "Form view..."
+msgstr "ÐžÐ±Ð·Ð¾Ñ€ Ñƒ Ð²Ð¸Ð³Ð»ÑÐ´Ñ– Ñ„Ð¾Ñ€Ð¼Ð¸"
+
+#: widgets/_views.py:84
+msgid "Search view..."
+msgstr "Ð’Ð¸Ð´ Ð´Ð»Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ"
+
+#: widgets/listgrid.py:289
+msgid "Wrong on_change trigger"
+msgstr "ÐÐµ Ð²Ñ–Ñ€Ð½Ð¸Ð¹ Ñ‚Ñ€Ð¸Ð³ÐµÑ€ on_change"
+
+#: widgets/listgrid.py:353 widgets/form/_form.py:904
+#, python-format
+msgid "Invalid view, duplicate field: %s"
+msgstr "ÐÐµ Ð²Ñ–Ñ€Ð½Ð¸Ð¹ Ð²Ð¸Ð´, Ð¿Ð¾Ð»Ðµ Ð´ÑƒÐ±Ð»ÑŽÑ”Ñ‚ÑŒÑÑ: %s"
+
+#: widgets/pager.py:56
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: widgets/pager.py:68
+#, python-format
+msgid "%s - %s"
+msgstr "%s - %s"
+
+#: widgets/search.py:282
+msgid "contains"
+msgstr "Ð¼Ñ–ÑÑ‚Ð¸Ñ‚ÑŒ"
+
+#: widgets/search.py:282
+msgid "doesn't contain"
+msgstr "Ð½Ðµ Ð¼Ñ–ÑÑ‚Ð¸Ñ‚ÑŒ"
+
+#: widgets/search.py:283
+msgid "is equal to"
+msgstr "ÑÐ¿Ñ–Ð²Ð¿Ð°Ð´Ð°Ñ” Ð·"
+
+#: widgets/search.py:283
+msgid "is not equal to"
+msgstr "Ð½Ðµ ÑÐ¿Ñ–Ð²Ð¿Ð°Ð´Ð°Ñ” Ð·"
+
+#: widgets/search.py:284
+msgid "greater than"
+msgstr "Ð±Ñ–Ð»ÑŒÑˆÐµ Ð½Ñ–Ð¶"
+
+#: widgets/search.py:284
+msgid "less than"
+msgstr "Ð¼ÐµÐ½ÑˆÐµ Ð½Ñ–Ð¶"
+
+#: widgets/search.py:285
+msgid "in"
+msgstr "Ñƒ"
+
+#: widgets/search.py:285
+msgid "not in"
+msgstr "Ð½Ðµ Ð²"
+
+#: widgets/search.py:392
+msgid "Yes"
+msgstr "Ð¢Ð°Ðº"
+
+#: widgets/search.py:392
+msgid "No"
+msgstr "ÐÑ–"
+
+#: widgets/form/_action.py:46
+msgid "Action not found!"
+msgstr "Ð”Ñ–ÑŽ Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾!"
+
+#: widgets/form/_o2m.py:73 widgets/templates/listgrid/listgrid.mako:138
+#: widgets/templates/listgrid/listgrid.mako:144
+#: widgets/templates/listgrid/listgroup.mako:20
+msgid "Create new record."
+msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ Ð½Ð¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ."
+
+#: widgets/form/_o2m.py:86
+msgid "Save/New"
+msgstr "Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸/ÐÐ¾Ð²Ð¸Ð¹"
+
+#: widgets/form/_o2m.py:86
+msgid "Save parent record."
+msgstr "Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ð±Ð°Ñ‚ÑŒÐºÑ–Ð²ÑÑŒÐºÐ¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ."
+
+#: widgets/form/_o2m.py:216
+#, python-format
+msgid "%d of %d"
+msgstr "%d Ð· %d"
+
+#: widgets/form/_o2m.py:218
+#, python-format
+msgid "- of %d"
+msgstr "- Ð· %d"
+
+#: widgets/form/templates/binary.mako:31
+msgid "add attachment"
+msgstr "Ð´Ð¾Ð´Ð°Ñ‚Ð¸ Ð²ÐºÐ»Ð°Ð´ÐµÐ½Ð½Ñ"
+
+#: widgets/form/templates/image.mako:7 widgets/form/templates/image.mako:39
+msgid "Click here to add new image."
+msgstr "ÐÐ°Ñ‚Ð¸ÑÐ½Ñ–Ñ‚ÑŒ Ñ‚ÑƒÑ‚ Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð´Ð¾Ð´Ð°Ñ‚Ð¸ Ð½Ð¾Ð²Ñƒ ÐºÐ°Ñ€Ñ‚Ð¸Ð½ÐºÑƒ."
+
+#: widgets/form/templates/many2one.mako:2
+#: widgets/form/templates/reference.mako:30
+msgid "Open"
+msgstr "Ð’Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸"
+
+#: widgets/form/templates/many2one.mako:2
+#: widgets/form/templates/reference.mako:30
+msgid "Open a resource"
+msgstr "Ð’Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ñ€ÐµÑÑƒÑ€Ñ"
+
+#: widgets/form/templates/one2many.mako:20
+msgid "Create new record..."
+msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ Ð½Ð¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ..."
+
+#: widgets/form/templates/one2many.mako:22
+msgid "Delete record..."
+msgstr "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ..."
+
+#: widgets/form/templates/one2many.mako:28
+msgid "Translate me."
+msgstr "ÐŸÐµÑ€ÐµÐºÐ»Ð°ÑÑ‚Ð¸ Ð¼ÐµÐ½Ðµ."
+
+#: widgets/form/templates/one2many.mako:47
+msgid "Previous record..."
+msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¹ Ð·Ð°Ð¿Ð¸Ñ..."
+
+#: widgets/form/templates/one2many.mako:49
+msgid "Next record..."
+msgstr "ÐÐ°ÑÑ‚ÑƒÐ¿Ð½Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ..."
+
+#: widgets/templates/logs.mako:22
+msgid "More..."
+msgstr "Ð‘Ñ–Ð»ÑŒÑˆÐµ..."
+
+#: widgets/templates/logs.mako:35
+msgid "Less..."
+msgstr "ÐœÐµÐ½ÑˆÐµ..."
+
+#: widgets/templates/pager.mako:9
+msgid "<< First"
+msgstr "<< ÐŸÐµÑ€ÑˆÐ°"
+
+#: widgets/templates/pager.mako:14
+msgid "< Previous"
+msgstr "< ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ"
+
+#: widgets/templates/pager.mako:19
+msgid "of"
+msgstr "Ð·"
+
+#: widgets/templates/pager.mako:24
+msgid "Next >"
+msgstr "ÐÐ°ÑÑ‚ÑƒÐ¿Ð½Ðµ >"
+
+#: widgets/templates/pager.mako:29
+msgid "Last >>"
+msgstr "ÐžÑÑ‚Ð°Ð½Ð½Ñ >>"
+
+#: widgets/templates/pager.mako:37
+msgid "Change Limit:"
+msgstr "Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ"
+
+#: widgets/templates/sidebar.mako:37
+msgid "Reports"
+msgstr "Ð—Ð²Ñ–Ñ‚Ð¸"
+
+#: widgets/templates/sidebar.mako:41 widgets/templates/viewform.mako:51
+msgid "Actions"
+msgstr "Ð”Ñ–Ñ—"
+
+#: widgets/templates/sidebar.mako:45
+msgid "Links"
+msgstr "ÐŸÐ¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ"
+
+#: widgets/templates/sidebar.mako:49
+msgid "Submenu"
+msgstr "ÐŸÑ–Ð´Ð¼ÐµÐ½ÑŽ"
+
+#: widgets/templates/sidebar.mako:54
+msgid "Attachments"
+msgstr "Ð”Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ"
+
+#: widgets/templates/sidebar.mako:74
+msgid "File"
+msgstr "Ð¤Ð°Ð¹Ð»"
+
+#: widgets/templates/sidebar.mako:83
+msgid "Customize"
+msgstr "ÐÐµÑ‚Ð¸Ð¿Ð¾Ð²Ñ– Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¸"
+
+#: widgets/templates/sidebar.mako:87
+msgid "Manage views of the current object"
+msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ Ð²Ð¸Ð´Ð¾Ð¼ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ Ð¾Ð±'Ñ”ÐºÑ‚Ñƒ"
+
+#: widgets/templates/sidebar.mako:89
+msgid "Manage Views"
+msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ Ð²Ð¸Ð´Ð°Ð¼Ð¸"
+
+#: widgets/templates/sidebar.mako:93
+msgid "Edit workflow of the current object"
+msgstr "Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ Ñ€Ð¾Ð±Ð¾Ñ‡Ð¸Ð¹ Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ Ð¾Ð±â€™Ñ”ÐºÑ‚Ñƒ"
+
+#: widgets/templates/sidebar.mako:94
+msgid "Edit Workflow"
+msgstr "Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ Ñ€Ð¾Ð±Ð¾Ñ‡Ð¸Ð¹ Ð¿Ñ€Ð¾Ñ†ÐµÑ"
+
+#: widgets/templates/sidebar.mako:98
+msgid "Customize current object or create a new object"
+msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð±â€™Ñ”ÐºÑ‚Ñƒ Ð°Ð±Ð¾ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¾Ð±â€™Ñ”ÐºÑ‚Ñƒ"
+
+#: widgets/templates/sidebar.mako:100
+msgid "Customize Object"
+msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð±â€™Ñ”ÐºÑ‚Ñƒ"
+
+#: widgets/templates/sidebar.mako:106
+msgid "Other Options"
+msgstr "Ð†Ð½ÑˆÑ– Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¸"
+
+#: widgets/templates/sidebar.mako:111
+msgid "Import"
+msgstr "Ð†Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸"
+
+#: widgets/templates/sidebar.mako:114
+msgid "Export"
+msgstr "Ð•ÐºÑÐ¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸"
+
+#: widgets/templates/sidebar.mako:118
+msgid "Translate"
+msgstr "ÐŸÐµÑ€ÐµÐºÐ»Ð°ÑÑ‚Ð¸"
+
+#: widgets/templates/sidebar.mako:123
+msgid "View Log"
+msgstr "ÐŸÐµÑ€ÐµÐ³Ð»ÑÐ½ÑƒÑ‚Ð¸ Ð¶ÑƒÑ€Ð½Ð°Ð»"
+
+#: widgets/templates/viewform.mako:25
+msgid "Filter records."
+msgstr "Ð¤Ñ–Ð»ÑŒÑ‚Ñ€ Ð·Ð°Ð¿Ð¸ÑÑ–Ð²"
+
+#: widgets/templates/viewform.mako:33
+msgid "Clear all."
+msgstr "ÐžÑ‡Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ Ð²ÑÐµ."
+
+#: widgets/templates/viewform.mako:35
+msgid "Clear"
+msgstr "ÐžÑ‡Ð¸ÑÑ‚Ð¸Ñ‚Ð¸"
+
+#: widgets/templates/viewform.mako:43
+msgid "Filters"
+msgstr "Ð¤Ñ–Ð»ÑŒÑ‚Ñ€Ð¸"
+
+#: widgets/templates/viewform.mako:45
+msgid "Saved Filters"
+msgstr "Ð—Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ñ– Ñ„Ñ–Ð»ÑŒÑ‚Ñ€Ð¸"
+
+#: widgets/templates/viewform.mako:52
+msgid "New Filter"
+msgstr "ÐÐ¾Ð²Ð¸Ð¹ Ñ„Ñ–Ð»ÑŒÑ‚Ñ€"
+
+#: widgets/templates/viewform.mako:53
+msgid "Save Filter"
+msgstr "Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ñ„Ñ–Ð»ÑŒÑ‚Ñ€"
+
+#: widgets/templates/viewform.mako:54
+msgid "Manage Filters"
+msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ñ–Ð»ÑŒÑ‚Ñ€Ð°Ð¼Ð¸"
+
+#: widgets/templates/listgrid/listgrid.mako:19
+msgid "Update"
+msgstr "ÐžÐ½Ð¾Ð²Ð¸Ñ‚Ð¸"
+
+#: widgets/templates/listgrid/listgrid.mako:134
+msgid "Add records..."
+msgstr "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ..."
+
+#: widgets/templates/listgrid/listgrid.mako:172
+#: widgets/templates/listgrid/listgrid.mako:176
+msgid "Delete record(s)."
+msgstr "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ(Ð¸)."

=== modified file 'addons/openerp/po/messages/vi.po'
--- addons/openerp/po/messages/vi.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/vi.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: validators.py:75
 msgid "Invalid literal for float"

=== modified file 'addons/openerp/po/messages/zh_CN.po'
--- addons/openerp/po/messages/zh_CN.po	2011-03-11 04:48:47 +0000
+++ addons/openerp/po/messages/zh_CN.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:15+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: validators.py:75

=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2011-02-16 08:57:33 +0000
+++ addons/openerp/static/javascript/form.js	2011-03-15 13:37:09 +0000
@@ -991,6 +991,10 @@
         var id = eval(params['_terp_selection'])[0]
     } else {
         var id = jQuery('[id="'+field+'"]').val();
+        if (id == 'False') {
+        	error_display(_("You must save this record to perform the action !"))
+        return;
+        }
     }
 
     var action_id = $src.attr('action_id') || null;

=== added file 'addons/view_calendar/po/javascript/ar.po.OTHER'
--- addons/view_calendar/po/javascript/ar.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_calendar/po/javascript/ar.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,66 @@
+# Arabic translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-16 16:47+0000\n"
+"Last-Translator: kifcaliph <kifcaliph@xxxxxxxxxxx>\n"
+"Language-Team: Arabic <ar@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: static/javascript/calendar_box.js:50
+msgid "Cancel"
+msgstr "Ø¥Ù„ØºØ§Ø¡"
+
+#: static/javascript/calendar_box.js:51
+msgid "Edit"
+msgstr "ØªØØ±ÙŠØ±"
+
+#: static/javascript/calendar_box.js:52
+msgid "Duplicate"
+msgstr "ØªÙƒØ±Ø§Ø±"
+
+#: static/javascript/calendar_box.js:53
+msgid "Delete"
+msgstr "ØØ°Ù"
+
+#: static/javascript/calendar_box.js:80
+msgid "Creation User: "
+msgstr "Ø¥Ù†Ø´Ø§Ø¡ ØØ³Ø§Ø¨: "
+
+#: static/javascript/calendar_box.js:81
+msgid "Creation Date: "
+msgstr "ØªØ§Ø±ÙŠØ® Ø§Ù„Ø¥Ù†Ø´Ø§Ø¡: "
+
+#: static/javascript/calendar_box.js:82
+msgid "Latest Modification by: "
+msgstr "Ø¢Ø®Ø± ØªØ¹Ø¯ÙŠÙ„ Ø¨ÙˆØ§Ø³Ø·Ø©: "
+
+#: static/javascript/calendar_box.js:83
+msgid "Latest Modification Date: "
+msgstr "Ø¢Ø®Ø± ØªØ§Ø±ÙŠØ® Ù„Ù„ØªØ¹Ø¯ÙŠÙ„: "
+
+#: static/javascript/calendar_box.js:167
+msgid "Do you really want to delete this record?"
+msgstr "Ù‡Ù„ ØªØ±ÙŠØ¯ ØØ°Ù Ù‡Ø°Ø§ Ø§Ù„Ø³Ø¬Ù„ØŸ"
+
+#: static/javascript/calendar_gantt.js:258
+#: static/javascript/calendar_month.js:412
+#: static/javascript/calendar_week.js:269
+#: static/javascript/calendar_week.js:672
+msgid "This calendar object can no longer be moved !"
+msgstr "Ù„Ø§ ØªØ³ØªØ·ÙŠØ¹ ØªØ¹Ø¯ÙŠÙ„ ÙƒØ§Ø¦Ù† Ø§Ù„ØªÙ‚ÙˆÙŠÙ… Ù‡Ø°Ø§ Ø¨Ø¹Ø¯ Ø§Ù„Ø£Ù† !"
+
+#: static/javascript/calendar_gantt.js:320
+#: static/javascript/calendar_week.js:96
+msgid "This calendar object can no longer be resized !"
+msgstr "Ù„Ø§ ØªØ³ØªØ·ÙŠØ¹ ØªØ¹Ø¯ÙŠÙ„ ØØ¬Ù… Ø§Ù„ÙƒØ§Ø¦Ù† Ù„Ù„ØªÙ‚ÙˆÙŠÙ… !"

=== added file 'addons/view_calendar/po/javascript/bg.po.OTHER'
--- addons/view_calendar/po/javascript/bg.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_calendar/po/javascript/bg.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,66 @@
+# Bulgarian translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-27 09:23+0000\n"
+"Last-Translator: Dimitar Markov <dimitar.markov@xxxxxxxxx>\n"
+"Language-Team: Bulgarian <bg@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: static/javascript/calendar_box.js:50
+msgid "Cancel"
+msgstr "ÐžÑ‚ÐºÐ°Ð·"
+
+#: static/javascript/calendar_box.js:51
+msgid "Edit"
+msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð°Ð¹"
+
+#: static/javascript/calendar_box.js:52
+msgid "Duplicate"
+msgstr "Ð”ÑƒÐ±Ð»Ð¸Ñ€Ð°Ð½Ðµ"
+
+#: static/javascript/calendar_box.js:53
+msgid "Delete"
+msgstr "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ"
+
+#: static/javascript/calendar_box.js:80
+msgid "Creation User: "
+msgstr ""
+
+#: static/javascript/calendar_box.js:81
+msgid "Creation Date: "
+msgstr "Ð”Ð°Ñ‚Ð° Ð½Ð° ÑÑŠÐ·Ð´Ð°Ð²Ð°Ð½Ðµ: "
+
+#: static/javascript/calendar_box.js:82
+msgid "Latest Modification by: "
+msgstr "ÐŸÐ¾ÑÐ»ÐµÐ´Ð½Ð° Ð¿Ñ€Ð¾Ð¼ÑÐ½Ð° Ð¾Ñ‚: "
+
+#: static/javascript/calendar_box.js:83
+msgid "Latest Modification Date: "
+msgstr "ÐŸÐ¾ÑÐ»ÐµÐ´Ð½Ð° Ð´Ð°Ñ‚Ð° Ð½Ð° Ð¿Ñ€Ð¾Ð¼ÑÐ½Ð°: "
+
+#: static/javascript/calendar_box.js:167
+msgid "Do you really want to delete this record?"
+msgstr "ÐÐ°Ð¸ÑÑ‚Ð¸Ð½Ð° Ð»Ð¸ Ð¶ÐµÐ»Ð°ÐµÑ‚Ðµ Ð´Ð° Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ Ñ‚Ð¾Ð·Ð¸ Ð·Ð°Ð¿Ð¸Ñ"
+
+#: static/javascript/calendar_gantt.js:258
+#: static/javascript/calendar_month.js:412
+#: static/javascript/calendar_week.js:269
+#: static/javascript/calendar_week.js:672
+msgid "This calendar object can no longer be moved !"
+msgstr "Ð¢Ð¾Ð·Ð¸ Ð¾Ð±ÐµÐºÑ‚ Ð² ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ€Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð²ÐµÑ‡Ðµ Ð´Ð° Ð±ÑŠÐ´Ðµ Ð¼ÐµÑÑ‚ÐµÐ½!"
+
+#: static/javascript/calendar_gantt.js:320
+#: static/javascript/calendar_week.js:96
+msgid "This calendar object can no longer be resized !"
+msgstr "Ð¢Ð¾Ð·Ð¸ Ð¾Ð±ÐµÐºÑ‚ Ð² ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ€Ð° Ð½Ðµ Ð²ÐµÑ‡Ðµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¼Ñƒ Ð±ÑŠÐ´Ðµ Ð¿Ñ€Ð¾Ð¼ÐµÐ½ÑÐ½ Ñ€Ð°Ð·Ð¼ÐµÑ€Ð°!"

=== added file 'addons/view_calendar/po/javascript/ca.po.OTHER'
--- addons/view_calendar/po/javascript/ca.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_calendar/po/javascript/ca.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,67 @@
+# Catalan translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-24 17:03+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@xxxxxxxxxxxxxxx>\n"
+"Language-Team: Catalan <ca@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: static/javascript/calendar_box.js:50
+msgid "Cancel"
+msgstr "CancelÂ·la"
+
+#: static/javascript/calendar_box.js:51
+msgid "Edit"
+msgstr "Edita"
+
+#: static/javascript/calendar_box.js:52
+msgid "Duplicate"
+msgstr "Duplica"
+
+#: static/javascript/calendar_box.js:53
+msgid "Delete"
+msgstr "Elimina"
+
+#: static/javascript/calendar_box.js:80
+msgid "Creation User: "
+msgstr "Creat per l'usuari: "
+
+#: static/javascript/calendar_box.js:81
+msgid "Creation Date: "
+msgstr "Data de creaciÃ³: "
+
+#: static/javascript/calendar_box.js:82
+msgid "Latest Modification by: "
+msgstr "Ãšltima modificaciÃ³ per: "
+
+#: static/javascript/calendar_box.js:83
+msgid "Latest Modification Date: "
+msgstr "Data Ãºltima modificaciÃ³: "
+
+#: static/javascript/calendar_box.js:167
+msgid "Do you really want to delete this record?"
+msgstr "Realment voleu eliminar aquest registre?"
+
+#: static/javascript/calendar_gantt.js:258
+#: static/javascript/calendar_month.js:412
+#: static/javascript/calendar_week.js:269
+#: static/javascript/calendar_week.js:672
+msgid "This calendar object can no longer be moved !"
+msgstr "No es pot moure mÃ©s aquest objecte calendari!"
+
+#: static/javascript/calendar_gantt.js:320
+#: static/javascript/calendar_week.js:96
+msgid "This calendar object can no longer be resized !"
+msgstr "No es pot canviar mÃ©s la grandaria d'aquest objecte calendari!"

=== modified file 'addons/view_calendar/po/javascript/de.po'
--- addons/view_calendar/po/javascript/de.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/de.po	2011-03-15 13:37:09 +0000
@@ -15,8 +15,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/calendar_box.js:50

=== modified file 'addons/view_calendar/po/javascript/es.po'
--- addons/view_calendar/po/javascript/es.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/es.po	2011-03-15 13:37:09 +0000
@@ -15,8 +15,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/calendar_box.js:50
 msgid "Cancel"

=== modified file 'addons/view_calendar/po/javascript/eu.po'
--- addons/view_calendar/po/javascript/eu.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/eu.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/calendar_box.js:50
 msgid "Cancel"

=== added file 'addons/view_calendar/po/javascript/fi.po.OTHER'
--- addons/view_calendar/po/javascript/fi.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_calendar/po/javascript/fi.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,66 @@
+# Finnish translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-20 22:08+0000\n"
+"Last-Translator: Harri Luuppala <Unknown>\n"
+"Language-Team: Finnish <fi@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: static/javascript/calendar_box.js:50
+msgid "Cancel"
+msgstr "KeskeytÃ¤"
+
+#: static/javascript/calendar_box.js:51
+msgid "Edit"
+msgstr "Muokkaa"
+
+#: static/javascript/calendar_box.js:52
+msgid "Duplicate"
+msgstr "Kopioi"
+
+#: static/javascript/calendar_box.js:53
+msgid "Delete"
+msgstr "Poista"
+
+#: static/javascript/calendar_box.js:80
+msgid "Creation User: "
+msgstr "Luoja: "
+
+#: static/javascript/calendar_box.js:81
+msgid "Creation Date: "
+msgstr "LuontipÃ¤ivÃ¤: "
+
+#: static/javascript/calendar_box.js:82
+msgid "Latest Modification by: "
+msgstr "Viimeksi muokkasi: "
+
+#: static/javascript/calendar_box.js:83
+msgid "Latest Modification Date: "
+msgstr "Viimeinen muokkauspÃ¤ivÃ¤: "
+
+#: static/javascript/calendar_box.js:167
+msgid "Do you really want to delete this record?"
+msgstr "Haluatko poistaa tÃ¤mÃ¤n tietueen?"
+
+#: static/javascript/calendar_gantt.js:258
+#: static/javascript/calendar_month.js:412
+#: static/javascript/calendar_week.js:269
+#: static/javascript/calendar_week.js:672
+msgid "This calendar object can no longer be moved !"
+msgstr "Kalenterin objektia ei voi poistaa!"
+
+#: static/javascript/calendar_gantt.js:320
+#: static/javascript/calendar_week.js:96
+msgid "This calendar object can no longer be resized !"
+msgstr "Kalenterin objektin kokoa ei voi enÃ¤Ã¤ muuttaa!"

=== modified file 'addons/view_calendar/po/javascript/fr.po'
--- addons/view_calendar/po/javascript/fr.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/fr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/calendar_box.js:50

=== modified file 'addons/view_calendar/po/javascript/gl.po'
--- addons/view_calendar/po/javascript/gl.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/gl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/calendar_box.js:50
 msgid "Cancel"

=== modified file 'addons/view_calendar/po/javascript/hr.po'
--- addons/view_calendar/po/javascript/hr.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/hr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/calendar_box.js:50
 msgid "Cancel"

=== modified file 'addons/view_calendar/po/javascript/hu.po'
--- addons/view_calendar/po/javascript/hu.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/hu.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/calendar_box.js:50
 msgid "Cancel"

=== modified file 'addons/view_calendar/po/javascript/it.po'
--- addons/view_calendar/po/javascript/it.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/it.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/calendar_box.js:50

=== modified file 'addons/view_calendar/po/javascript/lt.po'
--- addons/view_calendar/po/javascript/lt.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/lt.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/calendar_box.js:50
 msgid "Cancel"

=== modified file 'addons/view_calendar/po/javascript/lv.po'
--- addons/view_calendar/po/javascript/lv.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/lv.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/calendar_box.js:50
 msgid "Cancel"

=== modified file 'addons/view_calendar/po/javascript/nl.po'
--- addons/view_calendar/po/javascript/nl.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/nl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/calendar_box.js:50

=== modified file 'addons/view_calendar/po/javascript/pl.po'
--- addons/view_calendar/po/javascript/pl.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/pl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/calendar_box.js:50
 msgid "Cancel"

=== modified file 'addons/view_calendar/po/javascript/pt.po'
--- addons/view_calendar/po/javascript/pt.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/pt.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/calendar_box.js:50
 msgid "Cancel"

=== modified file 'addons/view_calendar/po/javascript/pt_BR.po'
--- addons/view_calendar/po/javascript/pt_BR.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/pt_BR.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/calendar_box.js:50

=== modified file 'addons/view_calendar/po/javascript/ru.po'
--- addons/view_calendar/po/javascript/ru.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/ru.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/calendar_box.js:50
 msgid "Cancel"

=== modified file 'addons/view_calendar/po/javascript/sk.po'
--- addons/view_calendar/po/javascript/sk.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/sk.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/calendar_box.js:50
 msgid "Cancel"

=== modified file 'addons/view_calendar/po/javascript/sr.po'
--- addons/view_calendar/po/javascript/sr.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/sr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/calendar_box.js:50

=== modified file 'addons/view_calendar/po/javascript/sr@xxxxxxxx'
--- addons/view_calendar/po/javascript/sr@xxxxxxxx	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/sr@xxxxxxxx	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/calendar_box.js:50
 msgid "Cancel"

=== modified file 'addons/view_calendar/po/javascript/sv.po'
--- addons/view_calendar/po/javascript/sv.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/sv.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/calendar_box.js:50

=== modified file 'addons/view_calendar/po/javascript/tr.po'
--- addons/view_calendar/po/javascript/tr.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/tr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/calendar_box.js:50
 msgid "Cancel"

=== modified file 'addons/view_calendar/po/javascript/uk.po'
--- addons/view_calendar/po/javascript/uk.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/uk.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/calendar_box.js:50
 msgid "Cancel"

=== modified file 'addons/view_calendar/po/javascript/zh_CN.po'
--- addons/view_calendar/po/javascript/zh_CN.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/javascript/zh_CN.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/calendar_box.js:50
 msgid "Cancel"

=== added file 'addons/view_calendar/po/messages/ar.po.OTHER'
--- addons/view_calendar/po/messages/ar.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_calendar/po/messages/ar.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,215 @@
+# Arabic translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-16 17:02+0000\n"
+"Last-Translator: kifcaliph <kifcaliph@xxxxxxxxxxx>\n"
+"Language-Team: Arabic <ar@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: controllers/templates/calpopup.mako:83
+msgid "Save"
+msgstr "ØÙÙ€Ø¸"
+
+#: controllers/templates/calpopup.mako:86
+msgid "Close"
+msgstr "Ø¥ØºÙ„Ø§Ù‚"
+
+#: widgets/_views.py:10
+msgid "Calendar"
+msgstr "Ø§Ù„ØªÙ‚ÙˆÙŠÙ…"
+
+#: widgets/_views.py:11
+msgid "Calendar view..."
+msgstr "Ø¹Ø±Ø¶ Ø§Ù„ØªÙ‚ÙˆÙŠÙ…..."
+
+#: widgets/_views.py:28
+msgid "Gantt"
+msgstr "Ø¬Ø§Ù†Øª"
+
+#: widgets/_views.py:29
+msgid "Gantt view..."
+msgstr "Ø¹Ø±Ø¶ Ù…Ø®Ø·Ø· Ø¬Ø§Ù†Øª..."
+
+#: widgets/utils.py:26
+msgid "Monday"
+msgstr "Ø§Ù„Ø¥Ø«Ù†ÙŠÙ†"
+
+#: widgets/utils.py:27
+msgid "Tuesday"
+msgstr "Ø§Ù„Ø«Ù„Ø§Ø«Ø§Ø¡"
+
+#: widgets/utils.py:28
+msgid "Wednesday"
+msgstr "Ø§Ù„Ø£Ø±Ø¨Ø¹Ø§Ø¡"
+
+#: widgets/utils.py:29
+msgid "Thursday"
+msgstr "Ø§Ù„Ø®Ù…ÙŠØ³"
+
+#: widgets/utils.py:30
+msgid "Friday"
+msgstr "Ø§Ù„Ø¬Ù…Ø¹Ø©"
+
+#: widgets/utils.py:31
+msgid "Saturday"
+msgstr "Ø§Ù„Ø³Ø¨Øª"
+
+#: widgets/utils.py:32
+msgid "Sunday"
+msgstr "Ø§Ù„Ø£ØØ¯"
+
+#: widgets/utils.py:35
+msgid "January"
+msgstr "ÙŠÙ†Ø§ÙŠØ±"
+
+#: widgets/utils.py:36
+msgid "February"
+msgstr "ÙØ¨Ø±Ø§ÙŠØ±"
+
+#: widgets/utils.py:37
+msgid "March"
+msgstr "Ù…Ø§Ø±Ø³"
+
+#: widgets/utils.py:38
+msgid "April"
+msgstr "Ø£Ø¨Ø±ÙŠÙ„"
+
+#: widgets/utils.py:39
+msgid "May"
+msgstr "Ù…Ø§ÙŠÙˆ"
+
+#: widgets/utils.py:40
+msgid "June"
+msgstr "ÙŠÙˆÙ†ÙŠÙˆ"
+
+#: widgets/utils.py:41
+msgid "July"
+msgstr "ÙŠÙˆÙ„ÙŠÙˆ"
+
+#: widgets/utils.py:42
+msgid "August"
+msgstr "Ø£ØºØ³Ø·Ø³"
+
+#: widgets/utils.py:43
+msgid "September"
+msgstr "Ø³Ø¨ØªÙ…Ø¨Ø±"
+
+#: widgets/utils.py:44
+msgid "October"
+msgstr "Ø£ÙƒØªÙˆØ¨Ø±"
+
+#: widgets/utils.py:45
+msgid "November"
+msgstr "Ù†ÙˆÙÙ…Ø¨Ø±"
+
+#: widgets/utils.py:46
+msgid "December"
+msgstr "Ø¯ÙŠØ³Ù…Ø¨Ø±"
+
+#: widgets/utils.py:173
+#, python-format
+msgid "%(first)s to %(last)s %(month)s"
+msgstr "%(first)s Ø§Ù„ÙŠ %(last)s %(month)s"
+
+#: widgets/widgets.py:281
+#, python-format
+msgid "%s, Week %s"
+msgstr "%s, Ø§Ø³Ø¨ÙˆØ¹ %s"
+
+#: widgets/widgets.py:294
+#, python-format
+msgid "%s - %s"
+msgstr "%s - %s"
+
+#: widgets/widgets.py:296 widgets/widgets.py:319 widgets/widgets.py:363
+#, python-format
+msgid "Week %s"
+msgstr "Ø§Ø³Ø¨ÙˆØ¹ %s"
+
+#: widgets/widgets.py:311
+#, python-format
+msgid "%s, Qtr %s"
+msgstr "%s, Qtr %s"
+
+#: widgets/widgets.py:330
+#, python-format
+msgid "W %s"
+msgstr "W %s"
+
+#: widgets/widgets.py:338 widgets/widgets.py:352
+#, python-format
+msgid "Year %s to Year %s"
+msgstr "Ø³Ù†Ù‡ %s Ø§Ù„ÙŠ Ø³Ù†Ù‡ %s"
+
+#: widgets/templates/day.mako:4 widgets/templates/day.mako:7
+#: widgets/templates/gantt.mako:5 widgets/templates/gantt.mako:8
+#: widgets/templates/month.mako:4 widgets/templates/week.mako:4
+msgid "Today"
+msgstr "Ø§Ù„ÙŠÙˆÙ…"
+
+#: widgets/templates/day.mako:21 widgets/templates/month.mako:15
+#: widgets/templates/week.mako:18
+msgid "Month Calendar..."
+msgstr "Ø§Ù„ØªÙ‚ÙˆÙŠÙ… Ø§Ù„Ø´Ù‡Ø±ÙŠ..."
+
+#: widgets/templates/day.mako:22 widgets/templates/month.mako:15
+#: widgets/templates/week.mako:19
+msgid "Month"
+msgstr "Ø´Ù‡Ø±"
+
+#: widgets/templates/day.mako:25 widgets/templates/month.mako:18
+#: widgets/templates/week.mako:22
+msgid "Week Calendar..."
+msgstr "Ø§Ù„ØªÙ‚ÙˆÙŠÙ… Ø§Ù„Ø¥Ø³Ø¨ÙˆØ¹ÙŠ..."
+
+#: widgets/templates/day.mako:26 widgets/templates/month.mako:19
+#: widgets/templates/week.mako:22
+msgid "Week"
+msgstr "Ø£Ø³Ø¨ÙˆØ¹"
+
+#: widgets/templates/day.mako:30 widgets/templates/month.mako:22
+#: widgets/templates/week.mako:25
+msgid "Day Calendar..."
+msgstr "Ø§Ù„ØªÙ‚ÙˆÙŠÙ… Ø§Ù„ÙŠÙˆÙ…ÙŠ..."
+
+#: widgets/templates/day.mako:30 widgets/templates/month.mako:23
+#: widgets/templates/week.mako:26
+msgid "Day"
+msgstr "ÙŠÙˆÙ…"
+
+#: widgets/templates/gantt.mako:7 widgets/templates/month.mako:3
+#: widgets/templates/week.mako:3
+msgid "Today..."
+msgstr "Ø§Ù„ÙŠÙˆÙ…..."
+
+#: widgets/templates/gantt.mako:22 widgets/templates/gantt.mako:24
+msgid "Zoom In"
+msgstr "ØªÙƒØ¨ÙŠØ±"
+
+#: widgets/templates/gantt.mako:30 widgets/templates/gantt.mako:32
+msgid "Zoom Out"
+msgstr "ØªØµØºÙŠØ±"
+
+#: widgets/templates/groups.mako:4
+msgid "Add"
+msgstr "Ø¥Ø¶Ø§ÙØ©"
+
+#: widgets/templates/sidebar.mako:3
+msgid "Navigator"
+msgstr "Ø§Ù„Ù…ØªØµÙØ"
+
+#: widgets/templates/week.mako:13
+#, python-format
+msgid "Week %(number)s"
+msgstr "Ø§Ø³Ø¨ÙˆØ¹ %(number)s"

=== added file 'addons/view_calendar/po/messages/bg.po.OTHER'
--- addons/view_calendar/po/messages/bg.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_calendar/po/messages/bg.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,215 @@
+# Bulgarian translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-27 09:08+0000\n"
+"Last-Translator: Dimitar Markov <dimitar.markov@xxxxxxxxx>\n"
+"Language-Team: Bulgarian <bg@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: controllers/templates/calpopup.mako:83
+msgid "Save"
+msgstr "Ð—Ð°Ð¿Ð°Ð·Ð¸"
+
+#: controllers/templates/calpopup.mako:86
+msgid "Close"
+msgstr "Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸"
+
+#: widgets/_views.py:10
+msgid "Calendar"
+msgstr "ÐšÐ°Ð»ÐµÐ½Ð´Ð°Ñ€"
+
+#: widgets/_views.py:11
+msgid "Calendar view..."
+msgstr "ÐšÐ°Ð»ÐµÐ½Ð´Ð°Ñ€ÐµÐ½ Ð¸Ð·Ð³Ð»ÐµÐ´..."
+
+#: widgets/_views.py:28
+msgid "Gantt"
+msgstr "Ð“Ð°Ð½Ñ‚Ð¾Ð²Ð° Ð´Ð¸Ð°Ð³Ñ€Ð°Ð¼Ð°"
+
+#: widgets/_views.py:29
+msgid "Gantt view..."
+msgstr "Ð’Ð¸Ð¶ ÐºÐ°Ñ‚Ð¾ Ð“Ð°Ð½Ñ‚Ð¾Ð²Ð° Ð´Ð¸Ð°Ð³Ñ€Ð°Ð¼Ð°"
+
+#: widgets/utils.py:26
+msgid "Monday"
+msgstr "ÐŸÐ¾Ð½ÐµÐ´ÐµÐ»Ð½Ð¸Ðº"
+
+#: widgets/utils.py:27
+msgid "Tuesday"
+msgstr "Ð’Ñ‚Ð¾Ñ€Ð½Ð¸Ðº"
+
+#: widgets/utils.py:28
+msgid "Wednesday"
+msgstr "Ð¡Ñ€ÑÐ´Ð°"
+
+#: widgets/utils.py:29
+msgid "Thursday"
+msgstr "Ð§ÐµÑ‚Ð²ÑŠÑ€Ñ‚ÑŠÐº"
+
+#: widgets/utils.py:30
+msgid "Friday"
+msgstr "ÐŸÐµÑ‚ÑŠÐº"
+
+#: widgets/utils.py:31
+msgid "Saturday"
+msgstr "Ð¡ÑŠÐ±Ð¾Ñ‚Ð°"
+
+#: widgets/utils.py:32
+msgid "Sunday"
+msgstr "ÐÐµÐ´ÐµÐ»Ñ"
+
+#: widgets/utils.py:35
+msgid "January"
+msgstr "Ð¯Ð½ÑƒÐ°Ñ€Ð¸"
+
+#: widgets/utils.py:36
+msgid "February"
+msgstr "Ð¤ÐµÐ²Ñ€ÑƒÐ°Ñ€Ð¸"
+
+#: widgets/utils.py:37
+msgid "March"
+msgstr "ÐœÐ°Ñ€Ñ‚"
+
+#: widgets/utils.py:38
+msgid "April"
+msgstr "ÐÐ¿Ñ€Ð¸Ð»"
+
+#: widgets/utils.py:39
+msgid "May"
+msgstr "ÐœÐ°Ð¹"
+
+#: widgets/utils.py:40
+msgid "June"
+msgstr "Ð®Ð½Ð¸"
+
+#: widgets/utils.py:41
+msgid "July"
+msgstr "Ð®Ð»Ð¸"
+
+#: widgets/utils.py:42
+msgid "August"
+msgstr "ÐÐ²Ð³ÑƒÑÑ‚"
+
+#: widgets/utils.py:43
+msgid "September"
+msgstr "Ð¡ÐµÐ¿Ñ‚ÐµÐ¼Ð²Ñ€Ð¸"
+
+#: widgets/utils.py:44
+msgid "October"
+msgstr "ÐžÐºÑ‚Ð¾Ð¼Ð²Ñ€Ð¸"
+
+#: widgets/utils.py:45
+msgid "November"
+msgstr "ÐÐ¾ÐµÐ¼Ð²Ñ€Ð¸"
+
+#: widgets/utils.py:46
+msgid "December"
+msgstr "Ð”ÐµÐºÐµÐ¼Ð²Ñ€Ð¸"
+
+#: widgets/utils.py:173
+#, python-format
+msgid "%(first)s to %(last)s %(month)s"
+msgstr "%(first)s Ð´Ð¾ %(last)s %(month)s"
+
+#: widgets/widgets.py:281
+#, python-format
+msgid "%s, Week %s"
+msgstr "%s, Ð¡ÐµÐ´Ð¼Ð¸Ñ†Ð° %s"
+
+#: widgets/widgets.py:294
+#, python-format
+msgid "%s - %s"
+msgstr "%s - %s"
+
+#: widgets/widgets.py:296 widgets/widgets.py:319 widgets/widgets.py:363
+#, python-format
+msgid "Week %s"
+msgstr "Ð¡ÐµÐ´Ð¼Ð¸Ñ†Ð¸ %s"
+
+#: widgets/widgets.py:311
+#, python-format
+msgid "%s, Qtr %s"
+msgstr "%s, Ð§ÐµÑ‚Ð²ÑŠÑ€Ñ‚ %s"
+
+#: widgets/widgets.py:330
+#, python-format
+msgid "W %s"
+msgstr "Ð¡ %s"
+
+#: widgets/widgets.py:338 widgets/widgets.py:352
+#, python-format
+msgid "Year %s to Year %s"
+msgstr "Ð“Ð¾Ð´Ð¸Ð½Ð° %s Ð´Ð¾ Ð“Ð¾Ð´Ð¸Ð½Ð° %s"
+
+#: widgets/templates/day.mako:4 widgets/templates/day.mako:7
+#: widgets/templates/gantt.mako:5 widgets/templates/gantt.mako:8
+#: widgets/templates/month.mako:4 widgets/templates/week.mako:4
+msgid "Today"
+msgstr "Ð”Ð½ÐµÑ"
+
+#: widgets/templates/day.mako:21 widgets/templates/month.mako:15
+#: widgets/templates/week.mako:18
+msgid "Month Calendar..."
+msgstr "ÐœÐµÑÐµÑ‡ÐµÐ½ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ€..."
+
+#: widgets/templates/day.mako:22 widgets/templates/month.mako:15
+#: widgets/templates/week.mako:19
+msgid "Month"
+msgstr "ÐœÐµÑÐµÑ†"
+
+#: widgets/templates/day.mako:25 widgets/templates/month.mako:18
+#: widgets/templates/week.mako:22
+msgid "Week Calendar..."
+msgstr "Ð¡ÐµÐ´Ð¼Ð¸Ñ‡ÐµÐ½ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ€..."
+
+#: widgets/templates/day.mako:26 widgets/templates/month.mako:19
+#: widgets/templates/week.mako:22
+msgid "Week"
+msgstr "Ð¡ÐµÐ´Ð¼Ð¸Ñ†Ð°"
+
+#: widgets/templates/day.mako:30 widgets/templates/month.mako:22
+#: widgets/templates/week.mako:25
+msgid "Day Calendar..."
+msgstr "Ð”Ð½ÐµÐ²ÐµÐ½ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ€..."
+
+#: widgets/templates/day.mako:30 widgets/templates/month.mako:23
+#: widgets/templates/week.mako:26
+msgid "Day"
+msgstr "Ð”ÐµÐ½"
+
+#: widgets/templates/gantt.mako:7 widgets/templates/month.mako:3
+#: widgets/templates/week.mako:3
+msgid "Today..."
+msgstr "Ð”Ð½ÐµÑ..."
+
+#: widgets/templates/gantt.mako:22 widgets/templates/gantt.mako:24
+msgid "Zoom In"
+msgstr "Ð£Ð²ÐµÐ»Ð¸Ñ‡Ð°Ð²Ð°Ð½Ðµ"
+
+#: widgets/templates/gantt.mako:30 widgets/templates/gantt.mako:32
+msgid "Zoom Out"
+msgstr "ÐÐ°Ð¼Ð°Ð»ÑÐ²Ð°Ð½Ðµ"
+
+#: widgets/templates/groups.mako:4
+msgid "Add"
+msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸"
+
+#: widgets/templates/sidebar.mako:3
+msgid "Navigator"
+msgstr "ÐÐ°Ð²Ð¸Ð³Ð°Ñ‚Ð¾Ñ€"
+
+#: widgets/templates/week.mako:13
+#, python-format
+msgid "Week %(number)s"
+msgstr "Ð¡ÐµÐ´Ð¼Ð¸Ñ†Ð° %(number)s"

=== added file 'addons/view_calendar/po/messages/ca.po.OTHER'
--- addons/view_calendar/po/messages/ca.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_calendar/po/messages/ca.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,216 @@
+# Catalan translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-24 17:48+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@xxxxxxxxxxxxxxx>\n"
+"Language-Team: Catalan <ca@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: controllers/templates/calpopup.mako:83
+msgid "Save"
+msgstr "Desa"
+
+#: controllers/templates/calpopup.mako:86
+msgid "Close"
+msgstr "Tanca"
+
+#: widgets/_views.py:10
+msgid "Calendar"
+msgstr "Calendari"
+
+#: widgets/_views.py:11
+msgid "Calendar view..."
+msgstr "Vista calendari..."
+
+#: widgets/_views.py:28
+msgid "Gantt"
+msgstr "Gantt"
+
+#: widgets/_views.py:29
+msgid "Gantt view..."
+msgstr "Vista Gantt..."
+
+#: widgets/utils.py:26
+msgid "Monday"
+msgstr "Dilluns"
+
+#: widgets/utils.py:27
+msgid "Tuesday"
+msgstr "Dimarts"
+
+#: widgets/utils.py:28
+msgid "Wednesday"
+msgstr "Dimecres"
+
+#: widgets/utils.py:29
+msgid "Thursday"
+msgstr "Dijous"
+
+#: widgets/utils.py:30
+msgid "Friday"
+msgstr "Divendres"
+
+#: widgets/utils.py:31
+msgid "Saturday"
+msgstr "Dissabte"
+
+#: widgets/utils.py:32
+msgid "Sunday"
+msgstr "Diumenge"
+
+#: widgets/utils.py:35
+msgid "January"
+msgstr "Gener"
+
+#: widgets/utils.py:36
+msgid "February"
+msgstr "Febrer"
+
+#: widgets/utils.py:37
+msgid "March"
+msgstr "MarÃ§"
+
+#: widgets/utils.py:38
+msgid "April"
+msgstr "Abril"
+
+#: widgets/utils.py:39
+msgid "May"
+msgstr "Maig"
+
+#: widgets/utils.py:40
+msgid "June"
+msgstr "Juny"
+
+#: widgets/utils.py:41
+msgid "July"
+msgstr "Juliol"
+
+#: widgets/utils.py:42
+msgid "August"
+msgstr "Agost"
+
+#: widgets/utils.py:43
+msgid "September"
+msgstr "Setembre"
+
+#: widgets/utils.py:44
+msgid "October"
+msgstr "Octubre"
+
+#: widgets/utils.py:45
+msgid "November"
+msgstr "Novembre"
+
+#: widgets/utils.py:46
+msgid "December"
+msgstr "Desembre"
+
+#: widgets/utils.py:173
+#, python-format
+msgid "%(first)s to %(last)s %(month)s"
+msgstr "%(first)s fins %(last)s %(month)s"
+
+#: widgets/widgets.py:281
+#, python-format
+msgid "%s, Week %s"
+msgstr "%s, Setmana %s"
+
+#: widgets/widgets.py:294
+#, python-format
+msgid "%s - %s"
+msgstr "%s - %s"
+
+#: widgets/widgets.py:296 widgets/widgets.py:319 widgets/widgets.py:363
+#, python-format
+msgid "Week %s"
+msgstr "Setmana %s"
+
+#: widgets/widgets.py:311
+#, python-format
+msgid "%s, Qtr %s"
+msgstr "%s, Trimestre %s"
+
+#: widgets/widgets.py:330
+#, python-format
+msgid "W %s"
+msgstr "S %s"
+
+#: widgets/widgets.py:338 widgets/widgets.py:352
+#, python-format
+msgid "Year %s to Year %s"
+msgstr "Any %s a any %s"
+
+#: widgets/templates/day.mako:4 widgets/templates/day.mako:7
+#: widgets/templates/gantt.mako:5 widgets/templates/gantt.mako:8
+#: widgets/templates/month.mako:4 widgets/templates/week.mako:4
+msgid "Today"
+msgstr "Avui"
+
+#: widgets/templates/day.mako:21 widgets/templates/month.mako:15
+#: widgets/templates/week.mako:18
+msgid "Month Calendar..."
+msgstr "Calendari mensual..."
+
+#: widgets/templates/day.mako:22 widgets/templates/month.mako:15
+#: widgets/templates/week.mako:19
+msgid "Month"
+msgstr "Mes"
+
+#: widgets/templates/day.mako:25 widgets/templates/month.mako:18
+#: widgets/templates/week.mako:22
+msgid "Week Calendar..."
+msgstr "Calendari setmanal..."
+
+#: widgets/templates/day.mako:26 widgets/templates/month.mako:19
+#: widgets/templates/week.mako:22
+msgid "Week"
+msgstr "Setmana"
+
+#: widgets/templates/day.mako:30 widgets/templates/month.mako:22
+#: widgets/templates/week.mako:25
+msgid "Day Calendar..."
+msgstr "Calendari diari..."
+
+#: widgets/templates/day.mako:30 widgets/templates/month.mako:23
+#: widgets/templates/week.mako:26
+msgid "Day"
+msgstr "Dia"
+
+#: widgets/templates/gantt.mako:7 widgets/templates/month.mako:3
+#: widgets/templates/week.mako:3
+msgid "Today..."
+msgstr "Avui..."
+
+#: widgets/templates/gantt.mako:22 widgets/templates/gantt.mako:24
+msgid "Zoom In"
+msgstr "Amplia"
+
+#: widgets/templates/gantt.mako:30 widgets/templates/gantt.mako:32
+msgid "Zoom Out"
+msgstr "Redueix"
+
+#: widgets/templates/groups.mako:4
+msgid "Add"
+msgstr "Afegeix"
+
+#: widgets/templates/sidebar.mako:3
+msgid "Navigator"
+msgstr "Navegador"
+
+#: widgets/templates/week.mako:13
+#, python-format
+msgid "Week %(number)s"
+msgstr "Setmana %(number)s"

=== modified file 'addons/view_calendar/po/messages/de.po'
--- addons/view_calendar/po/messages/de.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/de.po	2011-03-15 13:37:09 +0000
@@ -15,8 +15,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: controllers/templates/calpopup.mako:83

=== modified file 'addons/view_calendar/po/messages/es.po'
--- addons/view_calendar/po/messages/es.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/es.po	2011-03-15 13:37:09 +0000
@@ -15,8 +15,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/templates/calpopup.mako:83
 msgid "Save"

=== modified file 'addons/view_calendar/po/messages/eu.po'
--- addons/view_calendar/po/messages/eu.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/eu.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/templates/calpopup.mako:83
 msgid "Save"

=== added file 'addons/view_calendar/po/messages/fi.po.OTHER'
--- addons/view_calendar/po/messages/fi.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_calendar/po/messages/fi.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,215 @@
+# Finnish translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-03-01 09:02+0000\n"
+"Last-Translator: Jussi Mikkola <Unknown>\n"
+"Language-Team: Finnish <fi@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: controllers/templates/calpopup.mako:83
+msgid "Save"
+msgstr "Tallenna"
+
+#: controllers/templates/calpopup.mako:86
+msgid "Close"
+msgstr "Sulje"
+
+#: widgets/_views.py:10
+msgid "Calendar"
+msgstr "Kalenteri"
+
+#: widgets/_views.py:11
+msgid "Calendar view..."
+msgstr "KalenterinÃ¤kymÃ¤..."
+
+#: widgets/_views.py:28
+msgid "Gantt"
+msgstr "Gantt-kaavio"
+
+#: widgets/_views.py:29
+msgid "Gantt view..."
+msgstr "Gantt-kaavio"
+
+#: widgets/utils.py:26
+msgid "Monday"
+msgstr "Maanantai"
+
+#: widgets/utils.py:27
+msgid "Tuesday"
+msgstr "Tiistai"
+
+#: widgets/utils.py:28
+msgid "Wednesday"
+msgstr "Keskiviikko"
+
+#: widgets/utils.py:29
+msgid "Thursday"
+msgstr "Torstai"
+
+#: widgets/utils.py:30
+msgid "Friday"
+msgstr "Perjantai"
+
+#: widgets/utils.py:31
+msgid "Saturday"
+msgstr "Lauantai"
+
+#: widgets/utils.py:32
+msgid "Sunday"
+msgstr "Sunnuntai"
+
+#: widgets/utils.py:35
+msgid "January"
+msgstr "Tammikuu"
+
+#: widgets/utils.py:36
+msgid "February"
+msgstr "Helmikuu"
+
+#: widgets/utils.py:37
+msgid "March"
+msgstr "Maaliskuu"
+
+#: widgets/utils.py:38
+msgid "April"
+msgstr "Huhtikuu"
+
+#: widgets/utils.py:39
+msgid "May"
+msgstr "Toukokuu"
+
+#: widgets/utils.py:40
+msgid "June"
+msgstr "kesÃ¤kuu"
+
+#: widgets/utils.py:41
+msgid "July"
+msgstr "HeinÃ¤kuu"
+
+#: widgets/utils.py:42
+msgid "August"
+msgstr "Elokuu"
+
+#: widgets/utils.py:43
+msgid "September"
+msgstr "Syyskuu"
+
+#: widgets/utils.py:44
+msgid "October"
+msgstr "Lokakuu"
+
+#: widgets/utils.py:45
+msgid "November"
+msgstr "Marraskuu"
+
+#: widgets/utils.py:46
+msgid "December"
+msgstr "Joulukuu"
+
+#: widgets/utils.py:173
+#, python-format
+msgid "%(first)s to %(last)s %(month)s"
+msgstr ""
+
+#: widgets/widgets.py:281
+#, python-format
+msgid "%s, Week %s"
+msgstr "%s, Viikko %s"
+
+#: widgets/widgets.py:294
+#, python-format
+msgid "%s - %s"
+msgstr "%s - %s"
+
+#: widgets/widgets.py:296 widgets/widgets.py:319 widgets/widgets.py:363
+#, python-format
+msgid "Week %s"
+msgstr "viikko %s"
+
+#: widgets/widgets.py:311
+#, python-format
+msgid "%s, Qtr %s"
+msgstr "%s, Q%s"
+
+#: widgets/widgets.py:330
+#, python-format
+msgid "W %s"
+msgstr "Vkko %s"
+
+#: widgets/widgets.py:338 widgets/widgets.py:352
+#, python-format
+msgid "Year %s to Year %s"
+msgstr "V%s - %s"
+
+#: widgets/templates/day.mako:4 widgets/templates/day.mako:7
+#: widgets/templates/gantt.mako:5 widgets/templates/gantt.mako:8
+#: widgets/templates/month.mako:4 widgets/templates/week.mako:4
+msgid "Today"
+msgstr "TÃ¤nÃ¤Ã¤n"
+
+#: widgets/templates/day.mako:21 widgets/templates/month.mako:15
+#: widgets/templates/week.mako:18
+msgid "Month Calendar..."
+msgstr "Kuukausikalenteri"
+
+#: widgets/templates/day.mako:22 widgets/templates/month.mako:15
+#: widgets/templates/week.mako:19
+msgid "Month"
+msgstr "Kuukausi"
+
+#: widgets/templates/day.mako:25 widgets/templates/month.mako:18
+#: widgets/templates/week.mako:22
+msgid "Week Calendar..."
+msgstr "Viikkokalenteri"
+
+#: widgets/templates/day.mako:26 widgets/templates/month.mako:19
+#: widgets/templates/week.mako:22
+msgid "Week"
+msgstr "Viikko"
+
+#: widgets/templates/day.mako:30 widgets/templates/month.mako:22
+#: widgets/templates/week.mako:25
+msgid "Day Calendar..."
+msgstr "PÃ¤ivÃ¤kalenteri"
+
+#: widgets/templates/day.mako:30 widgets/templates/month.mako:23
+#: widgets/templates/week.mako:26
+msgid "Day"
+msgstr "PÃ¤ivÃ¤"
+
+#: widgets/templates/gantt.mako:7 widgets/templates/month.mako:3
+#: widgets/templates/week.mako:3
+msgid "Today..."
+msgstr "tÃ¤nÃ¤Ã¤n..."
+
+#: widgets/templates/gantt.mako:22 widgets/templates/gantt.mako:24
+msgid "Zoom In"
+msgstr "Suurenna"
+
+#: widgets/templates/gantt.mako:30 widgets/templates/gantt.mako:32
+msgid "Zoom Out"
+msgstr "PienennÃ¤"
+
+#: widgets/templates/groups.mako:4
+msgid "Add"
+msgstr "LisÃ¤Ã¤"
+
+#: widgets/templates/sidebar.mako:3
+msgid "Navigator"
+msgstr "Navigaattori"
+
+#: widgets/templates/week.mako:13
+#, python-format
+msgid "Week %(number)s"
+msgstr "Viikko %(number)s"

=== modified file 'addons/view_calendar/po/messages/fr.po'
--- addons/view_calendar/po/messages/fr.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/fr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: controllers/templates/calpopup.mako:83

=== modified file 'addons/view_calendar/po/messages/gl.po'
--- addons/view_calendar/po/messages/gl.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/gl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/templates/calpopup.mako:83
 msgid "Save"

=== modified file 'addons/view_calendar/po/messages/hr.po'
--- addons/view_calendar/po/messages/hr.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/hr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/templates/calpopup.mako:83
 msgid "Save"

=== modified file 'addons/view_calendar/po/messages/hu.po'
--- addons/view_calendar/po/messages/hu.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/hu.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/templates/calpopup.mako:83
 msgid "Save"

=== modified file 'addons/view_calendar/po/messages/it.po'
--- addons/view_calendar/po/messages/it.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/it.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: controllers/templates/calpopup.mako:83

=== modified file 'addons/view_calendar/po/messages/lt.po'
--- addons/view_calendar/po/messages/lt.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/lt.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/templates/calpopup.mako:83
 msgid "Save"

=== modified file 'addons/view_calendar/po/messages/lv.po'
--- addons/view_calendar/po/messages/lv.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/lv.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/templates/calpopup.mako:83
 msgid "Save"

=== modified file 'addons/view_calendar/po/messages/nl.po'
--- addons/view_calendar/po/messages/nl.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/nl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: controllers/templates/calpopup.mako:83

=== modified file 'addons/view_calendar/po/messages/pl.po'
--- addons/view_calendar/po/messages/pl.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/pl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: controllers/templates/calpopup.mako:83

=== modified file 'addons/view_calendar/po/messages/pt.po'
--- addons/view_calendar/po/messages/pt.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/pt.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/templates/calpopup.mako:83
 msgid "Save"

=== modified file 'addons/view_calendar/po/messages/pt_BR.po'
--- addons/view_calendar/po/messages/pt_BR.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/pt_BR.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: controllers/templates/calpopup.mako:83

=== modified file 'addons/view_calendar/po/messages/ru.po'
--- addons/view_calendar/po/messages/ru.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/ru.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/templates/calpopup.mako:83
 msgid "Save"

=== modified file 'addons/view_calendar/po/messages/sk.po'
--- addons/view_calendar/po/messages/sk.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/sk.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/templates/calpopup.mako:83
 msgid "Save"

=== modified file 'addons/view_calendar/po/messages/sr.po'
--- addons/view_calendar/po/messages/sr.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/sr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: controllers/templates/calpopup.mako:83

=== modified file 'addons/view_calendar/po/messages/sr@xxxxxxxx'
--- addons/view_calendar/po/messages/sr@xxxxxxxx	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/sr@xxxxxxxx	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/templates/calpopup.mako:83
 msgid "Save"

=== modified file 'addons/view_calendar/po/messages/sv.po'
--- addons/view_calendar/po/messages/sv.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/sv.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: controllers/templates/calpopup.mako:83

=== modified file 'addons/view_calendar/po/messages/tr.po'
--- addons/view_calendar/po/messages/tr.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/tr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: controllers/templates/calpopup.mako:83

=== modified file 'addons/view_calendar/po/messages/zh_CN.po'
--- addons/view_calendar/po/messages/zh_CN.po	2011-03-11 04:48:47 +0000
+++ addons/view_calendar/po/messages/zh_CN.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/templates/calpopup.mako:83
 msgid "Save"

=== added file 'addons/view_diagram/po/javascript/ar.po.OTHER'
--- addons/view_diagram/po/javascript/ar.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_diagram/po/javascript/ar.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,46 @@
+# Arabic translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-16 16:45+0000\n"
+"Last-Translator: kifcaliph <kifcaliph@xxxxxxxxxxx>\n"
+"Language-Team: Arabic <ar@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: static/javascript/infobox.js:135
+msgid "Do you really want to delete this record?"
+msgstr "Ù‡Ù„ ØªØ±ÙŠØ¯ ØØ°Ù Ù‡Ø°Ø§ Ø§Ù„Ø³Ø¬Ù„ØŸ"
+
+#: static/javascript/process.js:170
+msgid "Notes:"
+msgstr "Ù…Ù„Ø§ØØ¸Ø§Øª:"
+
+#: static/javascript/process.js:178
+msgid "Subflows:"
+msgstr "ØªØ¯ÙÙ‚Ø§Øª Ø¨ÙŠØ§Ù†ÙŠØ©:"
+
+#: static/javascript/process.js:182
+msgid "Related:"
+msgstr "Ù…ØªØ¹Ù„Ù‚:"
+
+#: static/javascript/process.js:266
+msgid "Help"
+msgstr "Ù…Ø³Ø§Ø¹Ø¯Ø©"
+
+#: static/javascript/workflow.js:317
+msgid "state could not be created"
+msgstr "Ù„Ø§ ÙŠÙ…ÙƒÙ† Ø¥Ø¬Ø±Ø§Ø¡ Ø§Ù„ØØ§Ù„Ø©"
+
+#: static/javascript/workflow.js:354
+msgid "Could not create transaction at server"
+msgstr "Ù„Ù… ÙŠØªÙ… Ø¥Ø¬Ø±Ø§Ø¡ Ø§Ù„Ø¹Ù…Ù„ÙŠØ© Ø¹Ù„ÙŠ Ø§Ù„Ø®Ø§Ø¯Ù…"

=== added file 'addons/view_diagram/po/javascript/bg.po.OTHER'
--- addons/view_diagram/po/javascript/bg.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_diagram/po/javascript/bg.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,46 @@
+# Bulgarian translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-27 09:00+0000\n"
+"Last-Translator: Dimitar Markov <dimitar.markov@xxxxxxxxx>\n"
+"Language-Team: Bulgarian <bg@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: static/javascript/infobox.js:135
+msgid "Do you really want to delete this record?"
+msgstr "ÐÐ°Ð¸ÑÑ‚Ð¸Ð½Ð° Ð»Ð¸ Ð¶ÐµÐ»Ð°ÐµÑ‚Ðµ Ð´Ð° Ð¸Ð·Ñ‚Ñ€Ð¸ÐµÑ‚Ðµ Ñ‚Ð¾Ð·Ð¸ Ð·Ð°Ð¿Ð¸Ñ"
+
+#: static/javascript/process.js:170
+msgid "Notes:"
+msgstr "Ð‘ÐµÐ»ÐµÐ¶ÐºÐ¸:"
+
+#: static/javascript/process.js:178
+msgid "Subflows:"
+msgstr "ÐŸÐ¾Ð´-Ð¿Ð¾Ñ‚Ð¾Ñ†Ð¸:"
+
+#: static/javascript/process.js:182
+msgid "Related:"
+msgstr "Ð¡Ð²ÑŠÑ€Ð°Ð·Ð½Ð¸"
+
+#: static/javascript/process.js:266
+msgid "Help"
+msgstr "ÐŸÐ¾Ð¼Ð¾Ñ‰"
+
+#: static/javascript/workflow.js:317
+msgid "state could not be created"
+msgstr "ÑÑŠÑÑ‚Ð¾ÑÐ½Ð¸Ðµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±ÑŠÐ´Ðµ ÑÑŠÐ·Ð´Ð°Ð´ÐµÐ½Ð¾"
+
+#: static/javascript/workflow.js:354
+msgid "Could not create transaction at server"
+msgstr "ÐÐµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÑŠÐ·Ð´Ð°Ð´Ðµ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ñ Ð½Ð° ÑÑŠÑ€Ð²ÑŠÑ€Ð°"

=== added file 'addons/view_diagram/po/javascript/ca.po.OTHER'
--- addons/view_diagram/po/javascript/ca.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_diagram/po/javascript/ca.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,47 @@
+# Catalan translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-24 16:59+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@xxxxxxxxxxxxxxx>\n"
+"Language-Team: Catalan <ca@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: static/javascript/infobox.js:135
+msgid "Do you really want to delete this record?"
+msgstr "Realment voleu eliminar aquest registre?"
+
+#: static/javascript/process.js:170
+msgid "Notes:"
+msgstr "Notes:"
+
+#: static/javascript/process.js:178
+msgid "Subflows:"
+msgstr "Subflujos:"
+
+#: static/javascript/process.js:182
+msgid "Related:"
+msgstr "Relacionat:"
+
+#: static/javascript/process.js:266
+msgid "Help"
+msgstr "Ajuda"
+
+#: static/javascript/workflow.js:317
+msgid "state could not be created"
+msgstr "estat no pot ser creat"
+
+#: static/javascript/workflow.js:354
+msgid "Could not create transaction at server"
+msgstr "No s'ha pogut crear una transacciÃ³ al servidor"

=== modified file 'addons/view_diagram/po/javascript/de.po'
--- addons/view_diagram/po/javascript/de.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/de.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/infobox.js:135

=== modified file 'addons/view_diagram/po/javascript/es.po'
--- addons/view_diagram/po/javascript/es.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/es.po	2011-03-15 13:37:09 +0000
@@ -15,8 +15,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/infobox.js:135
 msgid "Do you really want to delete this record?"

=== modified file 'addons/view_diagram/po/javascript/eu.po'
--- addons/view_diagram/po/javascript/eu.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/eu.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/infobox.js:135
 msgid "Do you really want to delete this record?"

=== added file 'addons/view_diagram/po/javascript/fi.po.OTHER'
--- addons/view_diagram/po/javascript/fi.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_diagram/po/javascript/fi.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,46 @@
+# Finnish translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-20 22:13+0000\n"
+"Last-Translator: Harri Luuppala <Unknown>\n"
+"Language-Team: Finnish <fi@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: static/javascript/infobox.js:135
+msgid "Do you really want to delete this record?"
+msgstr "Haluatko poistaa tÃ¤mÃ¤n tietueen?"
+
+#: static/javascript/process.js:170
+msgid "Notes:"
+msgstr "Huomautukset:"
+
+#: static/javascript/process.js:178
+msgid "Subflows:"
+msgstr "TyÃ¶nkulku (alataso):"
+
+#: static/javascript/process.js:182
+msgid "Related:"
+msgstr "Liittyy:"
+
+#: static/javascript/process.js:266
+msgid "Help"
+msgstr "Ohje"
+
+#: static/javascript/workflow.js:317
+msgid "state could not be created"
+msgstr "Tilaa ei votu luoda"
+
+#: static/javascript/workflow.js:354
+msgid "Could not create transaction at server"
+msgstr "Tapahtumaa ei voitu luoda palvelimelle"

=== modified file 'addons/view_diagram/po/javascript/fr.po'
--- addons/view_diagram/po/javascript/fr.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/fr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/infobox.js:135

=== modified file 'addons/view_diagram/po/javascript/gl.po'
--- addons/view_diagram/po/javascript/gl.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/gl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/infobox.js:135
 msgid "Do you really want to delete this record?"

=== modified file 'addons/view_diagram/po/javascript/hr.po'
--- addons/view_diagram/po/javascript/hr.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/hr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/infobox.js:135
 msgid "Do you really want to delete this record?"

=== modified file 'addons/view_diagram/po/javascript/hu.po'
--- addons/view_diagram/po/javascript/hu.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/hu.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/infobox.js:135
 msgid "Do you really want to delete this record?"

=== modified file 'addons/view_diagram/po/javascript/it.po'
--- addons/view_diagram/po/javascript/it.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/it.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/infobox.js:135

=== modified file 'addons/view_diagram/po/javascript/lt.po'
--- addons/view_diagram/po/javascript/lt.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/lt.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/infobox.js:135
 msgid "Do you really want to delete this record?"

=== modified file 'addons/view_diagram/po/javascript/lv.po'
--- addons/view_diagram/po/javascript/lv.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/lv.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/infobox.js:135
 msgid "Do you really want to delete this record?"

=== modified file 'addons/view_diagram/po/javascript/nl.po'
--- addons/view_diagram/po/javascript/nl.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/nl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:46+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/infobox.js:135

=== modified file 'addons/view_diagram/po/javascript/pl.po'
--- addons/view_diagram/po/javascript/pl.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/pl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/infobox.js:135
 msgid "Do you really want to delete this record?"

=== modified file 'addons/view_diagram/po/javascript/pt.po'
--- addons/view_diagram/po/javascript/pt.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/pt.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/infobox.js:135
 msgid "Do you really want to delete this record?"

=== modified file 'addons/view_diagram/po/javascript/pt_BR.po'
--- addons/view_diagram/po/javascript/pt_BR.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/pt_BR.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/infobox.js:135

=== modified file 'addons/view_diagram/po/javascript/ru.po'
--- addons/view_diagram/po/javascript/ru.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/ru.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/infobox.js:135
 msgid "Do you really want to delete this record?"

=== modified file 'addons/view_diagram/po/javascript/sk.po'
--- addons/view_diagram/po/javascript/sk.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/sk.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/infobox.js:135
 msgid "Do you really want to delete this record?"

=== modified file 'addons/view_diagram/po/javascript/sr.po'
--- addons/view_diagram/po/javascript/sr.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/sr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/infobox.js:135

=== modified file 'addons/view_diagram/po/javascript/sr@xxxxxxxx'
--- addons/view_diagram/po/javascript/sr@xxxxxxxx	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/sr@xxxxxxxx	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/infobox.js:135
 msgid "Do you really want to delete this record?"

=== modified file 'addons/view_diagram/po/javascript/sv.po'
--- addons/view_diagram/po/javascript/sv.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/sv.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/infobox.js:135

=== modified file 'addons/view_diagram/po/javascript/tr.po'
--- addons/view_diagram/po/javascript/tr.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/tr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/infobox.js:135
 msgid "Do you really want to delete this record?"

=== modified file 'addons/view_diagram/po/javascript/uk.po'
--- addons/view_diagram/po/javascript/uk.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/uk.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/infobox.js:135

=== modified file 'addons/view_diagram/po/javascript/zh_CN.po'
--- addons/view_diagram/po/javascript/zh_CN.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/javascript/zh_CN.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:47+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/infobox.js:135
 msgid "Do you really want to delete this record?"

=== added file 'addons/view_diagram/po/messages/ar.po.OTHER'
--- addons/view_diagram/po/messages/ar.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_diagram/po/messages/ar.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,128 @@
+# Arabic translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-16 16:59+0000\n"
+"Last-Translator: kifcaliph <kifcaliph@xxxxxxxxxxx>\n"
+"Language-Team: Arabic <ar@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: controllers/_diagram.py:89 controllers/_diagram.py:210
+msgid "Could not delete state"
+msgstr "Ù„Ø§ ÙŠÙ…ÙƒÙ† ØØ°Ù Ø§Ù„ØØ§Ù„Ø©"
+
+#: controllers/_diagram.py:274
+msgid "No workflow associated!"
+msgstr "Ù…Ø³Ø§Ø± Ø§Ù„Ø¹Ù…Ù„ÙŠØ© ØºÙŠØ± Ù…Ø±ØªØ¨Ø· !!"
+
+#: controllers/process.py:45
+msgid "Help: Not Defined"
+msgstr "Ù…Ø³Ø§Ø¹Ø¯Ø©: ØºÙŠØ± Ù…ÙØ¹Ø±ÙØ©"
+
+#: controllers/process.py:85
+#, python-format
+msgid "%(name)s - Resource: %(resource)s, State: %(state)s"
+msgstr "%(name)s - Ù…ØµØ¯Ø±: %(resource)s, ØØ§Ù„Ø©: %(state)s"
+
+#: controllers/process.py:97
+msgid "Last modified by:"
+msgstr "Ø¢Ø®Ø± ØªØ¹Ø¯ÙŠÙ„ Ø¨ÙˆØ§Ø³Ø·Ø©:"
+
+#: controllers/templates/process.mako:4 controllers/templates/process.mako:87
+#: controllers/templates/process_tip.mako:5
+msgid "Process"
+msgstr "Ø¹Ù…Ù„ÙŠÙ‘Ø©"
+
+#: controllers/templates/process.mako:55
+msgid "Documentation"
+msgstr "ÙˆØ«Ø§Ø¦Ù‚"
+
+#: controllers/templates/process.mako:56
+msgid "Read Documentation Online"
+msgstr "Ø§Ù‚Ø±Ø£ Ø§Ù„ÙˆØ«Ø§Ø¦Ù‚ Ù…Ù† Ø¹Ù„ÙŠ Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª"
+
+#: controllers/templates/process.mako:62
+msgid "Forum"
+msgstr "Ù…Ù†ØªØ¯Ù‰"
+
+#: controllers/templates/process.mako:63
+msgid "Community Discussion"
+msgstr "Ù†Ù‚Ø§Ø´ Ø§Ù„Ù…Ø¬ØªÙ…Ø¹"
+
+#: controllers/templates/process.mako:68
+msgid "Books"
+msgstr "ÙƒØªØ¨"
+
+#: controllers/templates/process.mako:69
+msgid "Get the book on Amazon"
+msgstr "Ù‚Ù… Ø¨Ø´Ø±Ø§Ø¦Ù‡ Ù…Ù† Ù…ÙˆÙ‚Ø¹ Amazon"
+
+#: controllers/templates/process.mako:74
+msgid "Support / Publisher Warranty"
+msgstr "Ø¶Ù…Ø§Ù† Ø§Ù„Ø¯Ø¹Ù… Ùˆ Ø§Ù„Ù†Ø´Ø±"
+
+#: controllers/templates/process.mako:75
+msgid "Get the OpenERP Warranty"
+msgstr "Ø§ØØµÙ„ Ø¹Ù„ÙŠ Ø¶Ù…Ø§Ù† OpenERP"
+
+#: controllers/templates/process.mako:97
+msgid "Select Process"
+msgstr "Ø§Ø®ØªØ± Ø§Ù„Ø¹Ù…Ù„ÙŠØ©"
+
+#: controllers/templates/process.mako:103
+msgid "Select"
+msgstr "Ø§Ø®ØªØ±"
+
+#: controllers/templates/process.mako:116
+msgid "[Edit Process]"
+msgstr "<ØØ±Ø± Ø§Ù„Ø¹Ù…Ù„ÙŠØ©>"
+
+#: controllers/templates/process.mako:117
+msgid "[show fields]"
+msgstr "<Ø§Ø¸Ù‡Ø± Ø§Ù„ØÙ‚ÙˆÙ„>"
+
+#: controllers/templates/process.mako:118
+msgid "[hide fields]"
+msgstr "<Ø¥Ø®ÙØ§Ø¡ Ø§Ù„ØÙ‚ÙˆÙ„>"
+
+#: controllers/templates/process_open.mako:54
+#: controllers/templates/process_tip.mako:20
+#: controllers/templates/wkf_popup.mako:52
+msgid "Close"
+msgstr "Ø¥ØºÙ„Ø§Ù‚"
+
+#: controllers/templates/process_open.mako:55
+#: controllers/templates/wkf_popup.mako:49
+msgid "Save"
+msgstr "ØÙÙ€Ø¸"
+
+#: controllers/templates/workflow.mako:4
+msgid "Workflow"
+msgstr "Ù…Ø³Ø§Ø± Ø§Ù„Ø¹Ù…Ù„"
+
+#: controllers/templates/workflow.mako:20
+#, python-format
+msgid "Workflow (%s)"
+msgstr "Ù…Ø³Ø§Ø± Ø§Ù„Ø¹Ù…Ù„ - (%s)"
+
+#: widgets/_views.py:8
+msgid "Diagram"
+msgstr "Ø§Ù„Ø±Ø³Ù… Ø§Ù„ØªØ®Ø·ÙŠØ·ÙŠ"
+
+#: widgets/_views.py:9
+msgid "Diagram view..."
+msgstr "Ø¹Ø±Ø¶ Ø§Ù„Ø±Ø³Ù… Ø§Ù„ØªØ®Ø·ÙŠØ·ÙŠ"
+
+#: widgets/templates/diagram.mako:27
+msgid "Loading..."
+msgstr "ØªØÙ…ÙŠÙ„..."

=== added file 'addons/view_diagram/po/messages/bg.po.OTHER'
--- addons/view_diagram/po/messages/bg.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_diagram/po/messages/bg.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,128 @@
+# Bulgarian translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-27 09:22+0000\n"
+"Last-Translator: Dimitar Markov <dimitar.markov@xxxxxxxxx>\n"
+"Language-Team: Bulgarian <bg@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: controllers/_diagram.py:89 controllers/_diagram.py:210
+msgid "Could not delete state"
+msgstr ""
+
+#: controllers/_diagram.py:274
+msgid "No workflow associated!"
+msgstr "ÐÐµ Ðµ ÑÐ²ÑŠÑ€Ð·Ð°Ð½ Ñ€Ð°Ð±Ð¾Ñ‚ÐµÐ½ Ð¿Ð¾Ñ‚Ð¾Ðº"
+
+#: controllers/process.py:45
+msgid "Help: Not Defined"
+msgstr "ÐŸÐ¾Ð¼Ð¾Ñ‰: ÐÐµ Ðµ Ð´ÐµÑ„Ð¸Ð½Ð¸Ñ€Ð°Ð½Ð°"
+
+#: controllers/process.py:85
+#, python-format
+msgid "%(name)s - Resource: %(resource)s, State: %(state)s"
+msgstr ""
+
+#: controllers/process.py:97
+msgid "Last modified by:"
+msgstr "ÐŸÐ¾ÑÐ»ÐµÐ´Ð½Ð° Ð¿Ñ€Ð¾Ð¼ÑÐ½Ð° Ð¾Ñ‚:"
+
+#: controllers/templates/process.mako:4 controllers/templates/process.mako:87
+#: controllers/templates/process_tip.mako:5
+msgid "Process"
+msgstr "ÐžÐ±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ°"
+
+#: controllers/templates/process.mako:55
+msgid "Documentation"
+msgstr "Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ñ"
+
+#: controllers/templates/process.mako:56
+msgid "Read Documentation Online"
+msgstr "ÐŸÑ€Ð¾Ñ‡ÐµÑ‚Ðµ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸ÑÑ‚Ð°"
+
+#: controllers/templates/process.mako:62
+msgid "Forum"
+msgstr "Ð¤Ð¾Ñ€ÑƒÐ¼"
+
+#: controllers/templates/process.mako:63
+msgid "Community Discussion"
+msgstr "Ð”Ð¸ÑÐºÑƒÑÐ¸Ñ Ð² Ð¾Ð±Ñ‰ÐµÑÑ‚Ð²Ð¾Ñ‚Ð¾"
+
+#: controllers/templates/process.mako:68
+msgid "Books"
+msgstr "ÐšÐ½Ð¸Ð³Ð¸"
+
+#: controllers/templates/process.mako:69
+msgid "Get the book on Amazon"
+msgstr "Ð’Ð·ÐµÐ¼ÐµÑ‚Ðµ ÐºÐ½Ð¸Ð³Ð°Ñ‚Ð° Ð¾Ñ‚ ÐÐ¼Ð°Ð·Ð¾Ð½"
+
+#: controllers/templates/process.mako:74
+msgid "Support / Publisher Warranty"
+msgstr ""
+
+#: controllers/templates/process.mako:75
+msgid "Get the OpenERP Warranty"
+msgstr "Ð’Ð·ÐµÐ¼ÐµÑ‚Ðµ OpenERP Warranty"
+
+#: controllers/templates/process.mako:97
+msgid "Select Process"
+msgstr "Ð˜Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ð¿Ñ€Ð¾Ñ†ÐµÑ"
+
+#: controllers/templates/process.mako:103
+msgid "Select"
+msgstr "Ð˜Ð·Ð±Ð¾Ñ€"
+
+#: controllers/templates/process.mako:116
+msgid "[Edit Process]"
+msgstr "[Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð°Ð¹ Ð¿Ñ€Ð¾Ñ†ÐµÑ]"
+
+#: controllers/templates/process.mako:117
+msgid "[show fields]"
+msgstr "[Ð¿Ð¾ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ð»ÐµÑ‚Ð°]"
+
+#: controllers/templates/process.mako:118
+msgid "[hide fields]"
+msgstr "[ÑÐºÑ€Ð¸Ð¹ Ð¿Ð¾Ð»ÐµÑ‚Ð°]"
+
+#: controllers/templates/process_open.mako:54
+#: controllers/templates/process_tip.mako:20
+#: controllers/templates/wkf_popup.mako:52
+msgid "Close"
+msgstr "Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸"
+
+#: controllers/templates/process_open.mako:55
+#: controllers/templates/wkf_popup.mako:49
+msgid "Save"
+msgstr "Ð—Ð°Ð¿Ð°Ð·Ð¸"
+
+#: controllers/templates/workflow.mako:4
+msgid "Workflow"
+msgstr "Ð Ð°Ð±Ð¾Ñ‚ÐµÐ½ Ð¿Ð¾Ñ‚Ð¾Ðº"
+
+#: controllers/templates/workflow.mako:20
+#, python-format
+msgid "Workflow (%s)"
+msgstr "Ð Ð°Ð±Ð¾Ñ‚ÐµÐ½ Ð¿Ð¾Ñ‚Ð¾Ðº (%s)"
+
+#: widgets/_views.py:8
+msgid "Diagram"
+msgstr "Ð“Ñ€Ð°Ñ„Ð¸ÐºÐ°"
+
+#: widgets/_views.py:9
+msgid "Diagram view..."
+msgstr "Ð’Ð¸Ð¶ ÐºÐ°Ñ‚Ð¾ Ð´Ð¸Ð°Ð³Ñ€Ð°Ð¼Ð°"
+
+#: widgets/templates/diagram.mako:27
+msgid "Loading..."
+msgstr "Ð—Ð°Ñ€ÐµÐ¶Ð´Ð° ÑÐµ..."

=== added file 'addons/view_diagram/po/messages/ca.po.OTHER'
--- addons/view_diagram/po/messages/ca.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_diagram/po/messages/ca.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,129 @@
+# Catalan translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-24 18:40+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@xxxxxxxxxxxxxxx>\n"
+"Language-Team: Catalan <ca@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: controllers/_diagram.py:89 controllers/_diagram.py:210
+msgid "Could not delete state"
+msgstr "No es pot eliminar l'estat"
+
+#: controllers/_diagram.py:274
+msgid "No workflow associated!"
+msgstr "No hi ha associat un flux de treball!"
+
+#: controllers/process.py:45
+msgid "Help: Not Defined"
+msgstr "Ajuda: No estÃ  definit"
+
+#: controllers/process.py:85
+#, python-format
+msgid "%(name)s - Resource: %(resource)s, State: %(state)s"
+msgstr "%(name)s - Recurs: %(resource)s, Estat: %(state)s"
+
+#: controllers/process.py:97
+msgid "Last modified by:"
+msgstr "Ãšltima modificaciÃ³ per:"
+
+#: controllers/templates/process.mako:4 controllers/templates/process.mako:87
+#: controllers/templates/process_tip.mako:5
+msgid "Process"
+msgstr "ProcÃ©s"
+
+#: controllers/templates/process.mako:55
+msgid "Documentation"
+msgstr "DocumentaciÃ³"
+
+#: controllers/templates/process.mako:56
+msgid "Read Documentation Online"
+msgstr "Llegeix documentaciÃ³ online"
+
+#: controllers/templates/process.mako:62
+msgid "Forum"
+msgstr "FÃ²rum"
+
+#: controllers/templates/process.mako:63
+msgid "Community Discussion"
+msgstr "Debat de la comunitat"
+
+#: controllers/templates/process.mako:68
+msgid "Books"
+msgstr "Llibres"
+
+#: controllers/templates/process.mako:69
+msgid "Get the book on Amazon"
+msgstr "ObtÃ© el llibre des d'Amazon"
+
+#: controllers/templates/process.mako:74
+msgid "Support / Publisher Warranty"
+msgstr "Suport / Garantia de l'editor"
+
+#: controllers/templates/process.mako:75
+msgid "Get the OpenERP Warranty"
+msgstr "ObtÃ© la garantia d'OpenERP"
+
+#: controllers/templates/process.mako:97
+msgid "Select Process"
+msgstr "Selecciona procÃ©s"
+
+#: controllers/templates/process.mako:103
+msgid "Select"
+msgstr "Selecciona"
+
+#: controllers/templates/process.mako:116
+msgid "[Edit Process]"
+msgstr "[Edita procÃ©s]"
+
+#: controllers/templates/process.mako:117
+msgid "[show fields]"
+msgstr "[mostra camps]"
+
+#: controllers/templates/process.mako:118
+msgid "[hide fields]"
+msgstr "[oculta camps]"
+
+#: controllers/templates/process_open.mako:54
+#: controllers/templates/process_tip.mako:20
+#: controllers/templates/wkf_popup.mako:52
+msgid "Close"
+msgstr "Tanca"
+
+#: controllers/templates/process_open.mako:55
+#: controllers/templates/wkf_popup.mako:49
+msgid "Save"
+msgstr "Desa"
+
+#: controllers/templates/workflow.mako:4
+msgid "Workflow"
+msgstr "Flux"
+
+#: controllers/templates/workflow.mako:20
+#, python-format
+msgid "Workflow (%s)"
+msgstr "Flux (%s)"
+
+#: widgets/_views.py:8
+msgid "Diagram"
+msgstr "Diagrama"
+
+#: widgets/_views.py:9
+msgid "Diagram view..."
+msgstr "Vista diagrama..."
+
+#: widgets/templates/diagram.mako:27
+msgid "Loading..."
+msgstr "S'estÃ  carregant..."

=== modified file 'addons/view_diagram/po/messages/de.po'
--- addons/view_diagram/po/messages/de.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/de.po	2011-03-15 13:37:09 +0000
@@ -15,8 +15,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210

=== modified file 'addons/view_diagram/po/messages/es.po'
--- addons/view_diagram/po/messages/es.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/es.po	2011-03-15 13:37:09 +0000
@@ -15,8 +15,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210
 msgid "Could not delete state"

=== modified file 'addons/view_diagram/po/messages/eu.po'
--- addons/view_diagram/po/messages/eu.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/eu.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210
 msgid "Could not delete state"

=== added file 'addons/view_diagram/po/messages/fi.po.OTHER'
--- addons/view_diagram/po/messages/fi.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_diagram/po/messages/fi.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,128 @@
+# Finnish translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-20 21:51+0000\n"
+"Last-Translator: Harri Luuppala <Unknown>\n"
+"Language-Team: Finnish <fi@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: controllers/_diagram.py:89 controllers/_diagram.py:210
+msgid "Could not delete state"
+msgstr "Tilaa ei voi poistaa"
+
+#: controllers/_diagram.py:274
+msgid "No workflow associated!"
+msgstr "TyÃ¶nkulkua ei ole!"
+
+#: controllers/process.py:45
+msgid "Help: Not Defined"
+msgstr "Ohjetta ei ole!"
+
+#: controllers/process.py:85
+#, python-format
+msgid "%(name)s - Resource: %(resource)s, State: %(state)s"
+msgstr "%(name)s - Resurssi: %(resource)s, Tila: %(state)s"
+
+#: controllers/process.py:97
+msgid "Last modified by:"
+msgstr "Viimeksi muokkasi:"
+
+#: controllers/templates/process.mako:4 controllers/templates/process.mako:87
+#: controllers/templates/process_tip.mako:5
+msgid "Process"
+msgstr "Prosessi"
+
+#: controllers/templates/process.mako:55
+msgid "Documentation"
+msgstr "Dokumentaatio"
+
+#: controllers/templates/process.mako:56
+msgid "Read Documentation Online"
+msgstr "Lue dokumentaatio verkosta"
+
+#: controllers/templates/process.mako:62
+msgid "Forum"
+msgstr "Keskustelualue"
+
+#: controllers/templates/process.mako:63
+msgid "Community Discussion"
+msgstr "YhteisÃ¶n keskustelut"
+
+#: controllers/templates/process.mako:68
+msgid "Books"
+msgstr "Kirjat"
+
+#: controllers/templates/process.mako:69
+msgid "Get the book on Amazon"
+msgstr "Hanki kirja Amazonista"
+
+#: controllers/templates/process.mako:74
+msgid "Support / Publisher Warranty"
+msgstr "Tuki / Valmistajan takuu"
+
+#: controllers/templates/process.mako:75
+msgid "Get the OpenERP Warranty"
+msgstr "Hanki OpenErp takuu"
+
+#: controllers/templates/process.mako:97
+msgid "Select Process"
+msgstr "Valitse Prosessi"
+
+#: controllers/templates/process.mako:103
+msgid "Select"
+msgstr "Valitse"
+
+#: controllers/templates/process.mako:116
+msgid "[Edit Process]"
+msgstr "[Muokkaa prosessia]"
+
+#: controllers/templates/process.mako:117
+msgid "[show fields]"
+msgstr "[nÃ¤ytÃ¤ kentÃ¤t]"
+
+#: controllers/templates/process.mako:118
+msgid "[hide fields]"
+msgstr "[piilota kentÃ¤t]"
+
+#: controllers/templates/process_open.mako:54
+#: controllers/templates/process_tip.mako:20
+#: controllers/templates/wkf_popup.mako:52
+msgid "Close"
+msgstr "Sulje"
+
+#: controllers/templates/process_open.mako:55
+#: controllers/templates/wkf_popup.mako:49
+msgid "Save"
+msgstr "Tallenna"
+
+#: controllers/templates/workflow.mako:4
+msgid "Workflow"
+msgstr "TyÃ¶nkulku"
+
+#: controllers/templates/workflow.mako:20
+#, python-format
+msgid "Workflow (%s)"
+msgstr "TyÃ¶nkulku (%s)"
+
+#: widgets/_views.py:8
+msgid "Diagram"
+msgstr "Kaavio"
+
+#: widgets/_views.py:9
+msgid "Diagram view..."
+msgstr "KaavionÃ¤kymÃ¤"
+
+#: widgets/templates/diagram.mako:27
+msgid "Loading..."
+msgstr "Lataa"

=== modified file 'addons/view_diagram/po/messages/fr.po'
--- addons/view_diagram/po/messages/fr.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/fr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210

=== modified file 'addons/view_diagram/po/messages/gl.po'
--- addons/view_diagram/po/messages/gl.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/gl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210
 msgid "Could not delete state"

=== modified file 'addons/view_diagram/po/messages/hr.po'
--- addons/view_diagram/po/messages/hr.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/hr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210
 msgid "Could not delete state"

=== modified file 'addons/view_diagram/po/messages/hu.po'
--- addons/view_diagram/po/messages/hu.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/hu.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210
 msgid "Could not delete state"

=== modified file 'addons/view_diagram/po/messages/it.po'
--- addons/view_diagram/po/messages/it.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/it.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210

=== modified file 'addons/view_diagram/po/messages/lt.po'
--- addons/view_diagram/po/messages/lt.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/lt.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210
 msgid "Could not delete state"

=== modified file 'addons/view_diagram/po/messages/lv.po'
--- addons/view_diagram/po/messages/lv.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/lv.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210
 msgid "Could not delete state"

=== modified file 'addons/view_diagram/po/messages/nl.po'
--- addons/view_diagram/po/messages/nl.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/nl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210

=== modified file 'addons/view_diagram/po/messages/pl.po'
--- addons/view_diagram/po/messages/pl.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/pl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210

=== modified file 'addons/view_diagram/po/messages/pt.po'
--- addons/view_diagram/po/messages/pt.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/pt.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210
 msgid "Could not delete state"

=== modified file 'addons/view_diagram/po/messages/pt_BR.po'
--- addons/view_diagram/po/messages/pt_BR.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/pt_BR.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210

=== modified file 'addons/view_diagram/po/messages/ru.po'
--- addons/view_diagram/po/messages/ru.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/ru.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210
 msgid "Could not delete state"

=== modified file 'addons/view_diagram/po/messages/sk.po'
--- addons/view_diagram/po/messages/sk.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/sk.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210
 msgid "Could not delete state"

=== modified file 'addons/view_diagram/po/messages/sr.po'
--- addons/view_diagram/po/messages/sr.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/sr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210

=== modified file 'addons/view_diagram/po/messages/sr@xxxxxxxx'
--- addons/view_diagram/po/messages/sr@xxxxxxxx	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/sr@xxxxxxxx	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210
 msgid "Could not delete state"

=== modified file 'addons/view_diagram/po/messages/sv.po'
--- addons/view_diagram/po/messages/sv.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/sv.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210

=== modified file 'addons/view_diagram/po/messages/tr.po'
--- addons/view_diagram/po/messages/tr.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/tr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210
 msgid "Could not delete state"

=== modified file 'addons/view_diagram/po/messages/uk.po'
--- addons/view_diagram/po/messages/uk.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/uk.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210

=== modified file 'addons/view_diagram/po/messages/zh_CN.po'
--- addons/view_diagram/po/messages/zh_CN.po	2011-03-11 04:48:47 +0000
+++ addons/view_diagram/po/messages/zh_CN.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: controllers/_diagram.py:89 controllers/_diagram.py:210
 msgid "Could not delete state"

=== modified file 'addons/view_graph/po/javascript/de.po'
--- addons/view_graph/po/javascript/de.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/javascript/de.po	2011-03-15 13:37:09 +0000
@@ -14,7 +14,12 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 

=== modified file 'addons/view_graph/po/javascript/fr.po'
--- addons/view_graph/po/javascript/fr.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/javascript/fr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 

=== modified file 'addons/view_graph/po/javascript/gl.po'
--- addons/view_graph/po/javascript/gl.po	2011-02-17 16:05:42 +0000
+++ addons/view_graph/po/javascript/gl.po	2011-03-15 13:37:09 +0000
@@ -16,5 +16,10 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 

=== modified file 'addons/view_graph/po/javascript/it.po'
--- addons/view_graph/po/javascript/it.po	2011-02-17 16:05:42 +0000
+++ addons/view_graph/po/javascript/it.po	2011-03-15 13:37:09 +0000
@@ -16,5 +16,10 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 

=== modified file 'addons/view_graph/po/javascript/nl.po'
--- addons/view_graph/po/javascript/nl.po	2011-02-17 16:05:42 +0000
+++ addons/view_graph/po/javascript/nl.po	2011-03-15 13:37:09 +0000
@@ -16,5 +16,10 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 

=== modified file 'addons/view_graph/po/javascript/pt_BR.po'
--- addons/view_graph/po/javascript/pt_BR.po	2011-02-17 16:05:42 +0000
+++ addons/view_graph/po/javascript/pt_BR.po	2011-03-15 13:37:09 +0000
@@ -16,5 +16,10 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 

=== modified file 'addons/view_graph/po/javascript/sr.po'
--- addons/view_graph/po/javascript/sr.po	2011-02-17 16:05:42 +0000
+++ addons/view_graph/po/javascript/sr.po	2011-03-15 13:37:09 +0000
@@ -17,5 +17,10 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 

=== modified file 'addons/view_graph/po/javascript/sr@xxxxxxxx'
--- addons/view_graph/po/javascript/sr@xxxxxxxx	2011-02-17 16:05:42 +0000
+++ addons/view_graph/po/javascript/sr@xxxxxxxx	2011-03-15 13:37:09 +0000
@@ -17,5 +17,10 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 

=== modified file 'addons/view_graph/po/javascript/sv.po'
--- addons/view_graph/po/javascript/sv.po	2011-02-17 16:05:42 +0000
+++ addons/view_graph/po/javascript/sv.po	2011-03-15 13:37:09 +0000
@@ -16,5 +16,10 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 

=== modified file 'addons/view_graph/po/javascript/uk.po'
--- addons/view_graph/po/javascript/uk.po	2011-02-17 16:05:42 +0000
+++ addons/view_graph/po/javascript/uk.po	2011-03-15 13:37:09 +0000
@@ -17,5 +17,10 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:13+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 

=== added file 'addons/view_graph/po/messages/ar.po.OTHER'
--- addons/view_graph/po/messages/ar.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_graph/po/messages/ar.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,26 @@
+# Arabic translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-16 16:44+0000\n"
+"Last-Translator: kifcaliph <kifcaliph@xxxxxxxxxxx>\n"
+"Language-Team: Arabic <ar@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: widgets/_views.py:8
+msgid "Graph"
+msgstr "Ø§Ù„Ø±Ø³Ù… Ø§Ù„Ø¨ÙŠØ§Ù†ÙŠ"
+
+#: widgets/_views.py:9
+msgid "Graph view..."
+msgstr "Ø¹Ø±Ø¶ Ø§Ù„Ø±Ø³Ù… Ø§Ù„Ø¨ÙŠØ§Ù†ÙŠ..."

=== added file 'addons/view_graph/po/messages/bg.po.OTHER'
--- addons/view_graph/po/messages/bg.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_graph/po/messages/bg.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,26 @@
+# Bulgarian translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-27 08:06+0000\n"
+"Last-Translator: Dimitar Markov <dimitar.markov@xxxxxxxxx>\n"
+"Language-Team: Bulgarian <bg@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: widgets/_views.py:8
+msgid "Graph"
+msgstr "Ð“Ñ€Ð°Ñ„Ð¸ÐºÐ°"
+
+#: widgets/_views.py:9
+msgid "Graph view..."
+msgstr "Ð’Ð¸Ð¶ Ð³Ñ€Ð°Ñ„Ð¸ÐºÐ°..."

=== added file 'addons/view_graph/po/messages/ca.po.OTHER'
--- addons/view_graph/po/messages/ca.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_graph/po/messages/ca.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,27 @@
+# Catalan translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-24 17:00+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@xxxxxxxxxxxxxxx>\n"
+"Language-Team: Catalan <ca@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: widgets/_views.py:8
+msgid "Graph"
+msgstr "GrÃ fic"
+
+#: widgets/_views.py:9
+msgid "Graph view..."
+msgstr "Vista grÃ fic..."

=== modified file 'addons/view_graph/po/messages/de.po'
--- addons/view_graph/po/messages/de.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/de.po	2011-03-15 13:37:09 +0000
@@ -15,8 +15,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: widgets/_views.py:8

=== modified file 'addons/view_graph/po/messages/es.po'
--- addons/view_graph/po/messages/es.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/es.po	2011-03-15 13:37:09 +0000
@@ -15,8 +15,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: widgets/_views.py:8
 msgid "Graph"

=== modified file 'addons/view_graph/po/messages/eu.po'
--- addons/view_graph/po/messages/eu.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/eu.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: widgets/_views.py:8
 msgid "Graph"

=== added file 'addons/view_graph/po/messages/fi.po.OTHER'
--- addons/view_graph/po/messages/fi.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/view_graph/po/messages/fi.po.OTHER	2011-03-15 13:37:09 +0000
@@ -0,0 +1,26 @@
+# Finnish translation for openobject-client-web
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-17 13:09+0100\n"
+"PO-Revision-Date: 2011-02-20 22:14+0000\n"
+"Last-Translator: Harri Luuppala <Unknown>\n"
+"Language-Team: Finnish <fi@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#: widgets/_views.py:8
+msgid "Graph"
+msgstr "Kuvaaja"
+
+#: widgets/_views.py:9
+msgid "Graph view..."
+msgstr "Kuvaajat..."

=== modified file 'addons/view_graph/po/messages/fr.po'
--- addons/view_graph/po/messages/fr.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/fr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: widgets/_views.py:8

=== modified file 'addons/view_graph/po/messages/gl.po'
--- addons/view_graph/po/messages/gl.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/gl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: widgets/_views.py:8
 msgid "Graph"

=== modified file 'addons/view_graph/po/messages/hr.po'
--- addons/view_graph/po/messages/hr.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/hr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: widgets/_views.py:8
 msgid "Graph"

=== modified file 'addons/view_graph/po/messages/hu.po'
--- addons/view_graph/po/messages/hu.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/hu.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: widgets/_views.py:8
 msgid "Graph"

=== modified file 'addons/view_graph/po/messages/it.po'
--- addons/view_graph/po/messages/it.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/it.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: widgets/_views.py:8

=== modified file 'addons/view_graph/po/messages/lt.po'
--- addons/view_graph/po/messages/lt.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/lt.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: widgets/_views.py:8
 msgid "Graph"

=== modified file 'addons/view_graph/po/messages/lv.po'
--- addons/view_graph/po/messages/lv.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/lv.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: widgets/_views.py:8
 msgid "Graph"

=== modified file 'addons/view_graph/po/messages/nl.po'
--- addons/view_graph/po/messages/nl.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/nl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: widgets/_views.py:8

=== modified file 'addons/view_graph/po/messages/pl.po'
--- addons/view_graph/po/messages/pl.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/pl.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: widgets/_views.py:8
 msgid "Graph"

=== modified file 'addons/view_graph/po/messages/pt.po'
--- addons/view_graph/po/messages/pt.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/pt.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: widgets/_views.py:8
 msgid "Graph"

=== modified file 'addons/view_graph/po/messages/pt_BR.po'
--- addons/view_graph/po/messages/pt_BR.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/pt_BR.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: widgets/_views.py:8

=== modified file 'addons/view_graph/po/messages/ru.po'
--- addons/view_graph/po/messages/ru.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/ru.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: widgets/_views.py:8
 msgid "Graph"

=== modified file 'addons/view_graph/po/messages/sk.po'
--- addons/view_graph/po/messages/sk.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/sk.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: widgets/_views.py:8
 msgid "Graph"

=== modified file 'addons/view_graph/po/messages/sr.po'
--- addons/view_graph/po/messages/sr.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/sr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: widgets/_views.py:8

=== modified file 'addons/view_graph/po/messages/sr@xxxxxxxx'
--- addons/view_graph/po/messages/sr@xxxxxxxx	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/sr@xxxxxxxx	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: widgets/_views.py:8
 msgid "Graph"

=== modified file 'addons/view_graph/po/messages/sv.po'
--- addons/view_graph/po/messages/sv.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/sv.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: widgets/_views.py:8

=== modified file 'addons/view_graph/po/messages/tr.po'
--- addons/view_graph/po/messages/tr.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/tr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: widgets/_views.py:8
 msgid "Graph"

=== modified file 'addons/view_graph/po/messages/uk.po'
--- addons/view_graph/po/messages/uk.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/uk.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: widgets/_views.py:8

=== modified file 'addons/view_graph/po/messages/zh_CN.po'
--- addons/view_graph/po/messages/zh_CN.po	2011-03-11 04:48:47 +0000
+++ addons/view_graph/po/messages/zh_CN.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 
 #: widgets/_views.py:8
 msgid "Graph"

=== modified file 'addons/widget_ckeditor/po/javascript/fr.po'
--- addons/widget_ckeditor/po/javascript/fr.po	2011-03-11 04:48:47 +0000
+++ addons/widget_ckeditor/po/javascript/fr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 

=== modified file 'addons/widget_ckeditor/po/messages/fr.po'
--- addons/widget_ckeditor/po/messages/fr.po	2011-03-11 04:48:47 +0000
+++ addons/widget_ckeditor/po/messages/fr.po	2011-03-15 13:37:09 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-03-11 04:48+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 06:14+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"

Follow ups

Re: [Merge] lp:~openerp-dev/openobject-client-web/6.0-opw-4311-sma into lp:openobject-client-web
From: Xavier (Open ERP), 2011-03-16
Re: [Merge] lp:~openerp-dev/openobject-client-web/6.0-opw-4311-sma into lp:openobject-client-web
From: Xavier (Open ERP), 2011-03-16