Merge lp:~openerp-dev/openobject-client-web/6.0-opw-16576-vro into lp:openobject-client-web/trunk

[Valencia Rodrigues (OpenERP)]

Hello,

A difference has been noticed between v5 and v6.

In v5, under the Attachments section, filenames would appear with their extension. Thus eventually, when you click the link to open the file, it's related handler would be available to open it.

In v6, the extension does not appear and so the related handler has to be manually searched for each attachment which is quite annoying.

Steps to reproduce this behavior:

1. Create an invoice and print the "Invoices" report.
2. Refresh the page to see a new attachment link under the "Attachments" section (it will be without an extension).
3. Click the link to bring up a dialog box (the file type is recognized as BIN).

This proposal resolves the issue.

Thanks

Unmerged revisions

4675. By Valencia Rodrigues (OpenERP) on 2011-08-05

[IMP] : Attachment filename extensions in the sidebar

4674. By Chirag Patel(OpenERP) on 2011-08-04

[FIX] Correction over the commit http://bazaar.launchpad.net/~openerp/openobject-client-web/6.0/revision/4671

4673. By Launchpad Translations on behalf of openerp on 2011-08-04

Launchpad automatic translations update.

4672. By Jay Vora (Serpent Consulting Services) on 2011-08-03

[MERGE] Merged Mohammed's branch for the fix of reloading M2M field when the result of on_change method returns []

4671. By Xavier (Open ERP) on 2011-07-27

[FIX] m2o search popup failing to open when calling it explicitly (via looking glass) if no text has been entered in the input

4670. By Launchpad Translations on behalf of openerp on 2011-07-23

Launchpad automatic translations update.

4669. By Launchpad Translations on behalf of openerp on 2011-07-20

Launchpad automatic translations update.

4668. By Jay Vora (Serpent Consulting Services) on 2011-07-18

[REVERT] Reverted the revision 4665 <email address hidden>

4667. By Sananaz (Open ERP) on 2011-07-12

[REV] Revert revision 4657.

4666. By Launchpad Translations on behalf of openerp on 2011-07-12

Launchpad automatic translations update.

=== modified file 'addons/openerp/controllers/attachment.py'
--- addons/openerp/controllers/attachment.py	2011-02-10 16:09:23 +0000
+++ addons/openerp/controllers/attachment.py	2011-08-05 10:11:55 +0000
@@ -60,7 +60,7 @@
         attachment = rpc.RPCProxy('ir.attachment').read(record, [], rpc.get_session().context)
 
         if attachment['type'] == 'binary':
-            cherrypy.response.headers["Content-Disposition"] = 'attachment; filename="%s"' % attachment['name']
+            cherrypy.response.headers["Content-Disposition"] = 'attachment; filename="%s"' % attachment['datas_fname']
             return base64.decodestring(attachment['datas'])
         elif attachment['type'] == 'url':
             raise redirect(attachment['url'])

=== modified file 'addons/openerp/controllers/root.py'
--- addons/openerp/controllers/root.py	2011-07-08 11:10:25 +0000
+++ addons/openerp/controllers/root.py	2011-08-05 10:11:55 +0000
@@ -53,7 +53,7 @@
             if user_action_id:
                 next = '/openerp/home'
         if active:
-            return self.menu(next, active)
+            return self.menu(active, next)
 
         return self.menu(next=next)
 

=== 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-08-05 10:11:55 +0000
@@ -0,0 +1,103 @@
+# 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-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-03-18 23:56+0000\n"
+"Last-Translator: kifcaliph <[e-mail]>\n"
+"Language-Team: Arabic <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
+"X-Generator: Launchpad (build 13573)\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:960
+msgid "You must select one or several records !"
+msgstr "يجب ان تختار سجل او مجموعة من السجلات !"
+
+#: static/javascript/form.js:995
+msgid "You must save this record to perform the action !"
+msgstr "يجب حفظ السجل قبل إجراء الأمر!"
+
+#: static/javascript/form.js:1127
+msgid "Do you really want to delete the attachment"
+msgstr "هل تريد حذف المرفقات"
+
+#: static/javascript/form.js:1161
+msgid "No record selected ! You can only attach to existing record."
+msgstr "لم يتم إختيار سجل ! يمكنك الإرفاق من خلال سجل."
+
+#: static/javascript/form.js:1220
+msgid "OpenERP - Error"
+msgstr "خطأ بالبرنامج - OpenERP"
+
+#: static/javascript/form.js:1291
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+"تحذير، قد تم تعديل السجل،\n"
+"لم تُحفظ التعديلات."
+
+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
+msgid "To edit Record, please first save it."
+msgstr "لتحرير السجل، رجاء احفظه."
+
+#: static/javascript/listgrid.js:650
+msgid "Do you really want to delete selected record(s) ?"
+msgstr "هل تريد حذف السجل/السجلات؟"
+
+#: static/javascript/m2o.js:526
+msgid "error in display::"
+msgstr "خطأ في العرض::"
+
+#: static/javascript/o2m.js:67
+msgid "Do you really want to delete record ?"
+msgstr "هل تريد حذف السجل؟"
+
+#: static/javascript/search.js:285
+msgid "Invalid Value"
+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:335
+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-08-05 10:11:55 +0000
@@ -0,0 +1,103 @@
+# 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-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-03-22 18:31+0000\n"
+"Last-Translator: Luk <Unknown>\n"
+"Language-Team: Bulgarian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
+"X-Generator: Launchpad (build 13573)\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:960
+msgid "You must select one or several records !"
+msgstr "Вие трябва да изберете един или няколко записа !"
+
+#: static/javascript/form.js:995
+msgid "You must save this record to perform the action !"
+msgstr "Трябва да запазите записа за да приключите с това действие !"
+
+#: static/javascript/form.js:1127
+msgid "Do you really want to delete the attachment"
+msgstr "Наистина ли желаете да изтриете прикрепения файл"
+
+#: static/javascript/form.js:1161
+msgid "No record selected ! You can only attach to existing record."
+msgstr "Няма запис избрани! Можете да прикачите към съществуващ запис."
+
+#: static/javascript/form.js:1220
+msgid "OpenERP - Error"
+msgstr "OpenERP - Грешка"
+
+#: static/javascript/form.js:1291
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+"Внимание, записът е бил променен,\n"
+"Промените ще бъдат отхвърлени."
+
+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
+msgid "To edit Record, please first save it."
+msgstr "За да редактирате запис, моля първо да го запазете."
+
+#: static/javascript/listgrid.js:650
+msgid "Do you really want to delete selected record(s) ?"
+msgstr "Наистина ли искате да изтриете избрания запис(и)?"
+
+#: static/javascript/m2o.js:526
+msgid "error in display::"
+msgstr "грешка при показване::"
+
+#: static/javascript/o2m.js:67
+msgid "Do you really want to delete record ?"
+msgstr "Наистина ли искате да изтриете запис?"
+
+#: static/javascript/search.js:285
+msgid "Invalid Value"
+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:335
+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-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/ca.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== added file 'addons/openerp/po/javascript/da.po.OTHER'
--- addons/openerp/po/javascript/da.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/javascript/da.po.OTHER	2011-08-05 10:11:55 +0000
@@ -0,0 +1,103 @@
+# 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-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-05-29 19:13+0000\n"
+"Last-Translator: Henning Dinsen - idata <Unknown>\n"
+"Language-Team: Danish <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
+"X-Generator: Launchpad (build 13573)\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 "Fejl i form, ret de røde felter."
+
+#: static/javascript/form.js:204
+msgid "Do you really want to delete this record?"
+msgstr "Vil du virkelig slette denne post?"
+
+#: static/javascript/form.js:960
+msgid "You must select one or several records !"
+msgstr "Du skal vælge en eller flere poster!"
+
+#: static/javascript/form.js:995
+msgid "You must save this record to perform the action !"
+msgstr "Du skal gemme denne post for at udføre denne handling!"
+
+#: static/javascript/form.js:1127
+msgid "Do you really want to delete the attachment"
+msgstr "Vil du virkelig slette Den vedhæftede fil?"
+
+#: static/javascript/form.js:1161
+msgid "No record selected ! You can only attach to existing record."
+msgstr "Ingen post valgt! Du kan kun vedhæfte til en eksisterende post."
+
+#: static/javascript/form.js:1220
+msgid "OpenERP - Error"
+msgstr "OpenERP - Fejl"
+
+#: static/javascript/form.js:1291
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+"Advarsel, posten er blevet ændret,\n"
+"du vil miste dine ændringer."
+
+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
+msgid "To edit Record, please first save it."
+msgstr "For at ændre posten, må du først gemme den."
+
+#: static/javascript/listgrid.js:650
+msgid "Do you really want to delete selected record(s) ?"
+msgstr "Vil du virkelig slette den/de valgte post(er)?"
+
+#: static/javascript/m2o.js:526
+msgid "error in display::"
+msgstr ""
+
+#: static/javascript/o2m.js:67
+msgid "Do you really want to delete record ?"
+msgstr "Vil du virkelig slette posten?"
+
+#: static/javascript/search.js:285
+msgid "Invalid Value"
+msgstr "Ugyldig værdi"
+
+#: static/javascript/viewed.js:63
+msgid "Do you really want to remove this node?"
+msgstr "Vil du virkelig slette debe node?"
+
+#: 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 ""
+
+#: static/javascript/openerp/openerp.base.js:335
+msgid "Loading"
+msgstr "Henter"
+
+#: static/javascript/openerp/openerp.ui.tips.js:51
+msgid "Object"
+msgstr "Objekt"
+
+#: static/javascript/openerp/openerp.ui.tips.js:52
+msgid "Field"
+msgstr "Felt"

=== modified file 'addons/openerp/po/javascript/de.po'
--- addons/openerp/po/javascript/de.po	2011-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/de.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== added file 'addons/openerp/po/javascript/en_AU.po.OTHER'
--- addons/openerp/po/javascript/en_AU.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/javascript/en_AU.po.OTHER	2011-08-05 10:11:55 +0000
@@ -0,0 +1,101 @@
+# English (Australia) 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-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-03-28 15:40+0000\n"
+"Last-Translator: Harmel Delphine (OpenERP) <Unknown>\n"
+"Language-Team: English (Australia) <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\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 "Do you really want to delete this record?"
+
+#: static/javascript/form.js:960
+msgid "You must select one or several records !"
+msgstr "You must select one or several records !"
+
+#: static/javascript/form.js:995
+msgid "You must save this record to perform the action !"
+msgstr ""
+
+#: static/javascript/form.js:1127
+msgid "Do you really want to delete the attachment"
+msgstr ""
+
+#: static/javascript/form.js:1161
+msgid "No record selected ! You can only attach to existing record."
+msgstr "No record selected ! You can only attach to existing record."
+
+#: static/javascript/form.js:1220
+msgid "OpenERP - Error"
+msgstr ""
+
+#: static/javascript/form.js:1291
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+
+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
+msgid "To edit Record, please first save it."
+msgstr ""
+
+#: static/javascript/listgrid.js:650
+msgid "Do you really want to delete selected record(s) ?"
+msgstr ""
+
+#: static/javascript/m2o.js:526
+msgid "error in display::"
+msgstr ""
+
+#: static/javascript/o2m.js:67
+msgid "Do you really want to delete record ?"
+msgstr ""
+
+#: static/javascript/search.js:285
+msgid "Invalid Value"
+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 ""
+
+#: static/javascript/openerp/openerp.base.js:335
+msgid "Loading"
+msgstr "Loading"
+
+#: static/javascript/openerp/openerp.ui.tips.js:51
+msgid "Object"
+msgstr "Object"
+
+#: static/javascript/openerp/openerp.ui.tips.js:52
+msgid "Field"
+msgstr "Field"

=== added file 'addons/openerp/po/javascript/en_CA.po.OTHER'
--- addons/openerp/po/javascript/en_CA.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/javascript/en_CA.po.OTHER	2011-08-05 10:11:55 +0000
@@ -0,0 +1,103 @@
+# 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-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-03-28 15:51+0000\n"
+"Last-Translator: Harmel Delphine (OpenERP) <Unknown>\n"
+"Language-Team: English (Canada) <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+
+#: static/javascript/form.js:92
+#, python-format
+msgid "You selected to open %(tabs)s tabs - do you want to continue?"
+msgstr "You selected to open %(tabs)s tabs - do you want to continue?"
+
+#: static/javascript/form.js:169
+msgid "Invalid form, correct red fields."
+msgstr "Invalid form, correct red fields."
+
+#: static/javascript/form.js:204
+msgid "Do you really want to delete this record?"
+msgstr "Do you really want to delete this record?"
+
+#: static/javascript/form.js:960
+msgid "You must select one or several records !"
+msgstr "You must select one or several records !"
+
+#: static/javascript/form.js:995
+msgid "You must save this record to perform the action !"
+msgstr ""
+
+#: static/javascript/form.js:1127
+msgid "Do you really want to delete the attachment"
+msgstr "Do you really want to delete the attachment"
+
+#: static/javascript/form.js:1161
+msgid "No record selected ! You can only attach to existing record."
+msgstr "No record selected ! You can only attach to existing record."
+
+#: static/javascript/form.js:1220
+msgid "OpenERP - Error"
+msgstr "OpenERP - Error"
+
+#: static/javascript/form.js:1291
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+
+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
+msgid "To edit Record, please first save it."
+msgstr "To edit Record, please first save it."
+
+#: static/javascript/listgrid.js:650
+msgid "Do you really want to delete selected record(s) ?"
+msgstr "Do you really want to delete selected record(s) ?"
+
+#: static/javascript/m2o.js:526
+msgid "error in display::"
+msgstr "error in display::"
+
+#: static/javascript/o2m.js:67
+msgid "Do you really want to delete record ?"
+msgstr "Do you really want to delete record ?"
+
+#: static/javascript/search.js:285
+msgid "Invalid Value"
+msgstr ""
+
+#: static/javascript/viewed.js:63
+msgid "Do you really want to remove this node?"
+msgstr "Do you really want to remove this node?"
+
+#: static/javascript/viewed.js:329
+msgid "Do you really wants to create an inherited view here?"
+msgstr "Do you really want to create an inherited view here?"
+
+#: static/javascript/openerp/openerp.base.js:127
+msgid "doLoadingSuccess: Cannot parse JSON"
+msgstr "doLoadingSuccess: Cannot parse JSON"
+
+#: static/javascript/openerp/openerp.base.js:335
+msgid "Loading"
+msgstr "Loading"
+
+#: static/javascript/openerp/openerp.ui.tips.js:51
+msgid "Object"
+msgstr "Object"
+
+#: static/javascript/openerp/openerp.ui.tips.js:52
+msgid "Field"
+msgstr "Field"

=== added file 'addons/openerp/po/javascript/en_GB.po.OTHER'
--- addons/openerp/po/javascript/en_GB.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/javascript/en_GB.po.OTHER	2011-08-05 10:11:55 +0000
@@ -0,0 +1,103 @@
+# English (United Kingdom) 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-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-07-04 10:02+0000\n"
+"Last-Translator: John Bradshaw <Unknown>\n"
+"Language-Team: English (United Kingdom) <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+
+#: static/javascript/form.js:92
+#, python-format
+msgid "You selected to open %(tabs)s tabs - do you want to continue?"
+msgstr "You selected to open %(tabs)s tabs - do you want to continue?"
+
+#: static/javascript/form.js:169
+msgid "Invalid form, correct red fields."
+msgstr "Invalid form, correct red fields."
+
+#: static/javascript/form.js:204
+msgid "Do you really want to delete this record?"
+msgstr "Do you really want to delete this record?"
+
+#: static/javascript/form.js:960
+msgid "You must select one or several records !"
+msgstr "You must select one or more records !"
+
+#: static/javascript/form.js:995
+msgid "You must save this record to perform the action !"
+msgstr "You must save this record to perform the action !"
+
+#: static/javascript/form.js:1127
+msgid "Do you really want to delete the attachment"
+msgstr "Do you really want to delete the attachment?"
+
+#: static/javascript/form.js:1161
+msgid "No record selected ! You can only attach to existing record."
+msgstr "No record selected ! You can only attach to existing record."
+
+#: static/javascript/form.js:1220
+msgid "OpenERP - Error"
+msgstr "OpenERP - Error"
+
+#: static/javascript/form.js:1291
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+
+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
+msgid "To edit Record, please first save it."
+msgstr "To edit Record, please first save it."
+
+#: static/javascript/listgrid.js:650
+msgid "Do you really want to delete selected record(s) ?"
+msgstr "Do you really want to delete selected record(s) ?"
+
+#: static/javascript/m2o.js:526
+msgid "error in display::"
+msgstr "error in display:"
+
+#: static/javascript/o2m.js:67
+msgid "Do you really want to delete record ?"
+msgstr "Do you really want to delete record ?"
+
+#: static/javascript/search.js:285
+msgid "Invalid Value"
+msgstr "Invalid Value"
+
+#: static/javascript/viewed.js:63
+msgid "Do you really want to remove this node?"
+msgstr "Do you really want to remove this node?"
+
+#: static/javascript/viewed.js:329
+msgid "Do you really wants to create an inherited view here?"
+msgstr "Do you really want to create an inherited view here?"
+
+#: static/javascript/openerp/openerp.base.js:127
+msgid "doLoadingSuccess: Cannot parse JSON"
+msgstr "doLoadingSuccess: Cannot parse JSON"
+
+#: static/javascript/openerp/openerp.base.js:335
+msgid "Loading"
+msgstr "Loading"
+
+#: static/javascript/openerp/openerp.ui.tips.js:51
+msgid "Object"
+msgstr "Object"
+
+#: static/javascript/openerp/openerp.ui.tips.js:52
+msgid "Field"
+msgstr "Field"

=== modified file 'addons/openerp/po/javascript/es.po'
--- addons/openerp/po/javascript/es.po	2011-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/es.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== added file 'addons/openerp/po/javascript/es_CL.po'
--- addons/openerp/po/javascript/es_CL.po	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/javascript/es_CL.po	2011-08-05 10:11:55 +0000
@@ -0,0 +1,101 @@
+# Spanish (Chile) 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-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-07-19 22:56+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Chile) <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\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:960
+msgid "You must select one or several records !"
+msgstr ""
+
+#: static/javascript/form.js:995
+msgid "You must save this record to perform the action !"
+msgstr ""
+
+#: static/javascript/form.js:1127
+msgid "Do you really want to delete the attachment"
+msgstr ""
+
+#: static/javascript/form.js:1161
+msgid "No record selected ! You can only attach to existing record."
+msgstr ""
+
+#: static/javascript/form.js:1220
+msgid "OpenERP - Error"
+msgstr ""
+
+#: static/javascript/form.js:1291
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+
+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
+msgid "To edit Record, please first save it."
+msgstr ""
+
+#: static/javascript/listgrid.js:650
+msgid "Do you really want to delete selected record(s) ?"
+msgstr ""
+
+#: static/javascript/m2o.js:526
+msgid "error in display::"
+msgstr ""
+
+#: static/javascript/o2m.js:67
+msgid "Do you really want to delete record ?"
+msgstr ""
+
+#: static/javascript/search.js:285
+msgid "Invalid Value"
+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 ""
+
+#: static/javascript/openerp/openerp.base.js:335
+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 ""

=== renamed file 'addons/openerp/po/javascript/es_CL.po' => 'addons/openerp/po/javascript/es_CL.po.moved'
=== modified file 'addons/openerp/po/javascript/eu.po'
--- addons/openerp/po/javascript/eu.po	2011-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/eu.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
+"X-Generator: Launchpad (build 13573)\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-08-05 10:11:55 +0000
@@ -0,0 +1,103 @@
+# 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-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-06-07 05:50+0000\n"
+"Last-Translator: Juha Kotamäki <Unknown>\n"
+"Language-Team: Finnish <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
+"X-Generator: Launchpad (build 13573)\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:960
+msgid "You must select one or several records !"
+msgstr "Valitse vähintään yksi tietue!"
+
+#: static/javascript/form.js:995
+msgid "You must save this record to perform the action !"
+msgstr "Sinun pitää tallentaa tietue toimintoa varten !"
+
+#: static/javascript/form.js:1127
+msgid "Do you really want to delete the attachment"
+msgstr "Haluatko poistaa valitun liitteen?"
+
+#: static/javascript/form.js:1161
+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:1220
+msgid "OpenERP - Error"
+msgstr "OpenERP - Virhe"
+
+#: static/javascript/form.js:1291
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+"Varoitus. Tietuetta on muutettu\n"
+"Tekemäsi muutokset hylätään."
+
+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
+msgid "To edit Record, please first save it."
+msgstr "Jotta voit muokata tietuetta, tallenna se ensin."
+
+#: static/javascript/listgrid.js:650
+msgid "Do you really want to delete selected record(s) ?"
+msgstr "Haluako poistaa valitut tietueet?"
+
+#: static/javascript/m2o.js:526
+msgid "error in display::"
+msgstr "virhe ikkunassa::"
+
+#: static/javascript/o2m.js:67
+msgid "Do you really want to delete record ?"
+msgstr "Haluatko poistaa tietueen?"
+
+#: static/javascript/search.js:285
+msgid "Invalid Value"
+msgstr "Virheellinen arvo"
+
+#: 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:335
+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-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/fr.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
+"X-Generator: Launchpad (build 13573)\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-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/gl.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== added file 'addons/openerp/po/javascript/he.po.OTHER'
--- addons/openerp/po/javascript/he.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/javascript/he.po.OTHER	2011-08-05 10:11:55 +0000
@@ -0,0 +1,101 @@
+# Hebrew 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-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-05-26 11:15+0000\n"
+"Last-Translator: Natan Alter <Unknown>\n"
+"Language-Team: Hebrew <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\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:960
+msgid "You must select one or several records !"
+msgstr "את/ה חייב/ת לבחור ברשומה אחת/מספר רשומות!"
+
+#: static/javascript/form.js:995
+msgid "You must save this record to perform the action !"
+msgstr ""
+
+#: static/javascript/form.js:1127
+msgid "Do you really want to delete the attachment"
+msgstr ""
+
+#: static/javascript/form.js:1161
+msgid "No record selected ! You can only attach to existing record."
+msgstr "לא נבחרה אף רשומה! ניתן לצרף לרשומה קיימת בלבד."
+
+#: static/javascript/form.js:1220
+msgid "OpenERP - Error"
+msgstr ""
+
+#: static/javascript/form.js:1291
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+
+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
+msgid "To edit Record, please first save it."
+msgstr ""
+
+#: static/javascript/listgrid.js:650
+msgid "Do you really want to delete selected record(s) ?"
+msgstr ""
+
+#: static/javascript/m2o.js:526
+msgid "error in display::"
+msgstr ""
+
+#: static/javascript/o2m.js:67
+msgid "Do you really want to delete record ?"
+msgstr ""
+
+#: static/javascript/search.js:285
+msgid "Invalid Value"
+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 ""
+
+#: static/javascript/openerp/openerp.base.js:335
+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/hr.po'
--- addons/openerp/po/javascript/hr.po	2011-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/hr.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\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-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/hu.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\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-08-05 10:11:55 +0000
@@ -0,0 +1,105 @@
+# 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-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-05-20 11:36+0000\n"
+"Last-Translator: Homa Posniroha Harahap <Unknown>\n"
+"Language-Team: Indonesian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+
+#: static/javascript/form.js:92
+#, python-format
+msgid "You selected to open %(tabs)s tabs - do you want to continue?"
+msgstr ""
+"Anda memilih untuk membuka %(tabs)s tabs - apakah Anda Ingin melanjutkan"
+
+#: static/javascript/form.js:169
+msgid "Invalid form, correct red fields."
+msgstr "Form tidak benar, benarkan pada bagaian berwarna merah."
+
+#: static/javascript/form.js:204
+msgid "Do you really want to delete this record?"
+msgstr "Apakah Anda yakin untuk menghapus data ini?"
+
+#: static/javascript/form.js:960
+msgid "You must select one or several records !"
+msgstr "Anda harus memilih satu data atau lebih !"
+
+#: static/javascript/form.js:995
+msgid "You must save this record to perform the action !"
+msgstr "Anda harus menyimpan catatan ini untuk melakukan tindakan"
+
+#: static/javascript/form.js:1127
+msgid "Do you really want to delete the attachment"
+msgstr "Apakah Anda yakin untuk menghapus lampiran"
+
+#: static/javascript/form.js:1161
+msgid "No record selected ! You can only attach to existing record."
+msgstr ""
+"Tidak ada data terpilih, Anda hanya bisa melampirkan data bersangkutan"
+
+#: static/javascript/form.js:1220
+msgid "OpenERP - Error"
+msgstr "Pesan kesalahan - OpenERP"
+
+#: static/javascript/form.js:1291
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+"Peringatan, data-data telah dimodifikasi, perubahan yang Anda lakukan akan "
+"dibuang."
+
+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
+msgid "To edit Record, please first save it."
+msgstr "Untuk melakukan editing Data, silahkan simpan data tersebut"
+
+#: static/javascript/listgrid.js:650
+msgid "Do you really want to delete selected record(s) ?"
+msgstr "Apakah Anda benar ingin menghapus data yang dipilih?"
+
+#: static/javascript/m2o.js:526
+msgid "error in display::"
+msgstr "tampilan pesan kesalahan"
+
+#: static/javascript/o2m.js:67
+msgid "Do you really want to delete record ?"
+msgstr "Apakah Anda yakin untuk menghapus data?"
+
+#: static/javascript/search.js:285
+msgid "Invalid Value"
+msgstr "Nilai tidak valid"
+
+#: 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:335
+msgid "Loading"
+msgstr "Sedang proses"
+
+#: static/javascript/openerp/openerp.ui.tips.js:51
+msgid "Object"
+msgstr "Objek"
+
+#: static/javascript/openerp/openerp.ui.tips.js:52
+msgid "Field"
+msgstr "Kolom"

=== modified file 'addons/openerp/po/javascript/it.po'
--- addons/openerp/po/javascript/it.po	2011-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/it.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\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-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/lt.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\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-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/lv.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== added file 'addons/openerp/po/javascript/mk.po.OTHER'
--- addons/openerp/po/javascript/mk.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/javascript/mk.po.OTHER	2011-08-05 10:11:55 +0000
@@ -0,0 +1,103 @@
+# Macedonian 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-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-05-07 06:31+0000\n"
+"Last-Translator: Vasko Gjurovski <Unknown>\n"
+"Language-Team: Macedonian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\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:960
+msgid "You must select one or several records !"
+msgstr "Мора да изберете еден или повеќе записи!"
+
+#: static/javascript/form.js:995
+msgid "You must save this record to perform the action !"
+msgstr ""
+
+#: static/javascript/form.js:1127
+msgid "Do you really want to delete the attachment"
+msgstr "Дали сте сигурни дека сакате да го иозбришете прикачениот документ?"
+
+#: static/javascript/form.js:1161
+msgid "No record selected ! You can only attach to existing record."
+msgstr "Немате изберено запис! Можете да прикачите само кон постоечки запис."
+
+#: static/javascript/form.js:1220
+msgid "OpenERP - Error"
+msgstr "OpenERP - Грешка"
+
+#: static/javascript/form.js:1291
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+"Предупредување, записот е променет,\n"
+"вашите примени ќе бидат избришани."
+
+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
+msgid "To edit Record, please first save it."
+msgstr "За да го промените записот, мора прво да го зачувате."
+
+#: static/javascript/listgrid.js:650
+msgid "Do you really want to delete selected record(s) ?"
+msgstr "Дали сте сигурни дека сакате да ги избришете избраните записи?"
+
+#: static/javascript/m2o.js:526
+msgid "error in display::"
+msgstr ""
+
+#: static/javascript/o2m.js:67
+msgid "Do you really want to delete record ?"
+msgstr "Дали сте сигурни дека сакате да го избришете избраниот запис?"
+
+#: static/javascript/search.js:285
+msgid "Invalid Value"
+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 ""
+
+#: static/javascript/openerp/openerp.base.js:335
+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/mn.po'
--- addons/openerp/po/javascript/mn.po	2011-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/mn.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+"Generated-By: Babel None\n"
+>>>>>>> MERGE-SOURCE
 
 #: static/javascript/form.js:92
 #, python-format

=== added file 'addons/openerp/po/javascript/nb.po.OTHER'
--- addons/openerp/po/javascript/nb.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/javascript/nb.po.OTHER	2011-08-05 10:11:55 +0000
@@ -0,0 +1,105 @@
+# Norwegian Bokmal 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-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-07-11 10:09+0000\n"
+"Last-Translator: Ole Kristian Gaski <Unknown>\n"
+"Language-Team: Norwegian Bokmal <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+
+#: static/javascript/form.js:92
+#, python-format
+msgid "You selected to open %(tabs)s tabs - do you want to continue?"
+msgstr "Du har valgt å åpne %(tabs)s faner - Vil du fortsette?"
+
+#: static/javascript/form.js:169
+msgid "Invalid form, correct red fields."
+msgstr "Feil i skjemaet, korriger røde felter."
+
+#: static/javascript/form.js:204
+msgid "Do you really want to delete this record?"
+msgstr "Vil du virkelig slette denne posten ?"
+
+#: static/javascript/form.js:960
+msgid "You must select one or several records !"
+msgstr "Du må velge en eller flere poster !"
+
+#: static/javascript/form.js:995
+msgid "You must save this record to perform the action !"
+msgstr "Du må lagre denne posten for å utføre handlingen !"
+
+#: static/javascript/form.js:1127
+msgid "Do you really want to delete the attachment"
+msgstr "Vil du virkelig slette dette vedlegget"
+
+#: static/javascript/form.js:1161
+msgid "No record selected ! You can only attach to existing record."
+msgstr ""
+"Ingen post er valgt! Du kan bare legge ved dokumenter til en eksisterende "
+"post."
+
+#: static/javascript/form.js:1220
+msgid "OpenERP - Error"
+msgstr "OpenERP - Feil"
+
+#: static/javascript/form.js:1291
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+"Advarsel, posten har blitt endret,\n"
+"dine endringer vil bli forkastet."
+
+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
+msgid "To edit Record, please first save it."
+msgstr "For å redigere posten må du først lagre den"
+
+#: static/javascript/listgrid.js:650
+msgid "Do you really want to delete selected record(s) ?"
+msgstr "Vil du virkelig slette valgt(e) post(er)?"
+
+#: static/javascript/m2o.js:526
+msgid "error in display::"
+msgstr "feil i visning::"
+
+#: static/javascript/o2m.js:67
+msgid "Do you really want to delete record ?"
+msgstr "Vil du virkelig slette denne posten ?"
+
+#: static/javascript/search.js:285
+msgid "Invalid Value"
+msgstr "Ugyldig verdi"
+
+#: static/javascript/viewed.js:63
+msgid "Do you really want to remove this node?"
+msgstr "Vil du virkelig fjerne denne noden?"
+
+#: 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 ""
+
+#: static/javascript/openerp/openerp.base.js:335
+msgid "Loading"
+msgstr "Laster..."
+
+#: static/javascript/openerp/openerp.ui.tips.js:51
+msgid "Object"
+msgstr "Objekt"
+
+#: static/javascript/openerp/openerp.ui.tips.js:52
+msgid "Field"
+msgstr "Felt"

=== modified file 'addons/openerp/po/javascript/nl.po'
--- addons/openerp/po/javascript/nl.po	2011-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/nl.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:11+0000\n"
+"X-Generator: Launchpad (build 13573)\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-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/pl.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\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-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/pt.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\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-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/pt_BR.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== added file 'addons/openerp/po/javascript/ro.po.OTHER'
--- addons/openerp/po/javascript/ro.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/javascript/ro.po.OTHER	2011-08-05 10:11:55 +0000
@@ -0,0 +1,101 @@
+# Romanian 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-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-03-15 08:06+0000\n"
+"Last-Translator: Mihai Satmarean <Unknown>\n"
+"Language-Team: Romanian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\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 "Chiar doriti stergerea acestei inregistrari?"
+
+#: static/javascript/form.js:960
+msgid "You must select one or several records !"
+msgstr ""
+
+#: static/javascript/form.js:995
+msgid "You must save this record to perform the action !"
+msgstr ""
+
+#: static/javascript/form.js:1127
+msgid "Do you really want to delete the attachment"
+msgstr ""
+
+#: static/javascript/form.js:1161
+msgid "No record selected ! You can only attach to existing record."
+msgstr ""
+
+#: static/javascript/form.js:1220
+msgid "OpenERP - Error"
+msgstr ""
+
+#: static/javascript/form.js:1291
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+
+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
+msgid "To edit Record, please first save it."
+msgstr ""
+
+#: static/javascript/listgrid.js:650
+msgid "Do you really want to delete selected record(s) ?"
+msgstr ""
+
+#: static/javascript/m2o.js:526
+msgid "error in display::"
+msgstr ""
+
+#: static/javascript/o2m.js:67
+msgid "Do you really want to delete record ?"
+msgstr ""
+
+#: static/javascript/search.js:285
+msgid "Invalid Value"
+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 ""
+
+#: static/javascript/openerp/openerp.base.js:335
+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/ru.po'
--- addons/openerp/po/javascript/ru.po	2011-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/ru.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\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-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/sk.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\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-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/sr.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== modified file 'addons/openerp/po/javascript/[e-mail]'
--- addons/openerp/po/javascript/[e-mail]	2011-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/[e-mail]	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\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-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/sv.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\n"
+>>>>>>> MERGE-SOURCE
 "Generated-By: Babel None\n"
 
 #: static/javascript/form.js:92

=== added file 'addons/openerp/po/javascript/th.po.OTHER'
--- addons/openerp/po/javascript/th.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/javascript/th.po.OTHER	2011-08-05 10:11:55 +0000
@@ -0,0 +1,103 @@
+# Thai 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-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-06-27 07:18+0000\n"
+"Last-Translator: Manop Pornpeanvichanon(มานพ พรเพียรวิชานนท์) <Unknown>\n"
+"Language-Team: Thai <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\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:960
+msgid "You must select one or several records !"
+msgstr "คุณต้องเลือกอย่างน้อยหนึ่งระเบียน"
+
+#: static/javascript/form.js:995
+msgid "You must save this record to perform the action !"
+msgstr "คุณต้องบันทึกระเบียนนี้ก่อนที่จะดำเนินการ !"
+
+#: static/javascript/form.js:1127
+msgid "Do you really want to delete the attachment"
+msgstr "คุณต้องการลบสิ่งที่แนบมาด้วย"
+
+#: static/javascript/form.js:1161
+msgid "No record selected ! You can only attach to existing record."
+msgstr "ไม่ได้เลือกระเบียน ! คุณทำได้แค่แนบไปกับระเบียนปัจจุบัน"
+
+#: static/javascript/form.js:1220
+msgid "OpenERP - Error"
+msgstr "OpenERP - ผิดพลาด"
+
+#: static/javascript/form.js:1291
+msgid ""
+"Warning, the record has been modified,\n"
+"your changes will be discarded."
+msgstr ""
+"คำเตือน, ข้อมูลในระเบียนถูกเปลี่ยนแล้ว,\n"
+"การเปลี่ยนแปลงของคุณถูกยกเลิก"
+
+#: static/javascript/listgrid.js:542 static/javascript/o2m.js:123
+msgid "To edit Record, please first save it."
+msgstr "ต้องบันทึกระเบียนก่อนที่จะเริ่มแก้ไข"
+
+#: static/javascript/listgrid.js:650
+msgid "Do you really want to delete selected record(s) ?"
+msgstr "คุณต้องการลบระเบียนที่เลือกไว้"
+
+#: static/javascript/m2o.js:526
+msgid "error in display::"
+msgstr "ข้อผิดพลาดในการแสดงผล::"
+
+#: static/javascript/o2m.js:67
+msgid "Do you really want to delete record ?"
+msgstr "คุณต้องการลบระเบียน"
+
+#: static/javascript/search.js:285
+msgid "Invalid Value"
+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: แปล JSON ไม่ออก"
+
+#: static/javascript/openerp/openerp.base.js:335
+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/tr.po'
--- addons/openerp/po/javascript/tr.po	2011-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/tr.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\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-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/uk.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\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-07-12 04:38:45 +0000
+++ addons/openerp/po/javascript/zh_CN.po	2011-08-05 10:11:55 +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-07-12 04:35+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
+=======
+"X-Launchpad-Export-Date: 2011-08-04 05:12+0000\n"
+"X-Generator: Launchpad (build 13573)\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-08-05 10:11:55 +0000
@@ -0,0 +1,1655 @@
+# 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-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-03-26 15:22+0000\n"
+"Last-Translator: kifcaliph <[e-mail]>\n"
+"Language-Team: Arabic <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-04 05:13+0000\n"
+"X-Generator: Launchpad (build 13573)\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:94
+msgid "Invalid View"
+msgstr "عرض خاطئ"
+
+#: controllers/actions.py:127
+msgid "Error no report"
+msgstr "خطأ، لا تقرير"
+
+#: controllers/actions.py:153
+msgid "Nothing to print"
+msgstr "لا يوجد شئ للطباعة"
+
+#: controllers/actions.py:173
+msgid "Printing aborted, too long delay"
+msgstr "توقفت الطباعة، بسبب التأخر"
+
+#: controllers/actions.py:397
+msgid "Relative URLs are not supported"
+msgstr "العناوين المتعلقة غير ملائمة"
+
+#: controllers/actions.py:425
+msgid "Action not found"
+msgstr "لا يوجد أمر"
+
+#: controllers/actions.py:474
+msgid "No action defined"
+msgstr "أمر غير معرف"
+
+#: controllers/attachment.py:55
+msgid "No record selected, You can only attach to existing record..."
+msgstr "لم يتم إخيار سجل، بإمكانك الإرفاق في حالة وجود سجل فقط..."
+
+#: controllers/database.py:63
+msgid "Create database"
+msgstr "إنشاء قاعدة بيانات"
+
+#: controllers/database.py:65 controllers/templates/database.mako:56
+#: controllers/templates/search.mako:145
+msgid "Create"
+msgstr "إنشاء"
+
+#: controllers/database.py:68
+msgid "Super admin password:"
+msgstr "كلمة السر للمشرف العام:"
+
+#: controllers/database.py:68
+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:69 controllers/database.py:101
+msgid "New database name:"
+msgstr "اسم قاعدة البيانات الجديدة:"
+
+#: controllers/database.py:69
+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:70
+msgid "Load Demonstration data:"
+msgstr "تحميل البيانات الوهمية:"
+
+#: controllers/database.py:70
+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:71
+msgid "Default Language:"
+msgstr "اللغة الفتراضية:"
+
+#: controllers/database.py:71
+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:72
+msgid "Administrator password:"
+msgstr "كلمة مرور المشرف:"
+
+#: controllers/database.py:72
+msgid ""
+"This is the password of the 'admin' user that will be created in your new "
+"database."
+msgstr "هذه كلمة مرور المشرف 'admin' و التي ستستخدم بقاعدة البيانات الجديدة"
+
+#: controllers/database.py:73
+msgid "Confirm password:"
+msgstr "تأكيد كلمة المرور:"
+
+#: controllers/database.py:73
+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:79
+msgid "Drop database"
+msgstr "إزالة قاعدة البيانات"
+
+#: controllers/database.py:81 controllers/templates/database.mako:58
+msgid "Drop"
+msgstr "إزالة"
+
+#: controllers/database.py:83 controllers/database.py:91
+#: controllers/templates/login.mako:43
+msgid "Database:"
+msgstr "قاعدة البيانات:"
+
+#: controllers/database.py:84 controllers/database.py:92
+#: controllers/database.py:100 controllers/templates/login.mako:61
+#: controllers/templates/login_ajax.mako:78
+#: controllers/templates/login_ajax.mako:98
+msgid "Password:"
+msgstr "كلمة المرور:"
+
+#: controllers/database.py:88
+msgid "Backup database"
+msgstr "نسخة إحتياطية لقاعدة البيانات"
+
+#: controllers/database.py:90 controllers/templates/database.mako:60
+msgid "Backup"
+msgstr "نسخة إحتياطية"
+
+#: controllers/database.py:96
+msgid "Restore database"
+msgstr "إستعادة قاعدة البيانات"
+
+#: controllers/database.py:98 controllers/templates/database.mako:62
+msgid "Restore"
+msgstr "استعادة"
+
+#: controllers/database.py:99
+msgid "File:"
+msgstr "ملف:"
+
+#: controllers/database.py:105
+msgid "Change Administrator Password"
+msgstr "غيّر كلمة مرور المشرف العام"
+
+#: controllers/database.py:107 controllers/templates/preferences/index.mako:37
+msgid "Change Password"
+msgstr "غيّر كلمة المرور"
+
+#: controllers/database.py:108
+msgid "Old Password:"
+msgstr "كلمة المرور القديمة:"
+
+#: controllers/database.py:109
+msgid "New Password:"
+msgstr "كلمة المرور الجديدة:"
+
+#: controllers/database.py:110
+msgid "Confirm Password:"
+msgstr "تأكيد كلمة المرور:"
+
+#: controllers/database.py:173
+msgid "You must avoid all accents, space or special characters."
+msgstr "تجنب إستخدام المسافات، و الرموز."
+
+#: controllers/database.py:174
+msgid "Bad database name"
+msgstr "اسم غير لائق لقاعدة البيانات"
+
+#: controllers/database.py:194
+msgid ""
+"The server crashed during installation.\n"
+"We suggest you to drop this database."
+msgstr ""
+"تعطل الخادم أثناء التنصيب.\n"
+"يبدو انه عليك إسقاط قاعة البيانات هذه."
+
+#: controllers/database.py:195
+msgid "Error during database creation"
+msgstr "خطأ أثناء إشاء قاعدة البيانات"
+
+#: controllers/database.py:198 controllers/database.py:225
+#: controllers/database.py:271 controllers/database.py:294
+msgid "Bad super admin password"
+msgstr "كلمة مرور للـ super admin غير لائقة"
+
+#: controllers/database.py:202
+msgid "Could not create database."
+msgstr "لا يمكن أنشاء قاعدة البيانات."
+
+#: controllers/database.py:228
+msgid "Could not drop database"
+msgstr "لا يمكن إسقاط قاعدة البيانات"
+
+#: controllers/database.py:251
+msgid "Could not create backup."
+msgstr "لا يمكن إنشاء النسخة الإحتياطية."
+
+#: controllers/database.py:275
+msgid "Could not restore database"
+msgstr "لا يمكن إستعادة قاعدة البيانات"
+
+#: controllers/database.py:298
+msgid "Error, password not changed."
+msgstr "خطأ، لم يتم تغيير كلمة المرور."
+
+#: controllers/error_page.py:79
+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:81
+#, 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:561
+#, python-format
+msgid "Invalid button type \"%s\""
+msgstr "نوع زر خاطئ \"%s\""
+
+#: controllers/form.py:944 controllers/tree.py:243
+msgid "No record selected"
+msgstr "لم يتم إختيار سجل"
+
+#: controllers/form.py:949
+msgid "Print Screen"
+msgstr "اطبع الشاشة"
+
+#: controllers/form.py:1016 widgets/listgrid.py:305 widgets/listgrid.py:366
+#: widgets/form/_form.py:910
+msgid "Application Error"
+msgstr "خطأ في البرنامج"
+
+#: controllers/form.py:1016
+#, python-format
+msgid "Wrong on_change trigger: %s"
+msgstr "خطأ في كود on_change : %s"
+
+#: controllers/form.py:1121
+msgid "Open resource"
+msgstr "مصدر مفتوح"
+
+#: controllers/form.py:1124
+msgid "Set to default value"
+msgstr "تعيين إلى القيمة الافتراضية"
+
+#: controllers/form.py:1125
+msgid "Set as default"
+msgstr "تعيين كقيمة إفتراضية"
+
+#: controllers/form.py:1132
+msgid "Action"
+msgstr "إجراء"
+
+#: controllers/form.py:1133
+msgid "Report"
+msgstr "تقرير"
+
+#: controllers/impex.py:66
+msgid ""
+"Operation failed\n"
+"I/O error"
+msgstr ""
+"فشلت العملية\n"
+"خطأ في الإدخال و الإخراج I/O"
+
+#: controllers/impex.py:402
+msgid "Export Error"
+msgstr "خطأ في الإصدار"
+
+#: controllers/impex.py:469
+msgid "Database ID"
+msgstr "معرف قاعدة البيانات (Database ID)"
+
+#: controllers/impex.py:476
+msgid "Error opening .CSV file"
+msgstr "خطأ في فتح الملف .CSV"
+
+#: controllers/impex.py:476
+msgid "Input Error."
+msgstr "خطأ في الإدخال"
+
+#: controllers/impex.py:498
+#, python-format
+msgid "You cannot import the field '%s', because we cannot auto-detect it"
+msgstr "لا يمكن إستقبال الحقل  '%s', لأنه لا يمكن الكشف التلقائي عنه"
+
+#: controllers/impex.py:501
+#, python-format
+msgid "Error processing the first line of the file. Field \"%s\" is unknown"
+msgstr "خطأ في معالجة السطر الأول من الملف. الحقل \"%s\" غير معرف"
+
+#: controllers/impex.py:72 controllers/impex.py:501
+msgid "Import Error."
+msgstr "خطأ في الإستيراد."
+
+#: controllers/impex.py:520
+msgid "The CSV delimiter must be a single character"
+msgstr "محدد الـ CVS يجب أن يكون حرف"
+
+#: controllers/impex.py:532
+msgid "File Format Error"
+msgstr "خطأ بنوع الملف"
+
+#: controllers/impex.py:550
+msgid "XML-RPC error"
+msgstr "خطأ في بيانات XML-RPC"
+
+#: controllers/impex.py:555
+#, python-format
+msgid "Imported %d objects"
+msgstr "الكائنات المستوردة %d"
+
+#: controllers/impex.py:560
+#, python-format
+msgid "Error trying to import this record:%s. ErrorMessage:%s %s"
+msgstr "خطأ في إستيراد هذا السجل:%s. رسالة الخطأ:%s %s"
+
+#: controllers/impex.py:561
+msgid "ImportationError"
+msgstr "خطأ في الإستيراد"
+
+#: controllers/listgrid.py:52
+msgid "Parent record doesn't exists..."
+msgstr "لا يوجد سجل أساسي..."
+
+#: controllers/preferences.py:35
+msgid "Change your password"
+msgstr "غيّر كلمة السر"
+
+#: controllers/preferences.py:65 controllers/templates/header.mako:59
+msgid "Preferences"
+msgstr "التفضيلات"
+
+#: controllers/preferences.py:92
+msgid "All passwords have to be filled."
+msgstr "يجب إملاء جميع كلمات المرور"
+
+#: controllers/preferences.py:94
+msgid "The new password and its confirmation must be identical."
+msgstr "كلمة المرور الجديدة و حقل تأكيدها يجب ان تكون متطابقة"
+
+#: controllers/preferences.py:103
+msgid "Could not change your password."
+msgstr "لم يتمكن من تغيير كلمة المرور"
+
+#: controllers/preferences.py:105
+msgid "Original password incorrect, your password was not changed."
+msgstr "كلمة المرور الأصلية خاطئة، فلم تتغير كلمة المرور"
+
+#: controllers/root.py:174
+#, python-format
+msgid "Version %s"
+msgstr "الإصدارة %s"
+
+#: controllers/translator.py:136
+msgid "You need to save the resource before adding translations."
+msgstr "يجب حفظ المصدر قبل إضافة الترجمة."
+
+#: controllers/tree.py:274
+msgid "No resource selected"
+msgstr "لم يتم إختيار مصدر"
+
+#: controllers/utils.py:43
+msgid "Could not connect to server"
+msgstr "تعذر الإتصال بالخادم"
+
+#: controllers/utils.py:127 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:221
+msgid "Invalid view id."
+msgstr "خطأ في عرض المعرف"
+
+#: controllers/viewed.py:499
+msgid "Unable to create inherited view."
+msgstr "لم يتمكن من إنشاء عرض موروث"
+
+#: controllers/viewed.py:501
+msgid "Can't create inherited view here."
+msgstr "لا يمكن من إنشاء عرض موروث هنا"
+
+#: controllers/viewed.py:504
+msgid "Not implemented yet!"
+msgstr "لم تنفذ حتي الأن!"
+
+#: controllers/viewed.py:609
+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:54 controllers/templates/login.mako:4
+#: controllers/templates/login.mako:71 controllers/templates/login_ajax.mako:85
+#: controllers/templates/login_ajax.mako:104
+msgid "Login"
+msgstr "تسجيل الدخول"
+
+#: controllers/templates/database.mako:64
+msgid "Password"
+msgstr "كلمة المرور"
+
+#: controllers/templates/error_page.mako:82
+#, python-format
+msgid "An %(error_type)s has been reported."
+msgstr "حدوث خطأ في %(error_type)s تم تسجيله."
+
+#: controllers/templates/error_page.mako:84
+msgid "Let me fix it"
+msgstr "اجعلني اصلحه"
+
+#: controllers/templates/error_page.mako:91
+#: controllers/templates/error_page.mako:93
+msgid "Fix it for me"
+msgstr "اصلحه من أجلي"
+
+#: controllers/templates/error_page.mako:99
+msgid "Publisher warranty contract."
+msgstr "عقد الضمان للناشر"
+
+#: controllers/templates/error_page.mako:100
+msgid ""
+"Your request will be sent to OpenERP and publisher warranty team will reply "
+"you shortly."
+msgstr "سيتم إرسال طلبك إلي فريق OpenERP و الناشر و ذلك للإجابة الفورية."
+
+#: controllers/templates/error_page.mako:104
+msgid "Summary of the problem:"
+msgstr "ملخص المشكلة:"
+
+#: controllers/templates/error_page.mako:111
+msgid "Explain what you did:"
+msgstr "إشرح ما فعلت:"
+
+#: controllers/templates/error_page.mako:120
+msgid "Other Comments:"
+msgstr "تعليقات أخري:"
+
+#: controllers/templates/error_page.mako:132
+msgid "Send to Publisher Warranty Team"
+msgstr "إرسال إلي فريق الضمان و النشر"
+
+#: controllers/templates/error_page.mako:159
+msgid "Write concurrency warning :"
+msgstr "اكتب تحذير تزامني:"
+
+#: controllers/templates/error_page.mako:164
+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:178 controllers/templates/exp.mako:251
+#: controllers/templates/form.mako:141 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:41
+msgid "Cancel"
+msgstr "إلغاء"
+
+#: controllers/templates/error_page.mako:179
+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:190
+msgid "Available fields"
+msgstr "الحقول المتوفرة"
+
+#: controllers/templates/exp.mako:192
+msgid "Fields to export"
+msgstr "حقول للتصدير"
+
+#: controllers/templates/exp.mako:194
+msgid "Save fields list"
+msgstr "حفظ قائمة الحقول"
+
+#: controllers/templates/exp.mako:196
+msgid "Save as:"
+msgstr "حفظ باسم:"
+
+#: controllers/templates/exp.mako:198 controllers/templates/fieldpref.mako:102
+#: controllers/templates/selection.mako:45
+msgid "OK"
+msgstr "موافق"
+
+#: controllers/templates/exp.mako:202
+msgid "Saved exports:"
+msgstr "مُصدرة محفوظة:"
+
+#: controllers/templates/exp.mako:211 controllers/templates/form.mako:136
+#: widgets/form/templates/one2many.mako:23 widgets/templates/sidebar.mako:67
+#: widgets/templates/listgrid/listgrid.mako:119
+#: widgets/templates/listgrid/listgrid.mako:123
+#: widgets/templates/listgrid/listgrid.mako:127
+#: widgets/templates/listgrid/listgrid.mako:191
+#: widgets/templates/listgrid/listgrid.mako:196
+#: widgets/templates/listgrid/listgroup.mako:131
+#: widgets/templates/listgrid/multiple_group.mako:81
+msgid "Delete"
+msgstr "حذف"
+
+#: controllers/templates/exp.mako:224 widgets/templates/sidebar.mako:56
+#: widgets/templates/listgrid/listgrid.mako:153
+msgid "Add"
+msgstr "إضافة"
+
+#: controllers/templates/exp.mako:229 controllers/templates/viewlist.mako:125
+msgid "Remove"
+msgstr "إزالة"
+
+#: controllers/templates/exp.mako:234
+msgid "Remove All"
+msgstr "إزالة الكل"
+
+#: controllers/templates/exp.mako:252
+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/imp.mako:204
+#: controllers/templates/index.mako:201 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:43
+#: 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:64 controllers/templates/tree.mako:33
+msgid "Disable all Tips"
+msgstr "ألغ النصائح"
+
+#: controllers/templates/form.mako:65 controllers/templates/tree.mako:34
+msgid "Hide this Tip"
+msgstr "أخف هذه النصيحة"
+
+#: controllers/templates/form.mako:83 controllers/templates/tree.mako:41
+msgid "Add / Remove Shortcut..."
+msgstr "إضافة / إزالة مختَصَر"
+
+#: controllers/templates/form.mako:87
+#, python-format
+msgid "Search: %s"
+msgstr "بحث: %s"
+
+#: controllers/templates/form.mako:94
+msgid "Corporate Intelligence..."
+msgstr "الاستخبارات التنافسية..."
+
+#: controllers/templates/form.mako:100
+msgid "Show Logs..."
+msgstr "عرض السجلات..."
+
+#: controllers/templates/form.mako:112
+msgid "Create a new resource"
+msgstr "إنشاء مصدر جديد"
+
+#: controllers/templates/form.mako:113 controllers/templates/search.mako:128
+#: controllers/templates/viewed_new_model.mako:36
+#: controllers/templates/viewlist.mako:119 widgets/form/_o2m.py:97
+#: widgets/form/templates/one2many.mako:21
+#: widgets/templates/listgrid/listgrid.mako:158
+#: widgets/templates/listgrid/listgrid.mako:162
+#: widgets/templates/listgrid/listgroup.mako:20
+msgid "New"
+msgstr "جديد"
+
+#: controllers/templates/form.mako:117
+msgid "Edit this resource"
+msgstr "حرر هذا المصدر"
+
+#: controllers/templates/form.mako:118 controllers/templates/viewlist.mako:122
+#: widgets/templates/listgrid/listgrid.mako:83
+#: widgets/templates/listgrid/listgrid.mako:93
+#: widgets/templates/listgrid/listgroup.mako:112
+#: widgets/templates/listgrid/multiple_group.mako:63
+msgid "Edit"
+msgstr "تحرير"
+
+#: controllers/templates/form.mako:122
+msgid "Save this resource"
+msgstr "حفظ هذا المظهر"
+
+#: controllers/templates/form.mako:123 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:40
+#: 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:125
+msgid "Save & Edit this resource"
+msgstr "حفظ و تحرير هذا المصدر"
+
+#: controllers/templates/form.mako:126
+msgid "Save & Edit"
+msgstr "حفظ و تحرير"
+
+#: controllers/templates/form.mako:130
+msgid "Duplicate this resource"
+msgstr "تكرار هذا المصدر"
+
+#: controllers/templates/form.mako:131
+msgid "Duplicate"
+msgstr "تكرار"
+
+#: controllers/templates/form.mako:135
+msgid "Delete this resource"
+msgstr "حذف هذا المصدر"
+
+#: controllers/templates/form.mako:140
+msgid "Cancel editing the current resource"
+msgstr "إلغاء تحرير المصدر الحالي"
+
+#: controllers/templates/form.mako:145
+msgid "Create new node"
+msgstr "إنشاء طرف جديد"
+
+#: controllers/templates/form.mako:146
+msgid "New Node"
+msgstr "طرف جديد"
+
+#: controllers/templates/form.mako:150
+msgid "Show grid in workflow canvas"
+msgstr "إظهار الشبكية لخلفية مسار العمل"
+
+#: controllers/templates/form.mako:151
+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:230
+#, 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/imp.mako:79
+msgid "Import Data"
+msgstr "استيراد البيانات"
+
+#: controllers/templates/imp.mako:89
+msgid "1. Import a .CSV file"
+msgstr "إستيراد ملف .CSV"
+
+#: controllers/templates/imp.mako:105
+msgid "CSV File:"
+msgstr "ملف CSV :"
+
+#: controllers/templates/imp.mako:123
+msgid "2. Check your file format"
+msgstr "تأكد من إمتداد الملف"
+
+#: controllers/templates/imp.mako:130
+#, python-format
+msgid "The import failed due to: %(message)s"
+msgstr "عملية الإستيراد فشلت لسبب: %(message)s"
+
+#: controllers/templates/imp.mako:132
+msgid "Here is a preview of the file we could not import:"
+msgstr "هذه معاينة لملف لم يتمكن من إستيراده:"
+
+#: controllers/templates/imp.mako:157
+msgid "CSV Options"
+msgstr "خيارات الــ CSV"
+
+#: controllers/templates/imp.mako:160
+msgid "Separator:"
+msgstr "فاصل :"
+
+#: controllers/templates/imp.mako:162
+msgid "Delimiter:"
+msgstr "محدد:"
+
+#: controllers/templates/imp.mako:166
+msgid "Encoding:"
+msgstr "ترميز:"
+
+#: controllers/templates/imp.mako:173
+msgid "Lines to skip:"
+msgstr "الخطوط للتخطي:"
+
+#: controllers/templates/imp.mako:187
+msgid "3. File imported"
+msgstr "الملفات المستوردة"
+
+#: controllers/templates/imp.mako:205
+msgid "Import File"
+msgstr "إستيراد ملف"
+
+#: controllers/templates/index.mako:167
+msgid "System Logs"
+msgstr "سجلات النظام"
+
+#: controllers/templates/index.mako:192
+msgid "More"
+msgstr "مزيد"
+
+#: controllers/templates/index.mako:193
+msgid "Widgets"
+msgstr "عناصر مرئية"
+
+#: controllers/templates/index.mako:233 controllers/templates/index.mako:238
+#, python-format
+msgid "Powered by %(openerp)s "
+msgstr "مدعوم بـ %(openerp)s و kifcaliph "
+
+#: controllers/templates/login.mako:57 controllers/templates/login_ajax.mako:72
+#: controllers/templates/login_ajax.mako:94
+msgid "User:"
+msgstr "المستخدم:"
+
+#: controllers/templates/login.mako:68
+msgid "Databases"
+msgstr "قواعد البيانات"
+
+#: controllers/templates/login.mako:88
+msgid "Top Contributor:"
+msgstr "الأكثر إسهاماً:"
+
+#: controllers/templates/login.mako:98
+msgid ""
+"We think that daily job activities can be more intuitive, efficient, "
+"automated, .. and even fun."
+msgstr "نؤمن بأن نشاط العمل اليومي يمكن أن يكون بديهي، فعال، سريع و ممتع"
+
+#: controllers/templates/login.mako:99
+msgid "OpenERP's vision to be:"
+msgstr "رؤي برنامج OpenERP هي:"
+
+#: controllers/templates/login.mako:107
+msgid "Full featured"
+msgstr "كامل الأوصاف"
+
+#: controllers/templates/login.mako:108
+msgid ""
+"Today's enterprise challenges are multiple. We provide one module for each "
+"need."
+msgstr ""
+"تتعدد تحديات المنشآت اليوم، و لذلك نوفر العديد من وحدات الأكواد لكل إحتياج."
+
+#: controllers/templates/login.mako:116
+msgid "Open Source"
+msgstr "مفتوح المصدر"
+
+#: controllers/templates/login.mako:117
+msgid ""
+"To Build a great product, we rely on the knowledge of thousands of "
+"contributors."
+msgstr "لبناء منتج قوي، نحن نعتمد علي معرفة ألاف المساهمين."
+
+#: controllers/templates/login.mako:125
+msgid "User Friendly"
+msgstr "سهلة الإستخدام"
+
+#: controllers/templates/login.mako:126
+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:77
+#: 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
+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:24
+msgid "Error"
+msgstr "خطأ"
+
+#: utils/common.py:27
+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:439
+msgid "== Access Denied =="
+msgstr "== مرفوض السماح =="
+
+#: widgets/_views.py:46
+msgid "Form"
+msgstr "نموذج"
+
+#: widgets/_views.py:47
+msgid "Form view..."
+msgstr "عرض النموذج..."
+
+#: widgets/_views.py:78
+msgid "Search view..."
+msgstr "عرض البحث..."
+
+#: widgets/listgrid.py:305
+msgid "Wrong on_change trigger"
+msgstr "خطأ بكود on_change"
+
+#: widgets/listgrid.py:368 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:280
+msgid "contains"
+msgstr "يحتوى على"
+
+#: widgets/search.py:280
+msgid "doesn't contain"
+msgstr "لا يحتوي علي"
+
+#: widgets/search.py:281
+msgid "is equal to"
+msgstr "مساوٍ لـ"
+
+#: widgets/search.py:281
+msgid "is not equal to"
+msgstr "ليس مساويًا لـ"
+
+#: widgets/search.py:282
+msgid "greater than"
+msgstr "أكبر من"
+
+#: widgets/search.py:282
+msgid "less than"
+msgstr "أقل من"
+
+#: widgets/search.py:283
+msgid "in"
+msgstr "في"
+
+#: widgets/search.py:283
+msgid "not in"
+msgstr "ليس في"
+
+#: widgets/search.py:392
+msgid "Yes"
+msgstr "نعم"
+
+#: widgets/search.py:392
+msgid "No"
+msgstr "ﻻ"
+
+#: widgets/form/_action.py:48
+msgid "Action not found!"
+msgstr "لم يتم العثور علي الإجراء!"
+
+#: widgets/form/_o2m.py:97 widgets/templates/listgrid/listgrid.mako:156
+#: widgets/templates/listgrid/listgrid.mako:162
+#: widgets/templates/listgrid/listgroup.mako:20
+msgid "Create new record."
+msgstr "إنشاء سجل جديد"
+
+#: widgets/form/_o2m.py:110
+msgid "Save/New"
+msgstr "حفظ/جديد"
+
+#: widgets/form/_o2m.py:110
+msgid "Save parent record."
+msgstr "حفظ السجل الرئيسي."
+
+#: widgets/form/_o2m.py:229
+#, python-format
+msgid "%d of %d"
+msgstr "%d من %d"
+
+#: widgets/form/_o2m.py:231
+#, python-format
+msgid "- of %d"
+msgstr "- من %d"
+
+#: widgets/form/templates/binary.mako:28
+msgid "Save As"
+msgstr "حفظ كـ"
+
+#: widgets/form/templates/binary.mako:31
+msgid "add attachment"
+msgstr "إضافة مرفقة"
+
+#: widgets/form/templates/image.mako:6
+msgid "Replace 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:21
+msgid "Create new record..."
+msgstr "إنشاء سجل جديد..."
+
+#: widgets/form/templates/one2many.mako:23
+msgid "Delete record..."
+msgstr "حذف سجل..."
+
+#: widgets/form/templates/one2many.mako:29
+msgid "Translate me."
+msgstr "ترجمني."
+
+#: widgets/form/templates/one2many.mako:48
+msgid "Previous record..."
+msgstr "سجل سابق..."
+
+#: widgets/form/templates/one2many.mako:50
+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 widgets/templates/sidebar.mako:119
+msgid "Import"
+msgstr "إستيراد"
+
+#: widgets/templates/sidebar.mako:114 widgets/templates/sidebar.mako:122
+msgid "Export"
+msgstr "تصدير"
+
+#: widgets/templates/sidebar.mako:126
+msgid "Translate"
+msgstr "ترجم"
+
+#: widgets/templates/sidebar.mako:131
+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:23
+msgid "Update"
+msgstr "تحديث"
+
+#: widgets/templates/listgrid/listgrid.mako:152
+msgid "Add records..."
+msgstr "إضافة سجل..."
+
+#: widgets/templates/listgrid/listgrid.mako:190
+#: widgets/templates/listgrid/listgrid.mako:194
+msgid "Delete record(s)."
+msgstr "حذف السجل او السجلات."
+
+#~ msgid "Click here to add new image."
+#~ msgstr "إضغط لإضافة صورة جديدة"
+
+#~ msgid "Add Resource:"
+#~ msgstr "إضافة مصدر:"
+
+#~ msgid "Image"
+#~ msgstr "صوره"
+
+#~ msgid "You do not have a valid OpenERP publisher warranty contract !"
+#~ msgstr "لا يوجد لديك عقد ضمان صحيح من الناشر للـ OpenERP"
+
+#~ 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"
+
+#~ 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"
+#~ "هذه قائمة بـ بجميع الأكواد التي لا تشتمل علي ضمان الناشر:"

=== added file 'addons/openerp/po/messages/bg.po.OTHER'
--- addons/openerp/po/messages/bg.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/openerp/po/messages/bg.po.OTHER	2011-08-05 10:11:55 +0000
@@ -0,0 +1,1578 @@
+# 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-03-18 11:53+0100\n"
+"PO-Revision-Date: 2011-03-27 16:44+0000\n"
+"Last-Translator: Dimitar Markov <[e-mail]>\n"
+"Language-Team: Bulgarian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-08-04 05:13+0000\n"
+"X-Generator: Launchpad (build 13573)\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 ""
+
+#: validators.py:260
+msgid "Please enter an integer value"
+msgstr "Моля въведете числов израз"
+
+#: validators.py:261
+msgid "Please enter a number"
+msgstr "Моля, въведете номер"
+
+#: controllers/actions.py:94
+msgid "Invalid View"
+msgstr "Невалиден изглед"
+
+#: controllers/actions.py:127
+msgid "Error no report"
+msgstr "Грешка няма справка"
+
+#: controllers/actions.py:153
+msgid "Nothing to print"
+msgstr "Няма нищо за отпечатване"
+
+#: controllers/actions.py:173
+msgid "Printing aborted, too long delay"
+msgstr "Принтирането е отхвърлено. Отне прекалено много време"
+
+#: controllers/actions.py:397
+msgid "Relative URLs are not supported"
+msgstr "Релативни URL не се поддържат"
+
+#: controllers/actions.py:425
+msgid "Action not found"
+msgstr "Действието не е намерено"
+
+#: controllers/actions.py:474
+msgid "No action defined"
+msgstr "Не е определено действие"
+
+#: controllers/attachment.py:55
+msgid "No record selected, You can only attach to existing record..."
+msgstr ""
+"Не е избран запис. Вие можете да прикрепите само съществуващ запис..."
+
+#: controllers/database.py:63
+msgid "Create database"
+msgstr "Създаване на база данни"
+
+#: controllers/database.py:65 controllers/templates/database.mako:56
+#: controllers/templates/search.mako:145
+msgid "Create"
+msgstr "Създаване"
+
+#: controllers/database.py:68
+msgid "Super admin password:"
+msgstr "Парола на СУПЕР администратор"
+
+#: controllers/database.py:68
+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:69 controllers/database.py:101
+msgid "New database name:"
+msgstr "Име на новата база"
+
+#: controllers/database.py:69
+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:70
+msgid "Load Demonstration data:"
+msgstr "Заредете демонстративни данни"
+
+#: controllers/database.py:70
+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:71
+msgid "Default Language:"
+msgstr "Език по подразбиране:"
+
+#: controllers/database.py:71
+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:72
+msgid "Administrator password:"
+msgstr "Администраторска парола"
+
+#: controllers/database.py:72
+msgid ""
+"This is the password of the 'admin' user that will be created in your new "
+"database."
+msgstr ""
+"Това е паролата на  'admin' потребителят, който ще бъде създаден във вашата "
+"нова база данни."
+
+#: controllers/database.py:73
+msgid "Confirm password:"
+msgstr "Потвърдете паролата:"
+
+#: controllers/database.py:73
+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:79
+msgid "Drop database"
+msgstr "Изтриване на база данни"
+
+#: controllers/database.py:81 controllers/templates/database.mako:58
+msgid "Drop"
+msgstr "Изтриване"
+
+#: controllers/database.py:83 controllers/database.py:91
+#: controllers/templates/login.mako:43
+msgid "Database:"
+msgstr "База данни:"
+
+#: controllers/database.py:84 controllers/database.py:92
+#: controllers/database.py:100 controllers/templates/login.mako:61
+#: controllers/templates/login_ajax.mako:78
+#: controllers/templates/login_ajax.mako:98
+msgid "Password:"
+msgstr "Парола:"
+
+#: controllers/database.py:88
+msgid "Backup database"
+msgstr "Архивиране на база данни"
+
+#: controllers/database.py:90 controllers/templates/database.mako:60
+msgid "Backup"
+msgstr "Архив"
+
+#: controllers/database.py:96
+msgid "Restore database"
+msgstr "Възстановяване на база данни"
+
+#: controllers/database.py:98 controllers/templates/database.mako:62
+msgid "Restore"
+msgstr "Възстановяване"
+
+#: controllers/database.py:99
+msgid "File:"
+msgstr "Файл:"
+
+#: controllers/database.py:105
+msgid "Change Administrator Password"
+msgstr "Промяна на администраторска парола"
+
+#: controllers/database.py:107 controllers/templates/preferences/index.mako:37
+msgid "Change Password"
+msgstr "Промяна на парола"
+
+#: controllers/database.py:108
+msgid "Old Password:"
+msgstr "Стара парола:"
+
+#: controllers/database.py:109
+msgid "New Password:"
+msgstr "Нова парола:"
+
+#: controllers/database.py:110
+msgid "Confirm Password:"
+msgstr "Потвърдете паролата:"
+
+#: controllers/database.py:173
+msgid "You must avoid all accents, space or special characters."
+msgstr ""
+"Трябва да избягвате всички ударени букви, специални знаци и интервали"
+
+#: controllers/database.py:174
+msgid "Bad database name"
+msgstr "Грешно име на база данни"
+
+#: controllers/database.py:194
+msgid ""
+"The server crashed during installation.\n"
+"We suggest you to drop this database."
+msgstr "Сървърът се счупи софтуерно по време на инсталацията."
+
+#: controllers/database.py:195
+msgid "Error during database creation"
+msgstr "Грешка при създаване на база данни"
+
+#: controllers/database.py:198 controllers/database.py:225
+#: controllers/database.py:271 controllers/database.py:294
+msgid "Bad super admin password"
+msgstr "Грешна парола на СУПЕР администратор"
+
+#: controllers/database.py:202
+msgid "Could not create database."
+msgstr "Не може да се създаде база данни."
+
+#: controllers/database.py:228
+msgid "Could not drop database"
+msgstr "Не може да се изтрие база данни"
+
+#: controllers/database.py:251
+msgid "Could not create backup."
+msgstr "Не може да се направи архив"
+
+#: controllers/database.py:275
+msgid "Could not restore database"
+msgstr "Не може да възтанови базата данни"
+
+#: controllers/database.py:298
+msgid "Error, password not changed."
+msgstr "Грешка, паролата не е променена"
+
+#: controllers/error_page.py:79
+msgid ""
+"Your problem has been sent to the quality team\n"
+"We will recontact you after analysing the problem."
+msgstr ""
+
+#: controllers/error_page.py:81
+#, 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:561
+#, python-format
+msgid "Invalid button type \"%s\""
+msgstr "Невалиден бутон тип \"%s\""
+
+#: controllers/form.py:944 controllers/tree.py:243
+msgid "No record selected"
+msgstr "Не е избран запис"
+
+#: controllers/form.py:949
+msgid "Print Screen"
+msgstr "Печатане на екрана"
+
+#: controllers/form.py:1016 widgets/listgrid.py:305 widgets/listgrid.py:366
+#: widgets/form/_form.py:910
+msgid "Application Error"
+msgstr "Грешка в приложението"
+
+#: controllers/form.py:1016
+#, python-format
+msgid "Wrong on_change trigger: %s"
+msgstr ""
+
+#: controllers/form.py:1121
+msgid "Open resource"
+msgstr "Отваряне на ресурс"
+
+#: controllers/form.py:1124
+msgid "Set to default value"
+msgstr "Сложи стойност по подразбиране"
+
+#: controllers/form.py:1125
+msgid "Set as default"
+msgstr "Задаване по подразбиране"
+
+#: controllers/form.py:1132
+msgid "Action"
+msgstr "Действие"
+
+#: controllers/form.py:1133
+msgid "Report"
+msgstr "Справка"
+
+#: controllers/impex.py:66
+msgid ""
+"Operation failed\n"
+"I/O error"
+msgstr ""
+"Операцията се провали\n"
+"I/O error - Входно-изходна грешка"
+
+#: controllers/impex.py:402
+msgid "Export Error"
+msgstr "Грешка при експортиране"
+
+#: controllers/impex.py:469
+msgid "Database ID"
+msgstr "ID на базата данни"
+
+#: controllers/impex.py:476
+msgid "Error opening .CSV file"
+msgstr "Грешка при отваряне на .CSV файл"
+
+#: controllers/impex.py:476
+msgid "Input Error."
+msgstr "Грешка при въвеждане."
+
+#: controllers/impex.py:498
+#, python-format
+msgid "You cannot import the field '%s', because we cannot auto-detect it"
+msgstr ""
+
+#: controllers/impex.py:501
+#, python-format
+msgid "Error processing the first line of the file. Field \"%s\" is unknown"
+msgstr ""
+"Грешка при обработване на първия ред от файла. Поле \"%s\" е неизвестно"
+
+#: controllers/impex.py:72 controllers/impex.py:501
+msgid "Import Error."
+msgstr "Грешка при импорт"
+
+#: controllers/impex.py:520
+msgid "The CSV delimiter must be a single character"
+msgstr "Разделителят при CSV-формата трябва да бъде един символ"
+
+#: controllers/impex.py:532
+msgid "File Format Error"
+msgstr "Грешка във формата на файла"
+
+#: controllers/impex.py:550
+msgid "XML-RPC error"
+msgstr "XML-RPC грешка"
+
+#: controllers/impex.py:555
+#, python-format
+msgid "Imported %d objects"
+msgstr "Импортирани %d обекти"
+
+#: controllers/impex.py:560
+#, python-format
+msgid "Error trying to import this record:%s. ErrorMessage:%s %s"
+msgstr ""
+
+#: controllers/impex.py:561
+msgid "ImportationError"
+msgstr "Важна грешка"
+
+#: controllers/listgrid.py:52
+msgid "Parent record doesn't exists..."
+msgstr ""
+
+#: controllers/preferences.py:35
+msgid "Change your password"
+msgstr "Смяна на вашата парола"
+
+#: controllers/preferences.py:65 controllers/templates/header.mako:59
+msgid "Preferences"
+msgstr "Предпочитания"
+
+#: controllers/preferences.py:92
+msgid "All passwords have to be filled."
+msgstr "Всички пароли следва да бъдато попълнени"
+
+#: controllers/preferences.py:94
+msgid "The new password and its confirmation must be identical."
+msgstr "Новата парола и потвърждението на пароалта трябва да бъда идентични"
+
+#: controllers/preferences.py:103
+msgid "Could not change your password."
+msgstr "Не може да се промени вашата парола"
+
+#: controllers/preferences.py:105
+msgid "Original password incorrect, your password was not changed."
+msgstr "Оригиналната парола не е вярна, паролата ви не беше сменена."
+
+#: controllers/root.py:174
+#, python-format
+msgid "Version %s"
+msgstr "Версия %s"
+
+#: controllers/translator.py:136
+msgid "You need to save the resource before adding translations."
+msgstr "нужно е да запишете ресурса преди добавяне на превод"
+
+#: controllers/tree.py:274
+msgid "No resource selected"
+msgstr "не е избран източник"
+
+#: controllers/utils.py:43
+msgid "Could not connect to server"
+msgstr "Не може да се свърже със сървър"
+
+#: controllers/utils.py:127 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:221
+msgid "Invalid view id."
+msgstr ""
+
+#: controllers/viewed.py:499
+msgid "Unable to create inherited view."
+msgstr "Невъзожно е да се създаде наследен изглед."
+
+#: controllers/viewed.py:501
+msgid "Can't create inherited view here."
+msgstr "Тук не може да бъде създаден наследен изглед"
+
+#: controllers/viewed.py:504
+msgid "Not implemented yet!"
+msgstr "Не е внедрено все още !"
+
+#: controllers/viewed.py:609
+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 Уеб"
+
+#: 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 запазена марка на OpenERP SA Company."
+
+#: 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 "Относно 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 ""
+
+#: 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 ""
+"Платформено независима система и може да бъде инсталирана под Windows, Mac "
+"OS X,\n"
+"                    и различни Линукс и Юникс базирани дистрибуции. "
+"Архитектурата позволява\n"
+"                    бързо добаване на нови функционалностти, и промени към "
+"работещи реално системи\n"
+"                    и мигриране директно към нови версии."
+
+#: controllers/templates/about.mako:57
+msgid ""
+"Depending on your needs, OpenERP is available through a web or application "
+"client."
+msgstr ""
+"В зависимост от вашшите нужди, OpenERP е налична и през уеб и през "
+"приложение като клиент на системата"
+
+#: controllers/templates/database.mako:54 controllers/templates/login.mako:4
+#: controllers/templates/login.mako:71 controllers/templates/login_ajax.mako:85
+#: controllers/templates/login_ajax.mako:104
+msgid "Login"
+msgstr "Вход"
+
+#: controllers/templates/database.mako:64
+msgid "Password"
+msgstr "Парола"
+
+#: controllers/templates/error_page.mako:82
+#, python-format
+msgid "An %(error_type)s has been reported."
+msgstr ""
+
+#: controllers/templates/error_page.mako:84
+msgid "Let me fix it"
+msgstr "Нека сам да се справя"
+
+#: controllers/templates/error_page.mako:91
+#: controllers/templates/error_page.mako:93
+msgid "Fix it for me"
+msgstr "Поправете ми го"
+
+#: controllers/templates/error_page.mako:99
+msgid "Publisher warranty contract."
+msgstr "Договор за ганционно обслужване."
+
+#: controllers/templates/error_page.mako:100
+msgid ""
+"Your request will be sent to OpenERP and publisher warranty team will reply "
+"you shortly."
+msgstr ""
+
+#: controllers/templates/error_page.mako:104
+msgid "Summary of the problem:"
+msgstr "Преглед на проблема:"
+
+#: controllers/templates/error_page.mako:111
+msgid "Explain what you did:"
+msgstr "Обяснете какво направихте"
+
+#: controllers/templates/error_page.mako:120
+msgid "Other Comments:"
+msgstr "Други коментари:"
+
+#: controllers/templates/error_page.mako:132
+msgid "Send to Publisher Warranty Team"
+msgstr ""
+
+#: controllers/templates/error_page.mako:159
+msgid "Write concurrency warning :"
+msgstr ""
+
+#: controllers/templates/error_page.mako:164
+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:178 controllers/templates/exp.mako:251
+#: controllers/templates/form.mako:141 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:41
+msgid "Cancel"
+msgstr "Отказ"
+
+#: controllers/templates/error_page.mako:179
+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:190
+msgid "Available fields"
+msgstr "Налични полета"
+
+#: controllers/templates/exp.mako:192
+msgid "Fields to export"
+msgstr "Полета за експорт"
+
+#: controllers/templates/exp.mako:194
+msgid "Save fields list"
+msgstr "Запазете списък с полета"
+
+#: controllers/templates/exp.mako:196
+msgid "Save as:"
+msgstr "Запиши като:"
+
+#: controllers/templates/exp.mako:198 controllers/templates/fieldpref.mako:102
+#: controllers/templates/selection.mako:45
+msgid "OK"
+msgstr "OK"
+
+#: controllers/templates/exp.mako:202
+msgid "Saved exports:"
+msgstr "Запазени експорти:"
+
+#: controllers/templates/exp.mako:211 controllers/templates/form.mako:136
+#: widgets/form/templates/one2many.mako:23 widgets/templates/sidebar.mako:67
+#: widgets/templates/listgrid/listgrid.mako:119
+#: widgets/templates/listgrid/listgrid.mako:123
+#: widgets/templates/listgrid/listgrid.mako:127
+#: widgets/templates/listgrid/listgrid.mako:191
+#: widgets/templates/listgrid/listgrid.mako:196
+#: widgets/templates/listgrid/listgroup.mako:131
+#: widgets/templates/listgrid/multiple_group.mako:81
+msgid "Delete"
+msgstr "Изтриване"
+
+#: controllers/templates/exp.mako:224 widgets/templates/sidebar.mako:56
+#: widgets/templates/listgrid/listgrid.mako:153
+msgid "Add"
+msgstr "Добави"
+
+#: controllers/templates/exp.mako:229 controllers/templates/viewlist.mako:125
+msgid "Remove"
+msgstr "Премахване"
+
+#: controllers/templates/exp.mako:234
+msgid "Remove All"
+msgstr "Премахвани всички"
+
+#: controllers/templates/exp.mako:252
+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/imp.mako:204
+#: controllers/templates/index.mako:201 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:43
+#: 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:64 controllers/templates/tree.mako:33
+msgid "Disable all Tips"
+msgstr "Изключване на всички подсказки"
+
+#: controllers/templates/form.mako:65 controllers/templates/tree.mako:34
+msgid "Hide this Tip"
+msgstr "Скриване на тази подсказка"
+
+#: controllers/templates/form.mako:83 controllers/templates/tree.mako:41
+msgid "Add / Remove Shortcut..."
+msgstr ""
+
+#: controllers/templates/form.mako:87
+#, python-format
+msgid "Search: %s"
+msgstr "Търси: %s"
+
+#: controllers/templates/form.mako:94
+msgid "Corporate Intelligence..."
+msgstr "Корпоративно разузнаване ..."
+
+#: controllers/templates/form.mako:100
+msgid "Show Logs..."
+msgstr "Покажи логове..."
+
+#: controllers/templates/form.mako:112
+msgid "Create a new resource"
+msgstr "Създай нов ресурс"
+
+#: controllers/templates/form.mako:113 controllers/templates/search.mako:128
+#: controllers/templates/viewed_new_model.mako:36
+#: controllers/templates/viewlist.mako:119 widgets/form/_o2m.py:97
+#: widgets/form/templates/one2many.mako:21
+#: widgets/templates/listgrid/listgrid.mako:158
+#: widgets/templates/listgrid/listgrid.mako:162
+#: widgets/templates/listgrid/listgroup.mako:20
+msgid "New"
+msgstr "Нов"
+
+#: controllers/templates/form.mako:117
+msgid "Edit this resource"
+msgstr "Редактиране на този ресурс"
+
+#: controllers/templates/form.mako:118 controllers/templates/viewlist.mako:122
+#: widgets/templates/listgrid/listgrid.mako:83
+#: widgets/templates/listgrid/listgrid.mako:93
+#: widgets/templates/listgrid/listgroup.mako:112
+#: widgets/templates/listgrid/multiple_group.mako:63
+msgid "Edit"
+msgstr "Редакция"
+
+#: controllers/templates/form.mako:122
+msgid "Save this resource"
+msgstr "Запази този ресурс"
+
+#: controllers/templates/form.mako:123 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:40
+#: 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:125
+msgid "Save & Edit this resource"
+msgstr "Запази и редактирай този ресурс"
+
+#: controllers/templates/form.mako:126
+msgid "Save & Edit"
+msgstr "Запази и редактирай"
+
+#: controllers/templates/form.mako:130
+msgid "Duplicate this resource"
+msgstr "Дублирай на този ресурс"
+
+#: controllers/templates/form.mako:131
+msgid "Duplicate"
+msgstr "Дублиране"
+
+#: controllers/templates/form.mako:135
+msgid "Delete this resource"
+msgstr "Изтрий този ресурс"
+
+#: controllers/templates/form.mako:140
+msgid "Cancel editing the current resource"
+msgstr "Откажете редактирането на текущия ресурс"
+
+#: controllers/templates/form.mako:145
+msgid "Create new node"
+msgstr "Създай ново разклонение"
+
+#: controllers/templates/form.mako:146
+msgid "New Node"
+msgstr "Ново разклонение"
+
+#: controllers/templates/form.mako:150
+msgid "Show grid in workflow canvas"
+msgstr "Покажи мрежата върху работното табло"
+
+#: controllers/templates/form.mako:151
+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:230
+#, 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/imp.mako:79
+msgid "Import Data"
+msgstr "Импортиране на данни"
+
+#: controllers/templates/imp.mako:89
+msgid "1. Import a .CSV file"
+msgstr "1. Импортиране .CSV file"
+
+#: controllers/templates/imp.mako:105
+msgid "CSV File:"
+msgstr "CSV файл:"
+
+#: controllers/templates/imp.mako:123
+msgid "2. Check your file format"
+msgstr "Проверете формата на файла"
+
+#: controllers/templates/imp.mako:130
+#, python-format
+msgid "The import failed due to: %(message)s"
+msgstr "Внасянето(импортирането) се провали защото: %(message)s"
+
+#: controllers/templates/imp.mako:132
+msgid "Here is a preview of the file we could not import:"
+msgstr "Тук прегледай файла, който не се внесе(импортира):"
+
+#: controllers/templates/imp.mako:157
+msgid "CSV Options"
+msgstr "CSV опции"
+
+#: controllers/templates/imp.mako:160
+msgid "Separator:"
+msgstr "Разделител:"
+
+#: controllers/templates/imp.mako:162
+msgid "Delimiter:"
+msgstr "Разделител:"
+
+#: controllers/templates/imp.mako:166
+msgid "Encoding:"
+msgstr "Кодова таблица:"
+
+#: controllers/templates/imp.mako:173
+msgid "Lines to skip:"
+msgstr "Редове, които да бъдат пропуснати:"
+
+#: controllers/templates/imp.mako:187
+msgid "3. File imported"
+msgstr "Файлът е импортиран"
+
+#: controllers/templates/imp.mako:205
+msgid "Import File"
+msgstr "Импорт на файл"
+
+#: controllers/templates/index.mako:167
+msgid "System Logs"
+msgstr "Системни логове"
+
+#: controllers/templates/index.mako:192
+msgid "More"
+msgstr "Още"
+
+#: controllers/templates/index.mako:193
+msgid "Widgets"
+msgstr "Добавки"
+
+#: controllers/templates/index.mako:233 controllers/templates/index.mako:238
+#, python-format
+msgid "Powered by %(openerp)s "
+msgstr "Осъществено от %(openerp)s "
+
+#: controllers/templates/login.mako:57 controllers/templates/login_ajax.mako:72
+#: controllers/templates/login_ajax.mako:94
+msgid "User:"
+msgstr "Потребител:"
+
+#: controllers/templates/login.mako:68
+msgid "Databases"
+msgstr "Бази данни"
+
+#: controllers/templates/login.mako:88
+msgid "Top Contributor:"
+msgstr "Топ сътрудник:"
+
+#: controllers/templates/login.mako:98
+msgid ""
+"We think that daily job activities can be more intuitive, efficient, "
+"automated, .. and even fun."
+msgstr ""
+"Ние смятаме, че ежедневните дейности на работното място могат да бъдат по-"
+"интуитивни, ефективни, автоматизирани, .. и дори забавни."
+
+#: controllers/templates/login.mako:99
+msgid "OpenERP's vision to be:"
+msgstr "OpenERP's визията може да е:"
+
+#: controllers/templates/login.mako:107
+msgid "Full featured"
+msgstr "Пълна поддръжка"
+
+#: controllers/templates/login.mako:108
+msgid ""
+"Today's enterprise challenges are multiple. We provide one module for each "
+"need."
+msgstr ""
+
+#: controllers/templates/login.mako:116
+msgid "Open Source"
+msgstr "Отворен Код"
+
+#: controllers/templates/login.mako:117
+msgid ""
+"To Build a great product, we rely on the knowledge of thousands of "
+"contributors."
+msgstr ""
+
+#: controllers/templates/login.mako:125
+msgid "User Friendly"
+msgstr "Приятелски настроен към потребителя"
+
+#: controllers/templates/login.mako:126
+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:77
+#: 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
+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 "Управление на изгледи (%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:24
+msgid "Error"
+msgstr "Грешка"
+
+#: utils/common.py:27
+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:439
+msgid "== Access Denied =="
+msgstr "== Достърп отказан =="
+
+#: widgets/_views.py:46
+msgid "Form"
+msgstr "Форма"
+
+#: widgets/_views.py:47
+msgid "Form view..."
+msgstr "Изглед форма"
+
+#: widgets/_views.py:78
+msgid "Search view..."
+msgstr "Изглед търсене"
+
+#: widgets/listgrid.py:305
+msgid "Wrong on_change trigger"
+msgstr "Грешно задействане при промяна"
+
+#: widgets/listgrid.py:368 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:280
+msgid "contains"
+msgstr "съдържа"
+
+#: widgets/search.py:280
+msgid "doesn't contain"
+msgstr "не съдържа"
+
+#: widgets/search.py:281
+msgid "is equal to"
+msgstr ""
+
+#: widgets/search.py:281
+msgid "is not equal to"
+msgstr "е равно на"
+
+#: widgets/search.py:282
+msgid "greater than"
+msgstr "е по-голямо от"
+
+#: widgets/search.py:282
+msgid "less than"
+msgstr "по-малко от"
+
+#: widgets/search.py:283
+msgid "in"
+msgstr "в"
+
+#: widgets/search.py:283
+msgid "not in"
+msgstr "извън"
+
+#: widgets/search.py:392
+msgid "Yes"
+msgstr "Да"
+
+#: widgets/search.py:392
+msgid "No"
+msgstr "Не"
+
+#: widgets/form/_action.py:48
+msgid "Action not found!"
+msgstr "Действието не е открито!"
+
+#: widgets/form/_o2m.py:97 widgets/templates/listgrid/listgrid.mako:156
+#: widgets/templates/listgrid/listgrid.mako:162
+#: widgets/templates/listgrid/listgroup.mako:20
+msgid "Create new record."
+msgstr "Създаване на нов запис."
+
+#: widgets/form/_o2m.py:110
+msgid "Save/New"
+msgstr "Запазване/Нов"
+
+#: widgets/form/_o2m.py:110
+msgid "Save parent record."
+msgstr ""