← Back to team overview

openerp-community team mailing list archive

lp:~openerp-community/openobject-client/6.0-bug-880592-moylop260 into lp:openobject-client

 

moylop260 - http://www.vauxoo.com has proposed merging lp:~openerp-community/openobject-client/6.0-bug-880592-moylop260 into lp:openobject-client.

Requested reviews:
  OpenERP sa GTK client R&D (openerp-dev-gtk)
Related bugs:
  Bug #880592 in OpenERP GTK Client: "[WISHLIST] [6.0] Widget many2many no set directly id when len is just one"
  https://bugs.launchpad.net/openobject-client/+bug/880592

For more details, see:
https://code.launchpad.net/~openerp-community/openobject-client/6.0-bug-880592-moylop260/+merge/80167

[WISHLIST] [6.0] Widget many2many no set directly id when len is just one

Widget many2many no set directly id when len is just one

In the widget many2one when return one value, these set it when these value without sub view
But in many2many no is this case
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~openerp-community/openobject-client/6.0-bug-880592-moylop260/+merge/80167
Your team OpenERP Community is subscribed to branch lp:~openerp-community/openobject-client/6.0-bug-880592-moylop260.
=== modified file 'bin/modules/gui/window/form.py'
--- bin/modules/gui/window/form.py	2011-10-11 06:15:57 +0000
+++ bin/modules/gui/window/form.py	2011-10-24 01:06:26 +0000
@@ -174,19 +174,29 @@
         ## and needed to be converted to real ids
         if isinstance(get_id, str):
             get_id = int(get_id.split('-')[0])
-        all_ids = rpc.session.rpc_exec_auth('/object', 'execute', self.model, 'search', [])
+
         if widget:
             get_id = int(widget.get_value())
-        if get_id in all_ids:
-            current_ids = self.screen.ids_get()
-            if get_id in current_ids:
-                self.screen.display(get_id)
-            else:
+            
+        # We need listed / searched set of IDS when we switch back to a view
+        listed_ids = self.screen.ids_get()
+        
+        ## If the record is already among the previously searched records or inside
+        ## the listed_ids, we do not need to call search
+        record_exists = False
+        if get_id in listed_ids:
+            self.screen.display(get_id)
+            record_exists = True
+        else:
+            # User is trying to see the record with Ctrl + G option! So we search domainless, limitless!
+            record_exists = rpc.session.rpc_exec_auth('/object', 'execute', self.model, 'search', [('id','=',get_id)], False, False, False, self.screen.context)
+            if record_exists:
                 self.screen.load([get_id])
+        
+        if get_id and record_exists:
             self.screen.current_view.set_cursor()
         else:
-            if widget:
-                common.message(_('Resource ID does not exist for this object!'))
+            common.message(_('Resource ID does not exist for this object!'))
 
     def get_event(self, widget, event, win):
         if event.keyval in (gtk.keysyms.Return, gtk.keysyms.KP_Enter):

=== modified file 'bin/modules/gui/window/win_export.py'
--- bin/modules/gui/window/win_export.py	2011-10-11 07:23:07 +0000
+++ bin/modules/gui/window/win_export.py	2011-10-24 01:06:26 +0000
@@ -288,7 +288,9 @@
     def import_toggled(self, widget=None):
         self.model1.clear()
         self.model2.clear()
+        self.fields_data.clear()
         self.model_populate(self.fields_original)
+        self.fill_predefwin()
 
     def sig_unsel_all(self, widget=None):
         self.model2.clear()

=== modified file 'bin/modules/gui/window/win_search.py'
--- bin/modules/gui/window/win_search.py	2011-10-11 06:15:57 +0000
+++ bin/modules/gui/window/win_search.py	2011-10-24 01:06:26 +0000
@@ -111,8 +111,14 @@
         self.model = model
         self.sel_multi = sel_multi
         self.ids = ids
+<<<<<<< TREE
         self.ui = openerp_gtk_builder('openerp.ui', ['win_search'])
         self.win = self.ui.get_object('win_search')
+=======
+        self.ctx = context
+        self.glade = glade.XML(common.terp_path("openerp.glade"),'win_search',gettext.textdomain())
+        self.win = self.glade.get_widget('win_search')
+>>>>>>> MERGE-SOURCE
         self.win.set_icon(common.OPENERP_ICON)
         if not parent:
             parent = service.LocalService('gui.main').window
@@ -184,7 +190,9 @@
     def go(self):
         ## This is if the user has set some filters by default with search_default_XXX
         if self.ids:
-            self.screen.win_search_domain += [('id','in', self.ids)]
+            #Add the domain only if there was no name_search performed with name
+            name_search = self.ctx.get('name_search',False)
+            self.screen.win_search_domain += [('id','in', self.ids)] if name_search else []
             self.find()
         else:
             self.screen.update_scroll()

=== modified file 'bin/po/ar.po'
--- bin/po/ar.po	2011-10-15 04:56:10 +0000
+++ bin/po/ar.po	2011-10-24 01:06:26 +0000
@@ -7,17 +7,28 @@
 msgstr ""
 "Project-Id-Version: openobject-client\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-07-28 15:22+0530\n"
 "PO-Revision-Date: 2011-10-14 15:46+0000\n"
+=======
+"POT-Creation-Date: 2010-12-13 18:11+0100\n"
+"PO-Revision-Date: 2011-10-21 21:54+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: kifcaliph <kifcaliph@xxxxxxxxxxx>\n"
 "Language-Team: Arabic <ar@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-10-15 04:56+0000\n"
 "X-Generator: Launchpad (build 14124)\n"
+=======
+"X-Launchpad-Export-Date: 2011-10-22 05:26+0000\n"
+"X-Generator: Launchpad (build 14170)\n"
+>>>>>>> MERGE-SOURCE
 "Language: ar\n"
 
+<<<<<<< TREE
 #: bin/widget/view/gantt_gtk/parser_dummy.py:30
 msgid "Gantt view not yet implemented !"
 msgstr "خريطة جانت لم يتم تنصيبها بعد!"
@@ -228,9 +239,293 @@
 
 #: bin/widget/view/form_gtk/image.py:112 bin/widget/view/form_gtk/url.py:118
 #: bin/modules/gui/main.py:1389 bin/openerp.glade:5817
+=======
+#: bin/plugins/__init__.py:27
+msgid "Print Workflow"
+msgstr "طباعة مسار العمل"
+
+#: bin/plugins/__init__.py:28
+msgid "Print Workflow (with subflows)"
+msgstr "طباعة مسار العمل (مُجمع)"
+
+#: bin/plugins/__init__.py:40
+msgid "No available plugin for this resource !"
+msgstr "لا توجد برامج مساعدة لهذا المصدر!"
+
+#: bin/plugins/__init__.py:42
+msgid "Choose a Plugin"
+msgstr "اختر برنامج إضافي"
+
+#: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
+msgid "Connection refused !"
+msgstr "إتصال غير مقبول !"
+
+#: bin/rpc.py:203 bin/rpc.py:205 bin/modules/action/wizard.py:162
+#: bin/modules/action/wizard.py:168 bin/modules/action/wizard.py:170
+#: bin/modules/gui/main.py:195 bin/modules/gui/main.py:201
+msgid "Application Error"
+msgstr "خطأ في البرنامج"
+
+#: bin/rpc.py:205 bin/modules/action/wizard.py:170
+msgid "View details"
+msgstr "عرض التفاصيل"
+
+#: bin/modules/action/main.py:48
+msgid "Nothing to print!"
+msgstr "لا يوجد شئ للطباعة!"
+
+#: bin/modules/action/main.py:66
+msgid "Printing aborted, too long delay !"
+msgstr "الطباعة توقفت. للتأخر الطويل جداَ !"
+
+#: bin/modules/action/main.py:195
+msgid "Select your action"
+msgstr "اختر إجراءك"
+
+#: bin/modules/gui/main.py:89 bin/modules/gui/main.py:341
+msgid "Could not connect to server !"
+msgstr "لم يتم التمكن من الاتصال بالخادم !"
+
+#: bin/modules/gui/main.py:93 bin/openerp.glade:72 bin/openerp.glade:6233
+#: bin/openerp.glade:6479 bin/openerp.glade:6802 bin/openerp.glade:7466
+msgid "Server:"
+msgstr "الخادم:"
+
+#: bin/modules/gui/main.py:104 bin/openerp.glade:98 bin/openerp.glade:6515
+#: bin/openerp.glade:6759 bin/openerp.glade:7058 bin/openerp.glade:7423
+msgid "Change"
+msgstr "تغيير"
+
+#: bin/modules/gui/main.py:111
+msgid "Super Administrator Password:"
+msgstr "كلمة مرور المشرف العام الفائق:"
+
+#: bin/modules/gui/main.py:193
+msgid "Bad Super Administrator Password"
+msgstr "كلمة مرور المشرف الاعلى خاطئة:"
+
+#: bin/modules/gui/main.py:217
+msgid "Migration Scripts"
+msgstr "أوامر الترحيل"
+
+#: bin/modules/gui/main.py:220
+msgid "Contract ID:"
+msgstr "رمز العقد:"
+
+#: bin/modules/gui/main.py:226
+msgid "Contract Password:"
+msgstr "كلمة مرور العقد:"
+
+#: bin/modules/gui/main.py:241
+msgid "You already have the latest version"
+msgstr "انت بالفعل لديك آخر اصدار"
+
+#: bin/modules/gui/main.py:246
+msgid "The following updates are available:"
+msgstr "التحديثات التالية متوفره:"
+
+#: bin/modules/gui/main.py:258
+msgid "You can now migrate your databases."
+msgstr "يمكنك الأن ترحيل قواعد بياناتك."
+
+#: bin/modules/gui/main.py:263
+msgid "Migrate Database"
+msgstr "ترحيل قاعدة البيانات"
+
+#: bin/modules/gui/main.py:280
+msgid "Database"
+msgstr "قاعدة البيانات"
+
+#: bin/modules/gui/main.py:292
+msgid "Your database has been upgraded."
+msgstr "تم تحديث قاعدة البيانات."
+
+#: bin/modules/gui/main.py:294
+msgid "Your databases have been upgraded."
+msgstr "تم تحديث قواعد البيانات."
+
+#: bin/modules/gui/main.py:296
+msgid "You have not selected a database"
+msgstr "لم يتم إختيار قاعدة بيانات"
+
+#: bin/modules/gui/main.py:360
+msgid "No database found, you must create one !"
+msgstr "لم يتم العثور على قاعدة بيانات، يجب ان تنشئ واحدة !"
+
+#: bin/modules/gui/main.py:468
+msgid "Unknown"
+msgstr "مجهول"
+
+#: bin/modules/gui/main.py:474
+#, python-format
+msgid ""
+"The versions of the server (%s) and the client (%s) missmatch. The client "
+"may not work properly. Use it at your own risks."
+msgstr ""
+"الإصدار الموجود علي الخادم (%s) لا يتوافق مع إصدار البرنامج الطرفي (%s). "
+"البرنامج الطرفي قد لا يعمل جيداً. استخدامه علي مسؤوليتك."
+
+#: bin/modules/gui/main.py:610
+msgid "Sorry,'"
+msgstr "عفواً، '"
+
+#: bin/modules/gui/main.py:610 bin/modules/gui/main.py:613
+msgid "Bad database name !"
+msgstr "اسم قاعدة البيانات غير صالح !"
+
+#: bin/modules/gui/main.py:613
+msgid ""
+"The database name must contain only normal characters or \"_\".\n"
+"You must avoid all accents, space or special characters."
+msgstr ""
+"اسم قاعدة البيانات يجب ان يتكون فقط من الحروف العاديه او \"_\".\n"
+"يجب ان تتجنب استعمال العلامات الخاصه، المسافات أو الفواصل."
+
+#: bin/modules/gui/main.py:637 bin/modules/gui/main.py:650
+#: bin/modules/gui/main.py:652 bin/modules/gui/main.py:654
+msgid "Could not create database."
+msgstr "لا يمكن إنشاء قاعدة البيانات."
+
+#: bin/modules/gui/main.py:638 bin/modules/gui/main.py:650
+msgid "Database already exists !"
+msgstr "قاعدة البيانات موجوده مسبقاً !"
+
+#: bin/modules/gui/main.py:652 bin/modules/gui/main.py:1384
+#: bin/modules/gui/main.py:1404 bin/modules/gui/main.py:1509
+msgid "Bad database administrator password !"
+msgstr "كلمة مرور عير صالحة لمشرف قاعدة البيانات !"
+
+#: bin/modules/gui/main.py:654 bin/modules/gui/main.py:661
+msgid "Error during database creation !"
+msgstr "خطأ اثناء إنشاء قاعدة البيانات !"
+
+#: bin/modules/gui/main.py:661
+msgid ""
+"The server crashed during installation.\n"
+"We suggest you to drop this database."
+msgstr ""
+"تعطل الخادم أثناء التنصيب.\n"
+"يبدو انه عليك إسقاط قاعة البيانات هذه."
+
+#: bin/modules/gui/main.py:707 bin/modules/gui/main.py:1072
+msgid "Press Ctrl+O to login"
+msgstr "إضغط علي مفتاحي Ctrl+O للدخول"
+
+#: bin/modules/gui/main.py:881
+msgid "Edit"
+msgstr "تحرير"
+
+#: bin/modules/gui/main.py:974
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: bin/modules/gui/main.py:976
+msgid "No Company"
+msgstr "لا توجد شركة"
+
+#: bin/modules/gui/main.py:989
+#, python-format
+msgid "%s request(s)"
+msgstr "%s طلب/طلبات"
+
+#: bin/modules/gui/main.py:991
+msgid "No request"
+msgstr "لا يوجد طلب"
+
+#: bin/modules/gui/main.py:993
+#, python-format
+msgid " - %s request(s) sent"
+msgstr " - %s تم إرسال طلب/طلبات"
+
+#: bin/modules/gui/main.py:1031
+msgid ""
+"Please double-check the database name or contact your administrator to "
+"verify the database status."
+msgstr ""
+"رجاءاً تأكد من اسم قاعدة البيانات او اتصل بمديرك المشرف علي النظام لمراجعة "
+"حالة قاعدة البيانات."
+
+#: bin/modules/gui/main.py:1031
+msgid "Database cannot be accessed or does not exist"
+msgstr "لايمكن الدخول لقاعدة البيانات او انها غير موجوده"
+
+#: bin/modules/gui/main.py:1035
+msgid ""
+"Connection error !\n"
+"Unable to connect to the server !"
+msgstr ""
+"خطأ في الاتصال !\n"
+"لم يتمكن الاتصال بالخادم !"
+
+#: bin/modules/gui/main.py:1037
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password !"
+msgstr ""
+"خطأ في التوثيق !\n"
+"كلمة المرور او اسم المستخدم غير صالح !"
+
+#: bin/modules/gui/main.py:1050
+#, python-format
+msgid "OpenERP - %s"
+msgstr "OpenERP - %s"
+
+#: bin/modules/gui/main.py:1070
+msgid "Not logged !"
+msgstr "غير متصل !"
+
+#: bin/widget/view/form_gtk/one2many_list.py:52 bin/modules/gui/main.py:1079
+#: bin/openerp.glade:6081
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#: bin/modules/gui/main.py:1153
+msgid ""
+"You can not log into the system !\n"
+"Ask the administrator to verify\n"
+"you have an action defined for your user."
+msgstr ""
+"لا يمكن الدخول للنظام !\n"
+"الرجاء سؤال مدير النظام للتأكد\n"
+"من ان لديك صلاحية للمستخدم الحالي"
+
+#: bin/modules/gui/main.py:1187 bin/modules/gui/main.py:1194
+msgid "Do you really want to quit ?"
+msgstr "هل تود الخروج ؟"
+
+#: bin/modules/gui/main.py:1263
+#, python-format
+msgid "Attachments (%d)"
+msgstr "مرفقات (%d)"
+
+#: bin/modules/gui/main.py:1276
+msgid "Attachments"
+msgstr "مرفقات"
+
+#: bin/modules/gui/main.py:1375
+msgid "Delete a database"
+msgstr "امسح قاعدة البيانات"
+
+#: bin/modules/gui/main.py:1381
+msgid "Database dropped successfully !"
+msgstr "تم حذف قاعدة البيانات بنجاح !"
+
+#: bin/modules/gui/main.py:1384
+msgid "Could not drop database."
+msgstr "لم يتمكن من حذف قاعدة البيانات."
+
+#: bin/modules/gui/main.py:1386
+msgid "Couldn't drop database"
+msgstr "لم يتمكن من حذف قاعدة البيانات."
+
+#: bin/widget/view/form_gtk/image.py:112 bin/widget/view/form_gtk/url.py:118
+#: bin/modules/gui/main.py:1389 bin/openerp.glade:5817
+>>>>>>> MERGE-SOURCE
 msgid "Open..."
 msgstr "إفتح..."
 
+<<<<<<< TREE
 #: bin/widget/view/form_gtk/image.py:127
 msgid "There is no image to save as !"
 msgstr "لا توجد صورة لحفظها !"
@@ -242,9 +537,52 @@
 #: bin/widget/view/form_gtk/image.py:129
 #: bin/widget/view/form_gtk/binary.py:167 bin/printer/printer.py:231
 #: bin/modules/gui/window/win_export.py:359 bin/modules/gui/main.py:1493
+=======
+#: bin/modules/gui/main.py:1401
+msgid "Database restored successfully !"
+msgstr "تم اسنعادة قاعدة البيانات بنجاح !"
+
+#: bin/modules/gui/main.py:1404
+msgid "Could not restore database."
+msgstr "لم يتم اسنعادة قاعدة البيانات ."
+
+#: bin/modules/gui/main.py:1406
+msgid "Couldn't restore database"
+msgstr "لم يتم اسنعادة قاعدة البيانات ."
+
+#: bin/modules/gui/main.py:1457
+msgid ""
+"Confirmation password does not match new password, operation cancelled!"
+msgstr "تأكيد كلمة المرور لم يتوافق مع كلمة المرور الجديدة، ألغيت العملية!"
+
+#: bin/modules/gui/main.py:1459
+msgid "Validation Error."
+msgstr "خطأ في التصحيح."
+
+#: bin/modules/gui/main.py:1476
+msgid "Could not change the Super Admin password."
+msgstr "لم يتمكن من تغيير كلمة مرور المشرف العام."
+
+#: bin/modules/gui/main.py:1477 bin/modules/gui/main.py:1483
+msgid "Bad password provided !"
+msgstr "كلمة مرور غير مقبولة !"
+
+#: bin/modules/gui/main.py:1457
+msgid "Error, password not changed."
+msgstr "خطأ، لم تتغير كلمة المرور."
+
+#: bin/modules/gui/main.py:1490 bin/modules/gui/main.py:1513
+msgid "Backup a database"
+msgstr "احتفظ بنسخة من قاعدة البيانات"
+
+#: bin/widget/view/form_gtk/image.py:129
+#: bin/widget/view/form_gtk/binary.py:167 bin/printer/printer.py:231
+#: bin/modules/gui/window/win_export.py:359 bin/modules/gui/main.py:1493
+>>>>>>> MERGE-SOURCE
 msgid "Save As..."
 msgstr "احفظ كـ..."
 
+<<<<<<< TREE
 #: bin/widget/view/form_gtk/image.py:177
 msgid "Image corrupted"
 msgstr "صورة غير سليمة"
@@ -352,12 +690,75 @@
 
 #: bin/widget/view/form_gtk/one2many_list.py:388
 #: bin/modules/gui/window/form.py:290
+=======
+#: bin/modules/gui/main.py:1506
+msgid "Database backed up successfully !"
+msgstr "تم الإحتفاظ بنجاح !"
+
+#: bin/modules/gui/main.py:1509
+msgid "Could not backup the database."
+msgstr "لم يتمكن من الإحتفاظ بنسخة لقاعدة البيانات."
+
+#: bin/modules/gui/main.py:1511
+msgid "Couldn't backup database."
+msgstr "لم يتمكن من الإحتفاظ بنسخة لقاعدة البيانات."
+
+#: bin/modules/gui/window/form.py:189
+msgid "Resource ID does not exist for this object!"
+msgstr "الرقم المعرّف للمورد غير موجود لهذا الكائن!"
+
+#: bin/modules/gui/window/form.py:247
+msgid "No record selected ! You can only attach to existing record."
+msgstr "لم يتم إختيار سجل ! يمكنك الإرفاق من خلال سجل."
+
+#: bin/modules/gui/window/form.py:264
+msgid "You have to select a record !"
+msgstr "يجب أن تحدد سجل"
+
+#: bin/modules/gui/window/form.py:270
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:41
+#: bin/modules/gui/window/win_export.py:213
+msgid "ID"
+msgstr "مُعرف"
+
+#: bin/modules/gui/window/form.py:271
+msgid "Creation User"
+msgstr "إنشاء مستخدم"
+
+#: bin/modules/gui/window/form.py:272
+msgid "Creation Date"
+msgstr "تاريخ الإنشاء"
+
+#: bin/modules/gui/window/form.py:273
+msgid "Latest Modification by"
+msgstr "آخر تعديل بواسطة"
+
+#: bin/modules/gui/window/form.py:274
+msgid "Latest Modification Date"
+msgstr "آخر تعديل بتاريخ"
+
+#: bin/modules/gui/window/form.py:275
+msgid "Internal Module Data ID"
+msgstr "رقم البيانات المعرّف للوحدة الداخلية"
+
+#: bin/modules/gui/window/form.py:269
+msgid ""
+"Record is not saved ! \n"
+" Do You want to Clear Current Record ?"
+msgstr ""
+"لم يتم حفظ السجل\n"
+" هل تريد مسح السجل؟"
+
+#: bin/widget/view/form_gtk/one2many_list.py:388
+#: bin/modules/gui/window/form.py:290
+>>>>>>> MERGE-SOURCE
 msgid "Are you sure to remove this record ?"
 msgstr "هل أنت متأكد بأنك تريد حذف هذا السجل؟"
 
 #: bin/widget/view/form_gtk/one2many_list.py:390
 #: bin/modules/gui/window/form.py:292
 msgid "Are you sure to remove those records ?"
+<<<<<<< TREE
 msgstr "هل أنت متأكد بأنك تريد حذف هذه السجلات؟"
 
 #: bin/widget/view/form_gtk/parser.py:61
@@ -528,6 +929,273 @@
 msgstr ""
 
 #: bin/options.py:121
+=======
+msgstr "هل أنت متأكد بأنك تريد حذف هذه السجلات؟"
+
+#: bin/modules/gui/window/form.py:296
+msgid "Resources cleared."
+msgstr "تم مسح السجلات."
+
+#: bin/modules/gui/window/form.py:298
+msgid "Resources successfully removed."
+msgstr "تم حذف الموارد بنجاح."
+
+#: bin/modules/gui/window/form.py:339
+msgid "Working now on the duplicated document !"
+msgstr "العمل على مستند مكرر!"
+
+#: bin/modules/gui/window/form.py:355
+msgid "Document Saved."
+msgstr "تم حفظ المستند."
+
+#: bin/widget/view/list.py:584 bin/widget/view/list.py:585
+#: bin/widget/view/form_gtk/parser.py:135 bin/modules/gui/window/form.py:366
+msgid "Invalid form, correct red fields !"
+msgstr "قيمة غير صحيحة، صحح الحقول الحمراء !"
+
+#: bin/widget/view/list.py:584
+msgid "Error !"
+msgstr "خطأ !"
+
+#: bin/modules/gui/window/form.py:368
+msgid "Warning !"
+msgstr "تحذير !"
+
+#: bin/modules/gui/window/form.py:389 bin/modules/gui/window/form.py:497
+msgid ""
+"This record has been modified\n"
+"do you want to save it ?"
+msgstr ""
+"هذا السجل تم تعديله\n"
+"هل تريد حفظه؟"
+
+#: bin/modules/gui/window/form.py:447
+msgid "You must select one or several records !"
+msgstr "يجب ان تختار سجل او مجموعة من السجلات !"
+
+#: bin/modules/gui/window/form.py:456
+msgid "Print Screen"
+msgstr "اطبع الشاشة"
+
+#: bin/modules/gui/window/form.py:476
+msgid "No record selected"
+msgstr "لم يتم إختيار سجل"
+
+#: bin/modules/gui/window/form.py:481
+msgid "New document"
+msgstr "ملف جديد"
+
+#: bin/modules/gui/window/form.py:483
+msgid "Editing document (id: "
+msgstr "تحرير الملف (مسلسل: "
+
+#: bin/modules/gui/window/form.py:486
+msgid "Record: "
+msgstr "سجل "
+
+#: bin/modules/gui/window/form.py:487
+msgid " of "
+msgstr " من "
+
+#: bin/modules/gui/window/win_import.py:51
+msgid "The file is empty !"
+msgstr "الملف فارغ !"
+
+#: bin/modules/gui/window/win_import.py:51
+msgid "Importation !"
+msgstr "إستيراد !"
+
+#: bin/modules/gui/window/win_import.py:56
+msgid "XML-RPC error !"
+msgstr "خطأفي بيانات XML-RPC"
+
+#: bin/modules/gui/window/win_import.py:61
+msgid "Imported one object !"
+msgstr "إستيراد كائن واحد !"
+
+#: bin/modules/gui/window/win_import.py:63
+#, python-format
+msgid "Imported %d objects !"
+msgstr "إستيراد %d  كائنات !"
+
+#: bin/modules/gui/window/win_import.py:68
+#, python-format
+msgid ""
+"Error trying to import this record:\n"
+"%s\n"
+"Error Message:\n"
+"%s\n"
+"\n"
+"%s"
+msgstr ""
+"خطأ في إستيراد هذه السجلات:\n"
+"%s\n"
+"رسالة الخطأ:\n"
+"%s\n"
+"\n"
+"%s"
+
+#: bin/modules/gui/window/win_import.py:72
+msgid "Importation Error !"
+msgstr "خطأ في الإستيراد !"
+
+#: bin/modules/gui/window/win_import.py:105
+#: bin/modules/gui/window/win_import.py:109
+msgid "Field name"
+msgstr "اسم الحقل"
+
+#: bin/modules/gui/window/win_import.py:181
+msgid "Error opening .CSV file"
+msgstr "خطأ في فتح الملف .CSV"
+
+#: bin/modules/gui/window/win_import.py:181
+msgid "Input Error."
+msgstr "خطأ في الإدخال"
+
+#: bin/modules/gui/window/win_import.py:199
+#, python-format
+msgid "You cannot import this field %s, because we cannot auto-detect it"
+msgstr "لا يمكنك إستيراد هذا الحقل %s، لنه لا يمكن تعريفه أوتوماتيكياً."
+
+#: bin/modules/gui/window/win_import.py:202
+#, python-format
+msgid ""
+"Error processing your first line of the file.\n"
+"Field %s is unknown !"
+msgstr ""
+"خطأ في معالجة أول سطر في الملف.\n"
+"حقل %s غير معروف !"
+
+#: bin/modules/gui/window/win_import.py:202
+msgid "Import Error."
+msgstr "خطأ في الإستيراد."
+
+#: bin/modules/gui/window/win_import.py:233
+msgid "You have not selected any fields to import"
+msgstr "لم يتم إختيار الحقول للإستيراد"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Extension"
+msgstr "امتداد"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Application"
+msgstr "تطبيق"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Print Processor"
+msgstr "معالج الطباعة"
+
+#: bin/modules/gui/window/win_extension.py:114
+msgid "This extension is already defined"
+msgstr "تم تعريف هذا الإمتداد"
+
+#: bin/modules/gui/window/win_extension.py:114 bin/openerp.glade:7642
+msgid "Extension Manager"
+msgstr "منظم الإمتدادات"
+
+#: bin/modules/gui/window/win_selection.py:51
+msgid "Name"
+msgstr "الاسم"
+
+#: bin/modules/gui/window/win_selection.py:55
+msgid "Ressource Name"
+msgstr "اسم المورد"
+
+#: bin/modules/gui/window/win_selection.py:55
+msgid "Names"
+msgstr "الأسماء"
+
+#: bin/modules/gui/window/__init__.py:31
+msgid "Unknown Window"
+msgstr "نافذة مجهولة"
+
+#: bin/modules/gui/window/win_preference.py:68
+msgid "Preferences"
+msgstr "تفضيلات"
+
+#: bin/modules/gui/window/win_preference.py:86
+msgid ""
+"The default language of the interface has been modified, do not forget to "
+"restart the client to have the interface in your language"
+msgstr ""
+"تم تعديل اللغة الإفتراضية للواجهات, لا تنس أن تعيد تشغيل البرنامج للحصول على "
+"الواجهات بلغتك"
+
+#: bin/modules/gui/window/win_preference.py:88
+msgid "Default language modified !"
+msgstr "تعدلت اللغة الإفتراضية !"
+
+#: bin/modules/gui/window/view_tree/parse.py:35
+msgid "Tree"
+msgstr "شجرة"
+
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:45
+msgid "Description"
+msgstr "الوصف"
+
+#: bin/modules/gui/window/tree.py:205 bin/modules/gui/window/tree.py:261
+msgid "No resource selected!"
+msgstr "لم يتم إختيار مورد!"
+
+#: bin/modules/gui/window/tree.py:219
+msgid ""
+"Are you sure you want\n"
+"to remove this record?"
+msgstr ""
+"هل أنت متأكد\n"
+"من حذف هذا السجل؟"
+
+#: bin/modules/gui/window/tree.py:224
+msgid "Error removing resource!"
+msgstr "خطأ في حذف المورد!"
+
+#: bin/modules/gui/window/tree.py:235
+msgid "Unable to chroot: no tree resource selected"
+msgstr "لم يتمكن إحكام المسار: لم يتم إختيار مصدر"
+
+#: bin/modules/gui/window/win_export.py:50
+msgid " record(s) saved !"
+msgstr " تم حفظ السجلات!"
+
+#: bin/modules/gui/window/win_export.py:53
+msgid ""
+"Operation failed !\n"
+"I/O error"
+msgstr ""
+"فشل في العملية\n"
+"خطأ دخل/خرج"
+
+#: bin/modules/gui/window/win_export.py:79
+#: bin/modules/gui/window/win_export.py:105
+msgid "Error Opening Excel !"
+msgstr "خطأ في فتح إكسل!"
+
+#: bin/modules/gui/window/win_export.py:317
+msgid "What is the name of this export ?"
+msgstr "ما هو الاسم لهذا التصدير؟"
+
+#: bin/modules/gui/window/win_export.py:351
+msgid "Exportation Error !"
+msgstr "خطأ في التصدير!"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1772
+#: bin/modules/gui/window/win_search.py:49
+msgid "OpenERP - Link"
+msgstr "رابط - OpenERP"
+
+#: bin/modules/gui/window/win_search.py:126
+#, python-format
+msgid "OpenERP Search: %s"
+msgstr "بحث OpenERP: %s"
+
+#: bin/modules/gui/window/win_search.py:127
+#, python-format
+msgid "OpenERP Search: %s (%%d result(s))"
+msgstr "بحث OpenERP: %s (%%d نتائج)"
+
+#: bin/options.py:121
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "OpenERP Client %s"
 msgstr "حاسب طرفي لـ Openerp %s"
@@ -568,6 +1236,10 @@
 "open this menu item, unless you disable all tips using the <b>'Menu "
 "Tips'</b> option in the user preferences."
 msgstr ""
+"<span foreground=\"darkred\"><b>الملحوظة الحالية:</b></span>\n"
+"This will hide the current tip. It will be displayed again next time you "
+"open this menu item, unless you disable all tips using the <b>'Menu "
+"Tips'</b> option in the user preferences."
 
 #: bin/common/common.py:100
 msgid "Disable all tips"
@@ -721,6 +1393,7 @@
 #: bin/printer/printer.py:193
 #, python-format
 msgid ""
+<<<<<<< TREE
 "Error occurred while printing:\n"
 "%s"
 msgstr ""
@@ -730,19 +1403,72 @@
 msgstr ""
 
 #: bin/printer/printer.py:212
+=======
+"Linux Automatic Printing not implemented.\n"
+"Use preview option !"
+msgstr ""
+"لم يتم تنصيب مكتبات لينكس للطباعة.\n"
+"إستخدم خيارات العرض!"
+
+#: bin/printer/printer.py:212
+>>>>>>> MERGE-SOURCE
 msgid "Error! No Data found. Make sure you have enough data to print!"
 msgstr "خطأ! لا توجد بيانات. تأكد من أن لديك بيانات للطباعة!"
 
 #: bin/printer/printer.py:239
 msgid "Error writing the file!"
-msgstr "خطأ في كتابة الملف!"
-
-#: bin/widget_search/form.py:492
+<<<<<<< TREE
+msgstr "خطأ في كتابة الملف!"
+
+#: bin/widget_search/form.py:492
+=======
+msgstr "خطأ في كتابة الملف!"
+
+#: bin/openerp-client.py:142
+msgid "Closing OpenERP, KeyboardInterrupt"
+msgstr "خطأ بالنظام، قد تكون لوحة المفاتيح"
+
+#: bin/widget/view/form_gtk/button.py:47 bin/widget_search/char.py:72
+#: bin/widget_search/calendar.py:125 bin/widget_search/calendar.py:250
+#: bin/widget_search/filter.py:77 bin/widget_search/reference.py:78
+#: bin/widget_search/spinbutton.py:92 bin/widget_search/selection.py:116
+#: bin/widget_search/custom_filter.py:140 bin/widget_search/spinint.py:95
+#: bin/widget_search/checkbox.py:68
+msgid "The content of the widget or ValueError if not valid"
+msgstr ""
+
+#: bin/widget_search/form.py:492
+>>>>>>> MERGE-SOURCE
 msgid "The content of the form or exception if not valid"
-msgstr "محتويات القائمة ناقصة أو غير صحيحة"
-
-#: bin/widget_search/char.py:45
+<<<<<<< TREE
+msgstr "محتويات القائمة ناقصة أو غير صحيحة"
+
+#: bin/widget_search/char.py:45
+=======
+msgstr "محتويات القائمة ناقصة أو غير صحيحة"
+
+#: bin/widget/view/form_gtk/date_widget.py:65
+#: bin/widget_search/date_widget.py:65
+msgid ""
+"You can use special operation by pressing +, - or =.  Plus/minus "
+"adds/decrease the variable to the current selected date. Equals set part of "
+"selected date. Available variables: 12h = 12 hours, 8d = 8 days, 4w = 4 "
+"weeks, 1m = 1 month, 2y = 2 years. Some examples:\n"
+"* +21d : adds 21 days to selected year\n"
+"* =23w : set date to the 23th week of the year\n"
+"* -4m : decrease 4 months to the current date\n"
+"You can also use \"=\" to set the date to the current date/time and '-' to "
+"clear the field."
+msgstr ""
+
+#: bin/widget_search/wid_int.py:56
+msgid "The content of the widget or exception if not valid"
+msgstr "المحتويات المستنبطة أو المستناة غير صحيحة"
+
+#: bin/widget_search/char.py:45
+>>>>>>> MERGE-SOURCE
 msgid "Error: "
+<<<<<<< TREE
 msgstr "خطأ: "
 
 #: bin/widget_search/custom_filter_widgets.py:36
@@ -806,6 +1532,34 @@
 #: bin/widget_search/custom_filter_widgets.py:40
 #: bin/widget_search/custom_filter_widgets.py:67
 #: bin/widget_search/custom_filter_widgets.py:98
+=======
+msgstr "خطأ: "
+
+#: bin/widget_search/calendar.py:49 bin/widget_search/calendar.py:177
+msgid "Start date"
+msgstr "تاريخ البدء"
+
+#: bin/widget/view/form_gtk/calendar.py:57
+#: bin/widget/view/form_gtk/calendar.py:184 bin/widget_search/calendar.py:53
+#: bin/widget_search/calendar.py:73 bin/widget_search/calendar.py:181
+#: bin/widget_search/calendar.py:201
+msgid "Open the calendar widget"
+msgstr "افتح قائمة  التاريخ"
+
+#: bin/widget_search/calendar.py:69 bin/widget_search/calendar.py:197
+msgid "End date"
+msgstr "تاريخ الانتهاء"
+
+#: bin/widget/view/form_gtk/calendar.py:135
+#: bin/widget/view/form_gtk/calendar.py:249 bin/widget_search/calendar.py:128
+#: bin/widget_search/calendar.py:267
+msgid "OpenERP - Date selection"
+msgstr "إختيار تاريخ - OpenERP"
+
+#: bin/widget_search/custom_filter_widgets.py:40
+#: bin/widget_search/custom_filter_widgets.py:67
+#: bin/widget_search/custom_filter_widgets.py:98
+>>>>>>> MERGE-SOURCE
 msgid "contains"
 msgstr "يحتوى على"
 
@@ -813,6 +1567,7 @@
 #: bin/widget_search/custom_filter_widgets.py:68
 #: bin/widget_search/custom_filter_widgets.py:98
 msgid "doesn't contain"
+<<<<<<< TREE
 msgstr "لا يحتوي علي"
 
 #: bin/widget_search/custom_filter_widgets.py:167
@@ -847,6 +1602,12 @@
 
 #: bin/widget_search/custom_filter_widgets.py:290
 #: bin/widget_search/custom_filter_widgets.py:331
+=======
+msgstr "لا يحتوي علي"
+
+#: bin/widget_search/custom_filter_widgets.py:290
+#: bin/widget_search/custom_filter_widgets.py:331
+>>>>>>> MERGE-SOURCE
 msgid "is equal to"
 msgstr "مساوٍ لـ"
 
@@ -863,6 +1624,7 @@
 #: bin/widget_search/custom_filter_widgets.py:293
 #: bin/widget_search/custom_filter_widgets.py:334
 msgid "less than"
+<<<<<<< TREE
 msgstr "أقل من"
 
 #: bin/widget_search/custom_filter_widgets.py:294
@@ -897,6 +1659,27 @@
 
 #: bin/widget_search/checkbox.py:35 bin/widget_search/checkbox.py:42
 #: bin/widget_search/checkbox.py:55
+=======
+msgstr "أقل من"
+
+#: bin/widget_search/custom_filter.py:62
+msgid "in"
+msgstr "في"
+
+#: bin/widget_search/custom_filter.py:63
+msgid "not in"
+msgstr "ليس في"
+
+#: bin/widget_search/custom_filter.py:82
+msgid ""
+"Enter Values separated by ',' if operator 'in' or 'not in' is chosen.\n"
+"For Date and DateTime Formats, specify text in '%Y-%m-%d' and '%Y-%m-%d "
+"%H:%M:%S' formats respectively."
+msgstr ""
+
+#: bin/widget_search/checkbox.py:35 bin/widget_search/checkbox.py:42
+#: bin/widget_search/checkbox.py:55
+>>>>>>> MERGE-SOURCE
 msgid "Yes"
 msgstr "نعم"
 
@@ -904,11 +1687,397 @@
 msgid "No"
 msgstr "لا"
 
+<<<<<<< TREE
 #: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
 msgid "Connection refused !"
 msgstr "إتصال غير مقبول !"
 
 #: bin/rpc.py:158
+=======
+#: bin/widget/view/form.py:137
+msgid "You must save this record to use the relate button !"
+msgstr "يجب حفظ هذا السجل لإستخدام الزر المتعلق به !"
+
+#: bin/widget/view/form.py:142
+msgid "Action not defined !"
+msgstr "أمر غير معروف !"
+
+#: bin/widget/view/form.py:211
+msgid "You must select a record to use the relate button !"
+msgstr "يجب إختيار سجل لاستعمال زر المتعلق به !"
+
+#: bin/widget/view/form.py:238 bin/widget/view/form_gtk/parser.py:635
+#: bin/widget/view/form_gtk/parser.py:756
+#: bin/widget/view/form_gtk/parser.py:813
+msgid "No other language available!"
+msgstr "لا توجد لغات أخرى!"
+
+#: bin/widget/view/form.py:245 bin/widget/view/form_gtk/parser.py:647
+#: bin/widget/view/form_gtk/parser.py:762
+#: bin/widget/view/form_gtk/parser.py:819
+msgid "Add Translation"
+msgstr "إضافة ترجمة"
+
+#: bin/widget/view/form.py:293 bin/widget/view/form_gtk/parser.py:875
+msgid "Translate label"
+msgstr "ترجم العنوان"
+
+#: bin/widget/view/calendar_gtk/parser.py:355 bin/openerp.glade:8064
+msgid "Week"
+msgstr "أسبوع"
+
+#: bin/widget/view/calendar_gtk/parser_dummy.py:30
+msgid "Calendar View Error !"
+msgstr "خطأ في عرض النتيجة!"
+
+#: bin/widget/view/calendar_gtk/parser_dummy.py:31
+msgid "You must intall the library python-hippocanvas to use calendars."
+msgstr "لابد من تنصيب مكتبة python-hippocanvasمنأجل إستخدام التقويم"
+
+#: bin/widget/view/screen_container.py:74
+msgid "--Actions--"
+msgstr "--إجراءات--"
+
+#: bin/widget/view/screen_container.py:73
+msgid "Save as a Shortcut"
+msgstr "حفظ كوصلة سريعة"
+
+#: bin/widget/view/screen_container.py:74
+msgid "Save as a Filter"
+msgstr "حفظ كمرشح"
+
+#: bin/widget/view/screen_container.py:74
+msgid "Manage Filters"
+msgstr "إدارة المرشحات"
+
+#: bin/widget/view/tree_gtk/parser.py:61
+msgid ""
+"You have unsaved record(s) !  \n"
+"\n"
+"Please Save them before sorting !"
+msgstr ""
+"لديك سجلات غير محفوظة !  \n"
+"\n"
+"رجاء الحفظ قبل الفرز !"
+
+#: bin/widget/view/tree_gtk/editabletree.py:140
+#, python-format
+msgid "Shortcut: %s"
+msgstr "وصلة سريعة: %s"
+
+#: bin/widget/view/tree_gtk/editabletree.py:140
+msgid "F1 New - F2 Open/Search"
+msgstr "F1 جديد - F2 فتح/بحث"
+
+#: bin/widget/view/tree_gtk/editabletree.py:215
+#, python-format
+msgid "Warning; field %s is required!"
+msgstr "تحذير، مطلوب الحقل التالي %s !"
+
+#: bin/widget/view/tree_gtk/date_renderer.py:197
+msgid ""
+"Press <i>'+'</i>, <i>'-'</i> or <i>'='</i> for special date operations."
+msgstr ""
+"اضغط <i>'+'</i>, <i>'-'</i> or <i>'='</i> و ذلك لعمليات خاصة علي التاريخ."
+
+#: bin/widget/view/widget_parse.py:53
+#, python-format
+msgid "This type (%s) is not supported by the GTK client !"
+msgstr "هذا النوع (%s) غير مقبول بالواجهة الطرفية GTK !"
+
+#: bin/widget/view/widget_parse.py:64
+msgid "No valid view found for this object!"
+msgstr "لا يوجد عرض صحيح لهذا الكائن!"
+
+#: bin/widget/view/graph_gtk/parser.py:64
+msgid "Can not generate graph !"
+msgstr "لا يمكن تكوين الرسم!"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1422
+msgid "Dot Viewer"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1712
+msgid "Add New Node"
+msgstr "إضافة طرف جديد"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1713
+msgid "Add New Edge"
+msgstr "إضافة حافة جديدة"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1714
+msgid "Enlarge the Diagram"
+msgstr "توسيع المخطط"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1715
+msgid "Shrink the Diagram"
+msgstr "تصغير المخطط"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1716
+msgid "Fit the diagram to the window"
+msgstr "محاذاة العرض للواجهة"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1717
+msgid "Show the diagram at its normal size"
+msgstr "مشاهدة المخطط بحجمه الطبيعي"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1718
+msgid "Print the Diagram"
+msgstr "طباعة المخطط"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1789
+#, python-format
+msgid "Close Current %s"
+msgstr "أغلاق %s الحالي"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1790
+#, python-format
+msgid "Delete Current %s"
+msgstr "حذف %sالحالي"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1791
+#, python-format
+msgid "Edit Current %s"
+msgstr "تحرير %s الحالي"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1875
+msgid " - Dot Viewer"
+msgstr ""
+
+#: bin/widget/view/form_gtk/reference.py:76 bin/openerp.glade:1258
+msgid "Create a new resource"
+msgstr "إنشاء مصدر جديد"
+
+#: bin/widget/view/form_gtk/reference.py:89
+msgid "Search / Open a resource"
+msgstr "بحث/فتح مصدر"
+
+#: bin/widget/view/form_gtk/parser.py:61
+msgid "Wrong icon for the button !"
+msgstr "أيقونة خطأ للزر !"
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Field"
+msgstr "حقل"
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Object"
+msgstr "كائن"
+
+#: bin/widget/view/form_gtk/parser.py:619
+msgid "Enter some text to the related field before adding translations!"
+msgstr "ضع بعض الحروف للحقول المتعلقة قبل إضافة الترجمة !"
+
+#: bin/widget/view/form_gtk/parser.py:626
+msgid "You need to save resource before adding translations!"
+msgstr "يجب حفظ المصدر قبل إضافة الترجمة!"
+
+#: bin/widget/view/form_gtk/parser.py:880
+msgid "Translate view"
+msgstr "ترجم هذه الصفحة"
+
+#: bin/widget/view/form_gtk/one2many_list.py:64
+msgid "Cancel"
+msgstr "إلغاء"
+
+#: bin/widget/view/form_gtk/one2many_list.py:70
+msgid "Save & Close"
+msgstr "حفظ و إغلاق"
+
+#: bin/widget/view/form_gtk/one2many_list.py:75
+msgid "Save & New"
+msgstr "حفظ و جديد"
+
+#: bin/widget/view/form_gtk/one2many_list.py:164
+#: bin/widget/view/form_gtk/interface.py:48
+msgid "Set to default value"
+msgstr "تعيين إلى القيمة الافتراضية"
+
+#: bin/widget/view/form_gtk/one2many_list.py:167
+msgid "Set Default"
+msgstr "تعيين الافتراضي"
+
+#: bin/widget/view/form_gtk/one2many_list.py:196
+msgid "Create a new entry"
+msgstr "إنشاء مدخلة جديدة"
+
+#: bin/widget/view/form_gtk/one2many_list.py:200
+msgid "Edit this entry"
+msgstr "تحرير هذه المدخلة"
+
+#: bin/widget/view/form_gtk/one2many_list.py:204
+msgid "Remove this entry"
+msgstr "حذف هذه المدخلة"
+
+#: bin/widget/view/form_gtk/many2many.py:84
+#: bin/widget/view/form_gtk/one2many_list.py:210
+msgid "Previous Page"
+msgstr "صفحة سابقة"
+
+#: bin/widget/view/form_gtk/many2many.py:88
+#: bin/widget/view/form_gtk/one2many_list.py:214
+msgid "Previous Record"
+msgstr "السجل السابق"
+
+#: bin/widget/view/form_gtk/many2many.py:96
+#: bin/widget/view/form_gtk/one2many_list.py:222
+msgid "Next Record"
+msgstr "سجل تالي"
+
+#: bin/widget/view/form_gtk/many2many.py:100
+#: bin/widget/view/form_gtk/one2many_list.py:226
+msgid "Next Page"
+msgstr "الصفحة التالية"
+
+#: bin/widget/view/form_gtk/one2many_list.py:232
+msgid "Switch"
+msgstr "حول"
+
+#: bin/widget/view/form_gtk/many2many.py:106
+#: bin/widget/view/form_gtk/one2many_list.py:238
+msgid "Choose Limit"
+msgstr "اختر حد"
+
+#: bin/widget/view/form_gtk/one2many_list.py:279
+msgid "You have to select a resource !"
+msgstr "عليك بإختيار مصدر !"
+
+#: bin/widget/view/form_gtk/image.py:73
+msgid "Set Image"
+msgstr "عيِّن صورة"
+
+#: bin/widget/view/form_gtk/image.py:82 bin/widget/view/form_gtk/binary.py:84
+msgid "Save As"
+msgstr "احفظ باسم"
+
+#: bin/widget/view/form_gtk/image.py:93 bin/widget/view/form_gtk/binary.py:88
+msgid "Clear"
+msgstr "امسح"
+
+#: bin/widget/view/form_gtk/image.py:102
+msgid "All files"
+msgstr "كل الملفّات"
+
+#: bin/widget/view/form_gtk/image.py:106
+msgid "Images"
+msgstr "صور"
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "There is no image to save as !"
+msgstr "لا توجد صورة لحفظها !"
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "Warning"
+msgstr "إنذار"
+
+#: bin/widget/view/form_gtk/many2one.py:158 bin/widget/view/form_gtk/url.py:53
+msgid "Open this resource"
+msgstr "فتح هذا المصدر"
+
+#: bin/widget/view/form_gtk/many2one.py:163
+#: bin/widget_search/custom_filter_widgets.py:87
+msgid "Search a resource"
+msgstr "بحث عن مصدر"
+
+#: bin/widget/view/form_gtk/many2one.py:174 bin/openerp.glade:1412
+msgid "Action"
+msgstr "إجراء"
+
+#: bin/widget/view/form_gtk/many2one.py:175
+msgid "Report"
+msgstr "تقرير"
+
+#: bin/widget/view/list.py:633 bin/widget/view/form_gtk/many2one.py:387
+msgid "You must select a record to use the relation !"
+msgstr "يجب إختيار سجل و ذلك لإستخدام العلاقة"
+
+#: bin/widget/view/form_gtk/interface.py:49
+msgid "Set as default"
+msgstr "اجعلها افتراضية"
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "You can not set to the default value here !"
+msgstr "لا يمكن إستخدام القيمة الإفتراضية هنا !"
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "Operation not permited"
+msgstr "العملية غير مسموحة"
+
+#: bin/widget/view/form_gtk/binary.py:76
+msgid "Select"
+msgstr "تحديد"
+
+#: bin/widget/view/form_gtk/binary.py:80
+msgid "Open"
+msgstr "فتح"
+
+#: bin/widget/view/form_gtk/binary.py:119
+#: bin/widget/view/form_gtk/binary.py:163
+msgid "Unable to read the file data"
+msgstr "لم يتمكن من قراءة بيانات الملف"
+
+#: bin/widget/view/form_gtk/binary.py:129
+#: bin/widget/view/form_gtk/binary.py:155
+#, python-format
+msgid "Error reading the file: %s"
+msgstr "خطأ في قراءة الملف الملف: %s"
+
+#: bin/widget/view/form_gtk/binary.py:138
+msgid "All Files"
+msgstr "كل الملفات"
+
+#: bin/widget/view/form_gtk/binary.py:148
+msgid "Select a file..."
+msgstr "إختيار ملف..."
+
+#: bin/widget/view/form_gtk/binary.py:177
+#, python-format
+msgid "Error writing the file: %s"
+msgstr "خطأ في كتابة الملف : %s"
+
+#: bin/widget/view/form_gtk/wid_common.py:59
+msgid "Always applicable !"
+msgstr "تنطبق دائماً !"
+
+#: bin/widget/view/form_gtk/calendar.py:99
+#: bin/widget/view/form_gtk/calendar.py:163
+msgid "Invalid date value! Year must be greater than 1899 !"
+msgstr "قيمة تاريخية خاطئة! يجب أن تكون السنة أكبر من 1899!"
+
+#: bin/widget/view/form_gtk/calendar.py:255 bin/widget_search/calendar.py:273
+msgid "Hour:"
+msgstr "الساعة:"
+
+#: bin/widget/view/form_gtk/calendar.py:258 bin/widget_search/calendar.py:276
+msgid "Minute:"
+msgstr "الدقيقة:"
+
+#: bin/widget/view/form_gtk/calendar.py:291 bin/widget_search/calendar.py:312
+msgid "Invalid datetime value! Year must be greater than 1899 !"
+msgstr "قيمة تاريخية خاطئة! السنة يجب أن تكون أكبر 1899!"
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:30
+msgid "Gantt view not yet implemented !"
+msgstr "خريطة جانت لم يتم تنصيبها بعد!"
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:31
+msgid ""
+"The gantt view is not available in this GTK Client, you should use the web "
+"interface or switch to the calendar view."
+msgstr ""
+"مخطط جانت غير مدعوم في بيئة GTK. يمكنك عرضه المخطط باستخدام واجهة البرنامج "
+"على الويب أو التحول إلى عرض الرزنامة."
+
+#: bin/widget/screen/screen.py:337
+msgid ""
+"(Any existing filter with the \n"
+"same name will be replaced)"
+msgstr ""
+"(أي مرشح موجود بنفس \n"
+"الاسم سيتم إستبداله)"
+
+#: bin/rpc.py:158
+>>>>>>> MERGE-SOURCE
 msgid "Connection refused!"
 msgstr "رفض اﻻتصال !"
 
@@ -1611,6 +2780,7 @@
 
 #: bin/openerp.glade:468
 msgid "_Preferences"
+<<<<<<< TREE
 msgstr "_تفضيلات"
 
 #: bin/openerp.glade:483 bin/openerp.glade:7304
@@ -1618,6 +2788,11 @@
 msgstr "تغيير كلمة المرور"
 
 #: bin/openerp.glade:496
+=======
+msgstr "_تفضيلات"
+
+#: bin/openerp.glade:496
+>>>>>>> MERGE-SOURCE
 msgid "_Send a request"
 msgstr "إرسال طلب"
 
@@ -1819,7 +2994,7 @@
 
 #: bin/openerp.glade:1140
 msgid "Enable Debug Mode Tooltips"
-msgstr ""
+msgstr "السماح لنمط التصحيح أدوات الإرشادات"
 
 #: bin/openerp.glade:1148 bin/openerp.glade:4366
 msgid "Support Request"
@@ -2081,9 +3256,23 @@
 
 #: bin/openerp.glade:2834
 msgid "<b>Predefined Exports</b>"
-msgstr "<b>تصديرات معرفة من قبل</b>"
-
-#: bin/openerp.glade:2880
+<<<<<<< TREE
+msgstr "<b>تصديرات معرفة من قبل</b>"
+
+#: bin/openerp.glade:2880
+=======
+msgstr "<b>تصديرات معرفة من قبل</b>"
+
+#: bin/openerp.glade:3134
+msgid "Import Compatible"
+msgstr "إستيراد المتوافق"
+
+#: bin/openerp.glade:2862
+msgid "<b>Select an Option to Export</b>"
+msgstr "حدد خيار للتصدير"
+
+#: bin/openerp.glade:2880
+>>>>>>> MERGE-SOURCE
 msgid "Available Fields"
 msgstr "الحقول المتوفرة"
 
@@ -2101,6 +3290,7 @@
 
 #: bin/openerp.glade:3073
 msgid "Fields to Export"
+<<<<<<< TREE
 msgstr "الحقول للتصدير"
 
 #: bin/openerp.glade:3115
@@ -2112,6 +3302,23 @@
 msgstr "إستيراد المتوافق"
 
 #: bin/openerp.glade:3156
+=======
+msgstr "الحقول للتصدير"
+
+#: bin/openerp.glade:3132
+msgid ""
+"Open in Excel\n"
+"Save as CSV"
+msgstr ""
+"فتح في ملف أكسل\n"
+"حفظ كـ CSV"
+
+#: bin/openerp.glade:3151
+msgid "Add _field names"
+msgstr "إضافة اسم للحقل"
+
+#: bin/openerp.glade:3156
+>>>>>>> MERGE-SOURCE
 msgid "<b>Opti_ons</b>"
 msgstr "<b>خيارات</b>"
 
@@ -2133,7 +3340,7 @@
 
 #: bin/openerp.glade:3408
 msgid "_Display a new tip next time?"
-msgstr ""
+msgstr "_عرض نصيحة جديدة المره القادمة؟"
 
 #: bin/openerp.glade:3461
 msgid "Pre_vious Tip"
@@ -2414,6 +3621,7 @@
 
 #: bin/openerp.glade:5715
 msgid "N_othing"
+<<<<<<< TREE
 msgstr "لا شئ"
 
 #: bin/openerp.glade:5772
@@ -2425,10 +3633,29 @@
 msgstr "الملفات للإستيراد: "
 
 #: bin/openerp.glade:5852
+=======
+msgstr "لا شئ"
+
+#: bin/openerp.glade:5852
+>>>>>>> MERGE-SOURCE
 msgid "Auto-Detect"
-msgstr "كشف تلقائي"
-
-#: bin/openerp.glade:5930
+<<<<<<< TREE
+msgstr "كشف تلقائي"
+
+#: bin/openerp.glade:5930
+=======
+msgstr "كشف تلقائي"
+
+#: bin/openerp.glade:5772
+msgid "<b>Fields to import</b>"
+msgstr "<b>الحقول للإستيراد</b>"
+
+#: bin/openerp.glade:5891
+msgid "File to Import:"
+msgstr "الملفات للإستيراد"
+
+#: bin/openerp.glade:5930
+>>>>>>> MERGE-SOURCE
 msgid "Lines to Skip:"
 msgstr "خطوط لتفاوتها:"
 
@@ -2438,6 +3665,7 @@
 
 #: bin/openerp.glade:5987
 msgid "Encoding:"
+<<<<<<< TREE
 msgstr "ترميز:"
 
 #: bin/openerp.glade:6000
@@ -2445,6 +3673,15 @@
 msgstr "فاصل الحقل: "
 
 #: bin/openerp.glade:6012
+=======
+msgstr "ترميز:"
+
+#: bin/openerp.glade:6035
+msgid "Field Separater:"
+msgstr "فاصل الحقول:"
+
+#: bin/openerp.glade:6012
+>>>>>>> MERGE-SOURCE
 msgid "CSV Parameters"
 msgstr "معطيات الـ CSV"
 
@@ -2612,10 +3849,21 @@
 "<sup><b><span foreground=\"dark green\">?</span></b></sup>Load Demonstration "
 "Data:"
 msgstr ""
-"<sup><b><span foreground=\"dark green\">?</span></b></sup>تحميل البيانات "
-"الوهمية:"
-
-#: bin/openerp.glade:7321
+<<<<<<< TREE
+"<sup><b><span foreground=\"dark green\">?</span></b></sup>تحميل البيانات "
+"الوهمية:"
+
+#: bin/openerp.glade:7321
+=======
+"<sup><b><span foreground=\"dark green\">?</span></b></sup>تحميل البيانات "
+"الوهمية:"
+
+#: bin/openerp.glade:483 bin/openerp.glade:7304
+msgid "Change password"
+msgstr "تغيير كلمة المرور"
+
+#: bin/openerp.glade:7321
+>>>>>>> MERGE-SOURCE
 msgid "<b>Change your super admin password</b>"
 msgstr "<b>تغيير كلمة مرور المشرف العام</b>"
 
@@ -2685,13 +3933,48 @@
 
 #: bin/openerp.glade:8076
 msgid "Month"
-msgstr "شهر"
-
-#: bin/openerp.glade:8230
-msgid "Filter Entry"
-msgstr "إدخال مرشح"
-
-#: bin/openerp.glade:8276
+<<<<<<< TREE
+msgstr "شهر"
+
+#: bin/openerp.glade:8230
+msgid "Filter Entry"
+msgstr "إدخال مرشح"
+=======
+msgstr "شهر"
+>>>>>>> MERGE-SOURCE
+
+#: bin/openerp.glade:8276
+<<<<<<< TREE
+=======
+msgid "Fields on which Search criteria to be applied"
+msgstr "الحقول التي سيتم تطبيق معايير البحث فيها"
+
+#: bin/openerp.glade:8289
+msgid "Conditional Operators"
+msgstr "الرموز الشرطية"
+
+#: bin/openerp.glade:8316
+msgid "The Choice will be applied with next filter if any"
+msgstr "سيتم تطبيق الإختيار مع المرشح التالي ﻷي شئ"
+
+#: bin/openerp.glade:8317
+msgid ""
+"AND\n"
+"OR"
+msgstr ""
+"AND\n"
+"OR"
+
+#: bin/openerp.glade:8330
+msgid "Remove Filter"
+msgstr "إزالة المرشح"
+
+#: bin/openerp.glade:8230
+msgid "Filter Entry"
+msgstr "إدخال مرشح"
+
+#: bin/openerp.glade:8276
+>>>>>>> MERGE-SOURCE
 msgid "Enter Filter Name:"
 msgstr "أدخل اسم المرشح:"
 
@@ -2715,22 +3998,42 @@
 "you shortly.\n"
 "</i>"
 msgstr ""
+<<<<<<< TREE
 "<b>عقد الضمان.</b>\n"
 "<i>\n"
 "تم إرسال المشكلة و سيتم الرد عليك في أقصر وقت.\n"
 "</i>"
+=======
+"<b>عقد الدعم الفني و الضمان.</b>\n"
+"<i>\n"
+"سيتم إرسال طلبك لفريق عمل OpenERP و الدعم الفني و سيتم الرد في أقصر وقت.\n"
+"</i>"
+>>>>>>> MERGE-SOURCE
 
 #: bin/win_error.glade:186
 msgid "Explain what you did:"
-msgstr "إشرح ما فعلت:"
+<<<<<<< TREE
+msgstr "إشرح ما فعلت:"
+=======
+msgstr "إشرح ما فعلت:"
+
+#: bin/win_error.glade:200
+msgid "Others Comments:"
+msgstr "تعليقات أخري"
+>>>>>>> MERGE-SOURCE
 
 #: bin/win_error.glade:285
 msgid "Send to Publisher Warranty Team"
 msgstr "إرسال إلي فريق الضمان و النشر"
 
 #: bin/win_error.glade:318
+<<<<<<< TREE
 msgid "Problems summary:"
 msgstr "ملخص المشاكل"
+=======
+msgid "Summary of the problem:"
+msgstr "ملخص المشكلة:"
+>>>>>>> MERGE-SOURCE
 
 #: bin/win_error.glade:360
 msgid "<i>_Support Request</i>"
@@ -2742,6 +4045,7 @@
 
 #: bin/win_error.glade:404
 msgid "<i>_Details</i>"
+<<<<<<< TREE
 msgstr "<i>_تفاصيل</i>"
 
 #~ msgid "Edit"
@@ -2858,3 +4162,6 @@
 
 #~ msgid "<b>Select an Option to Export</b>"
 #~ msgstr "حدد خيار للتصدير"
+=======
+msgstr "<i>_تفاصيل</i>"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/po/be.po'
--- bin/po/be.po	2011-10-11 05:32:10 +0000
+++ bin/po/be.po	2011-10-24 01:06:26 +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-10-11 05:29+0000\n"
 "X-Generator: Launchpad (build 14123)\n"
+=======
+"X-Launchpad-Export-Date: 2011-09-15 05:09+0000\n"
+"X-Generator: Launchpad (build 13921)\n"
+>>>>>>> MERGE-SOURCE
 "Language: be\n"
 
 #: bin/widget/view/gantt_gtk/parser_dummy.py:30
@@ -699,6 +704,7 @@
 msgid "Choose a Plugin"
 msgstr ""
 
+<<<<<<< TREE
 #: bin/printer/printer.py:184
 #, python-format
 msgid "Unable to handle %s filetype"
@@ -891,9 +897,13 @@
 msgstr "Не"
 
 #: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
+=======
+#: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
+>>>>>>> MERGE-SOURCE
 msgid "Connection refused !"
 msgstr "Спалучэньне страчанае!"
 
+<<<<<<< TREE
 #: bin/rpc.py:158
 msgid "Connection refused!"
 msgstr "Спалучэньне страчанае!"
@@ -911,6 +921,11 @@
 #: bin/rpc.py:203 bin/rpc.py:205 bin/modules/action/wizard.py:162
 #: bin/modules/action/wizard.py:168 bin/modules/action/wizard.py:170
 #: bin/modules/gui/main.py:195 bin/modules/gui/main.py:201
+=======
+#: bin/rpc.py:203 bin/rpc.py:205 bin/modules/action/wizard.py:162
+#: bin/modules/action/wizard.py:168 bin/modules/action/wizard.py:170
+#: bin/modules/gui/main.py:195 bin/modules/gui/main.py:201
+>>>>>>> MERGE-SOURCE
 msgid "Application Error"
 msgstr "Памылка дастасаваньня"
 
@@ -934,6 +949,7 @@
 msgid "Select your action"
 msgstr "Выберите свое действие"
 
+<<<<<<< TREE
 #: bin/modules/gui/window/win_extension.py:43
 msgid "Extension"
 msgstr ""
@@ -955,6 +971,291 @@
 msgstr ""
 
 #: bin/modules/gui/window/form.py:189
+=======
+#: bin/modules/gui/main.py:89 bin/modules/gui/main.py:341
+msgid "Could not connect to server !"
+msgstr "Немагчыма спалучыцца з сэрверам !"
+
+#: bin/modules/gui/main.py:93 bin/openerp.glade:72 bin/openerp.glade:6233
+#: bin/openerp.glade:6479 bin/openerp.glade:6802 bin/openerp.glade:7466
+msgid "Server:"
+msgstr "Сервер"
+
+#: bin/modules/gui/main.py:104 bin/openerp.glade:98 bin/openerp.glade:6515
+#: bin/openerp.glade:6759 bin/openerp.glade:7058 bin/openerp.glade:7423
+msgid "Change"
+msgstr "изменять"
+
+#: bin/modules/gui/main.py:111
+msgid "Super Administrator Password:"
+msgstr ""
+
+#: bin/modules/gui/main.py:193
+msgid "Bad Super Administrator Password"
+msgstr ""
+
+#: bin/modules/gui/main.py:217
+msgid "Migration Scripts"
+msgstr ""
+
+#: bin/modules/gui/main.py:220
+msgid "Contract ID:"
+msgstr ""
+
+#: bin/modules/gui/main.py:226
+msgid "Contract Password:"
+msgstr ""
+
+#: bin/modules/gui/main.py:241
+msgid "You already have the latest version"
+msgstr ""
+
+#: bin/modules/gui/main.py:246
+msgid "The following updates are available:"
+msgstr ""
+
+#: bin/modules/gui/main.py:258
+msgid "You can now migrate your databases."
+msgstr ""
+
+#: bin/modules/gui/main.py:263
+msgid "Migrate Database"
+msgstr ""
+
+#: bin/modules/gui/main.py:280
+msgid "Database"
+msgstr ""
+
+#: bin/modules/gui/main.py:292
+msgid "Your database has been upgraded."
+msgstr ""
+
+#: bin/modules/gui/main.py:294
+msgid "Your databases have been upgraded."
+msgstr ""
+
+#: bin/modules/gui/main.py:296
+msgid "You have not selected a database"
+msgstr ""
+
+#: bin/modules/gui/main.py:360
+msgid "No database found, you must create one !"
+msgstr "База даньняў ня знойдзеная, вы павінны стварыць яе !"
+
+#: bin/modules/gui/main.py:468
+msgid "Unknown"
+msgstr "unknown , Прилагательное  неизвестный"
+
+#: bin/modules/gui/main.py:474
+#, python-format
+msgid ""
+"The versions of the server (%s) and the client (%s) missmatch. The client "
+"may not work properly. Use it at your own risks."
+msgstr ""
+
+#: bin/modules/gui/main.py:610
+msgid "Sorry,'"
+msgstr "Прабачце,'"
+
+#: bin/modules/gui/main.py:610 bin/modules/gui/main.py:613
+msgid "Bad database name !"
+msgstr ""
+
+#: bin/modules/gui/main.py:613
+msgid ""
+"The database name must contain only normal characters or \"_\".\n"
+"You must avoid all accents, space or special characters."
+msgstr ""
+
+#: bin/modules/gui/main.py:637 bin/modules/gui/main.py:650
+#: bin/modules/gui/main.py:652 bin/modules/gui/main.py:654
+msgid "Could not create database."
+msgstr "Немагчыма стварыць базу даньняў."
+
+#: bin/modules/gui/main.py:638 bin/modules/gui/main.py:650
+msgid "Database already exists !"
+msgstr "База даньняў ужо існуе !"
+
+#: bin/modules/gui/main.py:652 bin/modules/gui/main.py:1384
+#: bin/modules/gui/main.py:1404 bin/modules/gui/main.py:1509
+msgid "Bad database administrator password !"
+msgstr ""
+
+#: bin/modules/gui/main.py:654 bin/modules/gui/main.py:661
+msgid "Error during database creation !"
+msgstr ""
+
+#: bin/modules/gui/main.py:661
+msgid ""
+"The server crashed during installation.\n"
+"We suggest you to drop this database."
+msgstr ""
+
+#: bin/modules/gui/main.py:707 bin/modules/gui/main.py:1072
+msgid "Press Ctrl+O to login"
+msgstr ""
+
+#: bin/modules/gui/main.py:881
+msgid "Edit"
+msgstr "Рэдагаваць"
+
+#: bin/modules/gui/main.py:974
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: bin/modules/gui/main.py:976
+msgid "No Company"
+msgstr ""
+
+#: bin/modules/gui/main.py:989
+#, python-format
+msgid "%s request(s)"
+msgstr ""
+
+#: bin/modules/gui/main.py:991
+msgid "No request"
+msgstr ""
+
+#: bin/modules/gui/main.py:993
+#, python-format
+msgid " - %s request(s) sent"
+msgstr ""
+
+#: bin/modules/gui/main.py:1031
+msgid ""
+"Please double-check the database name or contact your administrator to "
+"verify the database status."
+msgstr ""
+
+#: bin/modules/gui/main.py:1031
+msgid "Database cannot be accessed or does not exist"
+msgstr ""
+
+#: bin/modules/gui/main.py:1035
+msgid ""
+"Connection error !\n"
+"Unable to connect to the server !"
+msgstr ""
+
+#: bin/modules/gui/main.py:1037
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password !"
+msgstr ""
+
+#: bin/modules/gui/main.py:1050
+#, python-format
+msgid "OpenERP - %s"
+msgstr ""
+
+#: bin/modules/gui/main.py:1070
+msgid "Not logged !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:52 bin/modules/gui/main.py:1079
+#: bin/openerp.glade:6081
+msgid "OpenERP"
+msgstr ""
+
+#: bin/modules/gui/main.py:1153
+msgid ""
+"You can not log into the system !\n"
+"Ask the administrator to verify\n"
+"you have an action defined for your user."
+msgstr ""
+
+#: bin/modules/gui/main.py:1187 bin/modules/gui/main.py:1194
+msgid "Do you really want to quit ?"
+msgstr ""
+
+#: bin/modules/gui/main.py:1263
+#, python-format
+msgid "Attachments (%d)"
+msgstr ""
+
+#: bin/modules/gui/main.py:1276
+msgid "Attachments"
+msgstr ""
+
+#: bin/modules/gui/main.py:1375
+msgid "Delete a database"
+msgstr "Выдаліць базу даньняў"
+
+#: bin/modules/gui/main.py:1381
+msgid "Database dropped successfully !"
+msgstr ""
+
+#: bin/modules/gui/main.py:1384
+msgid "Could not drop database."
+msgstr ""
+
+#: bin/modules/gui/main.py:1386
+msgid "Couldn't drop database"
+msgstr ""
+
+#: bin/widget/view/form_gtk/image.py:112 bin/widget/view/form_gtk/url.py:118
+#: bin/modules/gui/main.py:1389 bin/openerp.glade:5817
+msgid "Open..."
+msgstr "Адкрыць..."
+
+#: bin/modules/gui/main.py:1401
+msgid "Database restored successfully !"
+msgstr ""
+
+#: bin/modules/gui/main.py:1404
+msgid "Could not restore database."
+msgstr ""
+
+#: bin/modules/gui/main.py:1406
+msgid "Couldn't restore database"
+msgstr ""
+
+#: bin/modules/gui/main.py:1457
+msgid ""
+"Confirmation password does not match new password, operation cancelled!"
+msgstr ""
+
+#: bin/modules/gui/main.py:1459
+msgid "Validation Error."
+msgstr ""
+
+#: bin/modules/gui/main.py:1476
+msgid "Could not change the Super Admin password."
+msgstr ""
+
+#: bin/modules/gui/main.py:1477 bin/modules/gui/main.py:1483
+msgid "Bad password provided !"
+msgstr ""
+
+#: bin/modules/gui/main.py:1457
+msgid "Error, password not changed."
+msgstr "Памылка, пароль ня зьменены."
+
+#: bin/modules/gui/main.py:1490 bin/modules/gui/main.py:1513
+msgid "Backup a database"
+msgstr ""
+
+#: bin/widget/view/form_gtk/image.py:129
+#: bin/widget/view/form_gtk/binary.py:167 bin/printer/printer.py:231
+#: bin/modules/gui/window/win_export.py:359 bin/modules/gui/main.py:1493
+msgid "Save As..."
+msgstr "Захаваць як..."
+
+#: bin/modules/gui/main.py:1506
+msgid "Database backed up successfully !"
+msgstr ""
+
+#: bin/modules/gui/main.py:1509
+msgid "Could not backup the database."
+msgstr ""
+
+#: bin/modules/gui/main.py:1511
+msgid "Couldn't backup database."
+msgstr ""
+
+#: bin/modules/gui/window/form.py:189
+>>>>>>> MERGE-SOURCE
 msgid "Resource ID does not exist for this object!"
 msgstr ""
 
@@ -995,10 +1296,27 @@
 #: bin/modules/gui/window/form.py:287
 msgid ""
 "Record is not saved ! \n"
+<<<<<<< TREE
 " Do you want to clear current record ?"
 msgstr ""
 
 #: bin/modules/gui/window/form.py:296
+=======
+" Do You want to Clear Current Record ?"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:388
+#: bin/modules/gui/window/form.py:290
+msgid "Are you sure to remove this record ?"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:390
+#: bin/modules/gui/window/form.py:292
+msgid "Are you sure to remove those records ?"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:296
+>>>>>>> MERGE-SOURCE
 msgid "Resources cleared."
 msgstr ""
 
@@ -1014,7 +1332,20 @@
 msgid "Document Saved."
 msgstr "Сохраненный Документ."
 
-#: bin/modules/gui/window/form.py:368
+<<<<<<< TREE
+#: bin/modules/gui/window/form.py:368
+=======
+#: bin/widget/view/list.py:584 bin/widget/view/list.py:585
+#: bin/widget/view/form_gtk/parser.py:135 bin/modules/gui/window/form.py:366
+msgid "Invalid form, correct red fields !"
+msgstr ""
+
+#: bin/widget/view/list.py:584
+msgid "Error !"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:368
+>>>>>>> MERGE-SOURCE
 msgid "Warning !"
 msgstr ""
 
@@ -1091,6 +1422,7 @@
 msgid "Field name"
 msgstr ""
 
+<<<<<<< TREE
 #: bin/modules/gui/window/win_import.py:142
 #: bin/modules/gui/window/win_import.py:144
 #: bin/modules/gui/window/win_export.py:214
@@ -1098,6 +1430,9 @@
 msgstr ""
 
 #: bin/modules/gui/window/win_import.py:181
+=======
+#: bin/modules/gui/window/win_import.py:181
+>>>>>>> MERGE-SOURCE
 msgid "Error opening .CSV file"
 msgstr ""
 
@@ -1125,6 +1460,29 @@
 msgid "You have not selected any fields to import"
 msgstr ""
 
+<<<<<<< TREE
+=======
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Extension"
+msgstr ""
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Application"
+msgstr ""
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Print Processor"
+msgstr ""
+
+#: bin/modules/gui/window/win_extension.py:114
+msgid "This extension is already defined"
+msgstr ""
+
+#: bin/modules/gui/window/win_extension.py:114 bin/openerp.glade:7642
+msgid "Extension Manager"
+msgstr ""
+
+>>>>>>> MERGE-SOURCE
 #: bin/modules/gui/window/win_selection.py:51
 msgid "Name"
 msgstr "Назва"
@@ -1159,6 +1517,7 @@
 msgid "Tree"
 msgstr ""
 
+<<<<<<< TREE
 #: bin/modules/gui/window/win_search.py:126
 #, python-format
 msgid "OpenERP Search: %s"
@@ -1174,6 +1533,13 @@
 msgstr ""
 
 #: bin/modules/gui/window/tree.py:205 bin/modules/gui/window/tree.py:261
+=======
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:45
+msgid "Description"
+msgstr "Апісаньне"
+
+#: bin/modules/gui/window/tree.py:205 bin/modules/gui/window/tree.py:261
+>>>>>>> MERGE-SOURCE
 msgid "No resource selected!"
 msgstr ""
 
@@ -1206,6 +1572,7 @@
 msgid "Error Opening Excel !"
 msgstr ""
 
+<<<<<<< TREE
 #: bin/modules/gui/window/win_export.py:142
 #: bin/modules/gui/window/win_export.py:146
 msgid "Field Name"
@@ -1220,6 +1587,9 @@
 msgstr ""
 
 #: bin/modules/gui/window/win_export.py:317
+=======
+#: bin/modules/gui/window/win_export.py:317
+>>>>>>> MERGE-SOURCE
 msgid "What is the name of this export ?"
 msgstr ""
 
@@ -1227,6 +1597,7 @@
 msgid "Exportation Error !"
 msgstr ""
 
+<<<<<<< TREE
 #: bin/modules/gui/main.py:89 bin/modules/gui/main.py:341
 msgid "Could not connect to server !"
 msgstr "Немагчыма спалучыцца з сэрверам !"
@@ -1493,6 +1864,726 @@
 #: bin/modules/gui/main.py:1511
 msgid "Couldn't backup database."
 msgstr ""
+=======
+#: bin/widget/view/diagram_gtk/xdot.py:1772
+#: bin/modules/gui/window/win_search.py:49
+msgid "OpenERP - Link"
+msgstr ""
+
+#: bin/modules/gui/window/win_search.py:126
+#, python-format
+msgid "OpenERP Search: %s"
+msgstr ""
+
+#: bin/modules/gui/window/win_search.py:127
+#, python-format
+msgid "OpenERP Search: %s (%%d result(s))"
+msgstr ""
+
+#: bin/options.py:121
+#, python-format
+msgid "OpenERP Client %s"
+msgstr "Кліент OpenERP %s"
+
+#: bin/options.py:122
+msgid "specify alternate config file"
+msgstr ""
+
+#: bin/options.py:123
+msgid "Enable basic debugging. Alias for '--log-level=debug'"
+msgstr ""
+
+#: bin/options.py:124
+#, python-format
+msgid "specify the log level: %s"
+msgstr ""
+
+#: bin/options.py:125
+msgid "specify the user login"
+msgstr ""
+
+#: bin/options.py:126
+msgid "specify the server port"
+msgstr ""
+
+#: bin/options.py:127
+msgid "specify the server ip/name"
+msgstr ""
+
+#: bin/common/common.py:89
+msgid "Close current tip"
+msgstr ""
+
+#: bin/common/common.py:90
+msgid ""
+"<span foreground=\"darkred\"><b>Close Current Tip:</b></span>\n"
+"This will hide the current tip. It will be displayed again next time you "
+"open this menu item, unless you disable all tips using the <b>'Menu "
+"Tips'</b> option in the user preferences."
+msgstr ""
+
+#: bin/common/common.py:100
+msgid "Disable all tips"
+msgstr ""
+
+#: bin/common/common.py:101
+msgid ""
+"<span foreground=\"darkred\"><b>Disable all tips:</b></span>\n"
+"This will disable the display of tips on all menu items.\n"
+"To re-enable tips you need to check the <b>'Menu Tips'</b> option in the "
+"user preferences."
+msgstr ""
+
+#: bin/common/common.py:115 bin/common/common.py:117
+msgid "Tips"
+msgstr ""
+
+#: bin/common/common.py:168
+msgid "OpenERP Computing"
+msgstr "Откройте Вычисление ERP"
+
+#: bin/common/common.py:187
+msgid "Operation in progress"
+msgstr "Операция в продвижении"
+
+#: bin/common/common.py:191
+msgid ""
+"Please wait,\n"
+"this operation may take a while..."
+msgstr ""
+
+#: bin/common/common.py:225
+#, python-format
+msgid "Ensure that the file %s is correct"
+msgstr ""
+
+#: bin/common/common.py:399
+msgid " has reported the following bug:\n"
+msgstr ""
+
+#: bin/common/common.py:399
+msgid "remarks"
+msgstr ""
+
+#: bin/common/common.py:402
+msgid "Support request sent !"
+msgstr ""
+
+#: bin/common/common.py:425 bin/common/common.py:469
+msgid ""
+"\n"
+"<b>An unknown error has been reported.</b>\n"
+"\n"
+"<b>You do not have a valid OpenERP publisher warranty contract !</b>\n"
+"If you are using OpenERP in production, it is highly suggested to subscribe\n"
+"a publisher warranty program.\n"
+"\n"
+"The OpenERP publisher warranty contract provides you a bugfix guarantee and "
+"an\n"
+"automatic migration system so that we can fix your problems within a few\n"
+"hours. If you had a publisher warranty contract, this error would have been "
+"sent\n"
+"to the quality team of the OpenERP editor.\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"
+"\n"
+"You can use the link bellow for more information. The detail of the error\n"
+"is displayed on the second tab.\n"
+msgstr ""
+
+#: bin/common/common.py:448
+#, python-format
+msgid ""
+"\n"
+"<b>An unknown error has been reported.</b>\n"
+"\n"
+"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:\n"
+"%s\n"
+"\n"
+"You can use the link bellow for more information. The detail of the error\n"
+"is displayed on the second tab."
+msgstr ""
+
+#: bin/common/common.py:525
+msgid ""
+"Your problem has been sent to the quality team !\n"
+"We will recontact you after analysing the problem."
+msgstr ""
+
+#: bin/common/common.py:528
+#, python-format
+msgid ""
+"Your problem could *NOT* be sent to the quality team !\n"
+"Please report this error manually at:\n"
+"\t%s"
+msgstr ""
+
+#: bin/common/common.py:528
+msgid "Error"
+msgstr ""
+
+#: bin/common/common.py:682
+msgid "Open with..."
+msgstr "Адкрыць з дапамогай..."
+
+#: bin/translate.py:183
+#, python-format
+msgid "Unable to set locale %s: %s"
+msgstr ""
+
+#: bin/printer/printer.py:184
+#, python-format
+msgid "Unable to handle %s filetype"
+msgstr ""
+
+#: bin/printer/printer.py:189
+msgid ""
+"Linux Automatic Printing not implemented.\n"
+"Use preview option !"
+msgstr ""
+"Linux Автоматическая Печать, не осуществленна.\n"
+"Используйте выбор предварительного просмотра!"
+
+#: bin/printer/printer.py:212
+msgid "Error! No Data found. Make sure you have enough data to print!"
+msgstr ""
+
+#: bin/printer/printer.py:239
+msgid "Error writing the file!"
+msgstr "Ошибка написания файла"
+
+#: bin/openerp-client.py:142
+msgid "Closing OpenERP, KeyboardInterrupt"
+msgstr "Закрывая Открытый ERP, Перерыв Клавиатуры"
+
+#: bin/widget/view/form_gtk/button.py:47 bin/widget_search/char.py:72
+#: bin/widget_search/calendar.py:125 bin/widget_search/calendar.py:250
+#: bin/widget_search/filter.py:77 bin/widget_search/reference.py:78
+#: bin/widget_search/spinbutton.py:92 bin/widget_search/selection.py:116
+#: bin/widget_search/custom_filter.py:140 bin/widget_search/spinint.py:95
+#: bin/widget_search/checkbox.py:68
+msgid "The content of the widget or ValueError if not valid"
+msgstr "Содержание виджета или Ошибки Ценности, если не действительный"
+
+#: bin/widget_search/form.py:492
+msgid "The content of the form or exception if not valid"
+msgstr ""
+
+#: bin/widget/view/form_gtk/date_widget.py:65
+#: bin/widget_search/date_widget.py:65
+msgid ""
+"You can use special operation by pressing +, - or =.  Plus/minus "
+"adds/decrease the variable to the current selected date. Equals set part of "
+"selected date. Available variables: 12h = 12 hours, 8d = 8 days, 4w = 4 "
+"weeks, 1m = 1 month, 2y = 2 years. Some examples:\n"
+"* +21d : adds 21 days to selected year\n"
+"* =23w : set date to the 23th week of the year\n"
+"* -4m : decrease 4 months to the current date\n"
+"You can also use \"=\" to set the date to the current date/time and '-' to "
+"clear the field."
+msgstr ""
+"Вы можете использовать специальную операцию, нажимая +, - или =. Плюс/минус "
+"добавляет/уменьшается, что переменная к потоку выбрала дату. Равняется части "
+"набора отобранной даты. Доступные переменные: 12-ый = 12 часов, 8d = 8 дней, "
+"4w = 4 недели, 1 м. = 1 месяц, 2y = 2 года. Некоторые примеры:\n"
+"* +21d: добавляет 21 день к отобранному году\n"
+"* = 23w: назначенная дата к 23-ой неделе года\n"
+"* - 4 м.: уменьшите 4 месяца к текущей дате\n"
+"Вы можете также использовать \"=\", чтобы назначить дату к текущей "
+"дате/времени и '-, 'чтобы очистить область."
+
+#: bin/widget_search/wid_int.py:56
+msgid "The content of the widget or exception if not valid"
+msgstr ""
+
+#: bin/widget_search/char.py:45
+msgid "Error: "
+msgstr ""
+
+#: bin/widget_search/calendar.py:49 bin/widget_search/calendar.py:177
+msgid "Start date"
+msgstr ""
+
+#: bin/widget/view/form_gtk/calendar.py:57
+#: bin/widget/view/form_gtk/calendar.py:184 bin/widget_search/calendar.py:53
+#: bin/widget_search/calendar.py:73 bin/widget_search/calendar.py:181
+#: bin/widget_search/calendar.py:201
+msgid "Open the calendar widget"
+msgstr "Откройте календарный виджет"
+
+#: bin/widget_search/calendar.py:69 bin/widget_search/calendar.py:197
+msgid "End date"
+msgstr ""
+
+#: bin/widget/view/form_gtk/calendar.py:135
+#: bin/widget/view/form_gtk/calendar.py:249 bin/widget_search/calendar.py:128
+#: bin/widget_search/calendar.py:267
+msgid "OpenERP - Date selection"
+msgstr ""
+
+#: bin/widget_search/custom_filter_widgets.py:40
+#: bin/widget_search/custom_filter_widgets.py:67
+#: bin/widget_search/custom_filter_widgets.py:98
+msgid "contains"
+msgstr ""
+
+#: bin/widget_search/custom_filter_widgets.py:41
+#: bin/widget_search/custom_filter_widgets.py:68
+#: bin/widget_search/custom_filter_widgets.py:98
+msgid "doesn't contain"
+msgstr ""
+
+#: bin/widget_search/custom_filter_widgets.py:290
+#: bin/widget_search/custom_filter_widgets.py:331
+msgid "is equal to"
+msgstr ""
+
+#: bin/widget_search/custom_filter_widgets.py:291
+#: bin/widget_search/custom_filter_widgets.py:332
+msgid "is not equal to"
+msgstr ""
+
+#: bin/widget_search/custom_filter_widgets.py:292
+#: bin/widget_search/custom_filter_widgets.py:333
+msgid "greater than"
+msgstr ""
+
+#: bin/widget_search/custom_filter_widgets.py:293
+#: bin/widget_search/custom_filter_widgets.py:334
+msgid "less than"
+msgstr ""
+
+#: bin/widget_search/custom_filter.py:62
+msgid "in"
+msgstr ""
+
+#: bin/widget_search/custom_filter.py:63
+msgid "not in"
+msgstr ""
+
+#: bin/widget_search/custom_filter.py:82
+msgid ""
+"Enter Values separated by ',' if operator 'in' or 'not in' is chosen.\n"
+"For Date and DateTime Formats, specify text in '%Y-%m-%d' and '%Y-%m-%d "
+"%H:%M:%S' formats respectively."
+msgstr ""
+
+#: bin/widget_search/checkbox.py:35 bin/widget_search/checkbox.py:42
+#: bin/widget_search/checkbox.py:55
+msgid "Yes"
+msgstr "Так"
+
+#: bin/widget_search/checkbox.py:36 bin/widget_search/checkbox.py:44
+msgid "No"
+msgstr "Не"
+
+#: bin/widget/view/form.py:137
+msgid "You must save this record to use the relate button !"
+msgstr ""
+
+#: bin/widget/view/form.py:142
+msgid "Action not defined !"
+msgstr ""
+
+#: bin/widget/view/form.py:211
+msgid "You must select a record to use the relate button !"
+msgstr ""
+
+#: bin/widget/view/form.py:238 bin/widget/view/form_gtk/parser.py:635
+#: bin/widget/view/form_gtk/parser.py:756
+#: bin/widget/view/form_gtk/parser.py:813
+msgid "No other language available!"
+msgstr "Никакой другой доступный язык!"
+
+#: bin/widget/view/form.py:245 bin/widget/view/form_gtk/parser.py:647
+#: bin/widget/view/form_gtk/parser.py:762
+#: bin/widget/view/form_gtk/parser.py:819
+msgid "Add Translation"
+msgstr "Дадаць пераклад"
+
+#: bin/widget/view/form.py:293 bin/widget/view/form_gtk/parser.py:875
+msgid "Translate label"
+msgstr ""
+
+#: bin/widget/view/calendar_gtk/parser.py:355 bin/openerp.glade:8064
+msgid "Week"
+msgstr "Тыдзень"
+
+#: bin/widget/view/calendar_gtk/parser_dummy.py:30
+msgid "Calendar View Error !"
+msgstr "Памылка прагляду календара !"
+
+#: bin/widget/view/calendar_gtk/parser_dummy.py:31
+msgid "You must intall the library python-hippocanvas to use calendars."
+msgstr ""
+
+#: bin/widget/view/screen_container.py:74
+msgid "--Actions--"
+msgstr ""
+
+#: bin/widget/view/screen_container.py:73
+msgid "Save as a Shortcut"
+msgstr ""
+
+#: bin/widget/view/screen_container.py:74
+msgid "Save as a Filter"
+msgstr ""
+
+#: bin/widget/view/screen_container.py:74
+msgid "Manage Filters"
+msgstr ""
+
+#: bin/widget/view/tree_gtk/parser.py:61
+msgid ""
+"You have unsaved record(s) !  \n"
+"\n"
+"Please Save them before sorting !"
+msgstr ""
+
+#: bin/widget/view/tree_gtk/editabletree.py:140
+#, python-format
+msgid "Shortcut: %s"
+msgstr ""
+
+#: bin/widget/view/tree_gtk/editabletree.py:140
+msgid "F1 New - F2 Open/Search"
+msgstr ""
+
+#: bin/widget/view/tree_gtk/editabletree.py:215
+#, python-format
+msgid "Warning; field %s is required!"
+msgstr ""
+
+#: bin/widget/view/tree_gtk/date_renderer.py:197
+msgid ""
+"Press <i>'+'</i>, <i>'-'</i> or <i>'='</i> for special date operations."
+msgstr ""
+
+#: bin/widget/view/widget_parse.py:53
+#, python-format
+msgid "This type (%s) is not supported by the GTK client !"
+msgstr ""
+
+#: bin/widget/view/widget_parse.py:64
+msgid "No valid view found for this object!"
+msgstr ""
+
+#: bin/widget/view/graph_gtk/parser.py:64
+msgid "Can not generate graph !"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1422
+msgid "Dot Viewer"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1712
+msgid "Add New Node"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1713
+msgid "Add New Edge"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1714
+msgid "Enlarge the Diagram"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1715
+msgid "Shrink the Diagram"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1716
+msgid "Fit the diagram to the window"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1717
+msgid "Show the diagram at its normal size"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1718
+msgid "Print the Diagram"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1789
+#, python-format
+msgid "Close Current %s"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1790
+#, python-format
+msgid "Delete Current %s"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1791
+#, python-format
+msgid "Edit Current %s"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1875
+msgid " - Dot Viewer"
+msgstr ""
+
+#: bin/widget/view/form_gtk/reference.py:76 bin/openerp.glade:1258
+msgid "Create a new resource"
+msgstr ""
+
+#: bin/widget/view/form_gtk/reference.py:89
+msgid "Search / Open a resource"
+msgstr ""
+
+#: bin/widget/view/form_gtk/parser.py:61
+msgid "Wrong icon for the button !"
+msgstr "Памылковая іконка для кнопкі !"
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Field"
+msgstr ""
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Object"
+msgstr ""
+
+#: bin/widget/view/form_gtk/parser.py:619
+msgid "Enter some text to the related field before adding translations!"
+msgstr ""
+
+#: bin/widget/view/form_gtk/parser.py:626
+msgid "You need to save resource before adding translations!"
+msgstr ""
+
+#: bin/widget/view/form_gtk/parser.py:880
+msgid "Translate view"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:64
+msgid "Cancel"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:70
+msgid "Save & Close"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:75
+msgid "Save & New"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:164
+#: bin/widget/view/form_gtk/interface.py:48
+msgid "Set to default value"
+msgstr "Усталяваць змоўчанае значэньне"
+
+#: bin/widget/view/form_gtk/one2many_list.py:167
+msgid "Set Default"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:196
+msgid "Create a new entry"
+msgstr "Стварыць новы запіс"
+
+#: bin/widget/view/form_gtk/one2many_list.py:200
+msgid "Edit this entry"
+msgstr "Рэдагаваць гэты запіс"
+
+#: bin/widget/view/form_gtk/one2many_list.py:204
+msgid "Remove this entry"
+msgstr "Выдаліць гэты запіс"
+
+#: bin/widget/view/form_gtk/many2many.py:84
+#: bin/widget/view/form_gtk/one2many_list.py:210
+msgid "Previous Page"
+msgstr ""
+
+#: bin/widget/view/form_gtk/many2many.py:88
+#: bin/widget/view/form_gtk/one2many_list.py:214
+msgid "Previous Record"
+msgstr ""
+
+#: bin/widget/view/form_gtk/many2many.py:96
+#: bin/widget/view/form_gtk/one2many_list.py:222
+msgid "Next Record"
+msgstr ""
+
+#: bin/widget/view/form_gtk/many2many.py:100
+#: bin/widget/view/form_gtk/one2many_list.py:226
+msgid "Next Page"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:232
+msgid "Switch"
+msgstr ""
+
+#: bin/widget/view/form_gtk/many2many.py:106
+#: bin/widget/view/form_gtk/one2many_list.py:238
+msgid "Choose Limit"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:279
+msgid "You have to select a resource !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/image.py:73
+msgid "Set Image"
+msgstr "Усталяваць выяву"
+
+#: bin/widget/view/form_gtk/image.py:82 bin/widget/view/form_gtk/binary.py:84
+msgid "Save As"
+msgstr "Захаваць як"
+
+#: bin/widget/view/form_gtk/image.py:93 bin/widget/view/form_gtk/binary.py:88
+msgid "Clear"
+msgstr ""
+
+#: bin/widget/view/form_gtk/image.py:102
+msgid "All files"
+msgstr "Усе файлы"
+
+#: bin/widget/view/form_gtk/image.py:106
+msgid "Images"
+msgstr "Малюнкі"
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "There is no image to save as !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "Warning"
+msgstr ""
+
+#: bin/widget/view/form_gtk/many2one.py:158 bin/widget/view/form_gtk/url.py:53
+msgid "Open this resource"
+msgstr ""
+
+#: bin/widget/view/form_gtk/many2one.py:163
+#: bin/widget_search/custom_filter_widgets.py:87
+msgid "Search a resource"
+msgstr ""
+
+#: bin/widget/view/form_gtk/many2one.py:174 bin/openerp.glade:1412
+msgid "Action"
+msgstr "Дзеяньне"
+
+#: bin/widget/view/form_gtk/many2one.py:175
+msgid "Report"
+msgstr ""
+
+#: bin/widget/view/list.py:633 bin/widget/view/form_gtk/many2one.py:387
+msgid "You must select a record to use the relation !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/interface.py:49
+msgid "Set as default"
+msgstr "Усталяваць як змоўчанае"
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "You can not set to the default value here !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "Operation not permited"
+msgstr ""
+
+#: bin/widget/view/form_gtk/binary.py:76
+msgid "Select"
+msgstr "Выбраць"
+
+#: bin/widget/view/form_gtk/binary.py:80
+msgid "Open"
+msgstr "Адкрыць"
+
+#: bin/widget/view/form_gtk/binary.py:119
+#: bin/widget/view/form_gtk/binary.py:163
+msgid "Unable to read the file data"
+msgstr "Немагчыма прачытаць даньні з файла"
+
+#: bin/widget/view/form_gtk/binary.py:129
+#: bin/widget/view/form_gtk/binary.py:155
+#, python-format
+msgid "Error reading the file: %s"
+msgstr "Памылка чытаньня файла: %s"
+
+#: bin/widget/view/form_gtk/binary.py:138
+msgid "All Files"
+msgstr "Усе файлы"
+
+#: bin/widget/view/form_gtk/binary.py:148
+msgid "Select a file..."
+msgstr "Выбраць файл..."
+
+#: bin/widget/view/form_gtk/binary.py:177
+#, python-format
+msgid "Error writing the file: %s"
+msgstr "Памылка пісаньня ў файл: %s"
+
+#: bin/widget/view/form_gtk/wid_common.py:59
+msgid "Always applicable !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/calendar.py:99
+#: bin/widget/view/form_gtk/calendar.py:163
+msgid "Invalid date value! Year must be greater than 1899 !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/calendar.py:255 bin/widget_search/calendar.py:273
+msgid "Hour:"
+msgstr ""
+
+#: bin/widget/view/form_gtk/calendar.py:258 bin/widget_search/calendar.py:276
+msgid "Minute:"
+msgstr ""
+
+#: bin/widget/view/form_gtk/calendar.py:291 bin/widget_search/calendar.py:312
+msgid "Invalid datetime value! Year must be greater than 1899 !"
+msgstr ""
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:30
+msgid "Gantt view not yet implemented !"
+msgstr ""
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:31
+msgid ""
+"The gantt view is not available in this GTK Client, you should use the web "
+"interface or switch to the calendar view."
+msgstr ""
+
+#: bin/widget/screen/screen.py:337
+msgid ""
+"(Any existing filter with the \n"
+"same name will be replaced)"
+msgstr ""
+
+#: bin/rpc.py:158
+msgid "Connection refused!"
+msgstr "Спалучэньне страчанае!"
+
+#: bin/rpc.py:188
+msgid ""
+"Unable to reach to OpenERP server !\n"
+"You should check your connection to the network and the OpenERP server."
+msgstr ""
+
+#: bin/rpc.py:188
+msgid "Connection Error"
+msgstr "Памылка спалучэньня"
+>>>>>>> MERGE-SOURCE
 
 #: bin/openerp.glade:6
 msgid "OpenERP - Login"
@@ -1562,11 +2653,15 @@
 msgid "_Preferences"
 msgstr ""
 
+<<<<<<< TREE
 #: bin/openerp.glade:483 bin/openerp.glade:7304
 msgid "Change password"
 msgstr ""
 
 #: bin/openerp.glade:496
+=======
+#: bin/openerp.glade:496
+>>>>>>> MERGE-SOURCE
 msgid "_Send a request"
 msgstr ""
 
@@ -2030,7 +3125,19 @@
 msgid "<b>Predefined Exports</b>"
 msgstr ""
 
-#: bin/openerp.glade:2880
+<<<<<<< TREE
+#: bin/openerp.glade:2880
+=======
+#: bin/openerp.glade:3134
+msgid "Import Compatible"
+msgstr ""
+
+#: bin/openerp.glade:2862
+msgid "<b>Select an Option to Export</b>"
+msgstr ""
+
+#: bin/openerp.glade:2880
+>>>>>>> MERGE-SOURCE
 msgid "Available Fields"
 msgstr ""
 
@@ -2050,6 +3157,7 @@
 msgid "Fields to Export"
 msgstr ""
 
+<<<<<<< TREE
 #: bin/openerp.glade:3115
 msgid "Add Field Names"
 msgstr ""
@@ -2059,6 +3167,19 @@
 msgstr ""
 
 #: bin/openerp.glade:3156
+=======
+#: bin/openerp.glade:3132
+msgid ""
+"Open in Excel\n"
+"Save as CSV"
+msgstr ""
+
+#: bin/openerp.glade:3151
+msgid "Add _field names"
+msgstr ""
+
+#: bin/openerp.glade:3156
+>>>>>>> MERGE-SOURCE
 msgid "<b>Opti_ons</b>"
 msgstr ""
 
@@ -2359,6 +3480,7 @@
 msgid "N_othing"
 msgstr ""
 
+<<<<<<< TREE
 #: bin/openerp.glade:5772
 msgid "<b>Fields to import</b>"
 msgstr ""
@@ -2368,10 +3490,25 @@
 msgstr ""
 
 #: bin/openerp.glade:5852
+=======
+#: bin/openerp.glade:5852
+>>>>>>> MERGE-SOURCE
 msgid "Auto-Detect"
 msgstr ""
 
-#: bin/openerp.glade:5930
+<<<<<<< TREE
+#: bin/openerp.glade:5930
+=======
+#: bin/openerp.glade:5772
+msgid "<b>Fields to import</b>"
+msgstr ""
+
+#: bin/openerp.glade:5891
+msgid "File to Import:"
+msgstr ""
+
+#: bin/openerp.glade:5930
+>>>>>>> MERGE-SOURCE
 msgid "Lines to Skip:"
 msgstr ""
 
@@ -2534,7 +3671,15 @@
 "Data:"
 msgstr ""
 
-#: bin/openerp.glade:7321
+<<<<<<< TREE
+#: bin/openerp.glade:7321
+=======
+#: bin/openerp.glade:483 bin/openerp.glade:7304
+msgid "Change password"
+msgstr ""
+
+#: bin/openerp.glade:7321
+>>>>>>> MERGE-SOURCE
 msgid "<b>Change your super admin password</b>"
 msgstr ""
 
@@ -2603,6 +3748,35 @@
 msgstr ""
 
 #: bin/openerp.glade:8276
+<<<<<<< TREE
+=======
+msgid "Fields on which Search criteria to be applied"
+msgstr ""
+
+#: bin/openerp.glade:8289
+msgid "Conditional Operators"
+msgstr ""
+
+#: bin/openerp.glade:8316
+msgid "The Choice will be applied with next filter if any"
+msgstr ""
+
+#: bin/openerp.glade:8317
+msgid ""
+"AND\n"
+"OR"
+msgstr ""
+
+#: bin/openerp.glade:8330
+msgid "Remove Filter"
+msgstr ""
+
+#: bin/openerp.glade:8230
+msgid "Filter Entry"
+msgstr ""
+
+#: bin/openerp.glade:8276
+>>>>>>> MERGE-SOURCE
 msgid "Enter Filter Name:"
 msgstr ""
 

=== modified file 'bin/po/bg.po'
--- bin/po/bg.po	2011-10-11 05:32:10 +0000
+++ bin/po/bg.po	2011-10-24 01:06:26 +0000
@@ -7,17 +7,29 @@
 msgstr ""
 "Project-Id-Version: openobject-client\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-07-28 15:22+0530\n"
 "PO-Revision-Date: 2011-07-25 16:05+0000\n"
 "Last-Translator: Naresh(OpenERP) <nch@xxxxxxxxxxx>\n"
+=======
+"POT-Creation-Date: 2010-12-13 18:11+0100\n"
+"PO-Revision-Date: 2011-07-20 14:55+0000\n"
+"Last-Translator: Bilyan Baldzhiev <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Bulgarian <bg@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-10-11 05:29+0000\n"
 "X-Generator: Launchpad (build 14123)\n"
+=======
+"X-Launchpad-Export-Date: 2011-09-15 05:09+0000\n"
+"X-Generator: Launchpad (build 13921)\n"
+>>>>>>> MERGE-SOURCE
 "Language: bg\n"
 
+<<<<<<< TREE
 #: bin/widget/view/gantt_gtk/parser_dummy.py:30
 msgid "Gantt view not yet implemented !"
 msgstr ""
@@ -30,11 +42,418 @@
 
 #: bin/widget/view/list.py:584 bin/widget/view/list.py:585
 #: bin/widget/view/form_gtk/parser.py:135 bin/modules/gui/window/form.py:366
+=======
+#: bin/plugins/__init__.py:27
+msgid "Print Workflow"
+msgstr "Отпечатване на Работният поток"
+
+#: bin/plugins/__init__.py:28
+msgid "Print Workflow (with subflows)"
+msgstr "Отпечатване Работният поток (комплексно)"
+
+#: bin/plugins/__init__.py:40
+msgid "No available plugin for this resource !"
+msgstr "Няма достъпна добавка за този ресурс !"
+
+#: bin/plugins/__init__.py:42
+msgid "Choose a Plugin"
+msgstr "Изберете Добавка"
+
+#: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
+msgid "Connection refused !"
+msgstr "Свързването е отхвърлено!"
+
+#: bin/rpc.py:203 bin/rpc.py:205 bin/modules/action/wizard.py:162
+#: bin/modules/action/wizard.py:168 bin/modules/action/wizard.py:170
+#: bin/modules/gui/main.py:195 bin/modules/gui/main.py:201
+msgid "Application Error"
+msgstr "Грешка в приложението"
+
+#: bin/rpc.py:205 bin/modules/action/wizard.py:170
+msgid "View details"
+msgstr "Подробен изглед"
+
+#: bin/modules/action/main.py:48
+msgid "Nothing to print!"
+msgstr "Няма нищо за печат!"
+
+#: bin/modules/action/main.py:66
+msgid "Printing aborted, too long delay !"
+msgstr "Печатът е отхжърлен, отнема прекалено много време!"
+
+#: bin/modules/action/main.py:195
+msgid "Select your action"
+msgstr "Изберете вашето действие"
+
+#: bin/modules/gui/main.py:89 bin/modules/gui/main.py:341
+msgid "Could not connect to server !"
+msgstr "Не може да се свърже със сървър!"
+
+#: bin/modules/gui/main.py:93 bin/openerp.glade:72 bin/openerp.glade:6233
+#: bin/openerp.glade:6479 bin/openerp.glade:6802 bin/openerp.glade:7466
+msgid "Server:"
+msgstr "Сървър:"
+
+#: bin/modules/gui/main.py:104 bin/openerp.glade:98 bin/openerp.glade:6515
+#: bin/openerp.glade:6759 bin/openerp.glade:7058 bin/openerp.glade:7423
+msgid "Change"
+msgstr "Промяна"
+
+#: bin/modules/gui/main.py:111
+msgid "Super Administrator Password:"
+msgstr "Парола на Супер администратор:"
+
+#: bin/modules/gui/main.py:193
+msgid "Bad Super Administrator Password"
+msgstr "Грешна парола на Супер администратор"
+
+#: bin/modules/gui/main.py:217
+msgid "Migration Scripts"
+msgstr "Скриптове за мигриране"
+
+#: bin/modules/gui/main.py:220
+msgid "Contract ID:"
+msgstr "ID на договор:"
+
+#: bin/modules/gui/main.py:226
+msgid "Contract Password:"
+msgstr ""
+
+#: bin/modules/gui/main.py:241
+msgid "You already have the latest version"
+msgstr "Вече имате последната версия"
+
+#: bin/modules/gui/main.py:246
+msgid "The following updates are available:"
+msgstr "Следните ъпдейти са налични:"
+
+#: bin/modules/gui/main.py:258
+msgid "You can now migrate your databases."
+msgstr "Сега можете да мигрирате базите данни."
+
+#: bin/modules/gui/main.py:263
+msgid "Migrate Database"
+msgstr "Мигрирай база данни"
+
+#: bin/modules/gui/main.py:280
+msgid "Database"
+msgstr "База данни"
+
+#: bin/modules/gui/main.py:292
+msgid "Your database has been upgraded."
+msgstr "Вашата база данни беше ъпгрейдната."
+
+#: bin/modules/gui/main.py:294
+msgid "Your databases have been upgraded."
+msgstr "Вашата база данни беше ъпгрейдната."
+
+#: bin/modules/gui/main.py:296
+msgid "You have not selected a database"
+msgstr "Не сте избрали база данни"
+
+#: bin/modules/gui/main.py:360
+msgid "No database found, you must create one !"
+msgstr "Не е открита база данни! Трябва да създадете такава."
+
+#: bin/modules/gui/main.py:468
+msgid "Unknown"
+msgstr "Непознат"
+
+#: bin/modules/gui/main.py:474
+#, python-format
+msgid ""
+"The versions of the server (%s) and the client (%s) missmatch. The client "
+"may not work properly. Use it at your own risks."
+msgstr ""
+"Версията на сървъра (%s) и на клиента (%s) не съвпадат. Клинтът може да на "
+"работи правилно. Използвайте го на собствен риск."
+
+#: bin/modules/gui/main.py:610
+msgid "Sorry,'"
+msgstr "Извинете,'"
+
+#: bin/modules/gui/main.py:610 bin/modules/gui/main.py:613
+msgid "Bad database name !"
+msgstr "Грешно име на база данни!"
+
+#: bin/modules/gui/main.py:613
+msgid ""
+"The database name must contain only normal characters or \"_\".\n"
+"You must avoid all accents, space or special characters."
+msgstr ""
+
+#: bin/modules/gui/main.py:637 bin/modules/gui/main.py:650
+#: bin/modules/gui/main.py:652 bin/modules/gui/main.py:654
+msgid "Could not create database."
+msgstr "Не може да се създаде база данни."
+
+#: bin/modules/gui/main.py:638 bin/modules/gui/main.py:650
+msgid "Database already exists !"
+msgstr "Базата данни вече съществува!"
+
+#: bin/modules/gui/main.py:652 bin/modules/gui/main.py:1384
+#: bin/modules/gui/main.py:1404 bin/modules/gui/main.py:1509
+msgid "Bad database administrator password !"
+msgstr "Грешна адмнистраторска парола за базата данни!"
+
+#: bin/modules/gui/main.py:654 bin/modules/gui/main.py:661
+msgid "Error during database creation !"
+msgstr "Грешка при създаване на базата данни!"
+
+#: bin/modules/gui/main.py:661
+msgid ""
+"The server crashed during installation.\n"
+"We suggest you to drop this database."
+msgstr "Сървърът се счупи софтуерно по време на инсталацията."
+
+#: bin/modules/gui/main.py:707 bin/modules/gui/main.py:1072
+msgid "Press Ctrl+O to login"
+msgstr "Натиснете Ctrl+O за вход"
+
+#: bin/modules/gui/main.py:881
+msgid "Edit"
+msgstr "Редакция"
+
+#: bin/modules/gui/main.py:974
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: bin/modules/gui/main.py:976
+msgid "No Company"
+msgstr "Няма фирма"
+
+#: bin/modules/gui/main.py:989
+#, python-format
+msgid "%s request(s)"
+msgstr "%s заявка(и)"
+
+#: bin/modules/gui/main.py:991
+msgid "No request"
+msgstr "Няма заявка"
+
+#: bin/modules/gui/main.py:993
+#, python-format
+msgid " - %s request(s) sent"
+msgstr " - %s заявка/и изпратена/и"
+
+#: bin/modules/gui/main.py:1031
+msgid ""
+"Please double-check the database name or contact your administrator to "
+"verify the database status."
+msgstr ""
+"Надлежно проверете името на базата данни или се свържете с вашия "
+"администратор за да провери състоянието на базата."
+
+#: bin/modules/gui/main.py:1031
+msgid "Database cannot be accessed or does not exist"
+msgstr "Базата данни не може да бъде достъпена или не съществува"
+
+#: bin/modules/gui/main.py:1035
+msgid ""
+"Connection error !\n"
+"Unable to connect to the server !"
+msgstr ""
+"Грешка във връзката!\n"
+"Не може да се осъществи връзка със сървъра!"
+
+#: bin/modules/gui/main.py:1037
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password !"
+msgstr ""
+"Грешка при автентикация!\n"
+"Грешен потребител или парола!"
+
+#: bin/modules/gui/main.py:1050
+#, python-format
+msgid "OpenERP - %s"
+msgstr "OpenERP - %s"
+
+#: bin/modules/gui/main.py:1070
+msgid "Not logged !"
+msgstr "Не сте влезли в системата!"
+
+#: bin/widget/view/form_gtk/one2many_list.py:52 bin/modules/gui/main.py:1079
+#: bin/openerp.glade:6081
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#: bin/modules/gui/main.py:1153
+msgid ""
+"You can not log into the system !\n"
+"Ask the administrator to verify\n"
+"you have an action defined for your user."
+msgstr ""
+
+#: bin/modules/gui/main.py:1187 bin/modules/gui/main.py:1194
+msgid "Do you really want to quit ?"
+msgstr "Наистина ли искате да излезете?"
+
+#: bin/modules/gui/main.py:1263
+#, python-format
+msgid "Attachments (%d)"
+msgstr "Прикачени файлове (%d)"
+
+#: bin/modules/gui/main.py:1276
+msgid "Attachments"
+msgstr "Прикачени файлове"
+
+#: bin/modules/gui/main.py:1375
+msgid "Delete a database"
+msgstr "Изтриване на база данни"
+
+#: bin/modules/gui/main.py:1381
+msgid "Database dropped successfully !"
+msgstr "Успешно бе изтрита базата данни!"
+
+#: bin/modules/gui/main.py:1384
+msgid "Could not drop database."
+msgstr "Не може да бъде изтрита базата данни."
+
+#: bin/modules/gui/main.py:1386
+msgid "Couldn't drop database"
+msgstr "Не може да бъде изтрита базата данни."
+
+#: bin/widget/view/form_gtk/image.py:112 bin/widget/view/form_gtk/url.py:118
+#: bin/modules/gui/main.py:1389 bin/openerp.glade:5817
+msgid "Open..."
+msgstr "Отваряне..."
+
+#: bin/modules/gui/main.py:1401
+msgid "Database restored successfully !"
+msgstr "Базата данни бе успешно възстановена!"
+
+#: bin/modules/gui/main.py:1404
+msgid "Could not restore database."
+msgstr "Не може да бъде възстановена базата данни."
+
+#: bin/modules/gui/main.py:1406
+msgid "Couldn't restore database"
+msgstr "Не може да бъде възстановена базата данни."
+
+#: bin/modules/gui/main.py:1457
+msgid ""
+"Confirmation password does not match new password, operation cancelled!"
+msgstr "Потвърждението на паролата не съответства, действието е отхвърлено!"
+
+#: bin/modules/gui/main.py:1459
+msgid "Validation Error."
+msgstr "Грешка при валидиране."
+
+#: bin/modules/gui/main.py:1476
+msgid "Could not change the Super Admin password."
+msgstr "Не може да бъде променена паролата на Супер администратора."
+
+#: bin/modules/gui/main.py:1477 bin/modules/gui/main.py:1483
+msgid "Bad password provided !"
+msgstr "Въведената парола е грешна!"
+
+#: bin/modules/gui/main.py:1457
+msgid "Error, password not changed."
+msgstr "Грешка, паролата не е променена"
+
+#: bin/modules/gui/main.py:1490 bin/modules/gui/main.py:1513
+msgid "Backup a database"
+msgstr "Резервно копие на базата данни"
+
+#: bin/widget/view/form_gtk/image.py:129
+#: bin/widget/view/form_gtk/binary.py:167 bin/printer/printer.py:231
+#: bin/modules/gui/window/win_export.py:359 bin/modules/gui/main.py:1493
+msgid "Save As..."
+msgstr "Запазване като…"
+
+#: bin/modules/gui/main.py:1506
+msgid "Database backed up successfully !"
+msgstr "Успешно бе създадено резервно копие на базата данни!"
+
+#: bin/modules/gui/main.py:1509
+msgid "Could not backup the database."
+msgstr "Не може да бъде създадено резервно копие на базата данни!"
+
+#: bin/modules/gui/main.py:1511
+msgid "Couldn't backup database."
+msgstr "Не може да бъде създадено резервно копие на базата данни!"
+
+#: bin/modules/gui/window/form.py:189
+msgid "Resource ID does not exist for this object!"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:247
+msgid "No record selected ! You can only attach to existing record."
+msgstr "Няма запис избрани! Можете да прикачите към съществуващ запис."
+
+#: bin/modules/gui/window/form.py:264
+msgid "You have to select a record !"
+msgstr "Трабва да изберете запис!"
+
+#: bin/modules/gui/window/form.py:270
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:41
+#: bin/modules/gui/window/win_export.py:213
+msgid "ID"
+msgstr "ID"
+
+#: bin/modules/gui/window/form.py:271
+msgid "Creation User"
+msgstr "Създаване на потребител"
+
+#: bin/modules/gui/window/form.py:272
+msgid "Creation Date"
+msgstr "Дата на създаване"
+
+#: bin/modules/gui/window/form.py:273
+msgid "Latest Modification by"
+msgstr "Последна промяна от"
+
+#: bin/modules/gui/window/form.py:274
+msgid "Latest Modification Date"
+msgstr "Последна дата на промяна"
+
+#: bin/modules/gui/window/form.py:275
+msgid "Internal Module Data ID"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:269
+msgid ""
+"Record is not saved ! \n"
+" Do You want to Clear Current Record ?"
+msgstr "Записът не е запазен!"
+
+#: bin/widget/view/form_gtk/one2many_list.py:388
+#: bin/modules/gui/window/form.py:290
+msgid "Are you sure to remove this record ?"
+msgstr "Потвърждавате ли ИЗТРИВАНЕТО на записа?"
+
+#: bin/widget/view/form_gtk/one2many_list.py:390
+#: bin/modules/gui/window/form.py:292
+msgid "Are you sure to remove those records ?"
+msgstr "Потвърждавате ли ИЗТРИВАНЕТО на записите?"
+
+#: bin/modules/gui/window/form.py:296
+msgid "Resources cleared."
+msgstr ""
+
+#: bin/modules/gui/window/form.py:298
+msgid "Resources successfully removed."
+msgstr ""
+
+#: bin/modules/gui/window/form.py:339
+msgid "Working now on the duplicated document !"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:355
+msgid "Document Saved."
+msgstr ""
+
+#: bin/widget/view/list.py:584 bin/widget/view/list.py:585
+#: bin/widget/view/form_gtk/parser.py:135 bin/modules/gui/window/form.py:366
+>>>>>>> MERGE-SOURCE
 msgid "Invalid form, correct red fields !"
 msgstr "Невалидна форма, поправете червените полета!"
 
 #: bin/widget/view/list.py:584
 msgid "Error !"
+<<<<<<< TREE
 msgstr "Грешка!"
 
 #: bin/widget/view/list.py:633 bin/widget/view/form_gtk/many2one.py:387
@@ -91,7 +510,78 @@
 #: bin/widget/view/tree_gtk/parser.py:61
 msgid ""
 "You have unsaved record(s) !  \n"
+=======
+msgstr "Грешка!"
+
+#: bin/modules/gui/window/form.py:368
+msgid "Warning !"
+msgstr "Предупреждение!"
+
+#: bin/modules/gui/window/form.py:389 bin/modules/gui/window/form.py:497
+msgid ""
+"This record has been modified\n"
+"do you want to save it ?"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:447
+msgid "You must select one or several records !"
+msgstr "Вие трябва да изберете един или няколко записа!"
+
+#: bin/modules/gui/window/form.py:456
+msgid "Print Screen"
+msgstr "Отпечатване на екрана"
+
+#: bin/modules/gui/window/form.py:476
+msgid "No record selected"
+msgstr "Не е избран запис"
+
+#: bin/modules/gui/window/form.py:481
+msgid "New document"
+msgstr "Нов документ"
+
+#: bin/modules/gui/window/form.py:483
+msgid "Editing document (id: "
+msgstr ""
+
+#: bin/modules/gui/window/form.py:486
+msgid "Record: "
+msgstr "Запис: "
+
+#: bin/modules/gui/window/form.py:487
+msgid " of "
+msgstr " на "
+
+#: bin/modules/gui/window/win_import.py:51
+msgid "The file is empty !"
+msgstr "Файлът е празен !"
+
+#: bin/modules/gui/window/win_import.py:51
+msgid "Importation !"
+msgstr "Внасяне !"
+
+#: bin/modules/gui/window/win_import.py:56
+msgid "XML-RPC error !"
+msgstr "XML-RPC грешка !"
+
+#: bin/modules/gui/window/win_import.py:61
+msgid "Imported one object !"
+msgstr "Внесен е един обект !"
+
+#: bin/modules/gui/window/win_import.py:63
+#, python-format
+msgid "Imported %d objects !"
+msgstr "Внесени са %d са обекти !"
+
+#: bin/modules/gui/window/win_import.py:68
+#, python-format
+msgid ""
+"Error trying to import this record:\n"
+"%s\n"
+"Error Message:\n"
+"%s\n"
+>>>>>>> MERGE-SOURCE
 "\n"
+<<<<<<< TREE
 "Please Save them before sorting !"
 msgstr ""
 
@@ -142,10 +632,155 @@
 msgstr ""
 
 #: bin/widget/view/diagram_gtk/xdot.py:1772
+=======
+"%s"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:72
+msgid "Importation Error !"
+msgstr "Грешка при внасяне !"
+
+#: bin/modules/gui/window/win_import.py:105
+#: bin/modules/gui/window/win_import.py:109
+msgid "Field name"
+msgstr "Име на поле"
+
+#: bin/modules/gui/window/win_import.py:181
+msgid "Error opening .CSV file"
+msgstr "Грешка при отваряне на .CSV файл"
+
+#: bin/modules/gui/window/win_import.py:181
+msgid "Input Error."
+msgstr "Грешка при въвеждане."
+
+#: bin/modules/gui/window/win_import.py:199
+#, python-format
+msgid "You cannot import this field %s, because we cannot auto-detect it"
+msgstr ""
+"Не може да внесете това поле %s, защото не може да бъде автоматично "
+"разпознато"
+
+#: bin/modules/gui/window/win_import.py:202
+#, python-format
+msgid ""
+"Error processing your first line of the file.\n"
+"Field %s is unknown !"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:202
+msgid "Import Error."
+msgstr "Грешка при импорт"
+
+#: bin/modules/gui/window/win_import.py:233
+msgid "You have not selected any fields to import"
+msgstr "Не сте избрали нито едно избрано поле за внасяне"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Extension"
+msgstr "Разширение"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Application"
+msgstr "Приложение"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Print Processor"
+msgstr ""
+
+#: bin/modules/gui/window/win_extension.py:114
+msgid "This extension is already defined"
+msgstr ""
+
+#: bin/modules/gui/window/win_extension.py:114 bin/openerp.glade:7642
+msgid "Extension Manager"
+msgstr "Управление на разширенията"
+
+#: bin/modules/gui/window/win_selection.py:51
+msgid "Name"
+msgstr "Име"
+
+#: bin/modules/gui/window/win_selection.py:55
+msgid "Ressource Name"
+msgstr "Име на източник"
+
+#: bin/modules/gui/window/win_selection.py:55
+msgid "Names"
+msgstr "Имена"
+
+#: bin/modules/gui/window/__init__.py:31
+msgid "Unknown Window"
+msgstr "Непознат прозорец"
+
+#: bin/modules/gui/window/win_preference.py:68
+msgid "Preferences"
+msgstr "Предпочитания"
+
+#: bin/modules/gui/window/win_preference.py:86
+msgid ""
+"The default language of the interface has been modified, do not forget to "
+"restart the client to have the interface in your language"
+msgstr ""
+
+#: bin/modules/gui/window/win_preference.py:88
+msgid "Default language modified !"
+msgstr ""
+
+#: bin/modules/gui/window/view_tree/parse.py:35
+msgid "Tree"
+msgstr "Дърво"
+
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:45
+msgid "Description"
+msgstr "Описание"
+
+#: bin/modules/gui/window/tree.py:205 bin/modules/gui/window/tree.py:261
+msgid "No resource selected!"
+msgstr ""
+
+#: bin/modules/gui/window/tree.py:219
+msgid ""
+"Are you sure you want\n"
+"to remove this record?"
+msgstr ""
+
+#: bin/modules/gui/window/tree.py:224
+msgid "Error removing resource!"
+msgstr ""
+
+#: bin/modules/gui/window/tree.py:235
+msgid "Unable to chroot: no tree resource selected"
+msgstr ""
+
+#: bin/modules/gui/window/win_export.py:50
+msgid " record(s) saved !"
+msgstr " Записът(ите) е(са) съхранен(и) !"
+
+#: bin/modules/gui/window/win_export.py:53
+msgid ""
+"Operation failed !\n"
+"I/O error"
+msgstr ""
+
+#: bin/modules/gui/window/win_export.py:79
+#: bin/modules/gui/window/win_export.py:105
+msgid "Error Opening Excel !"
+msgstr ""
+
+#: bin/modules/gui/window/win_export.py:317
+msgid "What is the name of this export ?"
+msgstr ""
+
+#: bin/modules/gui/window/win_export.py:351
+msgid "Exportation Error !"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1772
+>>>>>>> MERGE-SOURCE
 #: bin/modules/gui/window/win_search.py:49
 msgid "OpenERP - Link"
 msgstr "OpenERP - връзка"
 
+<<<<<<< TREE
 #: bin/widget/view/diagram_gtk/xdot.py:1789
 #, python-format
 msgid "Close Current %s"
@@ -516,6 +1151,19 @@
 msgstr "Няма възможност за местна настройка %(lang_enc)s: %(exception)s"
 
 #: bin/options.py:121
+=======
+#: bin/modules/gui/window/win_search.py:126
+#, python-format
+msgid "OpenERP Search: %s"
+msgstr "OpenERP Търсене: %s"
+
+#: bin/modules/gui/window/win_search.py:127
+#, python-format
+msgid "OpenERP Search: %s (%%d result(s))"
+msgstr "OpenERP Търсене: %s (%%d result(s))"
+
+#: bin/options.py:121
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "OpenERP Client %s"
 msgstr "OpenERP Клиент %s"
@@ -704,6 +1352,7 @@
 #: bin/printer/printer.py:193
 #, python-format
 msgid ""
+<<<<<<< TREE
 "Error occurred while printing:\n"
 "%s"
 msgstr ""
@@ -713,6 +1362,15 @@
 msgstr ""
 
 #: bin/printer/printer.py:212
+=======
+"Linux Automatic Printing not implemented.\n"
+"Use preview option !"
+msgstr ""
+"Автоматичният печат за Linux все още не е реализиран.\n"
+"Използвайте функцията за предварителен преглед!"
+
+#: bin/printer/printer.py:212
+>>>>>>> MERGE-SOURCE
 msgid "Error! No Data found. Make sure you have enough data to print!"
 msgstr ""
 
@@ -720,12 +1378,52 @@
 msgid "Error writing the file!"
 msgstr "Грешка при четенето на файла!"
 
-#: bin/widget_search/form.py:492
+<<<<<<< TREE
+#: bin/widget_search/form.py:492
+=======
+#: bin/openerp-client.py:142
+msgid "Closing OpenERP, KeyboardInterrupt"
+msgstr "OpenERP се изключва, грешка на клавиатурата"
+
+#: bin/widget/view/form_gtk/button.py:47 bin/widget_search/char.py:72
+#: bin/widget_search/calendar.py:125 bin/widget_search/calendar.py:250
+#: bin/widget_search/filter.py:77 bin/widget_search/reference.py:78
+#: bin/widget_search/spinbutton.py:92 bin/widget_search/selection.py:116
+#: bin/widget_search/custom_filter.py:140 bin/widget_search/spinint.py:95
+#: bin/widget_search/checkbox.py:68
+msgid "The content of the widget or ValueError if not valid"
+msgstr ""
+
+#: bin/widget_search/form.py:492
+>>>>>>> MERGE-SOURCE
 msgid "The content of the form or exception if not valid"
 msgstr ""
 
-#: bin/widget_search/char.py:45
+<<<<<<< TREE
+#: bin/widget_search/char.py:45
+=======
+#: bin/widget/view/form_gtk/date_widget.py:65
+#: bin/widget_search/date_widget.py:65
+msgid ""
+"You can use special operation by pressing +, - or =.  Plus/minus "
+"adds/decrease the variable to the current selected date. Equals set part of "
+"selected date. Available variables: 12h = 12 hours, 8d = 8 days, 4w = 4 "
+"weeks, 1m = 1 month, 2y = 2 years. Some examples:\n"
+"* +21d : adds 21 days to selected year\n"
+"* =23w : set date to the 23th week of the year\n"
+"* -4m : decrease 4 months to the current date\n"
+"You can also use \"=\" to set the date to the current date/time and '-' to "
+"clear the field."
+msgstr ""
+
+#: bin/widget_search/wid_int.py:56
+msgid "The content of the widget or exception if not valid"
+msgstr ""
+
+#: bin/widget_search/char.py:45
+>>>>>>> MERGE-SOURCE
 msgid "Error: "
+<<<<<<< TREE
 msgstr "Грешка: "
 
 #: bin/widget_search/custom_filter_widgets.py:36
@@ -789,6 +1487,34 @@
 #: bin/widget_search/custom_filter_widgets.py:40
 #: bin/widget_search/custom_filter_widgets.py:67
 #: bin/widget_search/custom_filter_widgets.py:98
+=======
+msgstr "Грешка: "
+
+#: bin/widget_search/calendar.py:49 bin/widget_search/calendar.py:177
+msgid "Start date"
+msgstr "Начална дата"
+
+#: bin/widget/view/form_gtk/calendar.py:57
+#: bin/widget/view/form_gtk/calendar.py:184 bin/widget_search/calendar.py:53
+#: bin/widget_search/calendar.py:73 bin/widget_search/calendar.py:181
+#: bin/widget_search/calendar.py:201
+msgid "Open the calendar widget"
+msgstr ""
+
+#: bin/widget_search/calendar.py:69 bin/widget_search/calendar.py:197
+msgid "End date"
+msgstr "Крайна дата"
+
+#: bin/widget/view/form_gtk/calendar.py:135
+#: bin/widget/view/form_gtk/calendar.py:249 bin/widget_search/calendar.py:128
+#: bin/widget_search/calendar.py:267
+msgid "OpenERP - Date selection"
+msgstr "OpenERP - Избор на дата"
+
+#: bin/widget_search/custom_filter_widgets.py:40
+#: bin/widget_search/custom_filter_widgets.py:67
+#: bin/widget_search/custom_filter_widgets.py:98
+>>>>>>> MERGE-SOURCE
 msgid "contains"
 msgstr "съдържа"
 
@@ -796,6 +1522,7 @@
 #: bin/widget_search/custom_filter_widgets.py:68
 #: bin/widget_search/custom_filter_widgets.py:98
 msgid "doesn't contain"
+<<<<<<< TREE
 msgstr "не съдържа"
 
 #: bin/widget_search/custom_filter_widgets.py:167
@@ -830,6 +1557,12 @@
 
 #: bin/widget_search/custom_filter_widgets.py:290
 #: bin/widget_search/custom_filter_widgets.py:331
+=======
+msgstr "не съдържа"
+
+#: bin/widget_search/custom_filter_widgets.py:290
+#: bin/widget_search/custom_filter_widgets.py:331
+>>>>>>> MERGE-SOURCE
 msgid "is equal to"
 msgstr ""
 
@@ -846,6 +1579,7 @@
 #: bin/widget_search/custom_filter_widgets.py:293
 #: bin/widget_search/custom_filter_widgets.py:334
 msgid "less than"
+<<<<<<< TREE
 msgstr "по-малко от"
 
 #: bin/widget_search/custom_filter_widgets.py:294
@@ -880,6 +1614,27 @@
 
 #: bin/widget_search/checkbox.py:35 bin/widget_search/checkbox.py:42
 #: bin/widget_search/checkbox.py:55
+=======
+msgstr "по-малко от"
+
+#: bin/widget_search/custom_filter.py:62
+msgid "in"
+msgstr "в"
+
+#: bin/widget_search/custom_filter.py:63
+msgid "not in"
+msgstr "извън"
+
+#: bin/widget_search/custom_filter.py:82
+msgid ""
+"Enter Values separated by ',' if operator 'in' or 'not in' is chosen.\n"
+"For Date and DateTime Formats, specify text in '%Y-%m-%d' and '%Y-%m-%d "
+"%H:%M:%S' formats respectively."
+msgstr ""
+
+#: bin/widget_search/checkbox.py:35 bin/widget_search/checkbox.py:42
+#: bin/widget_search/checkbox.py:55
+>>>>>>> MERGE-SOURCE
 msgid "Yes"
 msgstr "Да"
 
@@ -887,11 +1642,390 @@
 msgid "No"
 msgstr "Не"
 
+<<<<<<< TREE
 #: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
 msgid "Connection refused !"
 msgstr "Свързването е отхвърлено!"
 
 #: bin/rpc.py:158
+=======
+#: bin/widget/view/form.py:137
+msgid "You must save this record to use the relate button !"
+msgstr ""
+
+#: bin/widget/view/form.py:142
+msgid "Action not defined !"
+msgstr "Действието не е дефинирано"
+
+#: bin/widget/view/form.py:211
+msgid "You must select a record to use the relate button !"
+msgstr ""
+
+#: bin/widget/view/form.py:238 bin/widget/view/form_gtk/parser.py:635
+#: bin/widget/view/form_gtk/parser.py:756
+#: bin/widget/view/form_gtk/parser.py:813
+msgid "No other language available!"
+msgstr "Друг език не е наличен!"
+
+#: bin/widget/view/form.py:245 bin/widget/view/form_gtk/parser.py:647
+#: bin/widget/view/form_gtk/parser.py:762
+#: bin/widget/view/form_gtk/parser.py:819
+msgid "Add Translation"
+msgstr "Добави превод"
+
+#: bin/widget/view/form.py:293 bin/widget/view/form_gtk/parser.py:875
+msgid "Translate label"
+msgstr "Преведи етикета"
+
+#: bin/widget/view/calendar_gtk/parser.py:355 bin/openerp.glade:8064
+msgid "Week"
+msgstr "Седмица"
+
+#: bin/widget/view/calendar_gtk/parser_dummy.py:30
+msgid "Calendar View Error !"
+msgstr ""
+
+#: bin/widget/view/calendar_gtk/parser_dummy.py:31
+msgid "You must intall the library python-hippocanvas to use calendars."
+msgstr ""
+
+#: bin/widget/view/screen_container.py:74
+msgid "--Actions--"
+msgstr "--Действия--"
+
+#: bin/widget/view/screen_container.py:73
+msgid "Save as a Shortcut"
+msgstr ""
+
+#: bin/widget/view/screen_container.py:74
+msgid "Save as a Filter"
+msgstr "Запзи като филтър"
+
+#: bin/widget/view/screen_container.py:74
+msgid "Manage Filters"
+msgstr "Управление на филтри"
+
+#: bin/widget/view/tree_gtk/parser.py:61
+msgid ""
+"You have unsaved record(s) !  \n"
+"\n"
+"Please Save them before sorting !"
+msgstr ""
+
+#: bin/widget/view/tree_gtk/editabletree.py:140
+#, python-format
+msgid "Shortcut: %s"
+msgstr ""
+
+#: bin/widget/view/tree_gtk/editabletree.py:140
+msgid "F1 New - F2 Open/Search"
+msgstr ""
+
+#: bin/widget/view/tree_gtk/editabletree.py:215
+#, python-format
+msgid "Warning; field %s is required!"
+msgstr "Предопреждение; изисва се поле %s!"
+
+#: bin/widget/view/tree_gtk/date_renderer.py:197
+msgid ""
+"Press <i>'+'</i>, <i>'-'</i> or <i>'='</i> for special date operations."
+msgstr ""
+"Натиснете <i>'+'</i>, <i>'-'</i> or <i>'='</i> за специални операции с дати."
+
+#: bin/widget/view/widget_parse.py:53
+#, python-format
+msgid "This type (%s) is not supported by the GTK client !"
+msgstr ""
+
+#: bin/widget/view/widget_parse.py:64
+msgid "No valid view found for this object!"
+msgstr ""
+
+#: bin/widget/view/graph_gtk/parser.py:64
+msgid "Can not generate graph !"
+msgstr "Графиката не може да бъде генерирана!"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1422
+msgid "Dot Viewer"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1712
+msgid "Add New Node"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1713
+msgid "Add New Edge"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1714
+msgid "Enlarge the Diagram"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1715
+msgid "Shrink the Diagram"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1716
+msgid "Fit the diagram to the window"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1717
+msgid "Show the diagram at its normal size"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1718
+msgid "Print the Diagram"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1789
+#, python-format
+msgid "Close Current %s"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1790
+#, python-format
+msgid "Delete Current %s"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1791
+#, python-format
+msgid "Edit Current %s"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1875
+msgid " - Dot Viewer"
+msgstr ""
+
+#: bin/widget/view/form_gtk/reference.py:76 bin/openerp.glade:1258
+msgid "Create a new resource"
+msgstr "Създай нов ресурс"
+
+#: bin/widget/view/form_gtk/reference.py:89
+msgid "Search / Open a resource"
+msgstr "Търси/Отвори ресурс"
+
+#: bin/widget/view/form_gtk/parser.py:61
+msgid "Wrong icon for the button !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Field"
+msgstr ""
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Object"
+msgstr ""
+
+#: bin/widget/view/form_gtk/parser.py:619
+msgid "Enter some text to the related field before adding translations!"
+msgstr ""
+
+#: bin/widget/view/form_gtk/parser.py:626
+msgid "You need to save resource before adding translations!"
+msgstr ""
+
+#: bin/widget/view/form_gtk/parser.py:880
+msgid "Translate view"
+msgstr "Преведи изгледа"
+
+#: bin/widget/view/form_gtk/one2many_list.py:64
+msgid "Cancel"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:70
+msgid "Save & Close"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:75
+msgid "Save & New"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:164
+#: bin/widget/view/form_gtk/interface.py:48
+msgid "Set to default value"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:167
+msgid "Set Default"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:196
+msgid "Create a new entry"
+msgstr "Създай нов запис"
+
+#: bin/widget/view/form_gtk/one2many_list.py:200
+msgid "Edit this entry"
+msgstr "Редатирай този запис"
+
+#: bin/widget/view/form_gtk/one2many_list.py:204
+msgid "Remove this entry"
+msgstr "Премахни този запис"
+
+#: bin/widget/view/form_gtk/many2many.py:84
+#: bin/widget/view/form_gtk/one2many_list.py:210
+msgid "Previous Page"
+msgstr "Предишна страница"
+
+#: bin/widget/view/form_gtk/many2many.py:88
+#: bin/widget/view/form_gtk/one2many_list.py:214
+msgid "Previous Record"
+msgstr "Предишен запис"
+
+#: bin/widget/view/form_gtk/many2many.py:96
+#: bin/widget/view/form_gtk/one2many_list.py:222
+msgid "Next Record"
+msgstr "Следващ запис"
+
+#: bin/widget/view/form_gtk/many2many.py:100
+#: bin/widget/view/form_gtk/one2many_list.py:226
+msgid "Next Page"
+msgstr "Следваща страница"
+
+#: bin/widget/view/form_gtk/one2many_list.py:232
+msgid "Switch"
+msgstr ""
+
+#: bin/widget/view/form_gtk/many2many.py:106
+#: bin/widget/view/form_gtk/one2many_list.py:238
+msgid "Choose Limit"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:279
+msgid "You have to select a resource !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/image.py:73
+msgid "Set Image"
+msgstr ""
+
+#: bin/widget/view/form_gtk/image.py:82 bin/widget/view/form_gtk/binary.py:84
+msgid "Save As"
+msgstr "Запази като"
+
+#: bin/widget/view/form_gtk/image.py:93 bin/widget/view/form_gtk/binary.py:88
+msgid "Clear"
+msgstr ""
+
+#: bin/widget/view/form_gtk/image.py:102
+msgid "All files"
+msgstr "Всички файлове"
+
+#: bin/widget/view/form_gtk/image.py:106
+msgid "Images"
+msgstr "Изображения"
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "There is no image to save as !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "Warning"
+msgstr ""
+
+#: bin/widget/view/form_gtk/many2one.py:158 bin/widget/view/form_gtk/url.py:53
+msgid "Open this resource"
+msgstr "Отвори този ресурс"
+
+#: bin/widget/view/form_gtk/many2one.py:163
+#: bin/widget_search/custom_filter_widgets.py:87
+msgid "Search a resource"
+msgstr "Търси ресурс"
+
+#: bin/widget/view/form_gtk/many2one.py:174 bin/openerp.glade:1412
+msgid "Action"
+msgstr "Действие"
+
+#: bin/widget/view/form_gtk/many2one.py:175
+msgid "Report"
+msgstr "Справка"
+
+#: bin/widget/view/list.py:633 bin/widget/view/form_gtk/many2one.py:387
+msgid "You must select a record to use the relation !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/interface.py:49
+msgid "Set as default"
+msgstr ""
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "You can not set to the default value here !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "Operation not permited"
+msgstr ""
+
+#: bin/widget/view/form_gtk/binary.py:76
+msgid "Select"
+msgstr "Изберете"
+
+#: bin/widget/view/form_gtk/binary.py:80
+msgid "Open"
+msgstr "Отвори"
+
+#: bin/widget/view/form_gtk/binary.py:119
+#: bin/widget/view/form_gtk/binary.py:163
+msgid "Unable to read the file data"
+msgstr ""
+
+#: bin/widget/view/form_gtk/binary.py:129
+#: bin/widget/view/form_gtk/binary.py:155
+#, python-format
+msgid "Error reading the file: %s"
+msgstr ""
+
+#: bin/widget/view/form_gtk/binary.py:138
+msgid "All Files"
+msgstr "Всички файлове"
+
+#: bin/widget/view/form_gtk/binary.py:148
+msgid "Select a file..."
+msgstr "Избор на файл..."
+
+#: bin/widget/view/form_gtk/binary.py:177
+#, python-format
+msgid "Error writing the file: %s"
+msgstr "Грешка при записване на файл: %s"
+
+#: bin/widget/view/form_gtk/wid_common.py:59
+msgid "Always applicable !"
+msgstr "Винаги приложимо!"
+
+#: bin/widget/view/form_gtk/calendar.py:99
+#: bin/widget/view/form_gtk/calendar.py:163
+msgid "Invalid date value! Year must be greater than 1899 !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/calendar.py:255 bin/widget_search/calendar.py:273
+msgid "Hour:"
+msgstr "Час:"
+
+#: bin/widget/view/form_gtk/calendar.py:258 bin/widget_search/calendar.py:276
+msgid "Minute:"
+msgstr "Минута:"
+
+#: bin/widget/view/form_gtk/calendar.py:291 bin/widget_search/calendar.py:312
+msgid "Invalid datetime value! Year must be greater than 1899 !"
+msgstr ""
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:30
+msgid "Gantt view not yet implemented !"
+msgstr ""
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:31
+msgid ""
+"The gantt view is not available in this GTK Client, you should use the web "
+"interface or switch to the calendar view."
+msgstr ""
+
+#: bin/widget/screen/screen.py:337
+msgid ""
+"(Any existing filter with the \n"
+"same name will be replaced)"
+msgstr ""
+
+#: bin/rpc.py:158
+>>>>>>> MERGE-SOURCE
 msgid "Connection refused!"
 msgstr ""
 
@@ -1571,11 +2705,15 @@
 
 #: bin/openerp.glade:468
 msgid "_Preferences"
+<<<<<<< TREE
 msgstr "_Предпочитания"
 
 #: bin/openerp.glade:483 bin/openerp.glade:7304
 msgid "Change password"
 msgstr ""
+=======
+msgstr "_Предпочитания"
+>>>>>>> MERGE-SOURCE
 
 #: bin/openerp.glade:496
 msgid "_Send a request"
@@ -2041,7 +3179,19 @@
 msgid "<b>Predefined Exports</b>"
 msgstr ""
 
-#: bin/openerp.glade:2880
+<<<<<<< TREE
+#: bin/openerp.glade:2880
+=======
+#: bin/openerp.glade:3134
+msgid "Import Compatible"
+msgstr ""
+
+#: bin/openerp.glade:2862
+msgid "<b>Select an Option to Export</b>"
+msgstr ""
+
+#: bin/openerp.glade:2880
+>>>>>>> MERGE-SOURCE
 msgid "Available Fields"
 msgstr ""
 
@@ -2061,6 +3211,7 @@
 msgid "Fields to Export"
 msgstr ""
 
+<<<<<<< TREE
 #: bin/openerp.glade:3115
 msgid "Add Field Names"
 msgstr ""
@@ -2070,6 +3221,19 @@
 msgstr ""
 
 #: bin/openerp.glade:3156
+=======
+#: bin/openerp.glade:3132
+msgid ""
+"Open in Excel\n"
+"Save as CSV"
+msgstr ""
+
+#: bin/openerp.glade:3151
+msgid "Add _field names"
+msgstr ""
+
+#: bin/openerp.glade:3156
+>>>>>>> MERGE-SOURCE
 msgid "<b>Opti_ons</b>"
 msgstr ""
 
@@ -2370,6 +3534,7 @@
 msgid "N_othing"
 msgstr ""
 
+<<<<<<< TREE
 #: bin/openerp.glade:5772
 msgid "<b>Fields to import</b>"
 msgstr ""
@@ -2379,10 +3544,25 @@
 msgstr ""
 
 #: bin/openerp.glade:5852
+=======
+#: bin/openerp.glade:5852
+>>>>>>> MERGE-SOURCE
 msgid "Auto-Detect"
 msgstr ""
 
-#: bin/openerp.glade:5930
+<<<<<<< TREE
+#: bin/openerp.glade:5930
+=======
+#: bin/openerp.glade:5772
+msgid "<b>Fields to import</b>"
+msgstr ""
+
+#: bin/openerp.glade:5891
+msgid "File to Import:"
+msgstr ""
+
+#: bin/openerp.glade:5930
+>>>>>>> MERGE-SOURCE
 msgid "Lines to Skip:"
 msgstr ""
 
@@ -2550,7 +3730,15 @@
 "Data:"
 msgstr ""
 
-#: bin/openerp.glade:7321
+<<<<<<< TREE
+#: bin/openerp.glade:7321
+=======
+#: bin/openerp.glade:483 bin/openerp.glade:7304
+msgid "Change password"
+msgstr ""
+
+#: bin/openerp.glade:7321
+>>>>>>> MERGE-SOURCE
 msgid "<b>Change your super admin password</b>"
 msgstr ""
 
@@ -2619,6 +3807,35 @@
 msgstr ""
 
 #: bin/openerp.glade:8276
+<<<<<<< TREE
+=======
+msgid "Fields on which Search criteria to be applied"
+msgstr ""
+
+#: bin/openerp.glade:8289
+msgid "Conditional Operators"
+msgstr ""
+
+#: bin/openerp.glade:8316
+msgid "The Choice will be applied with next filter if any"
+msgstr ""
+
+#: bin/openerp.glade:8317
+msgid ""
+"AND\n"
+"OR"
+msgstr ""
+
+#: bin/openerp.glade:8330
+msgid "Remove Filter"
+msgstr ""
+
+#: bin/openerp.glade:8230
+msgid "Filter Entry"
+msgstr ""
+
+#: bin/openerp.glade:8276
+>>>>>>> MERGE-SOURCE
 msgid "Enter Filter Name:"
 msgstr ""
 

=== modified file 'bin/po/bs.po'
--- bin/po/bs.po	2011-10-11 05:32:10 +0000
+++ bin/po/bs.po	2011-10-24 01:06:26 +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-10-11 05:29+0000\n"
 "X-Generator: Launchpad (build 14123)\n"
+=======
+"X-Launchpad-Export-Date: 2011-09-15 05:09+0000\n"
+"X-Generator: Launchpad (build 13921)\n"
+>>>>>>> MERGE-SOURCE
 "Language: bs\n"
 
 #: bin/widget/view/gantt_gtk/parser_dummy.py:30
@@ -979,6 +984,7 @@
 msgstr "Izaberite dodatak"
 
 #
+<<<<<<< TREE
 # File: bin/printer/printer.py, line: 172
 #: bin/printer/printer.py:184
 #, python-format
@@ -1196,10 +1202,18 @@
 # File: bin/modules/action/wizard.py, line: 171
 # File: bin/rpc.py, line: 141
 #: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
+=======
+# File: bin/modules/action/wizard.py, line: 171
+# File: bin/rpc.py, line: 141
+# File: bin/modules/action/wizard.py, line: 171
+# File: bin/rpc.py, line: 141
+#: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
+>>>>>>> MERGE-SOURCE
 msgid "Connection refused !"
 msgstr "Konektovanje odbijeno !"
 
 #
+<<<<<<< TREE
 # File: bin/rpc.py, line: 142
 # File: bin/rpc.py, line: 142
 #: bin/rpc.py:158
@@ -1236,6 +1250,21 @@
 #: bin/rpc.py:203 bin/rpc.py:205 bin/modules/action/wizard.py:162
 #: bin/modules/action/wizard.py:168 bin/modules/action/wizard.py:170
 #: bin/modules/gui/main.py:195 bin/modules/gui/main.py:201
+=======
+# File: bin/modules/action/wizard.py, line: 183
+# File: bin/modules/action/wizard.py, line: 189
+# File: bin/modules/action/wizard.py, line: 191
+# File: bin/rpc.py, line: 187
+# File: bin/rpc.py, line: 189
+# File: bin/modules/action/wizard.py, line: 183
+# File: bin/modules/action/wizard.py, line: 189
+# File: bin/modules/action/wizard.py, line: 191
+# File: bin/rpc.py, line: 187
+# File: bin/rpc.py, line: 189
+#: bin/rpc.py:203 bin/rpc.py:205 bin/modules/action/wizard.py:162
+#: bin/modules/action/wizard.py:168 bin/modules/action/wizard.py:170
+#: bin/modules/gui/main.py:195 bin/modules/gui/main.py:201
+>>>>>>> MERGE-SOURCE
 msgid "Application Error"
 msgstr "Programska greška"
 
@@ -1275,6 +1304,7 @@
 msgid "Select your action"
 msgstr "Odaberite vašu akciju"
 
+<<<<<<< TREE
 #: bin/modules/gui/window/win_extension.py:43
 msgid "Extension"
 msgstr ""
@@ -1704,6 +1734,14 @@
 # File: bin/modules/gui/main.py, line: 145
 # File: bin/modules/gui/main.py, line: 1138
 #: bin/modules/gui/main.py:89 bin/modules/gui/main.py:341
+=======
+#
+# File: bin/modules/gui/main.py, line: 145
+# File: bin/modules/gui/main.py, line: 1138
+# File: bin/modules/gui/main.py, line: 145
+# File: bin/modules/gui/main.py, line: 1138
+#: bin/modules/gui/main.py:89 bin/modules/gui/main.py:341
+>>>>>>> MERGE-SOURCE
 msgid "Could not connect to server !"
 msgstr "Nemogu se spojiti na server"
 
@@ -1902,7 +1940,18 @@
 msgid "Press Ctrl+O to login"
 msgstr "Pritisnite Ctrl+O za prijavu"
 
-#: bin/modules/gui/main.py:974
+<<<<<<< TREE
+#: bin/modules/gui/main.py:974
+=======
+#
+# File: bin/modules/gui/main.py, line: 605
+# File: bin/modules/gui/main.py, line: 605
+#: bin/modules/gui/main.py:881
+msgid "Edit"
+msgstr "Izmjeni"
+
+#: bin/modules/gui/main.py:974
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "%s"
 msgstr ""
@@ -1973,9 +2022,22 @@
 msgstr "Niste prijavljeni !"
 
 #
-# File: bin/modules/gui/main.py, line: 833
-# File: bin/modules/gui/main.py, line: 833
-#: bin/modules/gui/main.py:1153
+<<<<<<< TREE
+# File: bin/modules/gui/main.py, line: 833
+# File: bin/modules/gui/main.py, line: 833
+#: bin/modules/gui/main.py:1153
+=======
+# File: bin/openerp.glade, line: 6974
+#: bin/widget/view/form_gtk/one2many_list.py:52 bin/modules/gui/main.py:1079
+#: bin/openerp.glade:6081
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#
+# File: bin/modules/gui/main.py, line: 833
+# File: bin/modules/gui/main.py, line: 833
+#: bin/modules/gui/main.py:1153
+>>>>>>> MERGE-SOURCE
 msgid ""
 "You can not log into the system !\n"
 "Ask the administrator to verify\n"
@@ -2038,9 +2100,29 @@
 msgstr "Nemogu ispustiti bazu podataka"
 
 #
-# File: bin/modules/gui/main.py, line: 1060
-# File: bin/modules/gui/main.py, line: 1060
-#: bin/modules/gui/main.py:1401
+<<<<<<< TREE
+# File: bin/modules/gui/main.py, line: 1060
+# File: bin/modules/gui/main.py, line: 1060
+#: bin/modules/gui/main.py:1401
+=======
+# File: bin/modules/gui/main.py, line: 1049
+# File: bin/widget/view/form_gtk/image.py, line: 110
+# File: bin/widget/view/form_gtk/url.py, line: 112
+# File: bin/openerp.glade, line: 7878
+# File: bin/modules/gui/main.py, line: 1049
+# File: bin/widget/view/form_gtk/image.py, line: 110
+# File: bin/widget/view/form_gtk/url.py, line: 112
+# File: bin/openerp.glade, line: 7878
+#: bin/widget/view/form_gtk/image.py:112 bin/widget/view/form_gtk/url.py:118
+#: bin/modules/gui/main.py:1389 bin/openerp.glade:5817
+msgid "Open..."
+msgstr "Otvori..."
+
+#
+# File: bin/modules/gui/main.py, line: 1060
+# File: bin/modules/gui/main.py, line: 1060
+#: bin/modules/gui/main.py:1401
+>>>>>>> MERGE-SOURCE
 msgid "Database restored successfully !"
 msgstr "Baza podataka je obnovljena uspješno !"
 
@@ -2058,11 +2140,15 @@
 msgid "Couldn't restore database"
 msgstr "Nemogu obnoviti bazu podataka"
 
+<<<<<<< TREE
 #: bin/modules/gui/main.py:1442
 msgid "<b>Change your password</b>"
 msgstr ""
 
 #: bin/modules/gui/main.py:1457
+=======
+#: bin/modules/gui/main.py:1457
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Confirmation password does not match new password, operation cancelled!"
 msgstr "Potvrdna šifra ne odgovara novoj šifri, operacija je otkazana!"
@@ -2095,7 +2181,28 @@
 msgid "Backup a database"
 msgstr "Sigurnosna kopija baze podataka"
 
-#: bin/modules/gui/main.py:1506
+<<<<<<< TREE
+#: bin/modules/gui/main.py:1506
+=======
+#
+# File: bin/modules/gui/main.py, line: 1120
+# File: bin/modules/gui/window/win_export.py, line: 282
+# File: bin/printer/printer.py, line: 207
+# File: bin/widget/view/form_gtk/binary.py, line: 162
+# File: bin/widget/view/form_gtk/image.py, line: 117
+# File: bin/modules/gui/main.py, line: 1120
+# File: bin/modules/gui/window/win_export.py, line: 282
+# File: bin/printer/printer.py, line: 207
+# File: bin/widget/view/form_gtk/binary.py, line: 162
+# File: bin/widget/view/form_gtk/image.py, line: 117
+#: bin/widget/view/form_gtk/image.py:129
+#: bin/widget/view/form_gtk/binary.py:167 bin/printer/printer.py:231
+#: bin/modules/gui/window/win_export.py:359 bin/modules/gui/main.py:1493
+msgid "Save As..."
+msgstr "Snimi kao..."
+
+#: bin/modules/gui/main.py:1506
+>>>>>>> MERGE-SOURCE
 msgid "Database backed up successfully !"
 msgstr "Sigurnosna kopija baze podataka je napravljena uspješno !"
 
@@ -2110,6 +2217,1411 @@
 msgid "Couldn't backup database."
 msgstr "Nemogu napraviti sigurnosnu kopiju baze podataka."
 
+<<<<<<< TREE
+=======
+#: bin/modules/gui/window/form.py:189
+msgid "Resource ID does not exist for this object!"
+msgstr "ID resursa ne postoji za ovaj objekat!"
+
+#
+# File: bin/modules/gui/window/form.py, line: 197
+#: bin/modules/gui/window/form.py:247
+msgid "No record selected ! You can only attach to existing record."
+msgstr "Nije odabran zapis! Možete samo spojiti na postojeći zapis."
+
+#
+# File: bin/modules/gui/window/form.py, line: 209
+#: bin/modules/gui/window/form.py:264
+msgid "You have to select a record !"
+msgstr "Morate odabrati zapis !"
+
+#
+# File: bin/modules/gui/window/form.py, line: 215
+# File: bin/modules/gui/window/view_tree/view_tree_sc.py, line: 43
+# File: bin/modules/gui/window/form.py, line: 215
+# File: bin/modules/gui/window/view_tree/view_tree_sc.py, line: 43
+#: bin/modules/gui/window/form.py:270
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:41
+#: bin/modules/gui/window/win_export.py:213
+msgid "ID"
+msgstr "ID"
+
+#
+# File: bin/modules/gui/window/form.py, line: 216
+# File: bin/modules/gui/window/form.py, line: 216
+#: bin/modules/gui/window/form.py:271
+msgid "Creation User"
+msgstr "Korisnik kreiranja"
+
+#
+# File: bin/modules/gui/window/form.py, line: 217
+# File: bin/modules/gui/window/form.py, line: 217
+#: bin/modules/gui/window/form.py:272
+msgid "Creation Date"
+msgstr "Datum kreiranja"
+
+#
+# File: bin/modules/gui/window/form.py, line: 218
+# File: bin/modules/gui/window/form.py, line: 218
+#: bin/modules/gui/window/form.py:273
+msgid "Latest Modification by"
+msgstr "Zadnju izmjenu izvršio"
+
+#
+# File: bin/modules/gui/window/form.py, line: 219
+# File: bin/modules/gui/window/form.py, line: 219
+#: bin/modules/gui/window/form.py:274
+msgid "Latest Modification Date"
+msgstr "Datum zadnje izmjene"
+
+#: bin/modules/gui/window/form.py:275
+msgid "Internal Module Data ID"
+msgstr ""
+
+#
+# File: bin/modules/gui/window/form.py, line: 230
+# File: bin/modules/gui/window/form.py, line: 230
+#: bin/modules/gui/window/form.py:269
+msgid ""
+"Record is not saved ! \n"
+" Do You want to Clear Current Record ?"
+msgstr ""
+"Zapis nije snimljen ! \n"
+" Želiš li da obrišeš trenutni zapis ?"
+
+#
+# File: bin/modules/gui/window/form.py, line: 233
+# File: bin/modules/gui/window/form.py, line: 233
+#: bin/widget/view/form_gtk/one2many_list.py:388
+#: bin/modules/gui/window/form.py:290
+msgid "Are you sure to remove this record ?"
+msgstr "Jeste li sigurni da želite ukloniti ovaj zapis ?"
+
+#
+# File: bin/modules/gui/window/form.py, line: 235
+# File: bin/modules/gui/window/form.py, line: 235
+#: bin/widget/view/form_gtk/one2many_list.py:390
+#: bin/modules/gui/window/form.py:292
+msgid "Are you sure to remove those records ?"
+msgstr "Jeste li sigurni da želite ukloniti ove zapise ?"
+
+#
+# File: bin/modules/gui/window/form.py, line: 239
+#: bin/modules/gui/window/form.py:296
+msgid "Resources cleared."
+msgstr "Resurs očišćen."
+
+#
+# File: bin/modules/gui/window/form.py, line: 241
+#: bin/modules/gui/window/form.py:298
+msgid "Resources successfully removed."
+msgstr "Resurs uspješno uklonjen."
+
+#
+# File: bin/modules/gui/window/form.py, line: 273
+# File: bin/modules/gui/window/form.py, line: 273
+#: bin/modules/gui/window/form.py:339
+msgid "Working now on the duplicated document !"
+msgstr "Sada radim na duplikatu dokumenta !"
+
+#
+# File: bin/modules/gui/window/form.py, line: 281
+#: bin/modules/gui/window/form.py:355
+msgid "Document Saved."
+msgstr "Dokument sačuvan."
+
+#
+# File: bin/widget/view/form_gtk/parser.py, line: 134
+# File: bin/modules/gui/window/form.py, line: 283
+#: bin/widget/view/list.py:584 bin/widget/view/list.py:585
+#: bin/widget/view/form_gtk/parser.py:135 bin/modules/gui/window/form.py:366
+msgid "Invalid form, correct red fields !"
+msgstr "Neispravan obrazac, ispravit crvena polja !"
+
+#: bin/widget/view/list.py:584
+msgid "Error !"
+msgstr "Greška !"
+
+#: bin/modules/gui/window/form.py:368
+msgid "Warning !"
+msgstr ""
+
+#
+# File: bin/modules/gui/window/form.py, line: 302
+# File: bin/modules/gui/window/form.py, line: 397
+# File: bin/modules/gui/window/form.py, line: 302
+# File: bin/modules/gui/window/form.py, line: 397
+#: bin/modules/gui/window/form.py:389 bin/modules/gui/window/form.py:497
+msgid ""
+"This record has been modified\n"
+"do you want to save it ?"
+msgstr ""
+"Ovaj zapis je izmjenjen\n"
+"želite li da ga snimite ?"
+
+#
+# File: bin/modules/gui/window/form.py, line: 349
+#: bin/modules/gui/window/form.py:447
+msgid "You must select one or several records !"
+msgstr "Morate odabrati jedan ili više zapisa !"
+
+#
+# File: bin/modules/gui/window/form.py, line: 358
+# File: bin/modules/gui/window/form.py, line: 358
+#: bin/modules/gui/window/form.py:456
+msgid "Print Screen"
+msgstr "Ispiši ekran"
+
+#
+# File: bin/modules/gui/window/form.py, line: 378
+# File: bin/modules/gui/window/form.py, line: 378
+#: bin/modules/gui/window/form.py:476
+msgid "No record selected"
+msgstr "Nije odabran zapis"
+
+#
+# File: bin/modules/gui/window/form.py, line: 383
+# File: bin/modules/gui/window/form.py, line: 383
+#: bin/modules/gui/window/form.py:481
+msgid "New document"
+msgstr "Novi dokument"
+
+#
+# File: bin/modules/gui/window/form.py, line: 385
+# File: bin/modules/gui/window/form.py, line: 385
+#: bin/modules/gui/window/form.py:483
+msgid "Editing document (id: "
+msgstr "Uređivanje dokumenta (id: "
+
+#
+# File: bin/modules/gui/window/form.py, line: 386
+# File: bin/modules/gui/window/form.py, line: 386
+#: bin/modules/gui/window/form.py:486
+msgid "Record: "
+msgstr "Zapis: "
+
+#
+# File: bin/modules/gui/window/form.py, line: 387
+# File: bin/modules/gui/window/form.py, line: 387
+#: bin/modules/gui/window/form.py:487
+msgid " of "
+msgstr " od "
+
+#: bin/modules/gui/window/win_import.py:51
+msgid "The file is empty !"
+msgstr "Ova datoteka je prazna !"
+
+#: bin/modules/gui/window/win_import.py:51
+msgid "Importation !"
+msgstr "Uvoz !"
+
+#
+# File: bin/modules/gui/window/win_import.py, line: 54
+# File: bin/modules/gui/window/win_import.py, line: 54
+#: bin/modules/gui/window/win_import.py:56
+msgid "XML-RPC error !"
+msgstr "XML-RPC greška !"
+
+#: bin/modules/gui/window/win_import.py:61
+msgid "Imported one object !"
+msgstr "Uvezen jedan objekat!"
+
+#
+# File: bin/modules/gui/window/win_import.py, line: 57
+# File: bin/modules/gui/window/win_import.py, line: 57
+#: bin/modules/gui/window/win_import.py:63
+#, python-format
+msgid "Imported %d objects !"
+msgstr "Uvezeno %d objekata !"
+
+#: bin/modules/gui/window/win_import.py:68
+#, python-format
+msgid ""
+"Error trying to import this record:\n"
+"%s\n"
+"Error Message:\n"
+"%s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:72
+msgid "Importation Error !"
+msgstr "Važna greška!"
+
+#
+# File: bin/modules/gui/window/win_import.py, line: 93
+# File: bin/modules/gui/window/win_import.py, line: 97
+# File: bin/modules/gui/window/win_import.py, line: 93
+# File: bin/modules/gui/window/win_import.py, line: 97
+#: bin/modules/gui/window/win_import.py:105
+#: bin/modules/gui/window/win_import.py:109
+msgid "Field name"
+msgstr "Naziv polja"
+
+#: bin/modules/gui/window/win_import.py:181
+msgid "Error opening .CSV file"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:181
+msgid "Input Error."
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:199
+#, python-format
+msgid "You cannot import this field %s, because we cannot auto-detect it"
+msgstr ""
+"Ne možete uvesti ovo polje %s, jer ga ne možemo prepoznati automatski."
+
+#: bin/modules/gui/window/win_import.py:202
+#, python-format
+msgid ""
+"Error processing your first line of the file.\n"
+"Field %s is unknown !"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:202
+msgid "Import Error."
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:233
+msgid "You have not selected any fields to import"
+msgstr "Niste odabrali nijedno polje za uvoz"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Extension"
+msgstr ""
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Application"
+msgstr ""
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Print Processor"
+msgstr ""
+
+#
+# File: bin/modules/gui/window/win_extension.py, line: 115
+#: bin/modules/gui/window/win_extension.py:114
+msgid "This extension is already defined"
+msgstr "Ovo proširenje je već definisano"
+
+#
+# File: bin/openerp.glade, line: 8697
+#: bin/modules/gui/window/win_extension.py:114 bin/openerp.glade:7642
+msgid "Extension Manager"
+msgstr "Menadžer dodataka"
+
+#
+# File: bin/modules/gui/window/win_selection.py, line: 52
+# File: bin/modules/gui/window/win_selection.py, line: 52
+#: bin/modules/gui/window/win_selection.py:51
+msgid "Name"
+msgstr "Naziv"
+
+#
+# File: bin/modules/gui/window/win_selection.py, line: 56
+# File: bin/modules/gui/window/win_selection.py, line: 56
+#: bin/modules/gui/window/win_selection.py:55
+msgid "Ressource Name"
+msgstr "Naziv resursa"
+
+#
+# File: bin/modules/gui/window/win_selection.py, line: 56
+# File: bin/modules/gui/window/win_selection.py, line: 56
+#: bin/modules/gui/window/win_selection.py:55
+msgid "Names"
+msgstr "Nazivi"
+
+#
+# File: bin/modules/gui/window/__init__.py, line: 33
+# File: bin/modules/gui/window/__init__.py, line: 33
+#: bin/modules/gui/window/__init__.py:31
+msgid "Unknown Window"
+msgstr "Nepoznat prozor"
+
+#: bin/modules/gui/window/win_preference.py:68
+msgid "Preferences"
+msgstr ""
+
+#: bin/modules/gui/window/win_preference.py:86
+msgid ""
+"The default language of the interface has been modified, do not forget to "
+"restart the client to have the interface in your language"
+msgstr ""
+"Podrazumijevani jezik sučelja je izmjenjen, nemojte zaboraviti restartati "
+"klijent da se sučelje prikaže na Vašem jeziku."
+
+#: bin/modules/gui/window/win_preference.py:88
+msgid "Default language modified !"
+msgstr "Uobičajeni jezik promijenjen !"
+
+#
+# File: bin/modules/gui/window/view_tree/parse.py, line: 36
+# File: bin/modules/gui/window/view_tree/parse.py, line: 36
+#: bin/modules/gui/window/view_tree/parse.py:35
+msgid "Tree"
+msgstr "Stablo"
+
+#
+# File: bin/modules/gui/window/view_tree/view_tree_sc.py, line: 49
+# File: bin/modules/gui/window/view_tree/view_tree_sc.py, line: 49
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:45
+msgid "Description"
+msgstr "Opis"
+
+#
+# File: bin/modules/gui/window/tree.py, line: 190
+# File: bin/modules/gui/window/tree.py, line: 246
+# File: bin/modules/gui/window/tree.py, line: 190
+# File: bin/modules/gui/window/tree.py, line: 246
+#: bin/modules/gui/window/tree.py:205 bin/modules/gui/window/tree.py:261
+msgid "No resource selected!"
+msgstr "Nije odabran resurs!"
+
+#
+# File: bin/modules/gui/window/tree.py, line: 204
+# File: bin/modules/gui/window/tree.py, line: 204
+#: bin/modules/gui/window/tree.py:219
+msgid ""
+"Are you sure you want\n"
+"to remove this record?"
+msgstr ""
+"Jeste li sigurni da želite\n"
+"ukloniti ovaj zapis?"
+
+#
+# File: bin/modules/gui/window/tree.py, line: 209
+# File: bin/modules/gui/window/tree.py, line: 209
+#: bin/modules/gui/window/tree.py:224
+msgid "Error removing resource!"
+msgstr "Greška kod uklanjanja resursa!"
+
+#
+# File: bin/modules/gui/window/tree.py, line: 220
+# File: bin/modules/gui/window/tree.py, line: 220
+#: bin/modules/gui/window/tree.py:235
+msgid "Unable to chroot: no tree resource selected"
+msgstr "Nemogu izvršiti chroot: nema označenog stabla resursa"
+
+#
+# File: bin/modules/gui/window/win_export.py, line: 52
+# File: bin/modules/gui/window/win_export.py, line: 52
+#: bin/modules/gui/window/win_export.py:50
+msgid " record(s) saved !"
+msgstr " zapis(i) snimljen(i) !"
+
+#
+# File: bin/modules/gui/window/win_export.py, line: 55
+# File: bin/modules/gui/window/win_export.py, line: 55
+#: bin/modules/gui/window/win_export.py:53
+msgid ""
+"Operation failed !\n"
+"I/O error"
+msgstr ""
+"Neuspjela operacija !\n"
+"Greška Ulaz/Izlaz"
+
+#
+# File: bin/modules/gui/window/win_export.py, line: 79
+# File: bin/modules/gui/window/win_export.py, line: 79
+#: bin/modules/gui/window/win_export.py:79
+#: bin/modules/gui/window/win_export.py:105
+msgid "Error Opening Excel !"
+msgstr "Greška kod otvaranja Excel-a !"
+
+#: bin/modules/gui/window/win_export.py:317
+msgid "What is the name of this export ?"
+msgstr ""
+
+#: bin/modules/gui/window/win_export.py:351
+msgid "Exportation Error !"
+msgstr "Greška izvoza!"
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 51
+# File: bin/modules/gui/window/win_search.py, line: 50
+#: bin/widget/view/diagram_gtk/xdot.py:1772
+#: bin/modules/gui/window/win_search.py:49
+msgid "OpenERP - Link"
+msgstr "OpenERP - Veza"
+
+#
+# File: bin/modules/gui/window/win_search.py, line: 143
+#: bin/modules/gui/window/win_search.py:126
+#, python-format
+msgid "OpenERP Search: %s"
+msgstr "OpenERP Traži: %s"
+
+#
+# File: bin/modules/gui/window/win_search.py, line: 144
+#: bin/modules/gui/window/win_search.py:127
+#, python-format
+msgid "OpenERP Search: %s (%%d result(s))"
+msgstr "OpenERP Pretraga: %s (%%d rezultat(a))"
+
+#
+# File: bin/options.py, line: 107
+#: bin/options.py:121
+#, python-format
+msgid "OpenERP Client %s"
+msgstr "OpenERP Klijent %s"
+
+#
+# File: bin/options.py, line: 89
+# File: bin/options.py, line: 89
+#: bin/options.py:122
+msgid "specify alternate config file"
+msgstr "navedite zamjenski konfiguracioni fajl"
+
+#: bin/options.py:123
+msgid "Enable basic debugging. Alias for '--log-level=debug'"
+msgstr "Omogući osnovno debugiranje. Ekvivalentno opciji '--og-level=debug'"
+
+#: bin/options.py:124
+#, python-format
+msgid "specify the log level: %s"
+msgstr "specificiraj nivo logiranja: %s"
+
+#
+# File: bin/options.py, line: 93
+# File: bin/options.py, line: 93
+#: bin/options.py:125
+msgid "specify the user login"
+msgstr "navedite korisničku prijavu"
+
+#
+# File: bin/options.py, line: 94
+# File: bin/options.py, line: 94
+#: bin/options.py:126
+msgid "specify the server port"
+msgstr "navedite serverski port"
+
+#
+# File: bin/options.py, line: 95
+# File: bin/options.py, line: 95
+#: bin/options.py:127
+msgid "specify the server ip/name"
+msgstr "navedite ime/ip adresu servera"
+
+#: bin/common/common.py:89
+msgid "Close current tip"
+msgstr ""
+
+#: bin/common/common.py:90
+msgid ""
+"<span foreground=\"darkred\"><b>Close Current Tip:</b></span>\n"
+"This will hide the current tip. It will be displayed again next time you "
+"open this menu item, unless you disable all tips using the <b>'Menu "
+"Tips'</b> option in the user preferences."
+msgstr ""
+
+#: bin/common/common.py:100
+msgid "Disable all tips"
+msgstr ""
+
+#: bin/common/common.py:101
+msgid ""
+"<span foreground=\"darkred\"><b>Disable all tips:</b></span>\n"
+"This will disable the display of tips on all menu items.\n"
+"To re-enable tips you need to check the <b>'Menu Tips'</b> option in the "
+"user preferences."
+msgstr ""
+
+#: bin/common/common.py:115 bin/common/common.py:117
+msgid "Tips"
+msgstr ""
+
+#
+# File: bin/modules/action/wizard.py, line: 133
+#: bin/common/common.py:168
+msgid "OpenERP Computing"
+msgstr "OpenERP računa"
+
+#
+# File: bin/modules/action/wizard.py, line: 143
+# File: bin/modules/action/wizard.py, line: 143
+#: bin/common/common.py:187
+msgid "Operation in progress"
+msgstr "Operacija u toku"
+
+#
+# File: bin/modules/action/wizard.py, line: 147
+# File: bin/modules/gui/main.py, line: 340
+# File: bin/modules/action/wizard.py, line: 147
+# File: bin/modules/gui/main.py, line: 340
+#: bin/common/common.py:191
+msgid ""
+"Please wait,\n"
+"this operation may take a while..."
+msgstr ""
+"Molim sačekajte,\n"
+"ova aktivnost može potrajati..."
+
+#: bin/common/common.py:225
+#, python-format
+msgid "Ensure that the file %s is correct"
+msgstr ""
+
+#: bin/common/common.py:399
+msgid " has reported the following bug:\n"
+msgstr ""
+
+#: bin/common/common.py:399
+msgid "remarks"
+msgstr ""
+
+#
+# File: bin/common/common.py, line: 289
+# File: bin/common/common.py, line: 343
+# File: bin/common/common.py, line: 289
+# File: bin/common/common.py, line: 343
+#: bin/common/common.py:402
+msgid "Support request sent !"
+msgstr "Zahtjev za podršku poslat !"
+
+#: bin/common/common.py:425 bin/common/common.py:469
+msgid ""
+"\n"
+"<b>An unknown error has been reported.</b>\n"
+"\n"
+"<b>You do not have a valid OpenERP publisher warranty contract !</b>\n"
+"If you are using OpenERP in production, it is highly suggested to subscribe\n"
+"a publisher warranty program.\n"
+"\n"
+"The OpenERP publisher warranty contract provides you a bugfix guarantee and "
+"an\n"
+"automatic migration system so that we can fix your problems within a few\n"
+"hours. If you had a publisher warranty contract, this error would have been "
+"sent\n"
+"to the quality team of the OpenERP editor.\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"
+"\n"
+"You can use the link bellow for more information. The detail of the error\n"
+"is displayed on the second tab.\n"
+msgstr ""
+
+#: bin/common/common.py:448
+#, python-format
+msgid ""
+"\n"
+"<b>An unknown error has been reported.</b>\n"
+"\n"
+"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:\n"
+"%s\n"
+"\n"
+"You can use the link bellow for more information. The detail of the error\n"
+"is displayed on the second tab."
+msgstr ""
+
+#: bin/common/common.py:525
+msgid ""
+"Your problem has been sent to the quality team !\n"
+"We will recontact you after analysing the problem."
+msgstr ""
+"Vaš problem je poslat timu za kvalitet !\n"
+"Kontaktiračemo vas poslije analize problema."
+
+#: bin/common/common.py:528
+#, python-format
+msgid ""
+"Your problem could *NOT* be sent to the quality team !\n"
+"Please report this error manually at:\n"
+"\t%s"
+msgstr ""
+"Vaš problem se *NIJE* mogao poslati timu kontrole kvalitete!\n"
+"Molimo da ovu grešku dojavite ručno na:\n"
+"\t%s"
+
+#: bin/common/common.py:528
+msgid "Error"
+msgstr "Greška"
+
+#
+# File: bin/common/common.py, line: 499
+# File: bin/common/common.py, line: 499
+#: bin/common/common.py:682
+msgid "Open with..."
+msgstr "Otvori sa ..."
+
+#: bin/translate.py:183
+#, python-format
+msgid "Unable to set locale %s: %s"
+msgstr ""
+
+#
+# File: bin/printer/printer.py, line: 172
+#: bin/printer/printer.py:184
+#, python-format
+msgid "Unable to handle %s filetype"
+msgstr "Nemogu da rukujem sa %s tipom datoteke"
+
+#
+# File: bin/printer/printer.py, line: 181
+# File: bin/printer/printer.py, line: 181
+#: bin/printer/printer.py:189
+msgid ""
+"Linux Automatic Printing not implemented.\n"
+"Use preview option !"
+msgstr ""
+"Linuxov automatski ispis nije implementiran.\n"
+"Koristi opciju za pregled !"
+
+#: bin/printer/printer.py:212
+msgid "Error! No Data found. Make sure you have enough data to print!"
+msgstr ""
+
+#
+# File: bin/printer/printer.py, line: 215
+# File: bin/printer/printer.py, line: 215
+#: bin/printer/printer.py:239
+msgid "Error writing the file!"
+msgstr "Greška tokom zapisivanja datoteke!"
+
+#
+# File: bin/openerp-client.py, line: 130
+#: bin/openerp-client.py:142
+msgid "Closing OpenERP, KeyboardInterrupt"
+msgstr "Zatvaram OpenERP, PrekidTastature"
+
+#
+# File: bin/widget_search/checkbox.py, line: 55
+# File: bin/widget_search/spinbutton.py, line: 69
+# File: bin/widget_search/spinint.py, line: 73
+# File: bin/widget_search/calendar.py, line: 106
+# File: bin/widget_search/char.py, line: 47
+# File: bin/widget_search/reference.py, line: 74
+# File: bin/widget_search/checkbox.py, line: 55
+# File: bin/widget_search/spinbutton.py, line: 69
+# File: bin/widget_search/spinint.py, line: 73
+# File: bin/widget_search/calendar.py, line: 106
+# File: bin/widget_search/char.py, line: 47
+# File: bin/widget_search/reference.py, line: 74
+#: bin/widget/view/form_gtk/button.py:47 bin/widget_search/char.py:72
+#: bin/widget_search/calendar.py:125 bin/widget_search/calendar.py:250
+#: bin/widget_search/filter.py:77 bin/widget_search/reference.py:78
+#: bin/widget_search/spinbutton.py:92 bin/widget_search/selection.py:116
+#: bin/widget_search/custom_filter.py:140 bin/widget_search/spinint.py:95
+#: bin/widget_search/checkbox.py:68
+msgid "The content of the widget or ValueError if not valid"
+msgstr "Sadržaj widget-a ili GreškaVrijednosti ako je neispravan"
+
+#
+# File: bin/widget_search/form.py, line: 301
+#: bin/widget_search/form.py:492
+msgid "The content of the form or exception if not valid"
+msgstr "Sadržaj obrasca ili izuzetak ako nije ispravan"
+
+#
+# File: bin/widget_search/date_widget.py, line: 65
+# File: bin/widget/view/form_gtk/date_widget.py, line: 65
+#: bin/widget/view/form_gtk/date_widget.py:65
+#: bin/widget_search/date_widget.py:65
+msgid ""
+"You can use special operation by pressing +, - or =.  Plus/minus "
+"adds/decrease the variable to the current selected date. Equals set part of "
+"selected date. Available variables: 12h = 12 hours, 8d = 8 days, 4w = 4 "
+"weeks, 1m = 1 month, 2y = 2 years. Some examples:\n"
+"* +21d : adds 21 days to selected year\n"
+"* =23w : set date to the 23th week of the year\n"
+"* -4m : decrease 4 months to the current date\n"
+"You can also use \"=\" to set the date to the current date/time and '-' to "
+"clear the field."
+msgstr ""
+"Možete koristiti specijalne operatore pritiskajući +, - ili =.  Plus/minus "
+"povećava/smanjuje promjnljivu sa trenutno odabranim datumom. Jednako "
+"postavlja dio odabranog datuma. Dostupne promjenljive: 12h = 12 sati, 8d = 8 "
+"dana, 4w = sedmice, 1m = 1 mjesec, 2y = 2 godine. Primjeri:\n"
+"* +21d : dodaje 21 dan na odabranu godinu\n"
+"* =23w : postavlja datum na 23 sedmicu u godini\n"
+"* -4m : smanjuje trenutni datum za 4 mjeseca\n"
+"Možete takođe korisiti \"=\" da postavite datum na trenutni datum/vrijeme i "
+"'-' da obrišete polje."
+
+#: bin/widget_search/wid_int.py:56
+msgid "The content of the widget or exception if not valid"
+msgstr "Sadržaj kontrole ili izuzetka ukoliko nije validan"
+
+#: bin/widget_search/char.py:45
+msgid "Error: "
+msgstr ""
+
+#
+# File: bin/widget_search/calendar.py, line: 51
+# File: bin/widget_search/calendar.py, line: 51
+#: bin/widget_search/calendar.py:49 bin/widget_search/calendar.py:177
+msgid "Start date"
+msgstr "Početni datum"
+
+#
+# File: bin/widget_search/calendar.py, line: 55
+# File: bin/widget_search/calendar.py, line: 74
+# File: bin/widget/view/form_gtk/calendar.py, line: 60
+# File: bin/widget/view/form_gtk/calendar.py, line: 163
+# File: bin/widget_search/calendar.py, line: 55
+# File: bin/widget_search/calendar.py, line: 74
+# File: bin/widget/view/form_gtk/calendar.py, line: 60
+# File: bin/widget/view/form_gtk/calendar.py, line: 163
+#: bin/widget/view/form_gtk/calendar.py:57
+#: bin/widget/view/form_gtk/calendar.py:184 bin/widget_search/calendar.py:53
+#: bin/widget_search/calendar.py:73 bin/widget_search/calendar.py:181
+#: bin/widget_search/calendar.py:201
+msgid "Open the calendar widget"
+msgstr "Otvorite kalendarski dodatak"
+
+#
+# File: bin/widget_search/calendar.py, line: 70
+# File: bin/widget_search/calendar.py, line: 70
+#: bin/widget_search/calendar.py:69 bin/widget_search/calendar.py:197
+msgid "End date"
+msgstr "Krajnji datum"
+
+#
+# File: bin/widget_search/calendar.py, line: 120
+# File: bin/widget/view/form_gtk/calendar.py, line: 133
+# File: bin/widget/view/form_gtk/calendar.py, line: 263
+#: bin/widget/view/form_gtk/calendar.py:135
+#: bin/widget/view/form_gtk/calendar.py:249 bin/widget_search/calendar.py:128
+#: bin/widget_search/calendar.py:267
+msgid "OpenERP - Date selection"
+msgstr "OpenERP - Odabir datuma"
+
+#: bin/widget_search/custom_filter_widgets.py:40
+#: bin/widget_search/custom_filter_widgets.py:67
+#: bin/widget_search/custom_filter_widgets.py:98
+msgid "contains"
+msgstr ""
+
+#: bin/widget_search/custom_filter_widgets.py:41
+#: bin/widget_search/custom_filter_widgets.py:68
+#: bin/widget_search/custom_filter_widgets.py:98
+msgid "doesn't contain"
+msgstr ""
+
+#: bin/widget_search/custom_filter_widgets.py:290
+#: bin/widget_search/custom_filter_widgets.py:331
+msgid "is equal to"
+msgstr ""
+
+#: bin/widget_search/custom_filter_widgets.py:291
+#: bin/widget_search/custom_filter_widgets.py:332
+msgid "is not equal to"
+msgstr ""
+
+#: bin/widget_search/custom_filter_widgets.py:292
+#: bin/widget_search/custom_filter_widgets.py:333
+msgid "greater than"
+msgstr ""
+
+#: bin/widget_search/custom_filter_widgets.py:293
+#: bin/widget_search/custom_filter_widgets.py:334
+msgid "less than"
+msgstr ""
+
+#: bin/widget_search/custom_filter.py:62
+msgid "in"
+msgstr ""
+
+#: bin/widget_search/custom_filter.py:63
+msgid "not in"
+msgstr ""
+
+#: bin/widget_search/custom_filter.py:82
+msgid ""
+"Enter Values separated by ',' if operator 'in' or 'not in' is chosen.\n"
+"For Date and DateTime Formats, specify text in '%Y-%m-%d' and '%Y-%m-%d "
+"%H:%M:%S' formats respectively."
+msgstr ""
+
+#
+# File: bin/widget_search/checkbox.py, line: 36
+# File: bin/widget_search/checkbox.py, line: 49
+# File: bin/widget_search/checkbox.py, line: 36
+# File: bin/widget_search/checkbox.py, line: 49
+#: bin/widget_search/checkbox.py:35 bin/widget_search/checkbox.py:42
+#: bin/widget_search/checkbox.py:55
+msgid "Yes"
+msgstr "Da"
+
+#
+# File: bin/widget_search/checkbox.py, line: 37
+# File: bin/widget_search/checkbox.py, line: 37
+#: bin/widget_search/checkbox.py:36 bin/widget_search/checkbox.py:44
+msgid "No"
+msgstr "Ne"
+
+#
+# File: bin/widget/view/form.py, line: 153
+# File: bin/widget/view/form.py, line: 153
+#: bin/widget/view/form.py:137
+msgid "You must save this record to use the relate button !"
+msgstr "Morate snimiti ovaj zapis da bi ste koristili povezane tastere !"
+
+#: bin/widget/view/form.py:142
+msgid "Action not defined !"
+msgstr ""
+
+#
+# File: bin/widget/view/form.py, line: 165
+# File: bin/widget/view/form.py, line: 165
+#: bin/widget/view/form.py:211
+msgid "You must select a record to use the relate button !"
+msgstr "Morate izabrati zapis da biste koristili povezane tastere !"
+
+#
+# File: bin/widget/view/form.py, line: 183
+# File: bin/widget/view/form_gtk/parser.py, line: 490
+# File: bin/widget/view/form_gtk/parser.py, line: 647
+# File: bin/widget/view/form_gtk/parser.py, line: 704
+# File: bin/widget/view/form.py, line: 183
+# File: bin/widget/view/form_gtk/parser.py, line: 490
+# File: bin/widget/view/form_gtk/parser.py, line: 647
+# File: bin/widget/view/form_gtk/parser.py, line: 704
+#: bin/widget/view/form.py:238 bin/widget/view/form_gtk/parser.py:635
+#: bin/widget/view/form_gtk/parser.py:756
+#: bin/widget/view/form_gtk/parser.py:813
+msgid "No other language available!"
+msgstr "Nema dostupnih drugih jezika!"
+
+#
+# File: bin/widget/view/form.py, line: 190
+# File: bin/widget/view/form_gtk/parser.py, line: 549
+# File: bin/widget/view/form_gtk/parser.py, line: 653
+# File: bin/widget/view/form_gtk/parser.py, line: 710
+# File: bin/widget/view/form.py, line: 190
+# File: bin/widget/view/form_gtk/parser.py, line: 549
+# File: bin/widget/view/form_gtk/parser.py, line: 653
+# File: bin/widget/view/form_gtk/parser.py, line: 710
+#: bin/widget/view/form.py:245 bin/widget/view/form_gtk/parser.py:647
+#: bin/widget/view/form_gtk/parser.py:762
+#: bin/widget/view/form_gtk/parser.py:819
+msgid "Add Translation"
+msgstr "Dodaj prevod"
+
+#
+# File: bin/widget/view/form.py, line: 241
+# File: bin/widget/view/form_gtk/parser.py, line: 766
+# File: bin/widget/view/form.py, line: 241
+# File: bin/widget/view/form_gtk/parser.py, line: 766
+#: bin/widget/view/form.py:293 bin/widget/view/form_gtk/parser.py:875
+msgid "Translate label"
+msgstr "Prevedi natpis"
+
+#
+# File: bin/widget/view/calendar_gtk/parser.py, line: 239
+# File: bin/openerp.glade, line: 9108
+#: bin/widget/view/calendar_gtk/parser.py:355 bin/openerp.glade:8064
+msgid "Week"
+msgstr "Sedmica"
+
+#
+# File: bin/widget/view/calendar_gtk/parser_dummy.py, line: 31
+#: bin/widget/view/calendar_gtk/parser_dummy.py:30
+msgid "Calendar View Error !"
+msgstr "Greška prikaza kalendara !"
+
+#
+# File: bin/widget/view/calendar_gtk/parser_dummy.py, line: 32
+#: bin/widget/view/calendar_gtk/parser_dummy.py:31
+msgid "You must intall the library python-hippocanvas to use calendars."
+msgstr ""
+"Morate instalirati biblioteku python-hippocanvas da biste koristili kalendar."
+
+#: bin/widget/view/screen_container.py:74
+msgid "--Actions--"
+msgstr ""
+
+#: bin/widget/view/screen_container.py:73
+msgid "Save as a Shortcut"
+msgstr ""
+
+#: bin/widget/view/screen_container.py:74
+msgid "Save as a Filter"
+msgstr ""
+
+#: bin/widget/view/screen_container.py:74
+msgid "Manage Filters"
+msgstr ""
+
+#: bin/widget/view/tree_gtk/parser.py:61
+msgid ""
+"You have unsaved record(s) !  \n"
+"\n"
+"Please Save them before sorting !"
+msgstr ""
+
+#
+# File: bin/widget/view/tree_gtk/editabletree.py, line: 125
+#: bin/widget/view/tree_gtk/editabletree.py:140
+#, python-format
+msgid "Shortcut: %s"
+msgstr "Prečica: %s"
+
+#
+# File: bin/widget/view/tree_gtk/editabletree.py, line: 125
+#: bin/widget/view/tree_gtk/editabletree.py:140
+msgid "F1 New - F2 Open/Search"
+msgstr "F1 Novi - F2 Otvori/Traži"
+
+#
+# File: bin/widget/view/tree_gtk/editabletree.py, line: 190
+#: bin/widget/view/tree_gtk/editabletree.py:215
+#, python-format
+msgid "Warning; field %s is required!"
+msgstr "Upozorenje; polje %s je zahtjevano!"
+
+#
+# File: bin/widget/view/tree_gtk/date_renderer.py, line: 200
+#: bin/widget/view/tree_gtk/date_renderer.py:197
+msgid ""
+"Press <i>'+'</i>, <i>'-'</i> or <i>'='</i> for special date operations."
+msgstr ""
+"Pritisnite <i>'+'</i>, <i>'-'</i> or <i>'='</i> za specijalne datumske "
+"operacije."
+
+#: bin/widget/view/widget_parse.py:53
+#, python-format
+msgid "This type (%s) is not supported by the GTK client !"
+msgstr "Ovaj tip (%s) nije podržan od strane GTK klijenta!"
+
+#: bin/widget/view/widget_parse.py:64
+msgid "No valid view found for this object!"
+msgstr "Nije nađen ispravan prikaz za ovaj objekt!"
+
+#
+# File: bin/widget/view/graph_gtk/parser.py, line: 65
+# File: bin/widget/view/graph_gtk/parser.py, line: 65
+#: bin/widget/view/graph_gtk/parser.py:64
+msgid "Can not generate graph !"
+msgstr "Ne možete kreirati grafikon !"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1422
+msgid "Dot Viewer"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1712
+msgid "Add New Node"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1713
+msgid "Add New Edge"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1714
+msgid "Enlarge the Diagram"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1715
+msgid "Shrink the Diagram"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1716
+msgid "Fit the diagram to the window"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1717
+msgid "Show the diagram at its normal size"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1718
+msgid "Print the Diagram"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1789
+#, python-format
+msgid "Close Current %s"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1790
+#, python-format
+msgid "Delete Current %s"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1791
+#, python-format
+msgid "Edit Current %s"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1875
+msgid " - Dot Viewer"
+msgstr ""
+
+#
+# File: bin/widget/view/form_gtk/reference.py, line: 92
+# File: bin/openerp.glade, line: 1214
+# File: bin/widget/view/form_gtk/reference.py, line: 92
+# File: bin/openerp.glade, line: 1214
+#: bin/widget/view/form_gtk/reference.py:76 bin/openerp.glade:1258
+msgid "Create a new resource"
+msgstr "Kreirajte novi resurs"
+
+#
+# File: bin/widget/view/form_gtk/reference.py, line: 93
+# File: bin/widget/view/form_gtk/reference.py, line: 93
+#: bin/widget/view/form_gtk/reference.py:89
+msgid "Search / Open a resource"
+msgstr "Pretraži / Otvori resurs"
+
+#
+# File: bin/widget/view/form_gtk/parser.py, line: 61
+# File: bin/widget/view/form_gtk/parser.py, line: 61
+#: bin/widget/view/form_gtk/parser.py:61
+msgid "Wrong icon for the button !"
+msgstr "Pogrešna sličica za dugme !"
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Field"
+msgstr ""
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Object"
+msgstr ""
+
+#: bin/widget/view/form_gtk/parser.py:619
+msgid "Enter some text to the related field before adding translations!"
+msgstr "Unesite neki tekst u odgovarajuće polje prije dodavanja prevoda!"
+
+#
+# File: bin/widget/view/form_gtk/parser.py, line: 480
+# File: bin/widget/view/form_gtk/parser.py, line: 480
+#: bin/widget/view/form_gtk/parser.py:626
+msgid "You need to save resource before adding translations!"
+msgstr "Vi trebate snimiti resurs prije dodavanja prijevoda!"
+
+#
+# File: bin/widget/view/form_gtk/parser.py, line: 772
+# File: bin/widget/view/form_gtk/parser.py, line: 772
+#: bin/widget/view/form_gtk/parser.py:880
+msgid "Translate view"
+msgstr "Pregled za prijevod"
+
+#: bin/widget/view/form_gtk/one2many_list.py:64
+msgid "Cancel"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:70
+msgid "Save & Close"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:75
+msgid "Save & New"
+msgstr ""
+
+#
+# File: bin/widget/view/form_gtk/interface.py, line: 47
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 148
+# File: bin/widget/view/form_gtk/interface.py, line: 47
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 148
+#: bin/widget/view/form_gtk/one2many_list.py:164
+#: bin/widget/view/form_gtk/interface.py:48
+msgid "Set to default value"
+msgstr "Podesite na osnovne vrijednosti"
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 151
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 151
+#: bin/widget/view/form_gtk/one2many_list.py:167
+msgid "Set Default"
+msgstr "Podesite na osnovne vrijednosti"
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 162
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 162
+#: bin/widget/view/form_gtk/one2many_list.py:196
+msgid "Create a new entry"
+msgstr "Kreirajte novi zapis"
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 172
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 172
+#: bin/widget/view/form_gtk/one2many_list.py:200
+msgid "Edit this entry"
+msgstr "Izmjenite ovaj zapis"
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 182
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 182
+#: bin/widget/view/form_gtk/one2many_list.py:204
+msgid "Remove this entry"
+msgstr "Uklonite ovaj zapis"
+
+#: bin/widget/view/form_gtk/many2many.py:84
+#: bin/widget/view/form_gtk/one2many_list.py:210
+msgid "Previous Page"
+msgstr ""
+
+#: bin/widget/view/form_gtk/many2many.py:88
+#: bin/widget/view/form_gtk/one2many_list.py:214
+msgid "Previous Record"
+msgstr ""
+
+#: bin/widget/view/form_gtk/many2many.py:96
+#: bin/widget/view/form_gtk/one2many_list.py:222
+msgid "Next Record"
+msgstr ""
+
+#: bin/widget/view/form_gtk/many2many.py:100
+#: bin/widget/view/form_gtk/one2many_list.py:226
+msgid "Next Page"
+msgstr ""
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 219
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 219
+#: bin/widget/view/form_gtk/one2many_list.py:232
+msgid "Switch"
+msgstr "Prebaci"
+
+#: bin/widget/view/form_gtk/many2many.py:106
+#: bin/widget/view/form_gtk/one2many_list.py:238
+msgid "Choose Limit"
+msgstr ""
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 269
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 269
+#: bin/widget/view/form_gtk/one2many_list.py:279
+msgid "You have to select a resource !"
+msgstr "Morate izabrati resurs !"
+
+#
+# File: bin/widget/view/form_gtk/image.py, line: 70
+# File: bin/widget/view/form_gtk/image.py, line: 70
+#: bin/widget/view/form_gtk/image.py:73
+msgid "Set Image"
+msgstr "Podesi sliku"
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 85
+# File: bin/widget/view/form_gtk/image.py, line: 79
+# File: bin/widget/view/form_gtk/binary.py, line: 85
+# File: bin/widget/view/form_gtk/image.py, line: 79
+#: bin/widget/view/form_gtk/image.py:82 bin/widget/view/form_gtk/binary.py:84
+msgid "Save As"
+msgstr "Snimi kao"
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 89
+# File: bin/widget/view/form_gtk/image.py, line: 88
+# File: bin/widget/view/form_gtk/binary.py, line: 89
+# File: bin/widget/view/form_gtk/image.py, line: 88
+#: bin/widget/view/form_gtk/image.py:93 bin/widget/view/form_gtk/binary.py:88
+msgid "Clear"
+msgstr "Očisti"
+
+#
+# File: bin/widget/view/form_gtk/image.py, line: 100
+# File: bin/widget/view/form_gtk/image.py, line: 100
+#: bin/widget/view/form_gtk/image.py:102
+msgid "All files"
+msgstr "Sve datoteke"
+
+#
+# File: bin/widget/view/form_gtk/image.py, line: 104
+# File: bin/widget/view/form_gtk/image.py, line: 104
+#: bin/widget/view/form_gtk/image.py:106
+msgid "Images"
+msgstr "Slike"
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "There is no image to save as !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "Warning"
+msgstr ""
+
+#: bin/widget/view/form_gtk/many2one.py:158 bin/widget/view/form_gtk/url.py:53
+msgid "Open this resource"
+msgstr "Otvori ovaj resurs"
+
+#
+#
+#: bin/widget/view/form_gtk/many2one.py:163
+#: bin/widget_search/custom_filter_widgets.py:87
+msgid "Search a resource"
+msgstr "Pretražite resurs"
+
+#
+# File: bin/widget/view/form_gtk/many2one.py, line: 168
+# File: bin/openerp.glade, line: 1356
+# File: bin/widget/view/form_gtk/many2one.py, line: 168
+# File: bin/openerp.glade, line: 1356
+#: bin/widget/view/form_gtk/many2one.py:174 bin/openerp.glade:1412
+msgid "Action"
+msgstr "Akcija"
+
+#
+# File: bin/widget/view/form_gtk/many2one.py, line: 169
+# File: bin/widget/view/form_gtk/many2one.py, line: 169
+#: bin/widget/view/form_gtk/many2one.py:175
+msgid "Report"
+msgstr "Izvještaj"
+
+#
+# File: bin/widget/view/form_gtk/many2one.py, line: 369
+# File: bin/widget/view/list.py, line: 274
+# File: bin/widget/view/form_gtk/many2one.py, line: 369
+# File: bin/widget/view/list.py, line: 274
+#: bin/widget/view/list.py:633 bin/widget/view/form_gtk/many2one.py:387
+msgid "You must select a record to use the relation !"
+msgstr "Morate izabrati zapis da bi ste koristili povezanost !"
+
+#
+# File: bin/widget/view/form_gtk/interface.py, line: 48
+# File: bin/widget/view/form_gtk/interface.py, line: 48
+#: bin/widget/view/form_gtk/interface.py:49
+msgid "Set as default"
+msgstr "Podesite na osnovne vrijednosti"
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "You can not set to the default value here !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "Operation not permited"
+msgstr ""
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 77
+#: bin/widget/view/form_gtk/binary.py:76
+msgid "Select"
+msgstr "Odaberi"
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 81
+#: bin/widget/view/form_gtk/binary.py:80
+msgid "Open"
+msgstr "Otvori"
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 114
+# File: bin/widget/view/form_gtk/binary.py, line: 158
+#: bin/widget/view/form_gtk/binary.py:119
+#: bin/widget/view/form_gtk/binary.py:163
+msgid "Unable to read the file data"
+msgstr "Nemogu da pročitam datoteku sa podatcima"
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 124
+# File: bin/widget/view/form_gtk/binary.py, line: 150
+#: bin/widget/view/form_gtk/binary.py:129
+#: bin/widget/view/form_gtk/binary.py:155
+#, python-format
+msgid "Error reading the file: %s"
+msgstr "Greška kod čitanja datoteke: %s"
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 133
+#: bin/widget/view/form_gtk/binary.py:138
+msgid "All Files"
+msgstr "Sve datoteke"
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 143
+#: bin/widget/view/form_gtk/binary.py:148
+msgid "Select a file..."
+msgstr "Odaberi datoteku..."
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 172
+#: bin/widget/view/form_gtk/binary.py:177
+#, python-format
+msgid "Error writing the file: %s"
+msgstr "Greška kod zapisivanja u datoteku: %s"
+
+#
+# File: bin/widget/view/form_gtk/wid_common.py, line: 60
+# File: bin/widget/view/form_gtk/wid_common.py, line: 60
+#: bin/widget/view/form_gtk/wid_common.py:59
+msgid "Always applicable !"
+msgstr "Uvijek primjenjiv !"
+
+#: bin/widget/view/form_gtk/calendar.py:99
+#: bin/widget/view/form_gtk/calendar.py:163
+msgid "Invalid date value! Year must be greater than 1899 !"
+msgstr "Neispravna vrijednost datuma! Godina mora biti veća od 1899 !"
+
+#
+# File: bin/widget/view/form_gtk/calendar.py, line: 247
+# File: bin/widget/view/form_gtk/calendar.py, line: 247
+#: bin/widget/view/form_gtk/calendar.py:255 bin/widget_search/calendar.py:273
+msgid "Hour:"
+msgstr "Sat:"
+
+#
+# File: bin/widget/view/form_gtk/calendar.py, line: 250
+# File: bin/widget/view/form_gtk/calendar.py, line: 250
+#: bin/widget/view/form_gtk/calendar.py:258 bin/widget_search/calendar.py:276
+msgid "Minute:"
+msgstr "Minuta:"
+
+#: bin/widget/view/form_gtk/calendar.py:291 bin/widget_search/calendar.py:312
+msgid "Invalid datetime value! Year must be greater than 1899 !"
+msgstr "Neispravna vrijednost datum-vremena! Godina mora biti veća od 1899 !"
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:30
+msgid "Gantt view not yet implemented !"
+msgstr "Gantt prikaz još nije implementiran!"
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:31
+msgid ""
+"The gantt view is not available in this GTK Client, you should use the web "
+"interface or switch to the calendar view."
+msgstr ""
+"Gantt prikaz nije dostupan u ovom GTK klijentu, koristite web pristup ili "
+"prebacite na kalendarski prikaz."
+
+#: bin/widget/screen/screen.py:337
+msgid ""
+"(Any existing filter with the \n"
+"same name will be replaced)"
+msgstr ""
+
+#
+# File: bin/rpc.py, line: 142
+# File: bin/rpc.py, line: 142
+#: bin/rpc.py:158
+msgid "Connection refused!"
+msgstr "Konektovanje odbijeno !"
+
+#
+# File: bin/rpc.py, line: 173
+#: bin/rpc.py:188
+msgid ""
+"Unable to reach to OpenERP server !\n"
+"You should check your connection to the network and the OpenERP server."
+msgstr ""
+"Nemogu da nađem OpenERP server !\n"
+"Provjerite vašu spoj na mrežu i OpenERP server."
+
+#
+# File: bin/rpc.py, line: 173
+#: bin/rpc.py:188
+msgid "Connection Error"
+msgstr "Greška pri spajanju"
+
+>>>>>>> MERGE-SOURCE
 #
 # File: bin/openerp.glade, line: 8
 #: bin/openerp.glade:6
@@ -2229,6 +3741,7 @@
 msgstr "_Postavke"
 
 #
+<<<<<<< TREE
 # File: bin/openerp.glade, line: 9299
 # File: bin/openerp.glade, line: 9299
 #: bin/openerp.glade:483 bin/openerp.glade:7304
@@ -2239,6 +3752,11 @@
 # File: bin/openerp.glade, line: 445
 # File: bin/openerp.glade, line: 445
 #: bin/openerp.glade:496
+=======
+# File: bin/openerp.glade, line: 445
+# File: bin/openerp.glade, line: 445
+#: bin/openerp.glade:496
+>>>>>>> MERGE-SOURCE
 msgid "_Send a request"
 msgstr "_Pošalji zahtjev"
 
@@ -3009,6 +4527,17 @@
 msgid "<b>Predefined Exports</b>"
 msgstr "<b>Prethodno definisan izvoz</b>"
 
+<<<<<<< TREE
+=======
+#: bin/openerp.glade:3134
+msgid "Import Compatible"
+msgstr "Uvoz kompatibilan"
+
+#: bin/openerp.glade:2862
+msgid "<b>Select an Option to Export</b>"
+msgstr "<b>Odaberite opciju za izvoz</b>"
+
+>>>>>>> MERGE-SOURCE
 #
 # File: bin/openerp.glade, line: 2792
 #: bin/openerp.glade:2880
@@ -3049,6 +4578,7 @@
 #: bin/openerp.glade:3115
 msgid "Add Field Names"
 msgstr ""
+<<<<<<< TREE
 
 #: bin/openerp.glade:3134
 msgid "Import Compatible"
@@ -3058,6 +4588,22 @@
 # File: bin/openerp.glade, line: 3035
 # File: bin/openerp.glade, line: 3035
 #: bin/openerp.glade:3156
+=======
+"Otvori u Excel-u\n"
+"Snimi kao CSV"
+
+#
+# File: bin/openerp.glade, line: 3018
+# File: bin/openerp.glade, line: 3018
+#: bin/openerp.glade:3151
+msgid "Add _field names"
+msgstr "Dodaj _nazive polja"
+
+#
+# File: bin/openerp.glade, line: 3035
+# File: bin/openerp.glade, line: 3035
+#: bin/openerp.glade:3156
+>>>>>>> MERGE-SOURCE
 msgid "<b>Opti_ons</b>"
 msgstr "<b>Opci_je</b>"
 
@@ -3588,6 +5134,7 @@
 msgstr "N_išta"
 
 #
+<<<<<<< TREE
 # File: bin/openerp.glade, line: 7833
 # File: bin/openerp.glade, line: 7833
 #: bin/openerp.glade:5772
@@ -3606,13 +5153,38 @@
 # File: bin/openerp.glade, line: 7778
 # File: bin/openerp.glade, line: 7778
 #: bin/openerp.glade:5852
+=======
+# File: bin/openerp.glade, line: 7778
+# File: bin/openerp.glade, line: 7778
+#: bin/openerp.glade:5852
+>>>>>>> MERGE-SOURCE
 msgid "Auto-Detect"
 msgstr "Automatska detekcija"
 
 #
-# File: bin/openerp.glade, line: 7942
-# File: bin/openerp.glade, line: 7942
-#: bin/openerp.glade:5930
+<<<<<<< TREE
+# File: bin/openerp.glade, line: 7942
+# File: bin/openerp.glade, line: 7942
+#: bin/openerp.glade:5930
+=======
+# File: bin/openerp.glade, line: 7833
+# File: bin/openerp.glade, line: 7833
+#: bin/openerp.glade:5772
+msgid "<b>Fields to import</b>"
+msgstr "<b>Polja za uvoz</b>"
+
+#
+# File: bin/openerp.glade, line: 7868
+# File: bin/openerp.glade, line: 7868
+#: bin/openerp.glade:5891
+msgid "File to Import:"
+msgstr "Datoteka za uvoz"
+
+#
+# File: bin/openerp.glade, line: 7942
+# File: bin/openerp.glade, line: 7942
+#: bin/openerp.glade:5930
+>>>>>>> MERGE-SOURCE
 msgid "Lines to Skip:"
 msgstr "Linije za preskočiti:"
 
@@ -3858,9 +5430,22 @@
 msgstr ""
 
 #
-# File: bin/openerp.glade, line: 9316
-# File: bin/openerp.glade, line: 9316
-#: bin/openerp.glade:7321
+<<<<<<< TREE
+# File: bin/openerp.glade, line: 9316
+# File: bin/openerp.glade, line: 9316
+#: bin/openerp.glade:7321
+=======
+# File: bin/openerp.glade, line: 9299
+# File: bin/openerp.glade, line: 9299
+#: bin/openerp.glade:483 bin/openerp.glade:7304
+msgid "Change password"
+msgstr "Promjeni šifru"
+
+#
+# File: bin/openerp.glade, line: 9316
+# File: bin/openerp.glade, line: 9316
+#: bin/openerp.glade:7321
+>>>>>>> MERGE-SOURCE
 msgid "<b>Change your super admin password</b>"
 msgstr "<b>Promjenite vašu šifru super admin -a </b>"
 
@@ -3970,6 +5555,35 @@
 msgstr ""
 
 #: bin/openerp.glade:8276
+<<<<<<< TREE
+=======
+msgid "Fields on which Search criteria to be applied"
+msgstr ""
+
+#: bin/openerp.glade:8289
+msgid "Conditional Operators"
+msgstr ""
+
+#: bin/openerp.glade:8316
+msgid "The Choice will be applied with next filter if any"
+msgstr ""
+
+#: bin/openerp.glade:8317
+msgid ""
+"AND\n"
+"OR"
+msgstr ""
+
+#: bin/openerp.glade:8330
+msgid "Remove Filter"
+msgstr ""
+
+#: bin/openerp.glade:8230
+msgid "Filter Entry"
+msgstr ""
+
+#: bin/openerp.glade:8276
+>>>>>>> MERGE-SOURCE
 msgid "Enter Filter Name:"
 msgstr ""
 

=== modified file 'bin/po/ca.po'
--- bin/po/ca.po	2011-10-11 05:32:10 +0000
+++ bin/po/ca.po	2011-10-24 01:06:26 +0000
@@ -14,10 +14,16 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-10-11 05:29+0000\n"
 "X-Generator: Launchpad (build 14123)\n"
+=======
+"X-Launchpad-Export-Date: 2011-09-15 05:09+0000\n"
+"X-Generator: Launchpad (build 13921)\n"
+>>>>>>> MERGE-SOURCE
 "Language: ca\n"
 
+<<<<<<< TREE
 #: bin/widget/view/gantt_gtk/parser_dummy.py:30
 msgid "Gantt view not yet implemented !"
 msgstr "La vista de Gantt encara no està implementada!"
@@ -316,9 +322,419 @@
 # File: bin/openerp.glade, line: 7878
 #: bin/widget/view/form_gtk/image.py:112 bin/widget/view/form_gtk/url.py:118
 #: bin/modules/gui/main.py:1389 bin/openerp.glade:5817
+=======
+#
+# File: bin/plugins/__init__.py, line: 28
+# File: bin/plugins/__init__.py, line: 28
+#: bin/plugins/__init__.py:27
+msgid "Print Workflow"
+msgstr "Imprimeix flux de treball"
+
+#
+# File: bin/plugins/__init__.py, line: 29
+# File: bin/plugins/__init__.py, line: 29
+#: bin/plugins/__init__.py:28
+msgid "Print Workflow (with subflows)"
+msgstr "Imprimeix flux de treball (complet)"
+
+#
+# File: bin/plugins/__init__.py, line: 41
+# File: bin/plugins/__init__.py, line: 41
+#: bin/plugins/__init__.py:40
+msgid "No available plugin for this resource !"
+msgstr "No hi ha connectors disponibles per aquest registre!"
+
+#: bin/plugins/__init__.py:42
+msgid "Choose a Plugin"
+msgstr "Seleccioneu un connector"
+
+#: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
+msgid "Connection refused !"
+msgstr "Connexió rebutjada!"
+
+#
+# File: bin/modules/action/wizard.py, line: 183
+# File: bin/modules/action/wizard.py, line: 189
+# File: bin/modules/action/wizard.py, line: 191
+# File: bin/rpc.py, line: 187
+# File: bin/rpc.py, line: 189
+# File: bin/modules/action/wizard.py, line: 183
+# File: bin/modules/action/wizard.py, line: 189
+# File: bin/modules/action/wizard.py, line: 191
+# File: bin/rpc.py, line: 187
+# File: bin/rpc.py, line: 189
+#: bin/rpc.py:203 bin/rpc.py:205 bin/modules/action/wizard.py:162
+#: bin/modules/action/wizard.py:168 bin/modules/action/wizard.py:170
+#: bin/modules/gui/main.py:195 bin/modules/gui/main.py:201
+msgid "Application Error"
+msgstr "Error d'aplicació"
+
+#
+# File: bin/modules/action/wizard.py, line: 191
+# File: bin/rpc.py, line: 189
+# File: bin/modules/action/wizard.py, line: 191
+# File: bin/rpc.py, line: 189
+#: bin/rpc.py:205 bin/modules/action/wizard.py:170
+msgid "View details"
+msgstr "Veure detalls"
+
+#
+# File: bin/modules/action/main.py, line: 46
+# File: bin/modules/action/main.py, line: 46
+#: bin/modules/action/main.py:48
+msgid "Nothing to print!"
+msgstr "Res a imprimir!"
+
+#
+# File: bin/modules/action/main.py, line: 63
+# File: bin/modules/action/main.py, line: 63
+#: bin/modules/action/main.py:66
+msgid "Printing aborted, too long delay !"
+msgstr "Impressió cancel·lada, temps d'espera massa llarg!"
+
+#
+# File: bin/modules/action/main.py, line: 178
+# File: bin/modules/action/main.py, line: 178
+#: bin/modules/action/main.py:195
+msgid "Select your action"
+msgstr "Seleccioneu la vostra acció"
+
+#: bin/modules/gui/main.py:89 bin/modules/gui/main.py:341
+msgid "Could not connect to server !"
+msgstr "No s'ha pogut connectar amb el servidor!"
+
+#
+# File: bin/openerp.glade, line: 74
+# File: bin/openerp.glade, line: 8255
+# File: bin/openerp.glade, line: 8491
+# File: bin/openerp.glade, line: 8813
+# File: bin/openerp.glade, line: 9458
+# File: bin/openerp.glade, line: 74
+# File: bin/openerp.glade, line: 8255
+# File: bin/openerp.glade, line: 8491
+# File: bin/openerp.glade, line: 8813
+# File: bin/openerp.glade, line: 9458
+#: bin/modules/gui/main.py:93 bin/openerp.glade:72 bin/openerp.glade:6233
+#: bin/openerp.glade:6479 bin/openerp.glade:6802 bin/openerp.glade:7466
+msgid "Server:"
+msgstr "Servidor:"
+
+#: bin/modules/gui/main.py:104 bin/openerp.glade:98 bin/openerp.glade:6515
+#: bin/openerp.glade:6759 bin/openerp.glade:7058 bin/openerp.glade:7423
+msgid "Change"
+msgstr "Canvia"
+
+#
+# File: bin/openerp.glade, line: 8994
+# File: bin/openerp.glade, line: 8994
+#: bin/modules/gui/main.py:111
+msgid "Super Administrator Password:"
+msgstr "Contrasenya del super-administrador:"
+
+#: bin/modules/gui/main.py:193
+msgid "Bad Super Administrator Password"
+msgstr "Contrasenya del super administrador errònia"
+
+#: bin/modules/gui/main.py:217
+msgid "Migration Scripts"
+msgstr "Programes (scripts) de migració"
+
+#: bin/modules/gui/main.py:220
+msgid "Contract ID:"
+msgstr "ID del contracte:"
+
+#: bin/modules/gui/main.py:226
+msgid "Contract Password:"
+msgstr "Contrasenya del contracte:"
+
+#: bin/modules/gui/main.py:241
+msgid "You already have the latest version"
+msgstr "Ja teniu l'última versió."
+
+#: bin/modules/gui/main.py:246
+msgid "The following updates are available:"
+msgstr "Les següents actualitzacions estan disponibles:"
+
+#: bin/modules/gui/main.py:258
+msgid "You can now migrate your databases."
+msgstr "Ara podeu migrar les vostres bases de dades."
+
+#: bin/modules/gui/main.py:263
+msgid "Migrate Database"
+msgstr "Migra base de dades"
+
+#: bin/modules/gui/main.py:280
+msgid "Database"
+msgstr "Base de dades"
+
+#: bin/modules/gui/main.py:292
+msgid "Your database has been upgraded."
+msgstr "La vostra base de dades ha estat actualitzada."
+
+#: bin/modules/gui/main.py:294
+msgid "Your databases have been upgraded."
+msgstr "Les vostres bases de dades han estat actualitzades."
+
+#: bin/modules/gui/main.py:296
+msgid "You have not selected a database"
+msgstr "No heu seleccionat una base de dades"
+
+#
+# File: bin/modules/gui/main.py, line: 152
+# File: bin/modules/gui/main.py, line: 1142
+# File: bin/modules/gui/main.py, line: 152
+# File: bin/modules/gui/main.py, line: 1142
+#: bin/modules/gui/main.py:360
+msgid "No database found, you must create one !"
+msgstr "No s'ha trobat la base de dades, heu de crear una!"
+
+#
+# File: bin/modules/gui/main.py, line: 141
+# File: bin/modules/gui/main.py, line: 141
+#: bin/modules/gui/main.py:468
+msgid "Unknown"
+msgstr "Desconegut"
+
+#: bin/modules/gui/main.py:474
+#, python-format
+msgid ""
+"The versions of the server (%s) and the client (%s) missmatch. The client "
+"may not work properly. Use it at your own risks."
+msgstr ""
+"Les versions del servidor (%s) i del client (%s) no coincideixen. El client "
+"pot no funcionar correctament. Utilitzeu-lo sota la vostra responsabilitat."
+
+#
+# File: bin/modules/gui/main.py, line: 296
+# File: bin/modules/gui/main.py, line: 296
+#: bin/modules/gui/main.py:610
+msgid "Sorry,'"
+msgstr "Ho sento,'"
+
+#
+# File: bin/modules/gui/main.py, line: 296
+# File: bin/modules/gui/main.py, line: 299
+# File: bin/modules/gui/main.py, line: 296
+# File: bin/modules/gui/main.py, line: 299
+#: bin/modules/gui/main.py:610 bin/modules/gui/main.py:613
+msgid "Bad database name !"
+msgstr "Nom de base de dades incorrecte!"
+
+#: bin/modules/gui/main.py:613
+msgid ""
+"The database name must contain only normal characters or \"_\".\n"
+"You must avoid all accents, space or special characters."
+msgstr ""
+"El nom de la base de dades només pot estar format per lletres i números o "
+"\"_\".\n"
+"No es permet l'ús d'accents, caràcters especials o espais."
+
+#: bin/modules/gui/main.py:637 bin/modules/gui/main.py:650
+#: bin/modules/gui/main.py:652 bin/modules/gui/main.py:654
+msgid "Could not create database."
+msgstr "No s'ha pogut crear la base de dades."
+
+#
+# File: bin/modules/gui/main.py, line: 359
+# File: bin/modules/gui/main.py, line: 359
+#: bin/modules/gui/main.py:638 bin/modules/gui/main.py:650
+msgid "Database already exists !"
+msgstr "La base de dades ja existeix!"
+
+#
+# File: bin/modules/gui/main.py, line: 361
+# File: bin/modules/gui/main.py, line: 1044
+# File: bin/modules/gui/main.py, line: 1063
+# File: bin/modules/gui/main.py, line: 361
+# File: bin/modules/gui/main.py, line: 1044
+# File: bin/modules/gui/main.py, line: 1063
+#: bin/modules/gui/main.py:652 bin/modules/gui/main.py:1384
+#: bin/modules/gui/main.py:1404 bin/modules/gui/main.py:1509
+msgid "Bad database administrator password !"
+msgstr "Contrasenya de l'administrador de la base de dades incorrecta!"
+
+#
+# File: bin/modules/gui/main.py, line: 363
+# File: bin/modules/gui/main.py, line: 370
+# File: bin/modules/gui/main.py, line: 363
+# File: bin/modules/gui/main.py, line: 370
+#: bin/modules/gui/main.py:654 bin/modules/gui/main.py:661
+msgid "Error during database creation !"
+msgstr "Error durant la creació de la base de dades!"
+
+#: bin/modules/gui/main.py:661
+msgid ""
+"The server crashed during installation.\n"
+"We suggest you to drop this database."
+msgstr ""
+"El servidor ha fallat durant la instal·lació.\n"
+"Us recomanem que elimineu la base de dades."
+
+#
+# File: bin/modules/gui/main.py, line: 432
+# File: bin/modules/gui/main.py, line: 763
+# File: bin/modules/gui/main.py, line: 432
+# File: bin/modules/gui/main.py, line: 763
+#: bin/modules/gui/main.py:707 bin/modules/gui/main.py:1072
+msgid "Press Ctrl+O to login"
+msgstr "Premeu Ctrl+O per connectar-vos"
+
+#
+# File: bin/modules/gui/main.py, line: 605
+# File: bin/modules/gui/main.py, line: 605
+#: bin/modules/gui/main.py:881
+msgid "Edit"
+msgstr "Edita"
+
+#: bin/modules/gui/main.py:974
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: bin/modules/gui/main.py:976
+msgid "No Company"
+msgstr "Sense companyia"
+
+#: bin/modules/gui/main.py:989
+#, python-format
+msgid "%s request(s)"
+msgstr "%s sol·licitud(s)"
+
+#: bin/modules/gui/main.py:991
+msgid "No request"
+msgstr "No hi ha sol·licituds"
+
+#: bin/modules/gui/main.py:993
+#, python-format
+msgid " - %s request(s) sent"
+msgstr " - %s sol·licitud(s) enviat(s)"
+
+#: bin/modules/gui/main.py:1031
+msgid ""
+"Please double-check the database name or contact your administrator to "
+"verify the database status."
+msgstr ""
+"Comproveu el nom de la base de dades o poseu-vos en contacte amb el vostre "
+"administrador per comprovar l'estat de la base de dades."
+
+#: bin/modules/gui/main.py:1031
+msgid "Database cannot be accessed or does not exist"
+msgstr "La base de datos no puede ser accedida o no existe"
+
+#
+# File: bin/modules/gui/main.py, line: 734
+# File: bin/modules/gui/main.py, line: 734
+#: bin/modules/gui/main.py:1035
+msgid ""
+"Connection error !\n"
+"Unable to connect to the server !"
+msgstr ""
+"Error de connexió!\n"
+"Impossible connectar-se amb el servidor!"
+
+#: bin/modules/gui/main.py:1037
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password !"
+msgstr ""
+"Error d'identificació!\n"
+"Nom d'usuari o contrasenya errònia!"
+
+#: bin/modules/gui/main.py:1050
+#, python-format
+msgid "OpenERP - %s"
+msgstr "OpenERP - %s"
+
+#
+# File: bin/modules/gui/main.py, line: 761
+# File: bin/modules/gui/main.py, line: 761
+#: bin/modules/gui/main.py:1070
+msgid "Not logged !"
+msgstr "No connectat!"
+
+#
+# File: bin/openerp.glade, line: 8103
+# File: bin/openerp.glade, line: 8103
+#: bin/widget/view/form_gtk/one2many_list.py:52 bin/modules/gui/main.py:1079
+#: bin/openerp.glade:6081
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#
+# File: bin/modules/gui/main.py, line: 833
+# File: bin/modules/gui/main.py, line: 833
+#: bin/modules/gui/main.py:1153
+msgid ""
+"You can not log into the system !\n"
+"Ask the administrator to verify\n"
+"you have an action defined for your user."
+msgstr ""
+"No podeu entrar al sistema!\n"
+"Pregunteu a l'administrador que verifiqui\n"
+"que teniu una acció definida per al vostre usuari."
+
+#
+# File: bin/modules/gui/main.py, line: 865
+# File: bin/modules/gui/main.py, line: 872
+# File: bin/modules/gui/main.py, line: 865
+# File: bin/modules/gui/main.py, line: 872
+#: bin/modules/gui/main.py:1187 bin/modules/gui/main.py:1194
+msgid "Do you really want to quit ?"
+msgstr "Realment voleu sortir?"
+
+#
+# File: bin/modules/gui/main.py, line: 927
+# File: bin/modules/gui/main.py, line: 927
+#: bin/modules/gui/main.py:1263
+#, python-format
+msgid "Attachments (%d)"
+msgstr "Adjunts (%d)"
+
+#
+# File: bin/modules/gui/main.py, line: 940
+# File: bin/modules/gui/main.py, line: 940
+#: bin/modules/gui/main.py:1276
+msgid "Attachments"
+msgstr "Fitxers adjunts"
+
+#
+# File: bin/modules/gui/main.py, line: 1035
+# File: bin/modules/gui/main.py, line: 1035
+#: bin/modules/gui/main.py:1375
+msgid "Delete a database"
+msgstr "Elimina base de dades"
+
+#
+# File: bin/modules/gui/main.py, line: 1041
+# File: bin/modules/gui/main.py, line: 1041
+#: bin/modules/gui/main.py:1381
+msgid "Database dropped successfully !"
+msgstr "Base de dades eliminada!"
+
+#: bin/modules/gui/main.py:1384
+msgid "Could not drop database."
+msgstr "No s'ha pogut eliminar la base de dades."
+
+#: bin/modules/gui/main.py:1386
+msgid "Couldn't drop database"
+msgstr "No s'ha pogut eliminar la base de dades"
+
+#
+# File: bin/modules/gui/main.py, line: 1049
+# File: bin/widget/view/form_gtk/image.py, line: 110
+# File: bin/widget/view/form_gtk/url.py, line: 112
+# File: bin/openerp.glade, line: 7878
+# File: bin/modules/gui/main.py, line: 1049
+# File: bin/widget/view/form_gtk/image.py, line: 110
+# File: bin/widget/view/form_gtk/url.py, line: 112
+# File: bin/openerp.glade, line: 7878
+#: bin/widget/view/form_gtk/image.py:112 bin/widget/view/form_gtk/url.py:118
+#: bin/modules/gui/main.py:1389 bin/openerp.glade:5817
+>>>>>>> MERGE-SOURCE
 msgid "Open..."
 msgstr "Obre..."
 
+<<<<<<< TREE
 #: bin/widget/view/form_gtk/image.py:127
 msgid "There is no image to save as !"
 msgstr "No hi ha imatgee per desar!"
@@ -341,9 +757,76 @@
 #: bin/widget/view/form_gtk/image.py:129
 #: bin/widget/view/form_gtk/binary.py:167 bin/printer/printer.py:231
 #: bin/modules/gui/window/win_export.py:359 bin/modules/gui/main.py:1493
+=======
+#: bin/modules/gui/main.py:1401
+msgid "Database restored successfully !"
+msgstr "Base de dades recuperada correctament!"
+
+#: bin/modules/gui/main.py:1404
+msgid "Could not restore database."
+msgstr "No es pot recuperar la base de dades."
+
+#: bin/modules/gui/main.py:1406
+msgid "Couldn't restore database"
+msgstr "No es pot recuperar la base de dades"
+
+#: bin/modules/gui/main.py:1457
+msgid ""
+"Confirmation password does not match new password, operation cancelled!"
+msgstr ""
+"La contrasenya de confirmació no concorda amb la contrasenya nova, operació "
+"cancel·lada!"
+
+#
+# File: bin/modules/gui/main.py, line: 1100
+# File: bin/modules/gui/main.py, line: 1100
+#: bin/modules/gui/main.py:1459
+msgid "Validation Error."
+msgstr "Error de validació."
+
+#: bin/modules/gui/main.py:1476
+msgid "Could not change the Super Admin password."
+msgstr "No s'ha pogut canviar la contrasenya del super administrador."
+
+#: bin/modules/gui/main.py:1477 bin/modules/gui/main.py:1483
+msgid "Bad password provided !"
+msgstr "Heu introduït una contrasenya errònia!"
+
+#
+# File: bin/modules/gui/main.py, line: 1111
+# File: bin/modules/gui/main.py, line: 1111
+#: bin/modules/gui/main.py:1457
+msgid "Error, password not changed."
+msgstr "Error, contrasenya no s'ha canviat."
+
+#
+# File: bin/modules/gui/main.py, line: 1117
+# File: bin/modules/gui/main.py, line: 1134
+# File: bin/modules/gui/main.py, line: 1117
+# File: bin/modules/gui/main.py, line: 1134
+#: bin/modules/gui/main.py:1490 bin/modules/gui/main.py:1513
+msgid "Backup a database"
+msgstr "Còpia de seguretat de la base de dades"
+
+#
+# File: bin/modules/gui/main.py, line: 1120
+# File: bin/modules/gui/window/win_export.py, line: 282
+# File: bin/printer/printer.py, line: 207
+# File: bin/widget/view/form_gtk/binary.py, line: 162
+# File: bin/widget/view/form_gtk/image.py, line: 117
+# File: bin/modules/gui/main.py, line: 1120
+# File: bin/modules/gui/window/win_export.py, line: 282
+# File: bin/printer/printer.py, line: 207
+# File: bin/widget/view/form_gtk/binary.py, line: 162
+# File: bin/widget/view/form_gtk/image.py, line: 117
+#: bin/widget/view/form_gtk/image.py:129
+#: bin/widget/view/form_gtk/binary.py:167 bin/printer/printer.py:231
+#: bin/modules/gui/window/win_export.py:359 bin/modules/gui/main.py:1493
+>>>>>>> MERGE-SOURCE
 msgid "Save As..."
 msgstr "Desa com..."
 
+<<<<<<< TREE
 #: bin/widget/view/form_gtk/image.py:177
 msgid "Image corrupted"
 msgstr ""
@@ -495,13 +978,100 @@
 # File: bin/widget/view/form_gtk/one2many_list.py, line: 269
 #: bin/widget/view/form_gtk/one2many_list.py:279
 msgid "You have to select a resource !"
+=======
+#: bin/modules/gui/main.py:1506
+msgid "Database backed up successfully !"
+msgstr ""
+"S'ha realitzat la còpia de seguretat de la base de dades correctament!"
+
+#: bin/modules/gui/main.py:1509
+msgid "Could not backup the database."
+msgstr "No s'ha pogut realitzar la còpia de seguretat de la base de dades."
+
+#
+# File: bin/modules/gui/main.py, line: 1132
+# File: bin/modules/gui/main.py, line: 1132
+#: bin/modules/gui/main.py:1511
+msgid "Couldn't backup database."
+msgstr "No s'ha pogut crear la còpia de seguretat de la base de dades."
+
+#: bin/modules/gui/window/form.py:189
+msgid "Resource ID does not exist for this object!"
+msgstr "No existeix un recurs amb aquest ID per a aquest objecte!"
+
+#: bin/modules/gui/window/form.py:247
+msgid "No record selected ! You can only attach to existing record."
+msgstr ""
+"No heu seleccionat cap registre! Només podeu adjuntar al registre actual..."
+
+#
+# File: bin/modules/gui/window/form.py, line: 209
+# File: bin/modules/gui/window/form.py, line: 209
+#: bin/modules/gui/window/form.py:264
+msgid "You have to select a record !"
+>>>>>>> MERGE-SOURCE
 msgstr "Heu de seleccionar un registre!"
 
 #
-# File: bin/modules/gui/window/form.py, line: 233
-# File: bin/modules/gui/window/form.py, line: 233
-#: bin/widget/view/form_gtk/one2many_list.py:388
-#: bin/modules/gui/window/form.py:290
+<<<<<<< TREE
+# File: bin/modules/gui/window/form.py, line: 233
+# File: bin/modules/gui/window/form.py, line: 233
+#: bin/widget/view/form_gtk/one2many_list.py:388
+#: bin/modules/gui/window/form.py:290
+=======
+# File: bin/modules/gui/window/form.py, line: 215
+# File: bin/modules/gui/window/view_tree/view_tree_sc.py, line: 43
+# File: bin/modules/gui/window/form.py, line: 215
+# File: bin/modules/gui/window/view_tree/view_tree_sc.py, line: 43
+#: bin/modules/gui/window/form.py:270
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:41
+#: bin/modules/gui/window/win_export.py:213
+msgid "ID"
+msgstr "ID"
+
+#
+# File: bin/modules/gui/window/form.py, line: 216
+# File: bin/modules/gui/window/form.py, line: 216
+#: bin/modules/gui/window/form.py:271
+msgid "Creation User"
+msgstr "Creat per l'usuari"
+
+#: bin/modules/gui/window/form.py:272
+msgid "Creation Date"
+msgstr "Data de creació"
+
+#
+# File: bin/modules/gui/window/form.py, line: 218
+# File: bin/modules/gui/window/form.py, line: 218
+#: bin/modules/gui/window/form.py:273
+msgid "Latest Modification by"
+msgstr "Última modificació per"
+
+#: bin/modules/gui/window/form.py:274
+msgid "Latest Modification Date"
+msgstr "Data de l'última modificació"
+
+#: bin/modules/gui/window/form.py:275
+msgid "Internal Module Data ID"
+msgstr "ID de dades del mòdul intern"
+
+#
+# File: bin/modules/gui/window/form.py, line: 230
+# File: bin/modules/gui/window/form.py, line: 230
+#: bin/modules/gui/window/form.py:269
+msgid ""
+"Record is not saved ! \n"
+" Do You want to Clear Current Record ?"
+msgstr ""
+"El registre no s'ha desat! \n"
+" ¿Voleu recuperar el registre actual?"
+
+#
+# File: bin/modules/gui/window/form.py, line: 233
+# File: bin/modules/gui/window/form.py, line: 233
+#: bin/widget/view/form_gtk/one2many_list.py:388
+#: bin/modules/gui/window/form.py:290
+>>>>>>> MERGE-SOURCE
 msgid "Are you sure to remove this record ?"
 msgstr "¿Está segur d'eliminar aquest registre?"
 
@@ -514,6 +1084,7 @@
 msgstr "¿Está segur d'eliminar aquests registres?"
 
 #
+<<<<<<< TREE
 # File: bin/widget/view/form_gtk/parser.py, line: 61
 # File: bin/widget/view/form_gtk/parser.py, line: 61
 #: bin/widget/view/form_gtk/parser.py:61
@@ -533,8 +1104,179 @@
 # File: bin/modules/gui/window/form.py, line: 365
 #: bin/widget/view/form_gtk/parser.py:134 bin/modules/gui/window/form.py:365
 msgid "Input Error !"
+=======
+# File: bin/modules/gui/window/form.py, line: 239
+# File: bin/modules/gui/window/form.py, line: 239
+#: bin/modules/gui/window/form.py:296
+msgid "Resources cleared."
+msgstr "Registres buidats."
+
+#
+# File: bin/modules/gui/window/form.py, line: 241
+# File: bin/modules/gui/window/form.py, line: 241
+#: bin/modules/gui/window/form.py:298
+msgid "Resources successfully removed."
+msgstr "Registres eliminats correctament."
+
+#
+# File: bin/modules/gui/window/form.py, line: 273
+# File: bin/modules/gui/window/form.py, line: 273
+#: bin/modules/gui/window/form.py:339
+msgid "Working now on the duplicated document !"
+msgstr "Treballant en el registre duplicat!"
+
+#
+# File: bin/modules/gui/window/form.py, line: 281
+# File: bin/modules/gui/window/form.py, line: 281
+#: bin/modules/gui/window/form.py:355
+msgid "Document Saved."
+msgstr "Document desat."
+
+#
+# File: bin/modules/gui/window/form.py, line: 283
+# File: bin/widget/view/form_gtk/parser.py, line: 129
+# File: bin/modules/gui/window/form.py, line: 283
+# File: bin/widget/view/form_gtk/parser.py, line: 129
+#: bin/widget/view/list.py:584 bin/widget/view/list.py:585
+#: bin/widget/view/form_gtk/parser.py:135 bin/modules/gui/window/form.py:366
+msgid "Invalid form, correct red fields !"
+msgstr "Formulari invàlid, corregiu els camps en vermell!"
+
+#: bin/widget/view/list.py:584
+msgid "Error !"
+msgstr "Error!"
+
+#: bin/modules/gui/window/form.py:368
+msgid "Warning !"
+msgstr "Avís!"
+
+#
+# File: bin/modules/gui/window/form.py, line: 302
+# File: bin/modules/gui/window/form.py, line: 397
+# File: bin/modules/gui/window/form.py, line: 302
+# File: bin/modules/gui/window/form.py, line: 397
+#: bin/modules/gui/window/form.py:389 bin/modules/gui/window/form.py:497
+msgid ""
+"This record has been modified\n"
+"do you want to save it ?"
+msgstr ""
+"Aquest registre s'ha modificat.\n"
+"¿Voleu desar-lo?"
+
+#
+# File: bin/modules/gui/window/form.py, line: 349
+# File: bin/modules/gui/window/form.py, line: 349
+#: bin/modules/gui/window/form.py:447
+msgid "You must select one or several records !"
+msgstr "Heu de seleccionar un o varis registres!"
+
+#
+# File: bin/modules/gui/window/form.py, line: 358
+# File: bin/modules/gui/window/form.py, line: 358
+#: bin/modules/gui/window/form.py:456
+msgid "Print Screen"
+msgstr "Imprimeix pantalla"
+
+#: bin/modules/gui/window/form.py:476
+msgid "No record selected"
+msgstr "No heu seleccionat cap registre!"
+
+#
+# File: bin/modules/gui/window/form.py, line: 383
+# File: bin/modules/gui/window/form.py, line: 383
+#: bin/modules/gui/window/form.py:481
+msgid "New document"
+msgstr "Document nou"
+
+#
+# File: bin/modules/gui/window/form.py, line: 385
+# File: bin/modules/gui/window/form.py, line: 385
+#: bin/modules/gui/window/form.py:483
+msgid "Editing document (id: "
+msgstr "Editant document (id: "
+
+#
+# File: bin/modules/gui/window/form.py, line: 386
+# File: bin/modules/gui/window/form.py, line: 386
+#: bin/modules/gui/window/form.py:486
+msgid "Record: "
+msgstr "Registre: "
+
+#
+# File: bin/modules/gui/window/form.py, line: 387
+# File: bin/modules/gui/window/form.py, line: 387
+#: bin/modules/gui/window/form.py:487
+msgid " of "
+msgstr " de "
+
+#: bin/modules/gui/window/win_import.py:51
+msgid "The file is empty !"
+msgstr "El fitxer està buit!"
+
+#: bin/modules/gui/window/win_import.py:51
+msgid "Importation !"
+msgstr "Importació!"
+
+#
+# File: bin/modules/gui/window/win_import.py, line: 54
+# File: bin/modules/gui/window/win_import.py, line: 54
+#: bin/modules/gui/window/win_import.py:56
+msgid "XML-RPC error !"
+msgstr "Error XML-RPC!"
+
+#: bin/modules/gui/window/win_import.py:61
+msgid "Imported one object !"
+msgstr "Importat un objecte!"
+
+#
+# File: bin/modules/gui/window/win_import.py, line: 57
+# File: bin/modules/gui/window/win_import.py, line: 57
+#: bin/modules/gui/window/win_import.py:63
+#, python-format
+msgid "Imported %d objects !"
+msgstr "S'han importat %d objectes!"
+
+#: bin/modules/gui/window/win_import.py:68
+#, python-format
+msgid ""
+"Error trying to import this record:\n"
+"%s\n"
+"Error Message:\n"
+"%s\n"
+"\n"
+"%s"
+msgstr ""
+"Error al importar aquest registre:\n"
+"%s\n"
+"Missatge d'error:\n"
+"%s\n"
+"\n"
+"%s"
+
+#: bin/modules/gui/window/win_import.py:72
+msgid "Importation Error !"
+msgstr "Error d'importació!"
+
+#
+# File: bin/modules/gui/window/win_import.py, line: 93
+# File: bin/modules/gui/window/win_import.py, line: 97
+# File: bin/modules/gui/window/win_import.py, line: 93
+# File: bin/modules/gui/window/win_import.py, line: 97
+#: bin/modules/gui/window/win_import.py:105
+#: bin/modules/gui/window/win_import.py:109
+msgid "Field name"
+msgstr "Nom del camp"
+
+#: bin/modules/gui/window/win_import.py:181
+msgid "Error opening .CSV file"
+msgstr "Error obrint fitxer .CSV"
+
+#: bin/modules/gui/window/win_import.py:181
+msgid "Input Error."
+>>>>>>> MERGE-SOURCE
 msgstr "Error d'entrada."
 
+<<<<<<< TREE
 #: bin/widget/view/form_gtk/parser.py:308
 msgid "Field"
 msgstr "Camp"
@@ -773,6 +1515,206 @@
 # File: bin/options.py, line: 88
 # File: bin/options.py, line: 88
 #: bin/options.py:121
+=======
+#: bin/modules/gui/window/win_import.py:199
+#, python-format
+msgid "You cannot import this field %s, because we cannot auto-detect it"
+msgstr ""
+"No es pot importar aquest camp %s, perquè no es pot auto detectar-lo."
+
+#: bin/modules/gui/window/win_import.py:202
+#, python-format
+msgid ""
+"Error processing your first line of the file.\n"
+"Field %s is unknown !"
+msgstr ""
+"Error al processar la primera línia del fitxer.\n"
+"Camp %s desconegut!"
+
+#: bin/modules/gui/window/win_import.py:202
+msgid "Import Error."
+msgstr "Error d'importació."
+
+#: bin/modules/gui/window/win_import.py:233
+msgid "You have not selected any fields to import"
+msgstr "No heu seleccionat cap camp per importar"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Extension"
+msgstr "Extensió"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Application"
+msgstr "Aplicació"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Print Processor"
+msgstr "Procesador de impresión"
+
+#: bin/modules/gui/window/win_extension.py:114
+msgid "This extension is already defined"
+msgstr "Aquesta extensió ja està definida"
+
+#
+# File: bin/openerp.glade, line: 9826
+# File: bin/openerp.glade, line: 9826
+#: bin/modules/gui/window/win_extension.py:114 bin/openerp.glade:7642
+msgid "Extension Manager"
+msgstr "Gestor d'extensions"
+
+#
+# File: bin/modules/gui/window/win_selection.py, line: 52
+# File: bin/modules/gui/window/win_selection.py, line: 52
+#: bin/modules/gui/window/win_selection.py:51
+msgid "Name"
+msgstr "Nom"
+
+#
+# File: bin/modules/gui/window/win_selection.py, line: 56
+# File: bin/modules/gui/window/win_selection.py, line: 56
+#: bin/modules/gui/window/win_selection.py:55
+msgid "Ressource Name"
+msgstr "Nom registre"
+
+#
+# File: bin/modules/gui/window/win_selection.py, line: 56
+# File: bin/modules/gui/window/win_selection.py, line: 56
+#: bin/modules/gui/window/win_selection.py:55
+msgid "Names"
+msgstr "Noms"
+
+#
+# File: bin/modules/gui/window/__init__.py, line: 33
+# File: bin/modules/gui/window/__init__.py, line: 33
+#: bin/modules/gui/window/__init__.py:31
+msgid "Unknown Window"
+msgstr "Finestra desconeguda"
+
+#: bin/modules/gui/window/win_preference.py:68
+msgid "Preferences"
+msgstr "Preferències"
+
+#: bin/modules/gui/window/win_preference.py:86
+msgid ""
+"The default language of the interface has been modified, do not forget to "
+"restart the client to have the interface in your language"
+msgstr ""
+"L'idioma per defecte de la interfície ha estat modificat, no oblideu "
+"rearrancar el client per a tenir la interfície en el vostre idioma."
+
+#: bin/modules/gui/window/win_preference.py:88
+msgid "Default language modified !"
+msgstr "Idioma per defecte modificat!"
+
+#
+# File: bin/modules/gui/window/view_tree/parse.py, line: 36
+# File: bin/modules/gui/window/view_tree/parse.py, line: 36
+#: bin/modules/gui/window/view_tree/parse.py:35
+msgid "Tree"
+msgstr "Arbre"
+
+#
+# File: bin/modules/gui/window/view_tree/view_tree_sc.py, line: 49
+# File: bin/modules/gui/window/view_tree/view_tree_sc.py, line: 49
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:45
+msgid "Description"
+msgstr "Descripció"
+
+#
+# File: bin/modules/gui/window/tree.py, line: 190
+# File: bin/modules/gui/window/tree.py, line: 246
+# File: bin/modules/gui/window/tree.py, line: 190
+# File: bin/modules/gui/window/tree.py, line: 246
+#: bin/modules/gui/window/tree.py:205 bin/modules/gui/window/tree.py:261
+msgid "No resource selected!"
+msgstr "No heu seleccionat cap registre!"
+
+#
+# File: bin/modules/gui/window/tree.py, line: 204
+# File: bin/modules/gui/window/tree.py, line: 204
+#: bin/modules/gui/window/tree.py:219
+msgid ""
+"Are you sure you want\n"
+"to remove this record?"
+msgstr ""
+"¿Esteu segur\n"
+"d'eliminar aquest registre?"
+
+#
+# File: bin/modules/gui/window/tree.py, line: 209
+# File: bin/modules/gui/window/tree.py, line: 209
+#: bin/modules/gui/window/tree.py:224
+msgid "Error removing resource!"
+msgstr "Error eliminant el registre!"
+
+#: bin/modules/gui/window/tree.py:235
+msgid "Unable to chroot: no tree resource selected"
+msgstr "Impossible fer chroot: no heu seleccionat cap registre d'arbre"
+
+#
+# File: bin/modules/gui/window/win_export.py, line: 52
+# File: bin/modules/gui/window/win_export.py, line: 52
+#: bin/modules/gui/window/win_export.py:50
+msgid " record(s) saved !"
+msgstr " registre(s) desat(s)!"
+
+#
+# File: bin/modules/gui/window/win_export.py, line: 55
+# File: bin/modules/gui/window/win_export.py, line: 55
+#: bin/modules/gui/window/win_export.py:53
+msgid ""
+"Operation failed !\n"
+"I/O error"
+msgstr ""
+"L'operació ha fallat!\n"
+"Error Entrada/Sortida"
+
+#: bin/modules/gui/window/win_export.py:79
+#: bin/modules/gui/window/win_export.py:105
+msgid "Error Opening Excel !"
+msgstr "Error a l'obrir el fitxer Excel!"
+
+#: bin/modules/gui/window/win_export.py:317
+msgid "What is the name of this export ?"
+msgstr "Quin és el nom d'aquesta exportació?"
+
+#: bin/modules/gui/window/win_export.py:351
+msgid "Exportation Error !"
+msgstr "Error d'exportació!"
+
+#
+# File: bin/modules/gui/window/win_search.py, line: 50
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 51
+# File: bin/widget/view/form_gtk/many2one.py, line: 54
+# File: bin/modules/gui/window/win_search.py, line: 50
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 51
+# File: bin/widget/view/form_gtk/many2one.py, line: 54
+#: bin/widget/view/diagram_gtk/xdot.py:1772
+#: bin/modules/gui/window/win_search.py:49
+msgid "OpenERP - Link"
+msgstr "OpenERP - Enllaç"
+
+#
+# File: bin/modules/gui/window/win_search.py, line: 143
+# File: bin/modules/gui/window/win_search.py, line: 143
+#: bin/modules/gui/window/win_search.py:126
+#, python-format
+msgid "OpenERP Search: %s"
+msgstr "Cerca OpenERP: %s"
+
+#
+# File: bin/modules/gui/window/win_search.py, line: 144
+# File: bin/modules/gui/window/win_search.py, line: 144
+#: bin/modules/gui/window/win_search.py:127
+#, python-format
+msgid "OpenERP Search: %s (%%d result(s))"
+msgstr "Cerca OpenERP: %s (%%d resultat(s))"
+
+#
+# File: bin/options.py, line: 88
+# File: bin/options.py, line: 88
+#: bin/options.py:121
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "OpenERP Client %s"
 msgstr "Client d'OpenERP %s"
@@ -1057,6 +1999,7 @@
 #: bin/printer/printer.py:193
 #, python-format
 msgid ""
+<<<<<<< TREE
 "Error occurred while printing:\n"
 "%s"
 msgstr ""
@@ -1066,6 +2009,15 @@
 msgstr ""
 
 #: bin/printer/printer.py:212
+=======
+"Linux Automatic Printing not implemented.\n"
+"Use preview option !"
+msgstr ""
+"Impressió automàtica no implementada a Linux.\n"
+"Utilitzeu l'opció previsualitzar!"
+
+#: bin/printer/printer.py:212
+>>>>>>> MERGE-SOURCE
 msgid "Error! No Data found. Make sure you have enough data to print!"
 msgstr ""
 "Error! No s'han trobat dades. Assegureu-vos de tenir suficients dades per "
@@ -1079,16 +2031,83 @@
 msgstr "Error escrivint el fitxer!"
 
 #
-# File: bin/widget_search/form.py, line: 298
-# File: bin/widget_search/form.py, line: 298
-#: bin/widget_search/form.py:492
+<<<<<<< TREE
+# File: bin/widget_search/form.py, line: 298
+# File: bin/widget_search/form.py, line: 298
+#: bin/widget_search/form.py:492
+=======
+# File: bin/openerp-client.py, line: 128
+# File: bin/openerp-client.py, line: 128
+#: bin/openerp-client.py:142
+msgid "Closing OpenERP, KeyboardInterrupt"
+msgstr "Tancant OpenERP, interrupció del teclat"
+
+#
+# File: bin/widget_search/checkbox.py, line: 55
+# File: bin/widget_search/spinbutton.py, line: 69
+# File: bin/widget_search/spinint.py, line: 73
+# File: bin/widget_search/calendar.py, line: 106
+# File: bin/widget_search/char.py, line: 47
+# File: bin/widget_search/reference.py, line: 74
+# File: bin/widget_search/checkbox.py, line: 55
+# File: bin/widget_search/spinbutton.py, line: 69
+# File: bin/widget_search/spinint.py, line: 73
+# File: bin/widget_search/calendar.py, line: 106
+# File: bin/widget_search/char.py, line: 47
+# File: bin/widget_search/reference.py, line: 74
+#: bin/widget/view/form_gtk/button.py:47 bin/widget_search/char.py:72
+#: bin/widget_search/calendar.py:125 bin/widget_search/calendar.py:250
+#: bin/widget_search/filter.py:77 bin/widget_search/reference.py:78
+#: bin/widget_search/spinbutton.py:92 bin/widget_search/selection.py:116
+#: bin/widget_search/custom_filter.py:140 bin/widget_search/spinint.py:95
+#: bin/widget_search/checkbox.py:68
+msgid "The content of the widget or ValueError if not valid"
+msgstr "El contingut del camp o ValueError si no és vàlid"
+
+#
+# File: bin/widget_search/form.py, line: 298
+# File: bin/widget_search/form.py, line: 298
+#: bin/widget_search/form.py:492
+>>>>>>> MERGE-SOURCE
 msgid "The content of the form or exception if not valid"
 msgstr "El contingut del formulari o excepció si no és vàlid"
 
-#: bin/widget_search/char.py:45
+<<<<<<< TREE
+#: bin/widget_search/char.py:45
+=======
+#: bin/widget/view/form_gtk/date_widget.py:65
+#: bin/widget_search/date_widget.py:65
+msgid ""
+"You can use special operation by pressing +, - or =.  Plus/minus "
+"adds/decrease the variable to the current selected date. Equals set part of "
+"selected date. Available variables: 12h = 12 hours, 8d = 8 days, 4w = 4 "
+"weeks, 1m = 1 month, 2y = 2 years. Some examples:\n"
+"* +21d : adds 21 days to selected year\n"
+"* =23w : set date to the 23th week of the year\n"
+"* -4m : decrease 4 months to the current date\n"
+"You can also use \"=\" to set the date to the current date/time and '-' to "
+"clear the field."
+msgstr ""
+"Podeu utilitzar una operació especial prement +, - o =. Més/menys "
+"incrementa/decreix la variable a la data seleccionada actual. Igual fixa "
+"part de la data seleccionada. Variables disponibles: 12h =12 hores, 8d =8 "
+"dies, 4w =4 setmanes, 1m =1 mes, 2y =2 anys. Alguns exemples:\n"
+"* +21d : Incrementa 21 dies a la data actual\n"
+"* =23w : Fixa la data a la 23a setmana de l'any\n"
+"* -4m : Fa decréixer 4 mesos a la data actual\n"
+"Podeu utilitzar també ' = ' per fixar la data a l'actual data/hora i ' - ' "
+"per buidar el camp."
+
+#: bin/widget_search/wid_int.py:56
+msgid "The content of the widget or exception if not valid"
+msgstr "El contingut del widget o excepció si no és vàlid"
+
+#: bin/widget_search/char.py:45
+>>>>>>> MERGE-SOURCE
 msgid "Error: "
 msgstr "Error: "
 
+<<<<<<< TREE
 #: bin/widget_search/custom_filter_widgets.py:36
 #: bin/widget_search/custom_filter_widgets.py:63
 #: bin/widget_search/custom_filter_widgets.py:128
@@ -1150,6 +2169,54 @@
 #: bin/widget_search/custom_filter_widgets.py:40
 #: bin/widget_search/custom_filter_widgets.py:67
 #: bin/widget_search/custom_filter_widgets.py:98
+=======
+#
+# File: bin/widget_search/calendar.py, line: 51
+# File: bin/widget_search/calendar.py, line: 51
+#: bin/widget_search/calendar.py:49 bin/widget_search/calendar.py:177
+msgid "Start date"
+msgstr "Data inicial"
+
+#
+# File: bin/widget_search/calendar.py, line: 55
+# File: bin/widget_search/calendar.py, line: 74
+# File: bin/widget/view/form_gtk/calendar.py, line: 60
+# File: bin/widget/view/form_gtk/calendar.py, line: 163
+# File: bin/widget_search/calendar.py, line: 55
+# File: bin/widget_search/calendar.py, line: 74
+# File: bin/widget/view/form_gtk/calendar.py, line: 60
+# File: bin/widget/view/form_gtk/calendar.py, line: 163
+#: bin/widget/view/form_gtk/calendar.py:57
+#: bin/widget/view/form_gtk/calendar.py:184 bin/widget_search/calendar.py:53
+#: bin/widget_search/calendar.py:73 bin/widget_search/calendar.py:181
+#: bin/widget_search/calendar.py:201
+msgid "Open the calendar widget"
+msgstr "Obre el calendari"
+
+#
+# File: bin/widget_search/calendar.py, line: 70
+# File: bin/widget_search/calendar.py, line: 70
+#: bin/widget_search/calendar.py:69 bin/widget_search/calendar.py:197
+msgid "End date"
+msgstr "Data final"
+
+#
+# File: bin/widget_search/calendar.py, line: 109
+# File: bin/widget/view/form_gtk/calendar.py, line: 121
+# File: bin/widget/view/form_gtk/calendar.py, line: 241
+# File: bin/widget_search/calendar.py, line: 109
+# File: bin/widget/view/form_gtk/calendar.py, line: 121
+# File: bin/widget/view/form_gtk/calendar.py, line: 241
+#: bin/widget/view/form_gtk/calendar.py:135
+#: bin/widget/view/form_gtk/calendar.py:249 bin/widget_search/calendar.py:128
+#: bin/widget_search/calendar.py:267
+msgid "OpenERP - Date selection"
+msgstr "OpenERP - Selecció de data"
+
+#: bin/widget_search/custom_filter_widgets.py:40
+#: bin/widget_search/custom_filter_widgets.py:67
+#: bin/widget_search/custom_filter_widgets.py:98
+>>>>>>> MERGE-SOURCE
 msgid "contains"
 msgstr "conté"
 
@@ -1159,6 +2226,7 @@
 msgid "doesn't contain"
 msgstr "no conté"
 
+<<<<<<< TREE
 #: bin/widget_search/custom_filter_widgets.py:167
 msgid "Equals"
 msgstr ""
@@ -1191,6 +2259,10 @@
 
 #: bin/widget_search/custom_filter_widgets.py:290
 #: bin/widget_search/custom_filter_widgets.py:331
+=======
+#: bin/widget_search/custom_filter_widgets.py:290
+#: bin/widget_search/custom_filter_widgets.py:331
+>>>>>>> MERGE-SOURCE
 msgid "is equal to"
 msgstr "és igual a"
 
@@ -1209,6 +2281,7 @@
 msgid "less than"
 msgstr "menor que"
 
+<<<<<<< TREE
 #: bin/widget_search/custom_filter_widgets.py:294
 #: bin/widget_search/custom_filter_widgets.py:335
 msgid "greater than equal to"
@@ -1252,6 +2325,34 @@
 # File: bin/widget_search/checkbox.py, line: 49
 #: bin/widget_search/checkbox.py:35 bin/widget_search/checkbox.py:42
 #: bin/widget_search/checkbox.py:55
+=======
+#: bin/widget_search/custom_filter.py:62
+msgid "in"
+msgstr "és dins de"
+
+#: bin/widget_search/custom_filter.py:63
+msgid "not in"
+msgstr "no és dins de"
+
+#: bin/widget_search/custom_filter.py:82
+msgid ""
+"Enter Values separated by ',' if operator 'in' or 'not in' is chosen.\n"
+"For Date and DateTime Formats, specify text in '%Y-%m-%d' and '%Y-%m-%d "
+"%H:%M:%S' formats respectively."
+msgstr ""
+"Introduïu els valors separats per ',' si es selecciona l'operador 'està a 'o "
+"'no està a'.\n"
+"Per a formats de Data i DataHora, introduïu el text en format '%Y-%m-%d ' i "
+"'%Y-%m-%d %H:%M:%S' respectivament."
+
+#
+# File: bin/widget_search/checkbox.py, line: 36
+# File: bin/widget_search/checkbox.py, line: 49
+# File: bin/widget_search/checkbox.py, line: 36
+# File: bin/widget_search/checkbox.py, line: 49
+#: bin/widget_search/checkbox.py:35 bin/widget_search/checkbox.py:42
+#: bin/widget_search/checkbox.py:55
+>>>>>>> MERGE-SOURCE
 msgid "Yes"
 msgstr "Sí"
 
@@ -1262,11 +2363,559 @@
 msgid "No"
 msgstr "No"
 
+<<<<<<< TREE
 #: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
 msgid "Connection refused !"
 msgstr "Connexió rebutjada!"
 
 #: bin/rpc.py:158
+=======
+#
+# File: bin/widget/view/form.py, line: 153
+# File: bin/widget/view/form.py, line: 153
+#: bin/widget/view/form.py:137
+msgid "You must save this record to use the relate button !"
+msgstr "Heu de desar el registre per utilitzar aquest botó!"
+
+#: bin/widget/view/form.py:142
+msgid "Action not defined !"
+msgstr "Acció no definida!"
+
+#
+# File: bin/widget/view/form.py, line: 165
+# File: bin/widget/view/form.py, line: 165
+#: bin/widget/view/form.py:211
+msgid "You must select a record to use the relate button !"
+msgstr "Heu de seleccionar un registre per utilitzar aquest botó!"
+
+#
+# File: bin/widget/view/form.py, line: 183
+# File: bin/widget/view/form_gtk/parser.py, line: 490
+# File: bin/widget/view/form_gtk/parser.py, line: 647
+# File: bin/widget/view/form_gtk/parser.py, line: 704
+# File: bin/widget/view/form.py, line: 183
+# File: bin/widget/view/form_gtk/parser.py, line: 490
+# File: bin/widget/view/form_gtk/parser.py, line: 647
+# File: bin/widget/view/form_gtk/parser.py, line: 704
+#: bin/widget/view/form.py:238 bin/widget/view/form_gtk/parser.py:635
+#: bin/widget/view/form_gtk/parser.py:756
+#: bin/widget/view/form_gtk/parser.py:813
+msgid "No other language available!"
+msgstr "No hi ha altre idioma disponible!"
+
+#
+# File: bin/widget/view/form.py, line: 190
+# File: bin/widget/view/form_gtk/parser.py, line: 549
+# File: bin/widget/view/form_gtk/parser.py, line: 653
+# File: bin/widget/view/form_gtk/parser.py, line: 710
+# File: bin/widget/view/form.py, line: 190
+# File: bin/widget/view/form_gtk/parser.py, line: 549
+# File: bin/widget/view/form_gtk/parser.py, line: 653
+# File: bin/widget/view/form_gtk/parser.py, line: 710
+#: bin/widget/view/form.py:245 bin/widget/view/form_gtk/parser.py:647
+#: bin/widget/view/form_gtk/parser.py:762
+#: bin/widget/view/form_gtk/parser.py:819
+msgid "Add Translation"
+msgstr "Afegir traducció"
+
+#
+# File: bin/widget/view/form.py, line: 241
+# File: bin/widget/view/form_gtk/parser.py, line: 766
+# File: bin/widget/view/form.py, line: 241
+# File: bin/widget/view/form_gtk/parser.py, line: 766
+#: bin/widget/view/form.py:293 bin/widget/view/form_gtk/parser.py:875
+msgid "Translate label"
+msgstr "Tradueix etiqueta"
+
+#
+# File: bin/widget/view/calendar_gtk/parser.py, line: 244
+# File: bin/openerp.glade, line: 10237
+# File: bin/widget/view/calendar_gtk/parser.py, line: 244
+# File: bin/openerp.glade, line: 10237
+#: bin/widget/view/calendar_gtk/parser.py:355 bin/openerp.glade:8064
+msgid "Week"
+msgstr "Setmana"
+
+#
+# File: bin/widget/view/calendar_gtk/parser_dummy.py, line: 31
+# File: bin/widget/view/calendar_gtk/parser_dummy.py, line: 31
+#: bin/widget/view/calendar_gtk/parser_dummy.py:30
+msgid "Calendar View Error !"
+msgstr "Error vista calendari!"
+
+#: bin/widget/view/calendar_gtk/parser_dummy.py:31
+msgid "You must intall the library python-hippocanvas to use calendars."
+msgstr ""
+"Heu d'instal·lar la llibreria python-hippocanvas per utilitzar calendaris."
+
+#: bin/widget/view/screen_container.py:74
+msgid "--Actions--"
+msgstr "--Accions--"
+
+#: bin/widget/view/screen_container.py:73
+msgid "Save as a Shortcut"
+msgstr "Desa com accés directe"
+
+#: bin/widget/view/screen_container.py:74
+msgid "Save as a Filter"
+msgstr "Desa com filtre"
+
+#: bin/widget/view/screen_container.py:74
+msgid "Manage Filters"
+msgstr "Gestiona filtres"
+
+#: bin/widget/view/tree_gtk/parser.py:61
+msgid ""
+"You have unsaved record(s) !  \n"
+"\n"
+"Please Save them before sorting !"
+msgstr ""
+"Teniu registre(s) sense desar!  \n"
+"\n"
+"Deseu-los abans de l'ordenació!"
+
+#
+# File: bin/widget/view/tree_gtk/editabletree.py, line: 125
+# File: bin/widget/view/tree_gtk/editabletree.py, line: 125
+#: bin/widget/view/tree_gtk/editabletree.py:140
+#, python-format
+msgid "Shortcut: %s"
+msgstr "Drecera: %s"
+
+#
+# File: bin/widget/view/tree_gtk/editabletree.py, line: 125
+# File: bin/widget/view/tree_gtk/editabletree.py, line: 125
+#: bin/widget/view/tree_gtk/editabletree.py:140
+msgid "F1 New - F2 Open/Search"
+msgstr "F1 Nou - F2 Obre/Cerca"
+
+#
+# File: bin/widget/view/tree_gtk/editabletree.py, line: 190
+# File: bin/widget/view/tree_gtk/editabletree.py, line: 190
+#: bin/widget/view/tree_gtk/editabletree.py:215
+#, python-format
+msgid "Warning; field %s is required!"
+msgstr "Atenció, el camp %s és necessari!"
+
+#: bin/widget/view/tree_gtk/date_renderer.py:197
+msgid ""
+"Press <i>'+'</i>, <i>'-'</i> or <i>'='</i> for special date operations."
+msgstr ""
+"Pressioneu <i>'+'</i>, <i>'-'</i> o <i>'='</i> per operacions especials de "
+"data."
+
+#: bin/widget/view/widget_parse.py:53
+#, python-format
+msgid "This type (%s) is not supported by the GTK client !"
+msgstr "Aquest tipus (%s) no està suportat pel client GTK!"
+
+#: bin/widget/view/widget_parse.py:64
+msgid "No valid view found for this object!"
+msgstr "La vista no és vàlida per aquest objecte!"
+
+#
+# File: bin/widget/view/graph_gtk/parser.py, line: 65
+# File: bin/widget/view/graph_gtk/parser.py, line: 65
+#: bin/widget/view/graph_gtk/parser.py:64
+msgid "Can not generate graph !"
+msgstr "No s'ha pogut generar un gràfic!"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1422
+msgid "Dot Viewer"
+msgstr "Visor de punto"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1712
+msgid "Add New Node"
+msgstr "Afegeix un node"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1713
+msgid "Add New Edge"
+msgstr "Afegeix nova aresta"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1714
+msgid "Enlarge the Diagram"
+msgstr "Amplia el diagrama"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1715
+msgid "Shrink the Diagram"
+msgstr "Redueix el diagrama"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1716
+msgid "Fit the diagram to the window"
+msgstr "Ajusta el diagrama a la finestra"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1717
+msgid "Show the diagram at its normal size"
+msgstr "Mostra el diagrama a la seva mida original"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1718
+msgid "Print the Diagram"
+msgstr "Imprimeix el diagrama"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1789
+#, python-format
+msgid "Close Current %s"
+msgstr "Tanca actual %s"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1790
+#, python-format
+msgid "Delete Current %s"
+msgstr "Esborra actual %s"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1791
+#, python-format
+msgid "Edit Current %s"
+msgstr "Edita actual %s"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1875
+msgid " - Dot Viewer"
+msgstr " - Visor de punt"
+
+#
+# File: bin/widget/view/form_gtk/reference.py, line: 92
+# File: bin/openerp.glade, line: 1214
+# File: bin/widget/view/form_gtk/reference.py, line: 92
+# File: bin/openerp.glade, line: 1214
+#: bin/widget/view/form_gtk/reference.py:76 bin/openerp.glade:1258
+msgid "Create a new resource"
+msgstr "Crea un registre nou"
+
+#
+# File: bin/widget/view/form_gtk/reference.py, line: 93
+# File: bin/widget/view/form_gtk/reference.py, line: 93
+#: bin/widget/view/form_gtk/reference.py:89
+msgid "Search / Open a resource"
+msgstr "Cerca / Obre un registre"
+
+#
+# File: bin/widget/view/form_gtk/parser.py, line: 61
+# File: bin/widget/view/form_gtk/parser.py, line: 61
+#: bin/widget/view/form_gtk/parser.py:61
+msgid "Wrong icon for the button !"
+msgstr "Icona errònia pel botó!"
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Field"
+msgstr "Camp"
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Object"
+msgstr "Objecte"
+
+#: bin/widget/view/form_gtk/parser.py:619
+msgid "Enter some text to the related field before adding translations!"
+msgstr "Introduïu algun text al camp abans d'afegir traduccions!"
+
+#
+# File: bin/widget/view/form_gtk/parser.py, line: 480
+# File: bin/widget/view/form_gtk/parser.py, line: 480
+#: bin/widget/view/form_gtk/parser.py:626
+msgid "You need to save resource before adding translations!"
+msgstr "Heu de desar el registre abans d'afegir les traduccions!"
+
+#
+# File: bin/widget/view/form_gtk/parser.py, line: 772
+# File: bin/widget/view/form_gtk/parser.py, line: 772
+#: bin/widget/view/form_gtk/parser.py:880
+msgid "Translate view"
+msgstr "Tradueix vista"
+
+#: bin/widget/view/form_gtk/one2many_list.py:64
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: bin/widget/view/form_gtk/one2many_list.py:70
+msgid "Save & Close"
+msgstr "Desa i Tanca"
+
+#: bin/widget/view/form_gtk/one2many_list.py:75
+msgid "Save & New"
+msgstr "Desa i Nou"
+
+#
+# File: bin/widget/view/form_gtk/interface.py, line: 47
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 148
+# File: bin/widget/view/form_gtk/interface.py, line: 47
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 148
+#: bin/widget/view/form_gtk/one2many_list.py:164
+#: bin/widget/view/form_gtk/interface.py:48
+msgid "Set to default value"
+msgstr "Estableix com a valor predeterminat"
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 151
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 151
+#: bin/widget/view/form_gtk/one2many_list.py:167
+msgid "Set Default"
+msgstr "Estableix per omissió"
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 162
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 162
+#: bin/widget/view/form_gtk/one2many_list.py:196
+msgid "Create a new entry"
+msgstr "Crea una nova entrada"
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 172
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 172
+#: bin/widget/view/form_gtk/one2many_list.py:200
+msgid "Edit this entry"
+msgstr "Edita aquesta entrada"
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 182
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 182
+#: bin/widget/view/form_gtk/one2many_list.py:204
+msgid "Remove this entry"
+msgstr "Elimina aquesta entrada"
+
+#: bin/widget/view/form_gtk/many2many.py:84
+#: bin/widget/view/form_gtk/one2many_list.py:210
+msgid "Previous Page"
+msgstr "Pàgina anterior"
+
+#: bin/widget/view/form_gtk/many2many.py:88
+#: bin/widget/view/form_gtk/one2many_list.py:214
+msgid "Previous Record"
+msgstr "Registre anterior"
+
+#: bin/widget/view/form_gtk/many2many.py:96
+#: bin/widget/view/form_gtk/one2many_list.py:222
+msgid "Next Record"
+msgstr "Registro següent"
+
+#: bin/widget/view/form_gtk/many2many.py:100
+#: bin/widget/view/form_gtk/one2many_list.py:226
+msgid "Next Page"
+msgstr "Pàgina següent"
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 219
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 219
+#: bin/widget/view/form_gtk/one2many_list.py:232
+msgid "Switch"
+msgstr "Canvia"
+
+#: bin/widget/view/form_gtk/many2many.py:106
+#: bin/widget/view/form_gtk/one2many_list.py:238
+msgid "Choose Limit"
+msgstr "Selecciona límit"
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 269
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 269
+#: bin/widget/view/form_gtk/one2many_list.py:279
+msgid "You have to select a resource !"
+msgstr "Heu de seleccionar un registre!"
+
+#
+# File: bin/widget/view/form_gtk/image.py, line: 70
+# File: bin/widget/view/form_gtk/image.py, line: 70
+#: bin/widget/view/form_gtk/image.py:73
+msgid "Set Image"
+msgstr "Fixa imatge"
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 85
+# File: bin/widget/view/form_gtk/image.py, line: 79
+# File: bin/widget/view/form_gtk/binary.py, line: 85
+# File: bin/widget/view/form_gtk/image.py, line: 79
+#: bin/widget/view/form_gtk/image.py:82 bin/widget/view/form_gtk/binary.py:84
+msgid "Save As"
+msgstr "Desa com"
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 89
+# File: bin/widget/view/form_gtk/image.py, line: 88
+# File: bin/widget/view/form_gtk/binary.py, line: 89
+# File: bin/widget/view/form_gtk/image.py, line: 88
+#: bin/widget/view/form_gtk/image.py:93 bin/widget/view/form_gtk/binary.py:88
+msgid "Clear"
+msgstr "Neteja"
+
+#
+# File: bin/widget/view/form_gtk/image.py, line: 100
+# File: bin/widget/view/form_gtk/image.py, line: 100
+#: bin/widget/view/form_gtk/image.py:102
+msgid "All files"
+msgstr "Tots els fitxers"
+
+#
+# File: bin/widget/view/form_gtk/image.py, line: 104
+# File: bin/widget/view/form_gtk/image.py, line: 104
+#: bin/widget/view/form_gtk/image.py:106
+msgid "Images"
+msgstr "Imatges"
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "There is no image to save as !"
+msgstr "No hi ha imatgee per desar!"
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "Warning"
+msgstr "Avís"
+
+#: bin/widget/view/form_gtk/many2one.py:158 bin/widget/view/form_gtk/url.py:53
+msgid "Open this resource"
+msgstr "Obre aquest recurs"
+
+#
+#
+#: bin/widget/view/form_gtk/many2one.py:163
+#: bin/widget_search/custom_filter_widgets.py:87
+msgid "Search a resource"
+msgstr "Cerca un registre"
+
+#
+# File: bin/widget/view/form_gtk/many2one.py, line: 168
+# File: bin/openerp.glade, line: 1356
+# File: bin/widget/view/form_gtk/many2one.py, line: 168
+# File: bin/openerp.glade, line: 1356
+#: bin/widget/view/form_gtk/many2one.py:174 bin/openerp.glade:1412
+msgid "Action"
+msgstr "Acció"
+
+#
+# File: bin/widget/view/form_gtk/many2one.py, line: 169
+# File: bin/widget/view/form_gtk/many2one.py, line: 169
+#: bin/widget/view/form_gtk/many2one.py:175
+msgid "Report"
+msgstr "Informe"
+
+#
+# File: bin/widget/view/form_gtk/many2one.py, line: 369
+# File: bin/widget/view/list.py, line: 274
+# File: bin/widget/view/form_gtk/many2one.py, line: 369
+# File: bin/widget/view/list.py, line: 274
+#: bin/widget/view/list.py:633 bin/widget/view/form_gtk/many2one.py:387
+msgid "You must select a record to use the relation !"
+msgstr "Heu de seleccionar un registre per utilitzar aquesta relació!"
+
+#
+# File: bin/widget/view/form_gtk/interface.py, line: 48
+# File: bin/widget/view/form_gtk/interface.py, line: 48
+#: bin/widget/view/form_gtk/interface.py:49
+msgid "Set as default"
+msgstr "Estableix com a predeterminat"
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "You can not set to the default value here !"
+msgstr "No es pot establir el valor per defecte aquí!"
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "Operation not permited"
+msgstr "Operació no permesa"
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 77
+# File: bin/widget/view/form_gtk/binary.py, line: 77
+#: bin/widget/view/form_gtk/binary.py:76
+msgid "Select"
+msgstr "Selecciona"
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 81
+# File: bin/widget/view/form_gtk/binary.py, line: 81
+#: bin/widget/view/form_gtk/binary.py:80
+msgid "Open"
+msgstr "Obre"
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 114
+# File: bin/widget/view/form_gtk/binary.py, line: 158
+# File: bin/widget/view/form_gtk/binary.py, line: 114
+# File: bin/widget/view/form_gtk/binary.py, line: 158
+#: bin/widget/view/form_gtk/binary.py:119
+#: bin/widget/view/form_gtk/binary.py:163
+msgid "Unable to read the file data"
+msgstr "No és possible llegir el fitxer de dades"
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 124
+# File: bin/widget/view/form_gtk/binary.py, line: 150
+# File: bin/widget/view/form_gtk/binary.py, line: 124
+# File: bin/widget/view/form_gtk/binary.py, line: 150
+#: bin/widget/view/form_gtk/binary.py:129
+#: bin/widget/view/form_gtk/binary.py:155
+#, python-format
+msgid "Error reading the file: %s"
+msgstr "Error llegint el fitxer: %s"
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 133
+# File: bin/widget/view/form_gtk/binary.py, line: 133
+#: bin/widget/view/form_gtk/binary.py:138
+msgid "All Files"
+msgstr "Tots els fitxers"
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 143
+# File: bin/widget/view/form_gtk/binary.py, line: 143
+#: bin/widget/view/form_gtk/binary.py:148
+msgid "Select a file..."
+msgstr "Selecciona un fitxer..."
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 172
+# File: bin/widget/view/form_gtk/binary.py, line: 172
+#: bin/widget/view/form_gtk/binary.py:177
+#, python-format
+msgid "Error writing the file: %s"
+msgstr "Error escrivint el fitxer: %s"
+
+#
+# File: bin/widget/view/form_gtk/wid_common.py, line: 60
+# File: bin/widget/view/form_gtk/wid_common.py, line: 60
+#: bin/widget/view/form_gtk/wid_common.py:59
+msgid "Always applicable !"
+msgstr "Sempre aplicable!"
+
+#: bin/widget/view/form_gtk/calendar.py:99
+#: bin/widget/view/form_gtk/calendar.py:163
+msgid "Invalid date value! Year must be greater than 1899 !"
+msgstr "¡Valor de data erroni! L'any ha de ser més gran que 1899."
+
+#
+# File: bin/widget/view/form_gtk/calendar.py, line: 247
+# File: bin/widget/view/form_gtk/calendar.py, line: 247
+#: bin/widget/view/form_gtk/calendar.py:255 bin/widget_search/calendar.py:273
+msgid "Hour:"
+msgstr "Hora:"
+
+#
+# File: bin/widget/view/form_gtk/calendar.py, line: 250
+# File: bin/widget/view/form_gtk/calendar.py, line: 250
+#: bin/widget/view/form_gtk/calendar.py:258 bin/widget_search/calendar.py:276
+msgid "Minute:"
+msgstr "Minut:"
+
+#: bin/widget/view/form_gtk/calendar.py:291 bin/widget_search/calendar.py:312
+msgid "Invalid datetime value! Year must be greater than 1899 !"
+msgstr "¡Valor de data-hora erroni! L'any ha de ser més gran que 1899."
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:30
+msgid "Gantt view not yet implemented !"
+msgstr "La vista de Gantt encara no està implementada!"
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:31
+msgid ""
+"The gantt view is not available in this GTK Client, you should use the web "
+"interface or switch to the calendar view."
+msgstr ""
+"La vista de Gantt no està disponible en aquest client GTK. Hauríeu "
+"d'utilitzar el client web o canviar a la vista calendari."
+
+#: bin/widget/screen/screen.py:337
+msgid ""
+"(Any existing filter with the \n"
+"same name will be replaced)"
+msgstr ""
+"(Qualsevol filtre existent amb el \n"
+"mateix nom serà reemplaçat)"
+
+#: bin/rpc.py:158
+>>>>>>> MERGE-SOURCE
 msgid "Connection refused!"
 msgstr "Connexió rebutjada!"
 
@@ -2254,6 +3903,7 @@
 msgid "_Preferences"
 msgstr "_Preferències"
 
+<<<<<<< TREE
 #
 # File: bin/openerp.glade, line: 9299
 # File: bin/openerp.glade, line: 9299
@@ -2262,6 +3912,9 @@
 msgstr "Canvia contrasenya"
 
 #: bin/openerp.glade:496
+=======
+#: bin/openerp.glade:496
+>>>>>>> MERGE-SOURCE
 msgid "_Send a request"
 msgstr "Envia una sol·licitud"
 
@@ -3038,6 +4691,17 @@
 msgid "<b>Predefined Exports</b>"
 msgstr "<b>Exportacions predeterminades</b>"
 
+<<<<<<< TREE
+=======
+#: bin/openerp.glade:3134
+msgid "Import Compatible"
+msgstr "Importació compatible"
+
+#: bin/openerp.glade:2862
+msgid "<b>Select an Option to Export</b>"
+msgstr "<b>Seleccioneu una opció per exportar</b>"
+
+>>>>>>> MERGE-SOURCE
 #
 # File: bin/openerp.glade, line: 2776
 # File: bin/openerp.glade, line: 2776
@@ -3627,6 +5291,7 @@
 msgstr "R_es"
 
 #
+<<<<<<< TREE
 # File: bin/openerp.glade, line: 7833
 # File: bin/openerp.glade, line: 7833
 #: bin/openerp.glade:5772
@@ -3645,13 +5310,38 @@
 # File: bin/openerp.glade, line: 7778
 # File: bin/openerp.glade, line: 7778
 #: bin/openerp.glade:5852
+=======
+# File: bin/openerp.glade, line: 7778
+# File: bin/openerp.glade, line: 7778
+#: bin/openerp.glade:5852
+>>>>>>> MERGE-SOURCE
 msgid "Auto-Detect"
 msgstr "Auto-Detecció"
 
 #
-# File: bin/openerp.glade, line: 7942
-# File: bin/openerp.glade, line: 7942
-#: bin/openerp.glade:5930
+<<<<<<< TREE
+# File: bin/openerp.glade, line: 7942
+# File: bin/openerp.glade, line: 7942
+#: bin/openerp.glade:5930
+=======
+# File: bin/openerp.glade, line: 7833
+# File: bin/openerp.glade, line: 7833
+#: bin/openerp.glade:5772
+msgid "<b>Fields to import</b>"
+msgstr "<b>Camps a importar</b>"
+
+#
+# File: bin/openerp.glade, line: 7868
+# File: bin/openerp.glade, line: 7868
+#: bin/openerp.glade:5891
+msgid "File to Import:"
+msgstr "Fitxer a importar:"
+
+#
+# File: bin/openerp.glade, line: 7942
+# File: bin/openerp.glade, line: 7942
+#: bin/openerp.glade:5930
+>>>>>>> MERGE-SOURCE
 msgid "Lines to Skip:"
 msgstr "Línies omeses:"
 
@@ -3910,9 +5600,22 @@
 "demostració:"
 
 #
-# File: bin/openerp.glade, line: 9316
-# File: bin/openerp.glade, line: 9316
-#: bin/openerp.glade:7321
+<<<<<<< TREE
+# File: bin/openerp.glade, line: 9316
+# File: bin/openerp.glade, line: 9316
+#: bin/openerp.glade:7321
+=======
+# File: bin/openerp.glade, line: 9299
+# File: bin/openerp.glade, line: 9299
+#: bin/openerp.glade:483 bin/openerp.glade:7304
+msgid "Change password"
+msgstr "Canvia contrasenya"
+
+#
+# File: bin/openerp.glade, line: 9316
+# File: bin/openerp.glade, line: 9316
+#: bin/openerp.glade:7321
+>>>>>>> MERGE-SOURCE
 msgid "<b>Change your super admin password</b>"
 msgstr ""
 "<b>Canvieu la vostra contrasenya d'administrador de la base de dades</b>"
@@ -4024,7 +5727,35 @@
 msgid "Month"
 msgstr "Mes"
 
-#: bin/openerp.glade:8230
+<<<<<<< TREE
+#: bin/openerp.glade:8230
+=======
+#: bin/openerp.glade:8276
+msgid "Fields on which Search criteria to be applied"
+msgstr "Camps en els que s'aplicarà el criteri de cerca"
+
+#: bin/openerp.glade:8289
+msgid "Conditional Operators"
+msgstr "Operadors condicionals"
+
+#: bin/openerp.glade:8316
+msgid "The Choice will be applied with next filter if any"
+msgstr "S'aplicarà l'elecció amb el següent filtre si procedeix"
+
+#: bin/openerp.glade:8317
+msgid ""
+"AND\n"
+"OR"
+msgstr ""
+"AND\n"
+"OR"
+
+#: bin/openerp.glade:8330
+msgid "Remove Filter"
+msgstr "Suprimeix filtre"
+
+#: bin/openerp.glade:8230
+>>>>>>> MERGE-SOURCE
 msgid "Filter Entry"
 msgstr "Entrada del filtre"
 

=== modified file 'bin/po/cs.po'
--- bin/po/cs.po	2011-10-11 05:32:10 +0000
+++ bin/po/cs.po	2011-10-24 01:06:26 +0000
@@ -7,15 +7,26 @@
 msgstr ""
 "Project-Id-Version: openobject-client\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-07-28 15:22+0530\n"
 "PO-Revision-Date: 2011-09-07 12:00+0000\n"
 "Last-Translator: Jiří Hajda <robie@xxxxxxxxxx>\n"
+=======
+"POT-Creation-Date: 2010-12-13 18:11+0100\n"
+"PO-Revision-Date: 2011-06-22 03:21+0000\n"
+"Last-Translator: Jiří Hajda <robie@xxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Czech <cs@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-10-11 05:29+0000\n"
 "X-Generator: Launchpad (build 14123)\n"
+=======
+"X-Launchpad-Export-Date: 2011-09-15 05:09+0000\n"
+"X-Generator: Launchpad (build 13921)\n"
+>>>>>>> MERGE-SOURCE
 "Language: cs\n"
 
 #: bin/widget/view/gantt_gtk/parser_dummy.py:30
@@ -722,6 +733,7 @@
 msgid "Choose a Plugin"
 msgstr "Vyberte plugin"
 
+<<<<<<< TREE
 #: bin/printer/printer.py:184
 #, python-format
 msgid "Unable to handle %s filetype"
@@ -915,9 +927,13 @@
 msgstr "Ne"
 
 #: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
+=======
+#: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
+>>>>>>> MERGE-SOURCE
 msgid "Connection refused !"
 msgstr "Připojení odmítnuto!"
 
+<<<<<<< TREE
 #: bin/rpc.py:158
 msgid "Connection refused!"
 msgstr "Připojení odmítnuto!"
@@ -937,6 +953,11 @@
 #: bin/rpc.py:203 bin/rpc.py:205 bin/modules/action/wizard.py:162
 #: bin/modules/action/wizard.py:168 bin/modules/action/wizard.py:170
 #: bin/modules/gui/main.py:195 bin/modules/gui/main.py:201
+=======
+#: bin/rpc.py:203 bin/rpc.py:205 bin/modules/action/wizard.py:162
+#: bin/modules/action/wizard.py:168 bin/modules/action/wizard.py:170
+#: bin/modules/gui/main.py:195 bin/modules/gui/main.py:201
+>>>>>>> MERGE-SOURCE
 msgid "Application Error"
 msgstr "Chyba aplikace"
 
@@ -960,6 +981,7 @@
 msgid "Select your action"
 msgstr "Výběr akce"
 
+<<<<<<< TREE
 #: bin/modules/gui/window/win_extension.py:43
 msgid "Extension"
 msgstr "Rozšíření"
@@ -1278,6 +1300,9 @@
 msgstr "Chyba exportování !"
 
 #: bin/modules/gui/main.py:89 bin/modules/gui/main.py:341
+=======
+#: bin/modules/gui/main.py:89 bin/modules/gui/main.py:341
+>>>>>>> MERGE-SOURCE
 msgid "Could not connect to server !"
 msgstr "Nelze připojit na server!"
 
@@ -1410,7 +1435,15 @@
 msgid "Press Ctrl+O to login"
 msgstr "Přihlašte se přes Ctrl + O"
 
-#: bin/modules/gui/main.py:974
+<<<<<<< TREE
+#: bin/modules/gui/main.py:974
+=======
+#: bin/modules/gui/main.py:881
+msgid "Edit"
+msgstr "Úpravy"
+
+#: bin/modules/gui/main.py:974
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "%s"
 msgstr "%s"
@@ -1470,7 +1503,16 @@
 msgid "Not logged !"
 msgstr "Nepřihlášen!"
 
-#: bin/modules/gui/main.py:1153
+<<<<<<< TREE
+#: bin/modules/gui/main.py:1153
+=======
+#: bin/widget/view/form_gtk/one2many_list.py:52 bin/modules/gui/main.py:1079
+#: bin/openerp.glade:6081
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#: bin/modules/gui/main.py:1153
+>>>>>>> MERGE-SOURCE
 msgid ""
 "You can not log into the system !\n"
 "Ask the administrator to verify\n"
@@ -1509,7 +1551,16 @@
 msgid "Couldn't drop database"
 msgstr "Nelze zrušit databázi."
 
-#: bin/modules/gui/main.py:1401
+<<<<<<< TREE
+#: bin/modules/gui/main.py:1401
+=======
+#: bin/widget/view/form_gtk/image.py:112 bin/widget/view/form_gtk/url.py:118
+#: bin/modules/gui/main.py:1389 bin/openerp.glade:5817
+msgid "Open..."
+msgstr "Otevřít..."
+
+#: bin/modules/gui/main.py:1401
+>>>>>>> MERGE-SOURCE
 msgid "Database restored successfully !"
 msgstr "Databáze obnovena!"
 
@@ -1521,11 +1572,15 @@
 msgid "Couldn't restore database"
 msgstr "Databáze nelze obnovit!"
 
+<<<<<<< TREE
 #: bin/modules/gui/main.py:1442
 msgid "<b>Change your password</b>"
 msgstr ""
 
 #: bin/modules/gui/main.py:1457
+=======
+#: bin/modules/gui/main.py:1457
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Confirmation password does not match new password, operation cancelled!"
 msgstr "Hesla nesouhlasí, operace zrušena!"
@@ -1550,7 +1605,17 @@
 msgid "Backup a database"
 msgstr "Záloha databáze"
 
-#: bin/modules/gui/main.py:1506
+<<<<<<< TREE
+#: bin/modules/gui/main.py:1506
+=======
+#: bin/widget/view/form_gtk/image.py:129
+#: bin/widget/view/form_gtk/binary.py:167 bin/printer/printer.py:231
+#: bin/modules/gui/window/win_export.py:359 bin/modules/gui/main.py:1493
+msgid "Save As..."
+msgstr "Uloži jako..."
+
+#: bin/modules/gui/main.py:1506
+>>>>>>> MERGE-SOURCE
 msgid "Database backed up successfully !"
 msgstr "Databáze úspěšně zazálohována!"
 
@@ -1562,6 +1627,1052 @@
 msgid "Couldn't backup database."
 msgstr "Databázi nelze zazálohovat."
 
+<<<<<<< TREE
+=======
+#: bin/modules/gui/window/form.py:189
+msgid "Resource ID does not exist for this object!"
+msgstr "Pro tento objekt neexistuje ID zdroje!"
+
+#: bin/modules/gui/window/form.py:247
+msgid "No record selected ! You can only attach to existing record."
+msgstr "Nevybrán zdroj ! Můžete přiložit pouze k existujícímu zdroji."
+
+#: bin/modules/gui/window/form.py:264
+msgid "You have to select a record !"
+msgstr "Musíte vybrat záznam!"
+
+#: bin/modules/gui/window/form.py:270
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:41
+#: bin/modules/gui/window/win_export.py:213
+msgid "ID"
+msgstr "ID"
+
+#: bin/modules/gui/window/form.py:271
+msgid "Creation User"
+msgstr "Vytvořil"
+
+#: bin/modules/gui/window/form.py:272
+msgid "Creation Date"
+msgstr "Vytvořeno"
+
+#: bin/modules/gui/window/form.py:273
+msgid "Latest Modification by"
+msgstr "Změnil"
+
+#: bin/modules/gui/window/form.py:274
+msgid "Latest Modification Date"
+msgstr "Naposledy změneno"
+
+#: bin/modules/gui/window/form.py:275
+msgid "Internal Module Data ID"
+msgstr "ID vnitřního datového modulu"
+
+#: bin/modules/gui/window/form.py:269
+msgid ""
+"Record is not saved ! \n"
+" Do You want to Clear Current Record ?"
+msgstr ""
+"Záznam nebyl uložen! \n"
+" Chcete smazat aktuální záznam?"
+
+#: bin/widget/view/form_gtk/one2many_list.py:388
+#: bin/modules/gui/window/form.py:290
+msgid "Are you sure to remove this record ?"
+msgstr "Opravdu smazat záznam?"
+
+#: bin/widget/view/form_gtk/one2many_list.py:390
+#: bin/modules/gui/window/form.py:292
+msgid "Are you sure to remove those records ?"
+msgstr "Opravdu smazat záznamy?"
+
+#: bin/modules/gui/window/form.py:296
+msgid "Resources cleared."
+msgstr "Zdroj vymazán."
+
+#: bin/modules/gui/window/form.py:298
+msgid "Resources successfully removed."
+msgstr "Zdroj úspěšně odstraněn."
+
+#: bin/modules/gui/window/form.py:339
+msgid "Working now on the duplicated document !"
+msgstr "Nyní pracujete na zdvojeném dokumentu !"
+
+#: bin/modules/gui/window/form.py:355
+msgid "Document Saved."
+msgstr "Dokument uložen-"
+
+#: bin/widget/view/list.py:584 bin/widget/view/list.py:585
+#: bin/widget/view/form_gtk/parser.py:135 bin/modules/gui/window/form.py:366
+msgid "Invalid form, correct red fields !"
+msgstr "Chyba ve formuláři, opravte červená pole!!"
+
+#: bin/widget/view/list.py:584
+msgid "Error !"
+msgstr "Chyba !"
+
+#: bin/modules/gui/window/form.py:368
+msgid "Warning !"
+msgstr "Varovnání !"
+
+#: bin/modules/gui/window/form.py:389 bin/modules/gui/window/form.py:497
+msgid ""
+"This record has been modified\n"
+"do you want to save it ?"
+msgstr ""
+"Záznam byl změněn, \n"
+"uložit změny?"
+
+#: bin/modules/gui/window/form.py:447
+msgid "You must select one or several records !"
+msgstr "Musíte vybrat jeden, nebo více záznamů!"
+
+#: bin/modules/gui/window/form.py:456
+msgid "Print Screen"
+msgstr "Vytisknout"
+
+#: bin/modules/gui/window/form.py:476
+msgid "No record selected"
+msgstr "Nevybrán žádný záznam"
+
+#: bin/modules/gui/window/form.py:481
+msgid "New document"
+msgstr "Npvý dokument"
+
+#: bin/modules/gui/window/form.py:483
+msgid "Editing document (id: "
+msgstr "Editovat dokument (id: "
+
+#: bin/modules/gui/window/form.py:486
+msgid "Record: "
+msgstr "Záznam: "
+
+#: bin/modules/gui/window/form.py:487
+msgid " of "
+msgstr " z "
+
+#: bin/modules/gui/window/win_import.py:51
+msgid "The file is empty !"
+msgstr "Soubor je prázdný !"
+
+#: bin/modules/gui/window/win_import.py:51
+msgid "Importation !"
+msgstr "Importování !"
+
+#: bin/modules/gui/window/win_import.py:56
+msgid "XML-RPC error !"
+msgstr "Chyba XML-RPC !"
+
+#: bin/modules/gui/window/win_import.py:61
+msgid "Imported one object !"
+msgstr "Importován jeden objekt !"
+
+#: bin/modules/gui/window/win_import.py:63
+#, python-format
+msgid "Imported %d objects !"
+msgstr "Imporotováno %d objektů !"
+
+#: bin/modules/gui/window/win_import.py:68
+#, python-format
+msgid ""
+"Error trying to import this record:\n"
+"%s\n"
+"Error Message:\n"
+"%s\n"
+"\n"
+"%s"
+msgstr ""
+"Chyba pokusu o import tohoto záznamu:\n"
+"%s\n"
+"Chybová zpráva:\n"
+"%s\n"
+"\n"
+"%s"
+
+#: bin/modules/gui/window/win_import.py:72
+msgid "Importation Error !"
+msgstr "Chyba importování !"
+
+#: bin/modules/gui/window/win_import.py:105
+#: bin/modules/gui/window/win_import.py:109
+msgid "Field name"
+msgstr "Název pole"
+
+#: bin/modules/gui/window/win_import.py:181
+msgid "Error opening .CSV file"
+msgstr "Chyba otvírání souboru .CSV"
+
+#: bin/modules/gui/window/win_import.py:181
+msgid "Input Error."
+msgstr "Chyba vstupu."
+
+#: bin/modules/gui/window/win_import.py:199
+#, python-format
+msgid "You cannot import this field %s, because we cannot auto-detect it"
+msgstr ""
+"Nemůžete importovat toto pole %s, protože jej nemůžeme automaticky rozpoznat"
+
+#: bin/modules/gui/window/win_import.py:202
+#, python-format
+msgid ""
+"Error processing your first line of the file.\n"
+"Field %s is unknown !"
+msgstr ""
+"Chyba zpracování vašeho prvního řádku souboru.\n"
+"Neznámé pole %s !"
+
+#: bin/modules/gui/window/win_import.py:202
+msgid "Import Error."
+msgstr "Chyba importu."
+
+#: bin/modules/gui/window/win_import.py:233
+msgid "You have not selected any fields to import"
+msgstr "Nevybrali jste žádné pole k importu"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Extension"
+msgstr "Rozšíření"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Application"
+msgstr "Aplikace"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Print Processor"
+msgstr "Tiskový procesor"
+
+#: bin/modules/gui/window/win_extension.py:114
+msgid "This extension is already defined"
+msgstr "Přípona již definována."
+
+#: bin/modules/gui/window/win_extension.py:114 bin/openerp.glade:7642
+msgid "Extension Manager"
+msgstr "Správce rozšíření"
+
+#: bin/modules/gui/window/win_selection.py:51
+msgid "Name"
+msgstr "Název"
+
+#: bin/modules/gui/window/win_selection.py:55
+msgid "Ressource Name"
+msgstr "Název zdroje"
+
+#: bin/modules/gui/window/win_selection.py:55
+msgid "Names"
+msgstr "Názvy"
+
+#: bin/modules/gui/window/__init__.py:31
+msgid "Unknown Window"
+msgstr "Neznámé okno"
+
+#: bin/modules/gui/window/win_preference.py:68
+msgid "Preferences"
+msgstr "Předvolby"
+
+#: bin/modules/gui/window/win_preference.py:86
+msgid ""
+"The default language of the interface has been modified, do not forget to "
+"restart the client to have the interface in your language"
+msgstr ""
+"Byl upraven výchozí jazyk rozhraní. Nezapomeňtě restartovat klienta, aby "
+"bylo rozhraní ve vašem jazyku."
+
+#: bin/modules/gui/window/win_preference.py:88
+msgid "Default language modified !"
+msgstr "Upraven výchozí jazyk !"
+
+#: bin/modules/gui/window/view_tree/parse.py:35
+msgid "Tree"
+msgstr "Strom"
+
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:45
+msgid "Description"
+msgstr "Popis"
+
+#: bin/modules/gui/window/tree.py:205 bin/modules/gui/window/tree.py:261
+msgid "No resource selected!"
+msgstr "Nevybrán žádný zdroj!"
+
+#: bin/modules/gui/window/tree.py:219
+msgid ""
+"Are you sure you want\n"
+"to remove this record?"
+msgstr ""
+"Určitě chcete\n"
+"smazat záznam?"
+
+#: bin/modules/gui/window/tree.py:224
+msgid "Error removing resource!"
+msgstr "Chyba odstranění zdroje!"
+
+#: bin/modules/gui/window/tree.py:235
+msgid "Unable to chroot: no tree resource selected"
+msgstr "Nelze chroot: nevybrán stromový zdroj"
+
+#: bin/modules/gui/window/win_export.py:50
+msgid " record(s) saved !"
+msgstr " záznam uložen!"
+
+#: bin/modules/gui/window/win_export.py:53
+msgid ""
+"Operation failed !\n"
+"I/O error"
+msgstr ""
+"Operace selhala!\n"
+"I/O chyba"
+
+#: bin/modules/gui/window/win_export.py:79
+#: bin/modules/gui/window/win_export.py:105
+msgid "Error Opening Excel !"
+msgstr "Chyba při otevírání Excel!"
+
+#: bin/modules/gui/window/win_export.py:317
+msgid "What is the name of this export ?"
+msgstr "Jaké je jméno tohoto exportu ?"
+
+#: bin/modules/gui/window/win_export.py:351
+msgid "Exportation Error !"
+msgstr "Chyba exportování !"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1772
+#: bin/modules/gui/window/win_search.py:49
+msgid "OpenERP - Link"
+msgstr "OpenERP - odkaz"
+
+#: bin/modules/gui/window/win_search.py:126
+#, python-format
+msgid "OpenERP Search: %s"
+msgstr "Vyhledávání OpenERP: %s"
+
+#: bin/modules/gui/window/win_search.py:127
+#, python-format
+msgid "OpenERP Search: %s (%%d result(s))"
+msgstr "Vyhledávání OpenERP: %s (%%d výsledky)"
+
+#: bin/options.py:121
+#, python-format
+msgid "OpenERP Client %s"
+msgstr "OpenERP klient %s"
+
+#: bin/options.py:122
+msgid "specify alternate config file"
+msgstr "určete náhradní konfigurační soubor"
+
+#: bin/options.py:123
+msgid "Enable basic debugging. Alias for '--log-level=debug'"
+msgstr "Povolení základního ladění. Zástupce za '--log-level=debug'"
+
+#: bin/options.py:124
+#, python-format
+msgid "specify the log level: %s"
+msgstr "určete úroveň záznamu: %s"
+
+#: bin/options.py:125
+msgid "specify the user login"
+msgstr "zadejte přihlašovací jméno"
+
+#: bin/options.py:126
+msgid "specify the server port"
+msgstr "zadejte port serveru"
+
+#: bin/options.py:127
+msgid "specify the server ip/name"
+msgstr "zadejte jméno/ip serveru"
+
+#: bin/common/common.py:89
+msgid "Close current tip"
+msgstr "Zavřít aktuální tip"
+
+#: bin/common/common.py:90
+msgid ""
+"<span foreground=\"darkred\"><b>Close Current Tip:</b></span>\n"
+"This will hide the current tip. It will be displayed again next time you "
+"open this menu item, unless you disable all tips using the <b>'Menu "
+"Tips'</b> option in the user preferences."
+msgstr ""
+"<span foreground=\"darkred\"><b>Zavřít aktuální tip:</b></span>\n"
+"Tímto skryjete aktuální tip. Toto bude zobrazeno příště až otevřete tuto "
+"položku nabídky, pokud nezakážete všechny tipy pomocí volby <b>'Nabídky "
+"tipy'</b> v uživatelských předvolbách."
+
+#: bin/common/common.py:100
+msgid "Disable all tips"
+msgstr "Zakázat všechny tipy"
+
+#: bin/common/common.py:101
+msgid ""
+"<span foreground=\"darkred\"><b>Disable all tips:</b></span>\n"
+"This will disable the display of tips on all menu items.\n"
+"To re-enable tips you need to check the <b>'Menu Tips'</b> option in the "
+"user preferences."
+msgstr ""
+"<span foreground=\"darkred\"><b>Zakázat všechny tipy:</b></span>\n"
+"Tímto zakážete zobrazení tipů ve všech položkách nabídky.\n"
+"K znovupovlení tipů musíte zaškrtnout volbu <b>'Nabídka tipy'</b> v "
+"uživatelských předvolbách."
+
+#: bin/common/common.py:115 bin/common/common.py:117
+msgid "Tips"
+msgstr "Tipy"
+
+#: bin/common/common.py:168
+msgid "OpenERP Computing"
+msgstr "OperERP počítá"
+
+#: bin/common/common.py:187
+msgid "Operation in progress"
+msgstr "Zpracovávám"
+
+#: bin/common/common.py:191
+msgid ""
+"Please wait,\n"
+"this operation may take a while..."
+msgstr ""
+"Chvíli strpení,\n"
+"tato operace může chvíli trvat...."
+
+#: bin/common/common.py:225
+#, python-format
+msgid "Ensure that the file %s is correct"
+msgstr "Ujistěte se, že soubor %s je správný."
+
+#: bin/common/common.py:399
+msgid " has reported the following bug:\n"
+msgstr " nahlásil následující chybu:\n"
+
+#: bin/common/common.py:399
+msgid "remarks"
+msgstr "poznámky"
+
+#: bin/common/common.py:402
+msgid "Support request sent !"
+msgstr "Požadavek o podporu odeslán!"
+
+#: bin/common/common.py:425 bin/common/common.py:469
+msgid ""
+"\n"
+"<b>An unknown error has been reported.</b>\n"
+"\n"
+"<b>You do not have a valid OpenERP publisher warranty contract !</b>\n"
+"If you are using OpenERP in production, it is highly suggested to subscribe\n"
+"a publisher warranty program.\n"
+"\n"
+"The OpenERP publisher warranty contract provides you a bugfix guarantee and "
+"an\n"
+"automatic migration system so that we can fix your problems within a few\n"
+"hours. If you had a publisher warranty contract, this error would have been "
+"sent\n"
+"to the quality team of the OpenERP editor.\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"
+"\n"
+"You can use the link bellow for more information. The detail of the error\n"
+"is displayed on the second tab.\n"
+msgstr ""
+
+#: bin/common/common.py:448
+#, python-format
+msgid ""
+"\n"
+"<b>An unknown error has been reported.</b>\n"
+"\n"
+"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:\n"
+"%s\n"
+"\n"
+"You can use the link bellow for more information. The detail of the error\n"
+"is displayed on the second tab."
+msgstr ""
+
+#: bin/common/common.py:525
+msgid ""
+"Your problem has been sent to the quality team !\n"
+"We will recontact you after analysing the problem."
+msgstr ""
+"Chyba byla odeslána podpurným týmům!\n"
+"Po vyřešení budete kontaktování."
+
+#: bin/common/common.py:528
+#, python-format
+msgid ""
+"Your problem could *NOT* be sent to the quality team !\n"
+"Please report this error manually at:\n"
+"\t%s"
+msgstr ""
+"Váš problém *NE*lze odeslat týmu kvality !\n"
+"Prosíme nahlašte tuto chybu ručně na:\n"
+"\t%s"
+
+#: bin/common/common.py:528
+msgid "Error"
+msgstr "Chyba"
+
+#: bin/common/common.py:682
+msgid "Open with..."
+msgstr "Otevřít s..."
+
+#: bin/translate.py:183
+#, python-format
+msgid "Unable to set locale %s: %s"
+msgstr "Nelze nastavit národní nastavení %s: %s"
+
+#: bin/printer/printer.py:184
+#, python-format
+msgid "Unable to handle %s filetype"
+msgstr "Nelze zpracovat typ souboru %s"
+
+#: bin/printer/printer.py:189
+msgid ""
+"Linux Automatic Printing not implemented.\n"
+"Use preview option !"
+msgstr ""
+"Automatický tisk na Linuxu není realizován.\n"
+"Použijte volbu náhled !"
+
+#: bin/printer/printer.py:212
+msgid "Error! No Data found. Make sure you have enough data to print!"
+msgstr ""
+"Chyba! Data nenalezena. Ujistěte se, že máte dostatek dat k vytištění!"
+
+#: bin/printer/printer.py:239
+msgid "Error writing the file!"
+msgstr "Chyba při zápisu souboru!"
+
+#: bin/openerp-client.py:142
+msgid "Closing OpenERP, KeyboardInterrupt"
+msgstr "Ukončování OpenERP, KeyboardInterrupt"
+
+#: bin/widget/view/form_gtk/button.py:47 bin/widget_search/char.py:72
+#: bin/widget_search/calendar.py:125 bin/widget_search/calendar.py:250
+#: bin/widget_search/filter.py:77 bin/widget_search/reference.py:78
+#: bin/widget_search/spinbutton.py:92 bin/widget_search/selection.py:116
+#: bin/widget_search/custom_filter.py:140 bin/widget_search/spinint.py:95
+#: bin/widget_search/checkbox.py:68
+msgid "The content of the widget or ValueError if not valid"
+msgstr "Obsah pomůcky nebo ValueError pokud nejsou platné"
+
+#: bin/widget_search/form.py:492
+msgid "The content of the form or exception if not valid"
+msgstr "Obsah formuláře nebo výjimka pokud je neplatný"
+
+#: bin/widget/view/form_gtk/date_widget.py:65
+#: bin/widget_search/date_widget.py:65
+msgid ""
+"You can use special operation by pressing +, - or =.  Plus/minus "
+"adds/decrease the variable to the current selected date. Equals set part of "
+"selected date. Available variables: 12h = 12 hours, 8d = 8 days, 4w = 4 "
+"weeks, 1m = 1 month, 2y = 2 years. Some examples:\n"
+"* +21d : adds 21 days to selected year\n"
+"* =23w : set date to the 23th week of the year\n"
+"* -4m : decrease 4 months to the current date\n"
+"You can also use \"=\" to set the date to the current date/time and '-' to "
+"clear the field."
+msgstr ""
+
+#: bin/widget_search/wid_int.py:56
+msgid "The content of the widget or exception if not valid"
+msgstr "Obsah pomůcky nebo výjimky pokud nejsou platné"
+
+#: bin/widget_search/char.py:45
+msgid "Error: "
+msgstr "Chyba: "
+
+#: bin/widget_search/calendar.py:49 bin/widget_search/calendar.py:177
+msgid "Start date"
+msgstr "Počáteční datum"
+
+#: bin/widget/view/form_gtk/calendar.py:57
+#: bin/widget/view/form_gtk/calendar.py:184 bin/widget_search/calendar.py:53
+#: bin/widget_search/calendar.py:73 bin/widget_search/calendar.py:181
+#: bin/widget_search/calendar.py:201
+msgid "Open the calendar widget"
+msgstr "Otevřít kalendář"
+
+#: bin/widget_search/calendar.py:69 bin/widget_search/calendar.py:197
+msgid "End date"
+msgstr "Konečné datum"
+
+#: bin/widget/view/form_gtk/calendar.py:135
+#: bin/widget/view/form_gtk/calendar.py:249 bin/widget_search/calendar.py:128
+#: bin/widget_search/calendar.py:267
+msgid "OpenERP - Date selection"
+msgstr "OpenERP - Výběr data"
+
+#: bin/widget_search/custom_filter_widgets.py:40
+#: bin/widget_search/custom_filter_widgets.py:67
+#: bin/widget_search/custom_filter_widgets.py:98
+msgid "contains"
+msgstr "obsahuje"
+
+#: bin/widget_search/custom_filter_widgets.py:41
+#: bin/widget_search/custom_filter_widgets.py:68
+#: bin/widget_search/custom_filter_widgets.py:98
+msgid "doesn't contain"
+msgstr "neobsahuje"
+
+#: bin/widget_search/custom_filter_widgets.py:290
+#: bin/widget_search/custom_filter_widgets.py:331
+msgid "is equal to"
+msgstr "rovná se"
+
+#: bin/widget_search/custom_filter_widgets.py:291
+#: bin/widget_search/custom_filter_widgets.py:332
+msgid "is not equal to"
+msgstr "nerovná se"
+
+#: bin/widget_search/custom_filter_widgets.py:292
+#: bin/widget_search/custom_filter_widgets.py:333
+msgid "greater than"
+msgstr "větší než"
+
+#: bin/widget_search/custom_filter_widgets.py:293
+#: bin/widget_search/custom_filter_widgets.py:334
+msgid "less than"
+msgstr "menší než"
+
+#: bin/widget_search/custom_filter.py:62
+msgid "in"
+msgstr "v"
+
+#: bin/widget_search/custom_filter.py:63
+msgid "not in"
+msgstr "není v"
+
+#: bin/widget_search/custom_filter.py:82
+msgid ""
+"Enter Values separated by ',' if operator 'in' or 'not in' is chosen.\n"
+"For Date and DateTime Formats, specify text in '%Y-%m-%d' and '%Y-%m-%d "
+"%H:%M:%S' formats respectively."
+msgstr ""
+"Pokud je použit operátor 'in' nebo 'not in', zadejte hodnoty oddělené ','.\n"
+"Pro formáty Datum a DatumČas zadejte text ve formátu '%Y-%m-%d' and '%Y-%m-"
+"%d %H:%M:%S'."
+
+#: bin/widget_search/checkbox.py:35 bin/widget_search/checkbox.py:42
+#: bin/widget_search/checkbox.py:55
+msgid "Yes"
+msgstr "Ano"
+
+#: bin/widget_search/checkbox.py:36 bin/widget_search/checkbox.py:44
+msgid "No"
+msgstr "Ne"
+
+#: bin/widget/view/form.py:137
+msgid "You must save this record to use the relate button !"
+msgstr "Musíte uložit tento záznam k použití tlačítka související !"
+
+#: bin/widget/view/form.py:142
+msgid "Action not defined !"
+msgstr "Akce není definována !"
+
+#: bin/widget/view/form.py:211
+msgid "You must select a record to use the relate button !"
+msgstr "Musíte vybrat záznam k použití tlačítka související !"
+
+#: bin/widget/view/form.py:238 bin/widget/view/form_gtk/parser.py:635
+#: bin/widget/view/form_gtk/parser.py:756
+#: bin/widget/view/form_gtk/parser.py:813
+msgid "No other language available!"
+msgstr "Další jazyk není k dispozici."
+
+#: bin/widget/view/form.py:245 bin/widget/view/form_gtk/parser.py:647
+#: bin/widget/view/form_gtk/parser.py:762
+#: bin/widget/view/form_gtk/parser.py:819
+msgid "Add Translation"
+msgstr "Přidat překlad"
+
+#: bin/widget/view/form.py:293 bin/widget/view/form_gtk/parser.py:875
+msgid "Translate label"
+msgstr "Přeložit označení"
+
+#: bin/widget/view/calendar_gtk/parser.py:355 bin/openerp.glade:8064
+msgid "Week"
+msgstr "Týden"
+
+#: bin/widget/view/calendar_gtk/parser_dummy.py:30
+msgid "Calendar View Error !"
+msgstr "Chyba zobrazení kalendáře!"
+
+#: bin/widget/view/calendar_gtk/parser_dummy.py:31
+msgid "You must intall the library python-hippocanvas to use calendars."
+msgstr "K použití kalendáře musíte nainstalovat knihovnu python-hippocanvas."
+
+#: bin/widget/view/screen_container.py:74
+msgid "--Actions--"
+msgstr "--Akce--"
+
+#: bin/widget/view/screen_container.py:73
+msgid "Save as a Shortcut"
+msgstr "Uložit jako Zkratku"
+
+#: bin/widget/view/screen_container.py:74
+msgid "Save as a Filter"
+msgstr "Uložit jako filtr"
+
+#: bin/widget/view/screen_container.py:74
+msgid "Manage Filters"
+msgstr "Spravovat filtry"
+
+#: bin/widget/view/tree_gtk/parser.py:61
+msgid ""
+"You have unsaved record(s) !  \n"
+"\n"
+"Please Save them before sorting !"
+msgstr ""
+"Máte neuložené záznam(y) ! \n"
+"Prosím uložte je před řazením !"
+
+#: bin/widget/view/tree_gtk/editabletree.py:140
+#, python-format
+msgid "Shortcut: %s"
+msgstr "Zkratka: %s"
+
+#: bin/widget/view/tree_gtk/editabletree.py:140
+msgid "F1 New - F2 Open/Search"
+msgstr "F1 Nový - F2 Otevřít/Hledat"
+
+#: bin/widget/view/tree_gtk/editabletree.py:215
+#, python-format
+msgid "Warning; field %s is required!"
+msgstr "Pozor!; pole %s je nutné zadat!"
+
+#: bin/widget/view/tree_gtk/date_renderer.py:197
+msgid ""
+"Press <i>'+'</i>, <i>'-'</i> or <i>'='</i> for special date operations."
+msgstr ""
+"Stiskněte <i>'+'</i>, <i>'-'</i> nebo <i>'='</i> pro speciální datové "
+"operace."
+
+#: bin/widget/view/widget_parse.py:53
+#, python-format
+msgid "This type (%s) is not supported by the GTK client !"
+msgstr "Tento typ (%s) není podporován GTK klientem!"
+
+#: bin/widget/view/widget_parse.py:64
+msgid "No valid view found for this object!"
+msgstr "Pro tento objekt nebylo nalezen platný pohled."
+
+#: bin/widget/view/graph_gtk/parser.py:64
+msgid "Can not generate graph !"
+msgstr "Nelze vytvořit graf!"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1422
+msgid "Dot Viewer"
+msgstr "Prohlížeč Dot"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1712
+msgid "Add New Node"
+msgstr "Přidat nový uzel"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1713
+msgid "Add New Edge"
+msgstr "Přidat nový okraj"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1714
+msgid "Enlarge the Diagram"
+msgstr "Roztáhnout diagram"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1715
+msgid "Shrink the Diagram"
+msgstr "Zmenšit diagram"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1716
+msgid "Fit the diagram to the window"
+msgstr "Zvětšit diagram do okna"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1717
+msgid "Show the diagram at its normal size"
+msgstr "Ukázat diagram v normální velikosti"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1718
+msgid "Print the Diagram"
+msgstr "Tisknout diagram"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1789
+#, python-format
+msgid "Close Current %s"
+msgstr "Zavřít aktuální %s"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1790
+#, python-format
+msgid "Delete Current %s"
+msgstr "Smazat aktuální %s"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1791
+#, python-format
+msgid "Edit Current %s"
+msgstr "Upravit aktuální %s"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1875
+msgid " - Dot Viewer"
+msgstr " - Prohlížeč Dot"
+
+#: bin/widget/view/form_gtk/reference.py:76 bin/openerp.glade:1258
+msgid "Create a new resource"
+msgstr "Vytvoř nový zdroj"
+
+#: bin/widget/view/form_gtk/reference.py:89
+msgid "Search / Open a resource"
+msgstr "Hledat/Otevřít zdroj"
+
+#: bin/widget/view/form_gtk/parser.py:61
+msgid "Wrong icon for the button !"
+msgstr "Chybná ikona pro tlačítko!"
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Field"
+msgstr "Pole"
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Object"
+msgstr "Objekt"
+
+#: bin/widget/view/form_gtk/parser.py:619
+msgid "Enter some text to the related field before adding translations!"
+msgstr "Zadejte nějaký text do pole související před přidáním překladu!"
+
+#: bin/widget/view/form_gtk/parser.py:626
+msgid "You need to save resource before adding translations!"
+msgstr "Potřebujte uložit zdroj před přidáním překladu!"
+
+#: bin/widget/view/form_gtk/parser.py:880
+msgid "Translate view"
+msgstr "Přeložit pohled"
+
+#: bin/widget/view/form_gtk/one2many_list.py:64
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: bin/widget/view/form_gtk/one2many_list.py:70
+msgid "Save & Close"
+msgstr "Uložit & Zavřít"
+
+#: bin/widget/view/form_gtk/one2many_list.py:75
+msgid "Save & New"
+msgstr "Uložit & Nový"
+
+#: bin/widget/view/form_gtk/one2many_list.py:164
+#: bin/widget/view/form_gtk/interface.py:48
+msgid "Set to default value"
+msgstr "Nastavit výchozí hodnotu"
+
+#: bin/widget/view/form_gtk/one2many_list.py:167
+msgid "Set Default"
+msgstr "Nastavit výchozí"
+
+#: bin/widget/view/form_gtk/one2many_list.py:196
+msgid "Create a new entry"
+msgstr "Vytvořit nový záznam"
+
+#: bin/widget/view/form_gtk/one2many_list.py:200
+msgid "Edit this entry"
+msgstr "Upravit záznam"
+
+#: bin/widget/view/form_gtk/one2many_list.py:204
+msgid "Remove this entry"
+msgstr "Odstranit záznam"
+
+#: bin/widget/view/form_gtk/many2many.py:84
+#: bin/widget/view/form_gtk/one2many_list.py:210
+msgid "Previous Page"
+msgstr "Předchozí stránka"
+
+#: bin/widget/view/form_gtk/many2many.py:88
+#: bin/widget/view/form_gtk/one2many_list.py:214
+msgid "Previous Record"
+msgstr "Předchozí záznam"
+
+#: bin/widget/view/form_gtk/many2many.py:96
+#: bin/widget/view/form_gtk/one2many_list.py:222
+msgid "Next Record"
+msgstr "Další záznam"
+
+#: bin/widget/view/form_gtk/many2many.py:100
+#: bin/widget/view/form_gtk/one2many_list.py:226
+msgid "Next Page"
+msgstr "Další stránka"
+
+#: bin/widget/view/form_gtk/one2many_list.py:232
+msgid "Switch"
+msgstr "Přepnout"
+
+#: bin/widget/view/form_gtk/many2many.py:106
+#: bin/widget/view/form_gtk/one2many_list.py:238
+msgid "Choose Limit"
+msgstr "Vybrat omezení"
+
+#: bin/widget/view/form_gtk/one2many_list.py:279
+msgid "You have to select a resource !"
+msgstr "Musíte vybrat zdroj !"
+
+#: bin/widget/view/form_gtk/image.py:73
+msgid "Set Image"
+msgstr "Nastav obrázek"
+
+#: bin/widget/view/form_gtk/image.py:82 bin/widget/view/form_gtk/binary.py:84
+msgid "Save As"
+msgstr "Uložit jako"
+
+#: bin/widget/view/form_gtk/image.py:93 bin/widget/view/form_gtk/binary.py:88
+msgid "Clear"
+msgstr "Vymazat"
+
+#: bin/widget/view/form_gtk/image.py:102
+msgid "All files"
+msgstr "Všechny soubory"
+
+#: bin/widget/view/form_gtk/image.py:106
+msgid "Images"
+msgstr "Obrazky"
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "There is no image to save as !"
+msgstr "Žádný obrázek k uložení jako !"
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "Warning"
+msgstr "Varování"
+
+#: bin/widget/view/form_gtk/many2one.py:158 bin/widget/view/form_gtk/url.py:53
+msgid "Open this resource"
+msgstr "Otevřít tento zdroj:"
+
+#: bin/widget/view/form_gtk/many2one.py:163
+#: bin/widget_search/custom_filter_widgets.py:87
+msgid "Search a resource"
+msgstr "Vyhledat zdroj"
+
+#: bin/widget/view/form_gtk/many2one.py:174 bin/openerp.glade:1412
+msgid "Action"
+msgstr "Akce"
+
+#: bin/widget/view/form_gtk/many2one.py:175
+msgid "Report"
+msgstr "Záznam"
+
+#: bin/widget/view/list.py:633 bin/widget/view/form_gtk/many2one.py:387
+msgid "You must select a record to use the relation !"
+msgstr "Musíte vybrat záznam k použití souvislosti !"
+
+#: bin/widget/view/form_gtk/interface.py:49
+msgid "Set as default"
+msgstr "Nastavit jako výchozí"
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "You can not set to the default value here !"
+msgstr "Zde nemůžete nastavit výchozí hodnotu !"
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "Operation not permited"
+msgstr "Operace není povolena"
+
+#: bin/widget/view/form_gtk/binary.py:76
+msgid "Select"
+msgstr "Vybrat"
+
+#: bin/widget/view/form_gtk/binary.py:80
+msgid "Open"
+msgstr "Otevřít"
+
+#: bin/widget/view/form_gtk/binary.py:119
+#: bin/widget/view/form_gtk/binary.py:163
+msgid "Unable to read the file data"
+msgstr "Nelze číst data souboru"
+
+#: bin/widget/view/form_gtk/binary.py:129
+#: bin/widget/view/form_gtk/binary.py:155
+#, python-format
+msgid "Error reading the file: %s"
+msgstr "Chyba čtení souboru: %s"
+
+#: bin/widget/view/form_gtk/binary.py:138
+msgid "All Files"
+msgstr "Všechny soubor"
+
+#: bin/widget/view/form_gtk/binary.py:148
+msgid "Select a file..."
+msgstr "Vyber soubor..."
+
+#: bin/widget/view/form_gtk/binary.py:177
+#, python-format
+msgid "Error writing the file: %s"
+msgstr "Chyba při zápisu do souboru: %s"
+
+#: bin/widget/view/form_gtk/wid_common.py:59
+msgid "Always applicable !"
+msgstr "Použitelné vždy !"
+
+#: bin/widget/view/form_gtk/calendar.py:99
+#: bin/widget/view/form_gtk/calendar.py:163
+msgid "Invalid date value! Year must be greater than 1899 !"
+msgstr "Neplatná hodnota data! Rok musí být větší než 1899 !"
+
+#: bin/widget/view/form_gtk/calendar.py:255 bin/widget_search/calendar.py:273
+msgid "Hour:"
+msgstr "Hodin:"
+
+#: bin/widget/view/form_gtk/calendar.py:258 bin/widget_search/calendar.py:276
+msgid "Minute:"
+msgstr "Minut:"
+
+#: bin/widget/view/form_gtk/calendar.py:291 bin/widget_search/calendar.py:312
+msgid "Invalid datetime value! Year must be greater than 1899 !"
+msgstr "Neplatná hodnota data a času! Rok musí být větší než 1899 !"
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:30
+msgid "Gantt view not yet implemented !"
+msgstr "Ganttův pohled zatím není implementován !"
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:31
+msgid ""
+"The gantt view is not available in this GTK Client, you should use the web "
+"interface or switch to the calendar view."
+msgstr ""
+"Ganttův pohled není dostupný v GTK klientovi, měli byste použít webové "
+"rozhraní nebo přepnout do kalendářového pohledu."
+
+#: bin/widget/screen/screen.py:337
+msgid ""
+"(Any existing filter with the \n"
+"same name will be replaced)"
+msgstr ""
+"(Jakýkoliv existující filtr s \n"
+"stejné jméno bude nahrazeno)"
+
+#: bin/rpc.py:158
+msgid "Connection refused!"
+msgstr "Připojení odmítnuto!"
+
+#: bin/rpc.py:188
+msgid ""
+"Unable to reach to OpenERP server !\n"
+"You should check your connection to the network and the OpenERP server."
+msgstr ""
+"Nelze se spojit s OpenRTP serverem !\n"
+"Měli byste zkontrolovat vaše spojení do sítě a k OpenERP serveru."
+
+#: bin/rpc.py:188
+msgid "Connection Error"
+msgstr "Chyba připojení"
+
+>>>>>>> MERGE-SOURCE
 #: bin/openerp.glade:6
 msgid "OpenERP - Login"
 msgstr "OpenERP - Přihlášení"
@@ -1630,11 +2741,15 @@
 msgid "_Preferences"
 msgstr "_Nastavení"
 
+<<<<<<< TREE
 #: bin/openerp.glade:483 bin/openerp.glade:7304
 msgid "Change password"
 msgstr "Změna hesla"
 
 #: bin/openerp.glade:496
+=======
+#: bin/openerp.glade:496
+>>>>>>> MERGE-SOURCE
 msgid "_Send a request"
 msgstr "Vytvořit požadavek"
 
@@ -2002,6 +3117,18 @@
 "\n"
 "More Info on www.openerp.com !"
 msgstr ""
+"\n"
+"OpenERP - GTK klient - v%s\n"
+"\n"
+"OpenERP je Otevřený ERP+CRM software\n"
+"pro malé až středbá podniky.\n"
+"\n"
+"Celý zdrojový kód je šířen pod\n"
+"podmínkami licence GNU Public.\n"
+"\n"
+"(c) 2003-DNES, Tiny sprl\n"
+"\n"
+"Více informací na www.openerp.com !"
 
 #: bin/openerp.glade:1931
 msgid "_OpenERP"
@@ -2025,6 +3152,7 @@
 "Mail: sales@xxxxxxxxxxx\n"
 "Web: http://openerp.com";
 msgstr ""
+<<<<<<< TREE
 "\n"
 "(c) 2004-DNES - OpenERP SA\n"
 "OpenERP je výtvor OpenERP SA:\n"
@@ -2038,6 +3166,20 @@
 "Tel : (+32) 2 290 34 90 (Sales)\n"
 "Mail: sales@xxxxxxxxxxx\n"
 "Web: http://openerp.com";
+=======
+"\n"
+"(c) 2003-DNES - Tiny sprl\n"
+"OpenERP je výtvor Tiny sprl:\n"
+"\n"
+"Tiny sprl\n"
+"40 Chaussée de Namur\n"
+"1367 Gérompont\n"
+"Belgium\n"
+"\n"
+"Tel : (+32)81.81.37.00\n"
+"Mail: sales@xxxxxxx\n"
+"Web: http://tiny.be";
+>>>>>>> MERGE-SOURCE
 
 #: bin/openerp.glade:1991
 msgid "_Contact"
@@ -2113,9 +3255,23 @@
 
 #: bin/openerp.glade:2834
 msgid "<b>Predefined Exports</b>"
-msgstr "<b>Předdefinované exporty</b>"
-
-#: bin/openerp.glade:2880
+<<<<<<< TREE
+msgstr "<b>Předdefinované exporty</b>"
+
+#: bin/openerp.glade:2880
+=======
+msgstr "<b>Předdefinované exporty</b>"
+
+#: bin/openerp.glade:3134
+msgid "Import Compatible"
+msgstr "Importovat kompatibilní"
+
+#: bin/openerp.glade:2862
+msgid "<b>Select an Option to Export</b>"
+msgstr "<b>Vyberte volbu k exportu</b>"
+
+#: bin/openerp.glade:2880
+>>>>>>> MERGE-SOURCE
 msgid "Available Fields"
 msgstr "Dostupná pole"
 
@@ -2133,6 +3289,7 @@
 
 #: bin/openerp.glade:3073
 msgid "Fields to Export"
+<<<<<<< TREE
 msgstr "Pole k exportu"
 
 #: bin/openerp.glade:3115
@@ -2144,6 +3301,23 @@
 msgstr "Importovat kompatibilní"
 
 #: bin/openerp.glade:3156
+=======
+msgstr "Pole k exportu"
+
+#: bin/openerp.glade:3132
+msgid ""
+"Open in Excel\n"
+"Save as CSV"
+msgstr ""
+"Otevřít v Excelu\n"
+"Uložit jako CSV"
+
+#: bin/openerp.glade:3151
+msgid "Add _field names"
+msgstr "Přidat jména _polí"
+
+#: bin/openerp.glade:3156
+>>>>>>> MERGE-SOURCE
 msgid "<b>Opti_ons</b>"
 msgstr "<b>V_olby</b>"
 
@@ -2452,6 +3626,7 @@
 
 #: bin/openerp.glade:5715
 msgid "N_othing"
+<<<<<<< TREE
 msgstr "Žá_dné"
 
 #: bin/openerp.glade:5772
@@ -2465,10 +3640,29 @@
 msgstr "Soubor k importu: "
 
 #: bin/openerp.glade:5852
+=======
+msgstr "Žá_dné"
+
+#: bin/openerp.glade:5852
+>>>>>>> MERGE-SOURCE
 msgid "Auto-Detect"
-msgstr "Automaticky zjistit"
-
-#: bin/openerp.glade:5930
+<<<<<<< TREE
+msgstr "Automaticky zjistit"
+
+#: bin/openerp.glade:5930
+=======
+msgstr "Automaticky zjistit"
+
+#: bin/openerp.glade:5772
+msgid "<b>Fields to import</b>"
+msgstr "<b>Pole k importu</b>"
+
+#: bin/openerp.glade:5891
+msgid "File to Import:"
+msgstr "Soubor k importu:"
+
+#: bin/openerp.glade:5930
+>>>>>>> MERGE-SOURCE
 msgid "Lines to Skip:"
 msgstr "Řádky k přeskočení:"
 
@@ -2478,6 +3672,7 @@
 
 #: bin/openerp.glade:5987
 msgid "Encoding:"
+<<<<<<< TREE
 msgstr "Kódování:"
 
 #
@@ -2487,6 +3682,15 @@
 msgstr "Oddělovač polí: "
 
 #: bin/openerp.glade:6012
+=======
+msgstr "Kódování:"
+
+#: bin/openerp.glade:6035
+msgid "Field Separater:"
+msgstr "Oddělovač polí:"
+
+#: bin/openerp.glade:6012
+>>>>>>> MERGE-SOURCE
 msgid "CSV Parameters"
 msgstr "Parametr CSV"
 
@@ -2655,10 +3859,21 @@
 "<sup><b><span foreground=\"dark green\">?</span></b></sup>Load Demonstration "
 "Data:"
 msgstr ""
-"<sup><b><span foreground=\"dark green\">?</span></b></sup>Načíst ukázková "
-"data:"
-
-#: bin/openerp.glade:7321
+<<<<<<< TREE
+"<sup><b><span foreground=\"dark green\">?</span></b></sup>Načíst ukázková "
+"data:"
+
+#: bin/openerp.glade:7321
+=======
+"<sup><b><span foreground=\"dark green\">?</span></b></sup>Načíst ukázková "
+"data:"
+
+#: bin/openerp.glade:483 bin/openerp.glade:7304
+msgid "Change password"
+msgstr "Změna hesla"
+
+#: bin/openerp.glade:7321
+>>>>>>> MERGE-SOURCE
 msgid "<b>Change your super admin password</b>"
 msgstr "<b>Změnte heslo super správce</b>"
 
@@ -2728,13 +3943,48 @@
 
 #: bin/openerp.glade:8076
 msgid "Month"
-msgstr "Měsíc"
-
-#: bin/openerp.glade:8230
-msgid "Filter Entry"
-msgstr "Položka filtru"
-
-#: bin/openerp.glade:8276
+<<<<<<< TREE
+msgstr "Měsíc"
+
+#: bin/openerp.glade:8230
+msgid "Filter Entry"
+msgstr "Položka filtru"
+=======
+msgstr "Měsíc"
+>>>>>>> MERGE-SOURCE
+
+#: bin/openerp.glade:8276
+<<<<<<< TREE
+=======
+msgid "Fields on which Search criteria to be applied"
+msgstr "Pole nebo podmínky hledání k použití"
+
+#: bin/openerp.glade:8289
+msgid "Conditional Operators"
+msgstr "Podmíněné operátory"
+
+#: bin/openerp.glade:8316
+msgid "The Choice will be applied with next filter if any"
+msgstr "Volba bude použita pro další filtr pokud je nějaký"
+
+#: bin/openerp.glade:8317
+msgid ""
+"AND\n"
+"OR"
+msgstr ""
+"A\n"
+"NEBO"
+
+#: bin/openerp.glade:8330
+msgid "Remove Filter"
+msgstr "Odstranit filtr"
+
+#: bin/openerp.glade:8230
+msgid "Filter Entry"
+msgstr "Položka filtru"
+
+#: bin/openerp.glade:8276
+>>>>>>> MERGE-SOURCE
 msgid "Enter Filter Name:"
 msgstr "Zadejte jméno filtru:"
 
@@ -2758,18 +4008,36 @@
 "you shortly.\n"
 "</i>"
 msgstr ""
+"<b>Smlouva záruky vydavatele.</b>\n"
+"<i>\n"
+"Váš požadavek bude odeslán OpenERP a záruční tým vydavatele vám brzy "
+"odpoví.\n"
+"</i>"
 
 #: bin/win_error.glade:186
 msgid "Explain what you did:"
-msgstr "Vysvětlete co jste udělali:"
+<<<<<<< TREE
+msgstr "Vysvětlete co jste udělali:"
+=======
+msgstr "Vysvětlete co jste udělali:"
+
+#: bin/win_error.glade:200
+msgid "Others Comments:"
+msgstr "Jiné komentáře:"
+>>>>>>> MERGE-SOURCE
 
 #: bin/win_error.glade:285
 msgid "Send to Publisher Warranty Team"
 msgstr "Odeslat záručnímu týmu vydavatele"
 
 #: bin/win_error.glade:318
+<<<<<<< TREE
 msgid "Problems summary:"
 msgstr ""
+=======
+msgid "Summary of the problem:"
+msgstr "Souhrn problému:"
+>>>>>>> MERGE-SOURCE
 
 #: bin/win_error.glade:360
 msgid "<i>_Support Request</i>"
@@ -2781,6 +4049,7 @@
 
 #: bin/win_error.glade:404
 msgid "<i>_Details</i>"
+<<<<<<< TREE
 msgstr "<i>_Podrobnosti</i>"
 
 #, python-format
@@ -2966,3 +4235,6 @@
 
 #~ msgid "Summary of the problem:"
 #~ msgstr "Souhrn problému:"
+=======
+msgstr "<i>_Podrobnosti</i>"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/po/da.po'
--- bin/po/da.po	2011-10-12 04:39:41 +0000
+++ bin/po/da.po	2011-10-24 01:06:26 +0000
@@ -7,17 +7,29 @@
 msgstr ""
 "Project-Id-Version: openobject-client\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-07-28 15:22+0530\n"
 "PO-Revision-Date: 2011-10-11 14:46+0000\n"
 "Last-Translator: Jonas Mortensen <Unknown>\n"
+=======
+"POT-Creation-Date: 2010-12-13 18:11+0100\n"
+"PO-Revision-Date: 2011-05-31 20:42+0000\n"
+"Last-Translator: Henning Dinsen - idata <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Danish <da@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-10-12 04:39+0000\n"
 "X-Generator: Launchpad (build 14124)\n"
+=======
+"X-Launchpad-Export-Date: 2011-09-15 05:09+0000\n"
+"X-Generator: Launchpad (build 13921)\n"
+>>>>>>> MERGE-SOURCE
 "Language: da\n"
 
+<<<<<<< TREE
 #: bin/widget/view/gantt_gtk/parser_dummy.py:30
 msgid "Gantt view not yet implemented !"
 msgstr "Gantt-visning findes endnu ikke!"
@@ -228,9 +240,290 @@
 
 #: bin/widget/view/form_gtk/image.py:112 bin/widget/view/form_gtk/url.py:118
 #: bin/modules/gui/main.py:1389 bin/openerp.glade:5817
+=======
+#: bin/plugins/__init__.py:27
+msgid "Print Workflow"
+msgstr "Print Workflow"
+
+#: bin/plugins/__init__.py:28
+msgid "Print Workflow (with subflows)"
+msgstr "Print Workflow (med subflows)"
+
+#: bin/plugins/__init__.py:40
+msgid "No available plugin for this resource !"
+msgstr "Ingen tilgængelige plugin for denne ressource!"
+
+#: bin/plugins/__init__.py:42
+msgid "Choose a Plugin"
+msgstr "Vælg et udvidelsesmodul"
+
+#: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
+msgid "Connection refused !"
+msgstr "Connection refused!"
+
+#: bin/rpc.py:203 bin/rpc.py:205 bin/modules/action/wizard.py:162
+#: bin/modules/action/wizard.py:168 bin/modules/action/wizard.py:170
+#: bin/modules/gui/main.py:195 bin/modules/gui/main.py:201
+msgid "Application Error"
+msgstr "Applikationsfejl"
+
+#: bin/rpc.py:205 bin/modules/action/wizard.py:170
+msgid "View details"
+msgstr "Se detaljer"
+
+#: bin/modules/action/main.py:48
+msgid "Nothing to print!"
+msgstr "Intet at printe!"
+
+#: bin/modules/action/main.py:66
+msgid "Printing aborted, too long delay !"
+msgstr "Udskrivning afbrydes, for lange pauser!"
+
+#: bin/modules/action/main.py:195
+msgid "Select your action"
+msgstr "Vælg din handling"
+
+#: bin/modules/gui/main.py:89 bin/modules/gui/main.py:341
+msgid "Could not connect to server !"
+msgstr "Kunne ikke forbinde til server!"
+
+#: bin/modules/gui/main.py:93 bin/openerp.glade:72 bin/openerp.glade:6233
+#: bin/openerp.glade:6479 bin/openerp.glade:6802 bin/openerp.glade:7466
+msgid "Server:"
+msgstr "Server:"
+
+#: bin/modules/gui/main.py:104 bin/openerp.glade:98 bin/openerp.glade:6515
+#: bin/openerp.glade:6759 bin/openerp.glade:7058 bin/openerp.glade:7423
+msgid "Change"
+msgstr "Ændre"
+
+#: bin/modules/gui/main.py:111
+msgid "Super Administrator Password:"
+msgstr "Super Administrator adgangskode:"
+
+#: bin/modules/gui/main.py:193
+msgid "Bad Super Administrator Password"
+msgstr "Dårlig Super Administrator adgangskode"
+
+#: bin/modules/gui/main.py:217
+msgid "Migration Scripts"
+msgstr "Migration Scripts"
+
+#: bin/modules/gui/main.py:220
+msgid "Contract ID:"
+msgstr "Kontrakt-id:"
+
+#: bin/modules/gui/main.py:226
+msgid "Contract Password:"
+msgstr "Kontrakt adgangskode:"
+
+#: bin/modules/gui/main.py:241
+msgid "You already have the latest version"
+msgstr "Du har allerede den nyeste version"
+
+#: bin/modules/gui/main.py:246
+msgid "The following updates are available:"
+msgstr "Følgende opdateringer er tilgængelige:"
+
+#: bin/modules/gui/main.py:258
+msgid "You can now migrate your databases."
+msgstr "Du kan nu migrere databaser."
+
+#: bin/modules/gui/main.py:263
+msgid "Migrate Database"
+msgstr "Migrere database"
+
+#: bin/modules/gui/main.py:280
+msgid "Database"
+msgstr "Database"
+
+#: bin/modules/gui/main.py:292
+msgid "Your database has been upgraded."
+msgstr "Din database er blevet opgraderet."
+
+#: bin/modules/gui/main.py:294
+msgid "Your databases have been upgraded."
+msgstr "Dine databaser er blevet opgraderet."
+
+#: bin/modules/gui/main.py:296
+msgid "You have not selected a database"
+msgstr "Du har ikke valgt en database"
+
+#: bin/modules/gui/main.py:360
+msgid "No database found, you must create one !"
+msgstr "Ingen database fundet, du skal oprette en!"
+
+#: bin/modules/gui/main.py:468
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: bin/modules/gui/main.py:474
+#, python-format
+msgid ""
+"The versions of the server (%s) and the client (%s) missmatch. The client "
+"may not work properly. Use it at your own risks."
+msgstr ""
+"De versioner af serveren (%s) og klienten (%s) missmatch. Bygherren kan ikke "
+"arbejde ordentligt. Brug den på egen risiko."
+
+#: bin/modules/gui/main.py:610
+msgid "Sorry,'"
+msgstr "Beklager,'"
+
+#: bin/modules/gui/main.py:610 bin/modules/gui/main.py:613
+msgid "Bad database name !"
+msgstr "Dårligt database navn!"
+
+#: bin/modules/gui/main.py:613
+msgid ""
+"The database name must contain only normal characters or \"_\".\n"
+"You must avoid all accents, space or special characters."
+msgstr ""
+"Databasen navn må kun indeholde normale tegn eller \"_\". \n"
+"Du skal undgå alle accenter, mellemrum eller specialtegn."
+
+#: bin/modules/gui/main.py:637 bin/modules/gui/main.py:650
+#: bin/modules/gui/main.py:652 bin/modules/gui/main.py:654
+msgid "Could not create database."
+msgstr "Kunne ikke oprette databasen."
+
+#: bin/modules/gui/main.py:638 bin/modules/gui/main.py:650
+msgid "Database already exists !"
+msgstr "Database eksisterer allerede!"
+
+#: bin/modules/gui/main.py:652 bin/modules/gui/main.py:1384
+#: bin/modules/gui/main.py:1404 bin/modules/gui/main.py:1509
+msgid "Bad database administrator password !"
+msgstr "Dårlig database administrator adgangskode!"
+
+#: bin/modules/gui/main.py:654 bin/modules/gui/main.py:661
+msgid "Error during database creation !"
+msgstr "Fejl under database oprettelse!"
+
+#: bin/modules/gui/main.py:661
+msgid ""
+"The server crashed during installation.\n"
+"We suggest you to drop this database."
+msgstr ""
+"Serveren fejlede under installationen. \n"
+"Vi anbefaler dig at slette denne database."
+
+#: bin/modules/gui/main.py:707 bin/modules/gui/main.py:1072
+msgid "Press Ctrl+O to login"
+msgstr "Tryk Ctrl+O for at logge ind"
+
+#: bin/modules/gui/main.py:881
+msgid "Edit"
+msgstr "Rediger"
+
+#: bin/modules/gui/main.py:974
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: bin/modules/gui/main.py:976
+msgid "No Company"
+msgstr "Ingen virksomhed"
+
+#: bin/modules/gui/main.py:989
+#, python-format
+msgid "%s request(s)"
+msgstr "%s anmodning(er)"
+
+#: bin/modules/gui/main.py:991
+msgid "No request"
+msgstr "Ingen anmodning"
+
+#: bin/modules/gui/main.py:993
+#, python-format
+msgid " - %s request(s) sent"
+msgstr " -%s anmodning(r) sendt"
+
+#: bin/modules/gui/main.py:1031
+msgid ""
+"Please double-check the database name or contact your administrator to "
+"verify the database status."
+msgstr ""
+"Venligst dobbelt-tjek database navn eller kontakt din administrator for at "
+"kontrollere database status."
+
+#: bin/modules/gui/main.py:1031
+msgid "Database cannot be accessed or does not exist"
+msgstr "Kan ikke få adgang til databasen eller den eksisterer ikke"
+
+#: bin/modules/gui/main.py:1035
+msgid ""
+"Connection error !\n"
+"Unable to connect to the server !"
+msgstr ""
+"Fejl i forbindelse!\n"
+"Kan ikke forbinde til serveren!"
+
+#: bin/modules/gui/main.py:1037
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password !"
+msgstr "Autentificering fejl! Dårlig brugernavn eller adgangskode!"
+
+#: bin/modules/gui/main.py:1050
+#, python-format
+msgid "OpenERP - %s"
+msgstr "OpenERP -%s"
+
+#: bin/modules/gui/main.py:1070
+msgid "Not logged !"
+msgstr "Ikke logget!"
+
+#: bin/widget/view/form_gtk/one2many_list.py:52 bin/modules/gui/main.py:1079
+#: bin/openerp.glade:6081
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#: bin/modules/gui/main.py:1153
+msgid ""
+"You can not log into the system !\n"
+"Ask the administrator to verify\n"
+"you have an action defined for your user."
+msgstr ""
+"Du kan ikke logge ind i systemet! Bede administratoren om at kontrollere at "
+"du har en handling er defineret for din bruger."
+
+#: bin/modules/gui/main.py:1187 bin/modules/gui/main.py:1194
+msgid "Do you really want to quit ?"
+msgstr "Vil du virkelig ønsker at holde op?"
+
+#: bin/modules/gui/main.py:1263
+#, python-format
+msgid "Attachments (%d)"
+msgstr "Vedhæftede filer (%d)"
+
+#: bin/modules/gui/main.py:1276
+msgid "Attachments"
+msgstr "Vedhæftede filer"
+
+#: bin/modules/gui/main.py:1375
+msgid "Delete a database"
+msgstr "Slet en database"
+
+#: bin/modules/gui/main.py:1381
+msgid "Database dropped successfully !"
+msgstr "Databasen er slette med succes!"
+
+#: bin/modules/gui/main.py:1384
+msgid "Could not drop database."
+msgstr "Kunne ikke slette database."
+
+#: bin/modules/gui/main.py:1386
+msgid "Couldn't drop database"
+msgstr "Kunne ikke slette database"
+
+#: bin/widget/view/form_gtk/image.py:112 bin/widget/view/form_gtk/url.py:118
+#: bin/modules/gui/main.py:1389 bin/openerp.glade:5817
+>>>>>>> MERGE-SOURCE
 msgid "Open..."
 msgstr "Åbn..."
 
+<<<<<<< TREE
 #: bin/widget/view/form_gtk/image.py:127
 msgid "There is no image to save as !"
 msgstr "Der er intet billede at gemme!"
@@ -242,9 +535,53 @@
 #: bin/widget/view/form_gtk/image.py:129
 #: bin/widget/view/form_gtk/binary.py:167 bin/printer/printer.py:231
 #: bin/modules/gui/window/win_export.py:359 bin/modules/gui/main.py:1493
+=======
+#: bin/modules/gui/main.py:1401
+msgid "Database restored successfully !"
+msgstr "Database genoprettet med succes!"
+
+#: bin/modules/gui/main.py:1404
+msgid "Could not restore database."
+msgstr "Kunne ikke gendanne databasen."
+
+#: bin/modules/gui/main.py:1406
+msgid "Couldn't restore database"
+msgstr "Kunne ikke gendanne databasen"
+
+#: bin/modules/gui/main.py:1457
+msgid ""
+"Confirmation password does not match new password, operation cancelled!"
+msgstr ""
+"Bekræftelse adgangskode matcher ikke den nye adgangskode, drift aflyst!"
+
+#: bin/modules/gui/main.py:1459
+msgid "Validation Error."
+msgstr "Valideringsfejl."
+
+#: bin/modules/gui/main.py:1476
+msgid "Could not change the Super Admin password."
+msgstr "Kunne ikke ændre Super Admin password."
+
+#: bin/modules/gui/main.py:1477 bin/modules/gui/main.py:1483
+msgid "Bad password provided !"
+msgstr "Forkert adgangskode angivet!"
+
+#: bin/modules/gui/main.py:1457
+msgid "Error, password not changed."
+msgstr "Fejl, adgangskode ikke ændret."
+
+#: bin/modules/gui/main.py:1490 bin/modules/gui/main.py:1513
+msgid "Backup a database"
+msgstr "Sikkerhedskopier en database"
+
+#: bin/widget/view/form_gtk/image.py:129
+#: bin/widget/view/form_gtk/binary.py:167 bin/printer/printer.py:231
+#: bin/modules/gui/window/win_export.py:359 bin/modules/gui/main.py:1493
+>>>>>>> MERGE-SOURCE
 msgid "Save As..."
 msgstr "Gem som..."
 
+<<<<<<< TREE
 #: bin/widget/view/form_gtk/image.py:177
 msgid "Image corrupted"
 msgstr "Afbilledningen er ødelagt"
@@ -352,12 +689,75 @@
 
 #: bin/widget/view/form_gtk/one2many_list.py:388
 #: bin/modules/gui/window/form.py:290
+=======
+#: bin/modules/gui/main.py:1506
+msgid "Database backed up successfully !"
+msgstr "Database er sikkerhedskopieret op med succes!"
+
+#: bin/modules/gui/main.py:1509
+msgid "Could not backup the database."
+msgstr "Kunne ikke  sikkerhedskopiere databasen."
+
+#: bin/modules/gui/main.py:1511
+msgid "Couldn't backup database."
+msgstr "Kunne ikke sikkerhedskopiere database."
+
+#: bin/modules/gui/window/form.py:189
+msgid "Resource ID does not exist for this object!"
+msgstr "Ressource-id findes ikke for dette objekt!"
+
+#: bin/modules/gui/window/form.py:247
+msgid "No record selected ! You can only attach to existing record."
+msgstr "Ingen post valgt! Du kan kun vedhæfte til en eksisterende post."
+
+#: bin/modules/gui/window/form.py:264
+msgid "You have to select a record !"
+msgstr "Du skal vælge en rekord!"
+
+#: bin/modules/gui/window/form.py:270
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:41
+#: bin/modules/gui/window/win_export.py:213
+msgid "ID"
+msgstr "ID"
+
+#: bin/modules/gui/window/form.py:271
+msgid "Creation User"
+msgstr "Skabelse Bruger"
+
+#: bin/modules/gui/window/form.py:272
+msgid "Creation Date"
+msgstr "Oprettelses dato"
+
+#: bin/modules/gui/window/form.py:273
+msgid "Latest Modification by"
+msgstr "Seneste ændring af"
+
+#: bin/modules/gui/window/form.py:274
+msgid "Latest Modification Date"
+msgstr "Seneste ændringsdato"
+
+#: bin/modules/gui/window/form.py:275
+msgid "Internal Module Data ID"
+msgstr "Intern Modul ID Data"
+
+#: bin/modules/gui/window/form.py:269
+msgid ""
+"Record is not saved ! \n"
+" Do You want to Clear Current Record ?"
+msgstr ""
+"Post er ikke gemt!\n"
+"Vil du vil rydde aktuelle post?"
+
+#: bin/widget/view/form_gtk/one2many_list.py:388
+#: bin/modules/gui/window/form.py:290
+>>>>>>> MERGE-SOURCE
 msgid "Are you sure to remove this record ?"
 msgstr "Er du sikker på at fjerne denne post?"
 
 #: bin/widget/view/form_gtk/one2many_list.py:390
 #: bin/modules/gui/window/form.py:292
 msgid "Are you sure to remove those records ?"
+<<<<<<< TREE
 msgstr "Er du sikker på at fjerne disse poster?"
 
 #: bin/widget/view/form_gtk/parser.py:61
@@ -541,6 +941,274 @@
 msgstr "Kunne ikke indstille locale %(lang_enc)s: %(exception)s"
 
 #: bin/options.py:121
+=======
+msgstr "Er du sikker på at fjerne disse poster?"
+
+#: bin/modules/gui/window/form.py:296
+msgid "Resources cleared."
+msgstr "Ressourcer ryddet."
+
+#: bin/modules/gui/window/form.py:298
+msgid "Resources successfully removed."
+msgstr "Ressourcer blev fjernet."
+
+#: bin/modules/gui/window/form.py:339
+msgid "Working now on the duplicated document !"
+msgstr "Arbejder nu på det duplikerede dokument!"
+
+#: bin/modules/gui/window/form.py:355
+msgid "Document Saved."
+msgstr "Dokument Gemt."
+
+#: bin/widget/view/list.py:584 bin/widget/view/list.py:585
+#: bin/widget/view/form_gtk/parser.py:135 bin/modules/gui/window/form.py:366
+msgid "Invalid form, correct red fields !"
+msgstr "Ugyldig form, ret røde felter!"
+
+#: bin/widget/view/list.py:584
+msgid "Error !"
+msgstr "Fejl!"
+
+#: bin/modules/gui/window/form.py:368
+msgid "Warning !"
+msgstr "Advarsel!"
+
+#: bin/modules/gui/window/form.py:389 bin/modules/gui/window/form.py:497
+msgid ""
+"This record has been modified\n"
+"do you want to save it ?"
+msgstr ""
+"Denne post er blevet ændret\n"
+"Vil du gemme den?"
+
+#: bin/modules/gui/window/form.py:447
+msgid "You must select one or several records !"
+msgstr "Du skal vælge en eller flere poster!"
+
+#: bin/modules/gui/window/form.py:456
+msgid "Print Screen"
+msgstr "Udskriv skærm"
+
+#: bin/modules/gui/window/form.py:476
+msgid "No record selected"
+msgstr "Ingen post valgt"
+
+#: bin/modules/gui/window/form.py:481
+msgid "New document"
+msgstr "Nyt dokument"
+
+#: bin/modules/gui/window/form.py:483
+msgid "Editing document (id: "
+msgstr "Redigerer dokument (id: "
+
+#: bin/modules/gui/window/form.py:486
+msgid "Record: "
+msgstr "Post: "
+
+#: bin/modules/gui/window/form.py:487
+msgid " of "
+msgstr " af "
+
+#: bin/modules/gui/window/win_import.py:51
+msgid "The file is empty !"
+msgstr "Filen er tom!"
+
+#: bin/modules/gui/window/win_import.py:51
+msgid "Importation !"
+msgstr "Indførsel!"
+
+#: bin/modules/gui/window/win_import.py:56
+msgid "XML-RPC error !"
+msgstr "XML-RPC fejl!"
+
+#: bin/modules/gui/window/win_import.py:61
+msgid "Imported one object !"
+msgstr "Importeret ét objekt!"
+
+#: bin/modules/gui/window/win_import.py:63
+#, python-format
+msgid "Imported %d objects !"
+msgstr "Importerede %d objekter!"
+
+#: bin/modules/gui/window/win_import.py:68
+#, python-format
+msgid ""
+"Error trying to import this record:\n"
+"%s\n"
+"Error Message:\n"
+"%s\n"
+"\n"
+"%s"
+msgstr ""
+"Fejl ved forsøg på at importere denne post:\n"
+"%s\n"
+"Fejlmeddelelse:\n"
+"%s\n"
+"\n"
+"%s"
+
+#: bin/modules/gui/window/win_import.py:72
+msgid "Importation Error !"
+msgstr "Indførsel Fejl!"
+
+#: bin/modules/gui/window/win_import.py:105
+#: bin/modules/gui/window/win_import.py:109
+msgid "Field name"
+msgstr "Feltnavn"
+
+#: bin/modules/gui/window/win_import.py:181
+msgid "Error opening .CSV file"
+msgstr "Fejl ved åbning af .cvs fil"
+
+#: bin/modules/gui/window/win_import.py:181
+msgid "Input Error."
+msgstr "Indtastnings fejl."
+
+#: bin/modules/gui/window/win_import.py:199
+#, python-format
+msgid "You cannot import this field %s, because we cannot auto-detect it"
+msgstr ""
+"Du kan ikke importere dette felt %s, fordi vi ikke kan auto-detektere det"
+
+#: bin/modules/gui/window/win_import.py:202
+#, python-format
+msgid ""
+"Error processing your first line of the file.\n"
+"Field %s is unknown !"
+msgstr ""
+"Fejl under behandling af din første linje i filen.\n"
+"Felt %s er ukendt!"
+
+#: bin/modules/gui/window/win_import.py:202
+msgid "Import Error."
+msgstr "Import Fejl."
+
+#: bin/modules/gui/window/win_import.py:233
+msgid "You have not selected any fields to import"
+msgstr "Du har ikke valgt nogen felter til import."
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Extension"
+msgstr "Udvidelse"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Application"
+msgstr "Applikation"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Print Processor"
+msgstr "Print Processor"
+
+#: bin/modules/gui/window/win_extension.py:114
+msgid "This extension is already defined"
+msgstr "Denne udvidelse er allerede defineret"
+
+#: bin/modules/gui/window/win_extension.py:114 bin/openerp.glade:7642
+msgid "Extension Manager"
+msgstr "Udvidelseshåndtering"
+
+#: bin/modules/gui/window/win_selection.py:51
+msgid "Name"
+msgstr "Navn"
+
+#: bin/modules/gui/window/win_selection.py:55
+msgid "Ressource Name"
+msgstr "Ressource navn"
+
+#: bin/modules/gui/window/win_selection.py:55
+msgid "Names"
+msgstr "Navne"
+
+#: bin/modules/gui/window/__init__.py:31
+msgid "Unknown Window"
+msgstr "Ukendt vindue"
+
+#: bin/modules/gui/window/win_preference.py:68
+msgid "Preferences"
+msgstr "Indstillinger"
+
+#: bin/modules/gui/window/win_preference.py:86
+msgid ""
+"The default language of the interface has been modified, do not forget to "
+"restart the client to have the interface in your language"
+msgstr ""
+"Standardsproget i grænsefladen er blevet ændret, så glem ikke at genstarte "
+"klienten at have interface på dit sprog"
+
+#: bin/modules/gui/window/win_preference.py:88
+msgid "Default language modified !"
+msgstr "Standard sprog modificeret!"
+
+#: bin/modules/gui/window/view_tree/parse.py:35
+msgid "Tree"
+msgstr "Træ"
+
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:45
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: bin/modules/gui/window/tree.py:205 bin/modules/gui/window/tree.py:261
+msgid "No resource selected!"
+msgstr "Ingen ressource valgt!"
+
+#: bin/modules/gui/window/tree.py:219
+msgid ""
+"Are you sure you want\n"
+"to remove this record?"
+msgstr ""
+"Er du sikker på at du\n"
+"vil fjerne denne rekord?"
+
+#: bin/modules/gui/window/tree.py:224
+msgid "Error removing resource!"
+msgstr "Fejl ved fjernelse af ressource!"
+
+#: bin/modules/gui/window/tree.py:235
+msgid "Unable to chroot: no tree resource selected"
+msgstr "I stand til at chroot: ingen træ valgte ressource"
+
+#: bin/modules/gui/window/win_export.py:50
+msgid " record(s) saved !"
+msgstr " post(er) gemt!"
+
+#: bin/modules/gui/window/win_export.py:53
+msgid ""
+"Operation failed !\n"
+"I/O error"
+msgstr ""
+"Operation mislykkedes!\n"
+"I/O fejl"
+
+#: bin/modules/gui/window/win_export.py:79
+#: bin/modules/gui/window/win_export.py:105
+msgid "Error Opening Excel !"
+msgstr "Fejl ved åbning af Excel!"
+
+#: bin/modules/gui/window/win_export.py:317
+msgid "What is the name of this export ?"
+msgstr "Hvad er navnet på denne eksport?"
+
+#: bin/modules/gui/window/win_export.py:351
+msgid "Exportation Error !"
+msgstr "Udførsel Fejl!"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1772
+#: bin/modules/gui/window/win_search.py:49
+msgid "OpenERP - Link"
+msgstr "OpenERP - Link"
+
+#: bin/modules/gui/window/win_search.py:126
+#, python-format
+msgid "OpenERP Search: %s"
+msgstr "OpenERP søg: %s"
+
+#: bin/modules/gui/window/win_search.py:127
+#, python-format
+msgid "OpenERP Search: %s (%%d result(s))"
+msgstr "OpenERP søg: %s (%%d resultat(er))"
+
+#: bin/options.py:121
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "OpenERP Client %s"
 msgstr "OpenERP klient %s"
@@ -742,6 +1410,7 @@
 msgid "Open with..."
 msgstr "Åbn med..."
 
+<<<<<<< TREE
 #: bin/plugins/__init__.py:27
 msgid "Print Workflow"
 msgstr "Print Workflow"
@@ -757,6 +1426,12 @@
 #: bin/plugins/__init__.py:42
 msgid "Choose a Plugin"
 msgstr "Vælg et udvidelsesmodul"
+=======
+#: bin/translate.py:183
+#, python-format
+msgid "Unable to set locale %s: %s"
+msgstr "Kunne ikke indstille locale%s:%s"
+>>>>>>> MERGE-SOURCE
 
 #: bin/printer/printer.py:184
 #, python-format
@@ -769,6 +1444,7 @@
 "Error occurred while printing:\n"
 "%s"
 msgstr ""
+<<<<<<< TREE
 "En fejl forekom ved udskrivning:\n"
 "%s"
 
@@ -777,20 +1453,77 @@
 msgstr "Udskrivningsrapport"
 
 #: bin/printer/printer.py:212
+=======
+"Linux automatisk udskrivning er ikke gennemført. \n"
+"Brug vis udskrift mulighed!"
+
+#: bin/printer/printer.py:212
+>>>>>>> MERGE-SOURCE
 msgid "Error! No Data found. Make sure you have enough data to print!"
 msgstr ""
 "Fejl! Ingen data fundet. Sørg for at du har nok data til at udskrive!"
 
 #: bin/printer/printer.py:239
 msgid "Error writing the file!"
-msgstr "Fejl ved skrivning af fil!"
-
-#: bin/widget_search/form.py:492
+<<<<<<< TREE
+msgstr "Fejl ved skrivning af fil!"
+
+#: bin/widget_search/form.py:492
+=======
+msgstr "Fejl ved skrivning af fil!"
+
+#: bin/openerp-client.py:142
+msgid "Closing OpenERP, KeyboardInterrupt"
+msgstr "Lukning OpenERP, KeyboardInterrupt"
+
+#: bin/widget/view/form_gtk/button.py:47 bin/widget_search/char.py:72
+#: bin/widget_search/calendar.py:125 bin/widget_search/calendar.py:250
+#: bin/widget_search/filter.py:77 bin/widget_search/reference.py:78
+#: bin/widget_search/spinbutton.py:92 bin/widget_search/selection.py:116
+#: bin/widget_search/custom_filter.py:140 bin/widget_search/spinint.py:95
+#: bin/widget_search/checkbox.py:68
+msgid "The content of the widget or ValueError if not valid"
+msgstr "Indholdet af denne widget eller værdi fejl hvis ikke gyldigt"
+
+#: bin/widget_search/form.py:492
+>>>>>>> MERGE-SOURCE
 msgid "The content of the form or exception if not valid"
 msgstr "Indholdet af den form eller undtagelse, er ikke gyldigt"
 
-#: bin/widget_search/char.py:45
+<<<<<<< TREE
+#: bin/widget_search/char.py:45
+=======
+#: bin/widget/view/form_gtk/date_widget.py:65
+#: bin/widget_search/date_widget.py:65
+msgid ""
+"You can use special operation by pressing +, - or =.  Plus/minus "
+"adds/decrease the variable to the current selected date. Equals set part of "
+"selected date. Available variables: 12h = 12 hours, 8d = 8 days, 4w = 4 "
+"weeks, 1m = 1 month, 2y = 2 years. Some examples:\n"
+"* +21d : adds 21 days to selected year\n"
+"* =23w : set date to the 23th week of the year\n"
+"* -4m : decrease 4 months to the current date\n"
+"You can also use \"=\" to set the date to the current date/time and '-' to "
+"clear the field."
+msgstr ""
+"Du kan bruge speciel funktion ved at trykke på +, - eller =. Plus / minus "
+"tilføjer / fald variablen til den aktuelt valgte dato. Lig indstille en del "
+"af den valgte dato. Tilgængelige variabler: 12h = 12 timer, 8d = 8 dage, 4w "
+"= 4 uger, 1m = 1 måned, 2y = 2 år. Nogle eksempler: \n"
+"* 21 d: tilføjer 21 dage til udvalgte år \n"
+"* = 23w: sæt datoen til den 23. uge af året \n"
+"*-4m: fald 4 måneder til den aktuelle dato \n"
+"Du kan også bruge \"=\" at fastsætte datoen til den nuværende dato / tid og "
+"'-' for at rydde området."
+
+#: bin/widget_search/wid_int.py:56
+msgid "The content of the widget or exception if not valid"
+msgstr "Indholdet af den widget eller undtagelse, hvis der ikke er gyldige"
+
+#: bin/widget_search/char.py:45
+>>>>>>> MERGE-SOURCE
 msgid "Error: "
+<<<<<<< TREE
 msgstr "Fejl: "
 
 #: bin/widget_search/custom_filter_widgets.py:36
@@ -854,6 +1587,34 @@
 #: bin/widget_search/custom_filter_widgets.py:40
 #: bin/widget_search/custom_filter_widgets.py:67
 #: bin/widget_search/custom_filter_widgets.py:98
+=======
+msgstr "Fejl: "
+
+#: bin/widget_search/calendar.py:49 bin/widget_search/calendar.py:177
+msgid "Start date"
+msgstr "Start dato"
+
+#: bin/widget/view/form_gtk/calendar.py:57
+#: bin/widget/view/form_gtk/calendar.py:184 bin/widget_search/calendar.py:53
+#: bin/widget_search/calendar.py:73 bin/widget_search/calendar.py:181
+#: bin/widget_search/calendar.py:201
+msgid "Open the calendar widget"
+msgstr "Åbn kalender widget"
+
+#: bin/widget_search/calendar.py:69 bin/widget_search/calendar.py:197
+msgid "End date"
+msgstr "Slut dato"
+
+#: bin/widget/view/form_gtk/calendar.py:135
+#: bin/widget/view/form_gtk/calendar.py:249 bin/widget_search/calendar.py:128
+#: bin/widget_search/calendar.py:267
+msgid "OpenERP - Date selection"
+msgstr "OpenERP - Dato valg"
+
+#: bin/widget_search/custom_filter_widgets.py:40
+#: bin/widget_search/custom_filter_widgets.py:67
+#: bin/widget_search/custom_filter_widgets.py:98
+>>>>>>> MERGE-SOURCE
 msgid "contains"
 msgstr "indeholder"
 
@@ -861,6 +1622,7 @@
 #: bin/widget_search/custom_filter_widgets.py:68
 #: bin/widget_search/custom_filter_widgets.py:98
 msgid "doesn't contain"
+<<<<<<< TREE
 msgstr "indeholder ikke"
 
 #: bin/widget_search/custom_filter_widgets.py:167
@@ -895,6 +1657,12 @@
 
 #: bin/widget_search/custom_filter_widgets.py:290
 #: bin/widget_search/custom_filter_widgets.py:331
+=======
+msgstr "indeholder ikke"
+
+#: bin/widget_search/custom_filter_widgets.py:290
+#: bin/widget_search/custom_filter_widgets.py:331
+>>>>>>> MERGE-SOURCE
 msgid "is equal to"
 msgstr "er lig med"
 
@@ -911,6 +1679,7 @@
 #: bin/widget_search/custom_filter_widgets.py:293
 #: bin/widget_search/custom_filter_widgets.py:334
 msgid "less than"
+<<<<<<< TREE
 msgstr "mindre end"
 
 #: bin/widget_search/custom_filter_widgets.py:294
@@ -945,6 +1714,30 @@
 
 #: bin/widget_search/checkbox.py:35 bin/widget_search/checkbox.py:42
 #: bin/widget_search/checkbox.py:55
+=======
+msgstr "mindre end"
+
+#: bin/widget_search/custom_filter.py:62
+msgid "in"
+msgstr "i"
+
+#: bin/widget_search/custom_filter.py:63
+msgid "not in"
+msgstr "ikke i"
+
+#: bin/widget_search/custom_filter.py:82
+msgid ""
+"Enter Values separated by ',' if operator 'in' or 'not in' is chosen.\n"
+"For Date and DateTime Formats, specify text in '%Y-%m-%d' and '%Y-%m-%d "
+"%H:%M:%S' formats respectively."
+msgstr ""
+"Indtast værdier adskilt af &#39;,&#39; Hvis operatør \"i\" eller \"ikke i "
+"&#39;er valgt. For Dato og DateTime formater, angive tekst i &#39;% Y-% m-% "
+"d&#39; og &#39;% Y-% m-% d% H:% M:% S&#39; formater hhv."
+
+#: bin/widget_search/checkbox.py:35 bin/widget_search/checkbox.py:42
+#: bin/widget_search/checkbox.py:55
+>>>>>>> MERGE-SOURCE
 msgid "Yes"
 msgstr "Ja"
 
@@ -952,11 +1745,399 @@
 msgid "No"
 msgstr "Nej"
 
+<<<<<<< TREE
 #: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
 msgid "Connection refused !"
 msgstr "Connection refused!"
 
 #: bin/rpc.py:158
+=======
+#: bin/widget/view/form.py:137
+msgid "You must save this record to use the relate button !"
+msgstr "Du skal gemme denne post, for at bruge tilhørende knap!"
+
+#: bin/widget/view/form.py:142
+msgid "Action not defined !"
+msgstr "Handling ikke er defineret!"
+
+#: bin/widget/view/form.py:211
+msgid "You must select a record to use the relate button !"
+msgstr "Du skal vælge en post for at bruge tilhørende knap!"
+
+#: bin/widget/view/form.py:238 bin/widget/view/form_gtk/parser.py:635
+#: bin/widget/view/form_gtk/parser.py:756
+#: bin/widget/view/form_gtk/parser.py:813
+msgid "No other language available!"
+msgstr "Ingen andre sprog til rådighed!"
+
+#: bin/widget/view/form.py:245 bin/widget/view/form_gtk/parser.py:647
+#: bin/widget/view/form_gtk/parser.py:762
+#: bin/widget/view/form_gtk/parser.py:819
+msgid "Add Translation"
+msgstr "Tilføj oversættelse"
+
+#: bin/widget/view/form.py:293 bin/widget/view/form_gtk/parser.py:875
+msgid "Translate label"
+msgstr "Oversæt etiket"
+
+#: bin/widget/view/calendar_gtk/parser.py:355 bin/openerp.glade:8064
+msgid "Week"
+msgstr "Uge"
+
+#: bin/widget/view/calendar_gtk/parser_dummy.py:30
+msgid "Calendar View Error !"
+msgstr "Fejl i kalender visning!"
+
+#: bin/widget/view/calendar_gtk/parser_dummy.py:31
+msgid "You must intall the library python-hippocanvas to use calendars."
+msgstr ""
+"Du skal installere biblioteket python-hippocanvas for at bruge kalendere."
+
+#: bin/widget/view/screen_container.py:74
+msgid "--Actions--"
+msgstr "- Soegsmaal -"
+
+#: bin/widget/view/screen_container.py:73
+msgid "Save as a Shortcut"
+msgstr "Gem som en genvej"
+
+#: bin/widget/view/screen_container.py:74
+msgid "Save as a Filter"
+msgstr "Gem som et filter"
+
+#: bin/widget/view/screen_container.py:74
+msgid "Manage Filters"
+msgstr "Administrer filtre"
+
+#: bin/widget/view/tree_gtk/parser.py:61
+msgid ""
+"You have unsaved record(s) !  \n"
+"\n"
+"Please Save them before sorting !"
+msgstr ""
+"Post(er) er ikke gemt! \n"
+"Vær venlig at gemme  før sorteringen!"
+
+#: bin/widget/view/tree_gtk/editabletree.py:140
+#, python-format
+msgid "Shortcut: %s"
+msgstr "Genvej: %s"
+
+#: bin/widget/view/tree_gtk/editabletree.py:140
+msgid "F1 New - F2 Open/Search"
+msgstr "F1 Ny - F2 Åben/Søg"
+
+#: bin/widget/view/tree_gtk/editabletree.py:215
+#, python-format
+msgid "Warning; field %s is required!"
+msgstr "Advarsel; området %s er påkrævet!"
+
+#: bin/widget/view/tree_gtk/date_renderer.py:197
+msgid ""
+"Press <i>'+'</i>, <i>'-'</i> or <i>'='</i> for special date operations."
+msgstr ""
+"Tryk på <i>&#39;+&#39;, &#39;-&#39;</i> eller <i>&#39;=&#39;</i> for særlig "
+"dato operationer."
+
+#: bin/widget/view/widget_parse.py:53
+#, python-format
+msgid "This type (%s) is not supported by the GTK client !"
+msgstr "Denne type (%s) er ikke understøttet af GTK klienten!"
+
+#: bin/widget/view/widget_parse.py:64
+msgid "No valid view found for this object!"
+msgstr "Ingen gyldig visning fundet for dette objekt!"
+
+#: bin/widget/view/graph_gtk/parser.py:64
+msgid "Can not generate graph !"
+msgstr "Kan ikke generere grafen!"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1422
+msgid "Dot Viewer"
+msgstr "Dot Viewer"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1712
+msgid "Add New Node"
+msgstr "Tilføj ny node"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1713
+msgid "Add New Edge"
+msgstr "Tilføj New Edge"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1714
+msgid "Enlarge the Diagram"
+msgstr "Forstør diagram"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1715
+msgid "Shrink the Diagram"
+msgstr "Indskrænk diagram"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1716
+msgid "Fit the diagram to the window"
+msgstr "Monter diagram til vinduet"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1717
+msgid "Show the diagram at its normal size"
+msgstr "Vise diagrammet i sin normale størrelse"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1718
+msgid "Print the Diagram"
+msgstr "Udskriv diagram"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1789
+#, python-format
+msgid "Close Current %s"
+msgstr "Luk nuværende %s"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1790
+#, python-format
+msgid "Delete Current %s"
+msgstr "Slet nuværende %s"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1791
+#, python-format
+msgid "Edit Current %s"
+msgstr "Rediger aktuel %s"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1875
+msgid " - Dot Viewer"
+msgstr " - Dot Viewer"
+
+#: bin/widget/view/form_gtk/reference.py:76 bin/openerp.glade:1258
+msgid "Create a new resource"
+msgstr "Opret en ny ressource"
+
+#: bin/widget/view/form_gtk/reference.py:89
+msgid "Search / Open a resource"
+msgstr "Søg / Åbn en ressource"
+
+#: bin/widget/view/form_gtk/parser.py:61
+msgid "Wrong icon for the button !"
+msgstr "Forkert ikon for denne knap!"
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Field"
+msgstr "Felt"
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Object"
+msgstr "Objekt"
+
+#: bin/widget/view/form_gtk/parser.py:619
+msgid "Enter some text to the related field before adding translations!"
+msgstr ""
+"Indtast noget tekst til det relaterede felt, før du tilføjer oversættelser!"
+
+#: bin/widget/view/form_gtk/parser.py:626
+msgid "You need to save resource before adding translations!"
+msgstr "Du er nødt til at gemme ressourcer, før du tilføjer oversættelser!"
+
+#: bin/widget/view/form_gtk/parser.py:880
+msgid "Translate view"
+msgstr "Oversæt view"
+
+#: bin/widget/view/form_gtk/one2many_list.py:64
+msgid "Cancel"
+msgstr "Annuller"
+
+#: bin/widget/view/form_gtk/one2many_list.py:70
+msgid "Save & Close"
+msgstr "Gem og luk"
+
+#: bin/widget/view/form_gtk/one2many_list.py:75
+msgid "Save & New"
+msgstr "Gem & ny"
+
+#: bin/widget/view/form_gtk/one2many_list.py:164
+#: bin/widget/view/form_gtk/interface.py:48
+msgid "Set to default value"
+msgstr "Indstil til standardværdien"
+
+#: bin/widget/view/form_gtk/one2many_list.py:167
+msgid "Set Default"
+msgstr "Sæt som standard"
+
+#: bin/widget/view/form_gtk/one2many_list.py:196
+msgid "Create a new entry"
+msgstr "Oprette en ny post"
+
+#: bin/widget/view/form_gtk/one2many_list.py:200
+msgid "Edit this entry"
+msgstr "Rediger dette indlæg"
+
+#: bin/widget/view/form_gtk/one2many_list.py:204
+msgid "Remove this entry"
+msgstr "Fjern denne post"
+
+#: bin/widget/view/form_gtk/many2many.py:84
+#: bin/widget/view/form_gtk/one2many_list.py:210
+msgid "Previous Page"
+msgstr "Forrige side"
+
+#: bin/widget/view/form_gtk/many2many.py:88
+#: bin/widget/view/form_gtk/one2many_list.py:214
+msgid "Previous Record"
+msgstr "Tidligere post"
+
+#: bin/widget/view/form_gtk/many2many.py:96
+#: bin/widget/view/form_gtk/one2many_list.py:222
+msgid "Next Record"
+msgstr "Næste post"
+
+#: bin/widget/view/form_gtk/many2many.py:100
+#: bin/widget/view/form_gtk/one2many_list.py:226
+msgid "Next Page"
+msgstr "Næste side"
+
+#: bin/widget/view/form_gtk/one2many_list.py:232
+msgid "Switch"
+msgstr "Skift"
+
+#: bin/widget/view/form_gtk/many2many.py:106
+#: bin/widget/view/form_gtk/one2many_list.py:238
+msgid "Choose Limit"
+msgstr "Vælg Limit"
+
+#: bin/widget/view/form_gtk/one2many_list.py:279
+msgid "You have to select a resource !"
+msgstr "Du skal vælge en ressource!"
+
+#: bin/widget/view/form_gtk/image.py:73
+msgid "Set Image"
+msgstr "Placér billede"
+
+#: bin/widget/view/form_gtk/image.py:82 bin/widget/view/form_gtk/binary.py:84
+msgid "Save As"
+msgstr "Gem som"
+
+#: bin/widget/view/form_gtk/image.py:93 bin/widget/view/form_gtk/binary.py:88
+msgid "Clear"
+msgstr "Ryd"
+
+#: bin/widget/view/form_gtk/image.py:102
+msgid "All files"
+msgstr "Alle filer"
+
+#: bin/widget/view/form_gtk/image.py:106
+msgid "Images"
+msgstr "Billeder"
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "There is no image to save as !"
+msgstr "Der er intet billede at gemme!"
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "Warning"
+msgstr "Advarsel"
+
+#: bin/widget/view/form_gtk/many2one.py:158 bin/widget/view/form_gtk/url.py:53
+msgid "Open this resource"
+msgstr "Åbn denne ressource"
+
+#: bin/widget/view/form_gtk/many2one.py:163
+#: bin/widget_search/custom_filter_widgets.py:87
+msgid "Search a resource"
+msgstr "Søg en ressource"
+
+#: bin/widget/view/form_gtk/many2one.py:174 bin/openerp.glade:1412
+msgid "Action"
+msgstr "Action"
+
+#: bin/widget/view/form_gtk/many2one.py:175
+msgid "Report"
+msgstr "Rapport"
+
+#: bin/widget/view/list.py:633 bin/widget/view/form_gtk/many2one.py:387
+msgid "You must select a record to use the relation !"
+msgstr "Du skal vælge en post for at bruge relatioen!"
+
+#: bin/widget/view/form_gtk/interface.py:49
+msgid "Set as default"
+msgstr "Vælg som standard"
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "You can not set to the default value here !"
+msgstr "Du kan ikke indstille standardværdien her!"
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "Operation not permited"
+msgstr "Operation ikke tilladt"
+
+#: bin/widget/view/form_gtk/binary.py:76
+msgid "Select"
+msgstr "Vælg"
+
+#: bin/widget/view/form_gtk/binary.py:80
+msgid "Open"
+msgstr "Åbn"
+
+#: bin/widget/view/form_gtk/binary.py:119
+#: bin/widget/view/form_gtk/binary.py:163
+msgid "Unable to read the file data"
+msgstr "kan ikke læse data filen"
+
+#: bin/widget/view/form_gtk/binary.py:129
+#: bin/widget/view/form_gtk/binary.py:155
+#, python-format
+msgid "Error reading the file: %s"
+msgstr "Fejl ved læsning af filen: %s"
+
+#: bin/widget/view/form_gtk/binary.py:138
+msgid "All Files"
+msgstr "Alle filer"
+
+#: bin/widget/view/form_gtk/binary.py:148
+msgid "Select a file..."
+msgstr "Vælg en fil ..."
+
+#: bin/widget/view/form_gtk/binary.py:177
+#, python-format
+msgid "Error writing the file: %s"
+msgstr "Fejl ved skrivning til fil: %s"
+
+#: bin/widget/view/form_gtk/wid_common.py:59
+msgid "Always applicable !"
+msgstr "Altid gældende!"
+
+#: bin/widget/view/form_gtk/calendar.py:99
+#: bin/widget/view/form_gtk/calendar.py:163
+msgid "Invalid date value! Year must be greater than 1899 !"
+msgstr "Ugyldig dato! År skal være større end 1899!"
+
+#: bin/widget/view/form_gtk/calendar.py:255 bin/widget_search/calendar.py:273
+msgid "Hour:"
+msgstr "Time:"
+
+#: bin/widget/view/form_gtk/calendar.py:258 bin/widget_search/calendar.py:276
+msgid "Minute:"
+msgstr "Minut:"
+
+#: bin/widget/view/form_gtk/calendar.py:291 bin/widget_search/calendar.py:312
+msgid "Invalid datetime value! Year must be greater than 1899 !"
+msgstr "Ugyldig dato og tid! År skal være større end 1899!"
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:30
+msgid "Gantt view not yet implemented !"
+msgstr "Gantt-visning findes endnu ikke!"
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:31
+msgid ""
+"The gantt view is not available in this GTK Client, you should use the web "
+"interface or switch to the calendar view."
+msgstr ""
+"Gantt visning er ikke tilgængelig i denne GTK Klient, skal du bruge web-"
+"grænseflade eller skifte til kalendervisning."
+
+#: bin/widget/screen/screen.py:337
+msgid ""
+"(Any existing filter with the \n"
+"same name will be replaced)"
+msgstr ""
+"(Enhver eksisterende filter\n"
+"med samme navn vil blive erstattet)"
+
+#: bin/rpc.py:158
+>>>>>>> MERGE-SOURCE
 msgid "Connection refused!"
 msgstr "Forbindelse afvist!"
 
@@ -970,6 +2151,7 @@
 
 #: bin/rpc.py:188
 msgid "Connection Error"
+<<<<<<< TREE
 msgstr "Forbindelse fejl"
 
 #: bin/rpc.py:203 bin/rpc.py:205 bin/modules/action/wizard.py:162
@@ -1596,6 +2778,9 @@
 #: bin/modules/gui/main.py:1511
 msgid "Couldn't backup database."
 msgstr "Kunne ikke sikkerhedskopiere database."
+=======
+msgstr "Forbindelse fejl"
+>>>>>>> MERGE-SOURCE
 
 #: bin/openerp.glade:6
 msgid "OpenERP - Login"
@@ -1663,6 +2848,7 @@
 
 #: bin/openerp.glade:468
 msgid "_Preferences"
+<<<<<<< TREE
 msgstr "_Preferences"
 
 #: bin/openerp.glade:483 bin/openerp.glade:7304
@@ -1670,6 +2856,11 @@
 msgstr "Skift adgangskode"
 
 #: bin/openerp.glade:496
+=======
+msgstr "_Preferences"
+
+#: bin/openerp.glade:496
+>>>>>>> MERGE-SOURCE
 msgid "_Send a request"
 msgstr "_Send en anmodning"
 
@@ -2035,6 +3226,7 @@
 "\n"
 "More Info on www.openerp.com !"
 msgstr ""
+<<<<<<< TREE
 "\n"
 "OpenERP - GTK Client - v% s\n"
 "\n"
@@ -2052,6 +3244,13 @@
 "(c) 2004-TODAY, OpenERP SA\n"
 "\n"
 "Mere information på www.openerp.com !"
+=======
+"\n"
+"OpenERP - GTK klient - v%s OpenERP er en Open Source ERP + CRM til små og "
+"mellemstore virksomheder. Hele kildekoden er distribueret under "
+"betingelserne i GNU Public Licence. (C) 2003-i dag, Tiny SPRL Mere info om "
+"www.openerp.com!"
+>>>>>>> MERGE-SOURCE
 
 #: bin/openerp.glade:1931
 msgid "_OpenERP"
@@ -2073,6 +3272,7 @@
 "Mail: sales@xxxxxxxxxxx\n"
 "Web: http://openerp.com";
 msgstr ""
+<<<<<<< TREE
 "\n"
 "(c) 2004-TODAY, OpenERP SA\n"
 "OpenERP er et produkt af OpenERP SA:\n"
@@ -2086,6 +3286,12 @@
 "Tel : (+32) 2 290 34 90 (Salg)\n"
 "Mail: sales@xxxxxxxxxxx\n"
 "Web: http://openerp.com";
+=======
+"\n"
+"(C) 2003-DAG - Tiny sprl OpenERP er et produkt af Tiny sprl: Tiny sprl 40 "
+"Chaussée de Namur 1367 Gérompont Belgien Tlf: (+32) 81.81.37.00 Mail: "
+"sales@xxxxxxx Web: http://tiny. være"
+>>>>>>> MERGE-SOURCE
 
 #: bin/openerp.glade:1991
 msgid "_Contact"
@@ -2161,9 +3367,23 @@
 
 #: bin/openerp.glade:2834
 msgid "<b>Predefined Exports</b>"
-msgstr "<b>Foruddefinerede Eksport</b>"
-
-#: bin/openerp.glade:2880
+<<<<<<< TREE
+msgstr "<b>Foruddefinerede Eksport</b>"
+
+#: bin/openerp.glade:2880
+=======
+msgstr "<b>Foruddefinerede Eksport</b>"
+
+#: bin/openerp.glade:3134
+msgid "Import Compatible"
+msgstr "Import Kompatibel"
+
+#: bin/openerp.glade:2862
+msgid "<b>Select an Option to Export</b>"
+msgstr "<b>Vælg en mulighed for at eksportere</b>"
+
+#: bin/openerp.glade:2880
+>>>>>>> MERGE-SOURCE
 msgid "Available Fields"
 msgstr "Tilgængelige felter"
 
@@ -2181,6 +3401,7 @@
 
 #: bin/openerp.glade:3073
 msgid "Fields to Export"
+<<<<<<< TREE
 msgstr "Felter til Export"
 
 #: bin/openerp.glade:3115
@@ -2192,6 +3413,23 @@
 msgstr "Import Kompatibel"
 
 #: bin/openerp.glade:3156
+=======
+msgstr "Felter til Export"
+
+#: bin/openerp.glade:3132
+msgid ""
+"Open in Excel\n"
+"Save as CSV"
+msgstr ""
+"Åbn i Excel\n"
+"Gem som CSV"
+
+#: bin/openerp.glade:3151
+msgid "Add _field names"
+msgstr "Tilføj _field navne"
+
+#: bin/openerp.glade:3156
+>>>>>>> MERGE-SOURCE
 msgid "<b>Opti_ons</b>"
 msgstr "<b>Opti_ons</b>"
 
@@ -2498,6 +3736,7 @@
 
 #: bin/openerp.glade:5715
 msgid "N_othing"
+<<<<<<< TREE
 msgstr "N_othing"
 
 #: bin/openerp.glade:5772
@@ -2511,10 +3750,29 @@
 msgstr "Fil til import: "
 
 #: bin/openerp.glade:5852
+=======
+msgstr "N_othing"
+
+#: bin/openerp.glade:5852
+>>>>>>> MERGE-SOURCE
 msgid "Auto-Detect"
-msgstr "Autodetektér"
-
-#: bin/openerp.glade:5930
+<<<<<<< TREE
+msgstr "Autodetektér"
+
+#: bin/openerp.glade:5930
+=======
+msgstr "Autodetektér"
+
+#: bin/openerp.glade:5772
+msgid "<b>Fields to import</b>"
+msgstr "<b>Felter for at importere</b>"
+
+#: bin/openerp.glade:5891
+msgid "File to Import:"
+msgstr "Fil til import:"
+
+#: bin/openerp.glade:5930
+>>>>>>> MERGE-SOURCE
 msgid "Lines to Skip:"
 msgstr "Linjer som springes over:"
 
@@ -2524,6 +3782,7 @@
 
 #: bin/openerp.glade:5987
 msgid "Encoding:"
+<<<<<<< TREE
 msgstr "Kodning:"
 
 #
@@ -2533,6 +3792,15 @@
 msgstr "Felt separater: "
 
 #: bin/openerp.glade:6012
+=======
+msgstr "Kodning:"
+
+#: bin/openerp.glade:6035
+msgid "Field Separater:"
+msgstr "Felt separater:"
+
+#: bin/openerp.glade:6012
+>>>>>>> MERGE-SOURCE
 msgid "CSV Parameters"
 msgstr "CSV parametre"
 
@@ -2705,10 +3973,21 @@
 "<sup><b><span foreground=\"dark green\">?</span></b></sup>Load Demonstration "
 "Data:"
 msgstr ""
-"<span foreground=\"dark green\"><b><sup>?</sup></b></span> Load "
-"Demonstration Data:"
-
-#: bin/openerp.glade:7321
+<<<<<<< TREE
+"<span foreground=\"dark green\"><b><sup>?</sup></b></span> Load "
+"Demonstration Data:"
+
+#: bin/openerp.glade:7321
+=======
+"<span foreground=\"dark green\"><b><sup>?</sup></b></span> Load "
+"Demonstration Data:"
+
+#: bin/openerp.glade:483 bin/openerp.glade:7304
+msgid "Change password"
+msgstr "Skift adgangskode"
+
+#: bin/openerp.glade:7321
+>>>>>>> MERGE-SOURCE
 msgid "<b>Change your super admin password</b>"
 msgstr "<b>Skift din super admin password</b>"
 
@@ -2774,13 +4053,46 @@
 
 #: bin/openerp.glade:8076
 msgid "Month"
-msgstr "Måned"
-
-#: bin/openerp.glade:8230
-msgid "Filter Entry"
-msgstr "Filter Entry"
-
-#: bin/openerp.glade:8276
+<<<<<<< TREE
+msgstr "Måned"
+
+#: bin/openerp.glade:8230
+msgid "Filter Entry"
+msgstr "Filter Entry"
+=======
+msgstr "Måned"
+>>>>>>> MERGE-SOURCE
+
+#: bin/openerp.glade:8276
+<<<<<<< TREE
+=======
+msgid "Fields on which Search criteria to be applied"
+msgstr "Områder, som Search kriterier, der skal anvendes"
+
+#: bin/openerp.glade:8289
+msgid "Conditional Operators"
+msgstr "Betinget Operatører"
+
+#: bin/openerp.glade:8316
+msgid "The Choice will be applied with next filter if any"
+msgstr "Valget vil blive anvendt med næste filter eventuelle"
+
+#: bin/openerp.glade:8317
+msgid ""
+"AND\n"
+"OR"
+msgstr "OG ELLER"
+
+#: bin/openerp.glade:8330
+msgid "Remove Filter"
+msgstr "Fjern filter"
+
+#: bin/openerp.glade:8230
+msgid "Filter Entry"
+msgstr "Filter Entry"
+
+#: bin/openerp.glade:8276
+>>>>>>> MERGE-SOURCE
 msgid "Enter Filter Name:"
 msgstr "Indtast Filter navn:"
 
@@ -2804,23 +4116,41 @@
 "you shortly.\n"
 "</i>"
 msgstr ""
+<<<<<<< TREE
 "<b>Publisher Warranty Contract.</b>\n"
 "<i>\n"
 "Din anmodning vil blive sendt til OpenERP, og publisher warranty team vil "
 "svare dig hurtigst mulig.\n"
 "</i>"
+=======
+"<b>Udgiver Garanti Kontrakt.</b> <i>Din anmodning vil blive sendt til "
+"OpenERP og udgiverens garanti team vil svare dig snarest.</i>"
+>>>>>>> MERGE-SOURCE
 
 #: bin/win_error.glade:186
 msgid "Explain what you did:"
-msgstr "Forklar hvad du gjorde:"
+<<<<<<< TREE
+msgstr "Forklar hvad du gjorde:"
+=======
+msgstr "Forklar hvad du gjorde:"
+
+#: bin/win_error.glade:200
+msgid "Others Comments:"
+msgstr "Andre Kommentarer:"
+>>>>>>> MERGE-SOURCE
 
 #: bin/win_error.glade:285
 msgid "Send to Publisher Warranty Team"
 msgstr "Send til Publisher Garanti Team"
 
 #: bin/win_error.glade:318
+<<<<<<< TREE
 msgid "Problems summary:"
 msgstr "Sammendrag af problemerne"
+=======
+msgid "Summary of the problem:"
+msgstr "Resumé af problemet:"
+>>>>>>> MERGE-SOURCE
 
 #: bin/win_error.glade:360
 msgid "<i>_Support Request</i>"
@@ -2832,6 +4162,7 @@
 
 #: bin/win_error.glade:404
 msgid "<i>_Details</i>"
+<<<<<<< TREE
 msgstr "<i>_Details</i>"
 
 #~ msgid "Edit"
@@ -2996,3 +4327,6 @@
 
 #~ msgid "Field Separater:"
 #~ msgstr "Felt separater:"
+=======
+msgstr "<i>_Details</i>"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/po/de.po'
--- bin/po/de.po	2011-10-11 05:32:10 +0000
+++ bin/po/de.po	2011-10-24 01:06:26 +0000
@@ -16,10 +16,16 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-10-11 05:30+0000\n"
 "X-Generator: Launchpad (build 14123)\n"
+=======
+"X-Launchpad-Export-Date: 2011-09-15 05:09+0000\n"
+"X-Generator: Launchpad (build 13921)\n"
+>>>>>>> MERGE-SOURCE
 "Language: \n"
 
+<<<<<<< TREE
 #: bin/widget/view/gantt_gtk/parser_dummy.py:30
 msgid "Gantt view not yet implemented !"
 msgstr "Gantt Ansicht ist noch nicht programmiert."
@@ -330,9 +336,503 @@
 # File: bin/openerp.glade, line: 7878
 #: bin/widget/view/form_gtk/image.py:112 bin/widget/view/form_gtk/url.py:118
 #: bin/modules/gui/main.py:1389 bin/openerp.glade:5817
+=======
+#: bin/plugins/__init__.py:27
+msgid "Print Workflow"
+msgstr "Arbeitsprozess ausdrucken"
+
+#: bin/plugins/__init__.py:28
+msgid "Print Workflow (with subflows)"
+msgstr "Arbeitsablauf drucken (komplex)"
+
+#: bin/plugins/__init__.py:40
+msgid "No available plugin for this resource !"
+msgstr "Kein Plugin für diese Ressource verfügbar!"
+
+#: bin/plugins/__init__.py:42
+msgid "Choose a Plugin"
+msgstr "Plugin auswählen"
+
+#
+# File: bin/modules/action/wizard.py, line: 171
+# File: bin/rpc.py, line: 141
+# File: bin/modules/action/wizard.py, line: 171
+# File: bin/rpc.py, line: 141
+# File: bin/modules/action/wizard.py, line: 171
+# File: bin/rpc.py, line: 141
+#: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
+msgid "Connection refused !"
+msgstr "Verbindung abgelehnt!"
+
+#
+# File: bin/modules/action/wizard.py, line: 183
+# File: bin/modules/action/wizard.py, line: 189
+# File: bin/modules/action/wizard.py, line: 191
+# File: bin/rpc.py, line: 187
+# File: bin/rpc.py, line: 189
+# File: bin/modules/action/wizard.py, line: 183
+# File: bin/modules/action/wizard.py, line: 189
+# File: bin/modules/action/wizard.py, line: 191
+# File: bin/rpc.py, line: 187
+# File: bin/rpc.py, line: 189
+# File: bin/modules/action/wizard.py, line: 183
+# File: bin/modules/action/wizard.py, line: 189
+# File: bin/modules/action/wizard.py, line: 191
+# File: bin/rpc.py, line: 187
+# File: bin/rpc.py, line: 189
+#: bin/rpc.py:203 bin/rpc.py:205 bin/modules/action/wizard.py:162
+#: bin/modules/action/wizard.py:168 bin/modules/action/wizard.py:170
+#: bin/modules/gui/main.py:195 bin/modules/gui/main.py:201
+msgid "Application Error"
+msgstr "Anwendungsfehler"
+
+#
+# File: bin/modules/action/wizard.py, line: 191
+# File: bin/rpc.py, line: 189
+# File: bin/modules/action/wizard.py, line: 191
+# File: bin/rpc.py, line: 189
+# File: bin/modules/action/wizard.py, line: 191
+# File: bin/rpc.py, line: 189
+#: bin/rpc.py:205 bin/modules/action/wizard.py:170
+msgid "View details"
+msgstr "Zeige Details"
+
+#
+# File: bin/modules/action/main.py, line: 46
+# File: bin/modules/action/main.py, line: 46
+# File: bin/modules/action/main.py, line: 46
+#: bin/modules/action/main.py:48
+msgid "Nothing to print!"
+msgstr "Nichts zu drucken!"
+
+#
+# File: bin/modules/action/main.py, line: 63
+# File: bin/modules/action/main.py, line: 63
+# File: bin/modules/action/main.py, line: 63
+#: bin/modules/action/main.py:66
+msgid "Printing aborted, too long delay !"
+msgstr "Ausdruck abgebrochen, zu lange Wartezeit!"
+
+#
+# File: bin/modules/action/main.py, line: 178
+# File: bin/modules/action/main.py, line: 178
+# File: bin/modules/action/main.py, line: 178
+#: bin/modules/action/main.py:195
+msgid "Select your action"
+msgstr "Wählen Sie Ihren Arbeitsschritt aus."
+
+#
+# File: bin/modules/gui/main.py, line: 145
+# File: bin/modules/gui/main.py, line: 1138
+# File: bin/modules/gui/main.py, line: 145
+# File: bin/modules/gui/main.py, line: 1138
+# File: bin/modules/gui/main.py, line: 145
+# File: bin/modules/gui/main.py, line: 1138
+#: bin/modules/gui/main.py:89 bin/modules/gui/main.py:341
+msgid "Could not connect to server !"
+msgstr "Kann zum Server nicht verbinden!"
+
+#
+# File: bin/openerp.glade, line: 74
+# File: bin/openerp.glade, line: 8255
+# File: bin/openerp.glade, line: 8491
+# File: bin/openerp.glade, line: 8813
+# File: bin/openerp.glade, line: 9458
+# File: bin/openerp.glade, line: 74
+# File: bin/openerp.glade, line: 8255
+# File: bin/openerp.glade, line: 8491
+# File: bin/openerp.glade, line: 8813
+# File: bin/openerp.glade, line: 9458
+# File: bin/openerp.glade, line: 74
+# File: bin/openerp.glade, line: 8255
+# File: bin/openerp.glade, line: 8491
+# File: bin/openerp.glade, line: 8813
+# File: bin/openerp.glade, line: 9458
+#: bin/modules/gui/main.py:93 bin/openerp.glade:72 bin/openerp.glade:6233
+#: bin/openerp.glade:6479 bin/openerp.glade:6802 bin/openerp.glade:7466
+msgid "Server:"
+msgstr "Server:"
+
+#
+# File: bin/openerp.glade, line: 100
+# File: bin/openerp.glade, line: 8527
+# File: bin/openerp.glade, line: 8770
+# File: bin/openerp.glade, line: 9067
+# File: bin/openerp.glade, line: 9415
+# File: bin/openerp.glade, line: 100
+# File: bin/openerp.glade, line: 8527
+# File: bin/openerp.glade, line: 8770
+# File: bin/openerp.glade, line: 9067
+# File: bin/openerp.glade, line: 9415
+# File: bin/openerp.glade, line: 100
+# File: bin/openerp.glade, line: 8527
+# File: bin/openerp.glade, line: 8770
+# File: bin/openerp.glade, line: 9067
+# File: bin/openerp.glade, line: 9415
+#: bin/modules/gui/main.py:104 bin/openerp.glade:98 bin/openerp.glade:6515
+#: bin/openerp.glade:6759 bin/openerp.glade:7058 bin/openerp.glade:7423
+msgid "Change"
+msgstr "Ändern"
+
+#
+# File: bin/openerp.glade, line: 372
+# File: bin/openerp.glade, line: 372
+# File: bin/openerp.glade, line: 372
+#: bin/modules/gui/main.py:111
+msgid "Super Administrator Password:"
+msgstr "Kennwort des Systemadmininstrators"
+
+#: bin/modules/gui/main.py:193
+msgid "Bad Super Administrator Password"
+msgstr "Falsches Systemverwalterkennwort"
+
+#: bin/modules/gui/main.py:217
+msgid "Migration Scripts"
+msgstr "Migrations-Skripte"
+
+#: bin/modules/gui/main.py:220
+msgid "Contract ID:"
+msgstr "Vertragsnummer:"
+
+#: bin/modules/gui/main.py:226
+msgid "Contract Password:"
+msgstr "Vertragspasswort:"
+
+#: bin/modules/gui/main.py:241
+msgid "You already have the latest version"
+msgstr "Sie haben bereits die aktuellste Version"
+
+#: bin/modules/gui/main.py:246
+msgid "The following updates are available:"
+msgstr "Die folgenden Aktualisierungen sind verfügbar:"
+
+#: bin/modules/gui/main.py:258
+msgid "You can now migrate your databases."
+msgstr "Sie können jetzt Ihre Datenbanken migrieren."
+
+#: bin/modules/gui/main.py:263
+msgid "Migrate Database"
+msgstr "Migriere Datenbank"
+
+#: bin/modules/gui/main.py:280
+msgid "Database"
+msgstr "Datenbank"
+
+#: bin/modules/gui/main.py:292
+msgid "Your database has been upgraded."
+msgstr "Ihre Datenbank wurde aktualisiert."
+
+#: bin/modules/gui/main.py:294
+msgid "Your databases have been upgraded."
+msgstr "Ihre Datenbanken wurden aktualisiert."
+
+#: bin/modules/gui/main.py:296
+msgid "You have not selected a database"
+msgstr "Sie haben keine Datenbank ausgewählt"
+
+#
+# File: bin/modules/gui/main.py, line: 152
+# File: bin/modules/gui/main.py, line: 1142
+# File: bin/modules/gui/main.py, line: 152
+# File: bin/modules/gui/main.py, line: 1142
+# File: bin/modules/gui/main.py, line: 152
+# File: bin/modules/gui/main.py, line: 1142
+#: bin/modules/gui/main.py:360
+msgid "No database found, you must create one !"
+msgstr "Keine Datenbank gefunden, es muß eine erzeugt werden!"
+
+#: bin/modules/gui/main.py:468
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: bin/modules/gui/main.py:474
+#, python-format
+msgid ""
+"The versions of the server (%s) and the client (%s) missmatch. The client "
+"may not work properly. Use it at your own risks."
+msgstr ""
+"Server (%s) und Anwendungsversion(%s) passen nicht zusammen.\n"
+"Die Anwendung könnte nicht richtig funktionieren.\n"
+"Verwendung auf eigene Gefahr!"
+
+#: bin/modules/gui/main.py:610
+msgid "Sorry,'"
+msgstr "Entschulidigung,'"
+
+#
+# File: bin/modules/gui/main.py, line: 296
+# File: bin/modules/gui/main.py, line: 299
+# File: bin/modules/gui/main.py, line: 296
+# File: bin/modules/gui/main.py, line: 299
+# File: bin/modules/gui/main.py, line: 296
+# File: bin/modules/gui/main.py, line: 299
+#: bin/modules/gui/main.py:610 bin/modules/gui/main.py:613
+msgid "Bad database name !"
+msgstr "Falscher Name der Datenbank!"
+
+#
+# File: bin/modules/gui/main.py, line: 299
+# File: bin/modules/gui/main.py, line: 299
+# File: bin/modules/gui/main.py, line: 299
+#: bin/modules/gui/main.py:613
+msgid ""
+"The database name must contain only normal characters or \"_\".\n"
+"You must avoid all accents, space or special characters."
+msgstr ""
+"Der Datenbankname darf nur aus normalen Zeichen und \"_\" bestehen.\n"
+"Keine Akkzente, Leerstellen, oder Sonderzeichen."
+
+#
+# File: bin/modules/gui/main.py, line: 359
+# File: bin/modules/gui/main.py, line: 361
+# File: bin/modules/gui/main.py, line: 363
+# File: bin/modules/gui/main.py, line: 359
+# File: bin/modules/gui/main.py, line: 361
+# File: bin/modules/gui/main.py, line: 363
+# File: bin/modules/gui/main.py, line: 359
+# File: bin/modules/gui/main.py, line: 361
+# File: bin/modules/gui/main.py, line: 363
+#: bin/modules/gui/main.py:637 bin/modules/gui/main.py:650
+#: bin/modules/gui/main.py:652 bin/modules/gui/main.py:654
+msgid "Could not create database."
+msgstr "Kann keine Datenbank erzeugen."
+
+#
+# File: bin/modules/gui/main.py, line: 359
+# File: bin/modules/gui/main.py, line: 359
+# File: bin/modules/gui/main.py, line: 359
+#: bin/modules/gui/main.py:638 bin/modules/gui/main.py:650
+msgid "Database already exists !"
+msgstr "Datenbank existiert bereits!"
+
+#
+# File: bin/modules/gui/main.py, line: 361
+# File: bin/modules/gui/main.py, line: 1044
+# File: bin/modules/gui/main.py, line: 1063
+# File: bin/modules/gui/main.py, line: 361
+# File: bin/modules/gui/main.py, line: 1044
+# File: bin/modules/gui/main.py, line: 1063
+# File: bin/modules/gui/main.py, line: 361
+# File: bin/modules/gui/main.py, line: 1044
+# File: bin/modules/gui/main.py, line: 1063
+#: bin/modules/gui/main.py:652 bin/modules/gui/main.py:1384
+#: bin/modules/gui/main.py:1404 bin/modules/gui/main.py:1509
+msgid "Bad database administrator password !"
+msgstr "Flasches Systemadministratorkennwort für die Datenbank!"
+
+#
+# File: bin/modules/gui/main.py, line: 363
+# File: bin/modules/gui/main.py, line: 370
+# File: bin/modules/gui/main.py, line: 363
+# File: bin/modules/gui/main.py, line: 370
+# File: bin/modules/gui/main.py, line: 363
+# File: bin/modules/gui/main.py, line: 370
+#: bin/modules/gui/main.py:654 bin/modules/gui/main.py:661
+msgid "Error during database creation !"
+msgstr "Fehler beim Erzeugen der Datenbank"
+
+#
+# File: bin/modules/gui/main.py, line: 370
+# File: bin/modules/gui/main.py, line: 370
+# File: bin/modules/gui/main.py, line: 370
+#: bin/modules/gui/main.py:661
+msgid ""
+"The server crashed during installation.\n"
+"We suggest you to drop this database."
+msgstr ""
+"Die Datenbank ist während der Installation abgestürzt.\n"
+"Wir empfehlen, diese zu löschen."
+
+#
+# File: bin/modules/gui/main.py, line: 432
+# File: bin/modules/gui/main.py, line: 763
+# File: bin/modules/gui/main.py, line: 432
+# File: bin/modules/gui/main.py, line: 763
+# File: bin/modules/gui/main.py, line: 432
+# File: bin/modules/gui/main.py, line: 763
+#: bin/modules/gui/main.py:707 bin/modules/gui/main.py:1072
+msgid "Press Ctrl+O to login"
+msgstr "Drücken Sie Strg+O, um sich anzumelden"
+
+#
+# File: bin/modules/gui/main.py, line: 605
+# File: bin/modules/gui/main.py, line: 605
+# File: bin/modules/gui/main.py, line: 605
+#: bin/modules/gui/main.py:881
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: bin/modules/gui/main.py:974
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: bin/modules/gui/main.py:976
+msgid "No Company"
+msgstr "Keine Firma"
+
+#
+# File: bin/modules/gui/main.py, line: 694
+# File: bin/modules/gui/main.py, line: 694
+# File: bin/modules/gui/main.py, line: 694
+#: bin/modules/gui/main.py:989
+#, python-format
+msgid "%s request(s)"
+msgstr "%s Anfrage(n)"
+
+#
+# File: bin/modules/gui/main.py, line: 696
+# File: bin/modules/gui/main.py, line: 696
+# File: bin/modules/gui/main.py, line: 696
+#: bin/modules/gui/main.py:991
+msgid "No request"
+msgstr "Keine Anfrage"
+
+#: bin/modules/gui/main.py:993
+#, python-format
+msgid " - %s request(s) sent"
+msgstr " - %s Anfrage(n) gesendet"
+
+#: bin/modules/gui/main.py:1031
+msgid ""
+"Please double-check the database name or contact your administrator to "
+"verify the database status."
+msgstr ""
+"Bitte überprüfen sie den Datenbanknamen oder fragen Sie Ihren Administrator "
+"nach dem Status der Datenbank."
+
+#: bin/modules/gui/main.py:1031
+msgid "Database cannot be accessed or does not exist"
+msgstr "Datenbank kann nicht verwendet werden oder exsitiert nicht."
+
+#
+# File: bin/modules/gui/main.py, line: 734
+# File: bin/modules/gui/main.py, line: 734
+# File: bin/modules/gui/main.py, line: 734
+#: bin/modules/gui/main.py:1035
+msgid ""
+"Connection error !\n"
+"Unable to connect to the server !"
+msgstr ""
+"Verbindungsfehler!\n"
+"Konnte nicht zum Server verbinden!"
+
+#: bin/modules/gui/main.py:1037
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password !"
+msgstr ""
+"Fehler beid er Anmeldung!\n"
+"Username oder Passwort falsch!"
+
+#: bin/modules/gui/main.py:1050
+#, python-format
+msgid "OpenERP - %s"
+msgstr "OpenERP - %s"
+
+#
+# File: bin/modules/gui/main.py, line: 761
+# File: bin/modules/gui/main.py, line: 761
+# File: bin/modules/gui/main.py, line: 761
+#: bin/modules/gui/main.py:1070
+msgid "Not logged !"
+msgstr "nicht mitprotokolliert!"
+
+#: bin/widget/view/form_gtk/one2many_list.py:52 bin/modules/gui/main.py:1079
+#: bin/openerp.glade:6081
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#: bin/modules/gui/main.py:1153
+msgid ""
+"You can not log into the system !\n"
+"Ask the administrator to verify\n"
+"you have an action defined for your user."
+msgstr ""
+"Sie können sich nicht am System anmelden!\n"
+"Problem: Es wurde keine Aktion für den Benutzer definiert. Fragen Sie ihren "
+"Administrator."
+
+#
+# File: bin/modules/gui/main.py, line: 865
+# File: bin/modules/gui/main.py, line: 872
+# File: bin/modules/gui/main.py, line: 865
+# File: bin/modules/gui/main.py, line: 872
+# File: bin/modules/gui/main.py, line: 865
+# File: bin/modules/gui/main.py, line: 872
+#: bin/modules/gui/main.py:1187 bin/modules/gui/main.py:1194
+msgid "Do you really want to quit ?"
+msgstr "Wollen Sie dieses Programm beenden?"
+
+#
+# File: bin/modules/gui/main.py, line: 927
+# File: bin/modules/gui/main.py, line: 927
+# File: bin/modules/gui/main.py, line: 927
+#: bin/modules/gui/main.py:1263
+#, python-format
+msgid "Attachments (%d)"
+msgstr "Anhang/Anhänge (%d)"
+
+#
+# File: bin/modules/gui/main.py, line: 940
+# File: bin/modules/gui/main.py, line: 940
+# File: bin/modules/gui/main.py, line: 940
+#: bin/modules/gui/main.py:1276
+msgid "Attachments"
+msgstr "Anhänge"
+
+#
+# File: bin/modules/gui/main.py, line: 1035
+# File: bin/modules/gui/main.py, line: 1035
+# File: bin/modules/gui/main.py, line: 1035
+#: bin/modules/gui/main.py:1375
+msgid "Delete a database"
+msgstr "Eine Datenbank löschen"
+
+#
+# File: bin/modules/gui/main.py, line: 1041
+# File: bin/modules/gui/main.py, line: 1041
+# File: bin/modules/gui/main.py, line: 1041
+#: bin/modules/gui/main.py:1381
+msgid "Database dropped successfully !"
+msgstr "Datenbank erfolgreich gelöscht!"
+
+#
+# File: bin/modules/gui/main.py, line: 1044
+# File: bin/modules/gui/main.py, line: 1044
+# File: bin/modules/gui/main.py, line: 1044
+#: bin/modules/gui/main.py:1384
+msgid "Could not drop database."
+msgstr "Konnte Datenbank nicht löschen"
+
+#
+# File: bin/modules/gui/main.py, line: 1046
+# File: bin/modules/gui/main.py, line: 1046
+# File: bin/modules/gui/main.py, line: 1046
+#: bin/modules/gui/main.py:1386
+msgid "Couldn't drop database"
+msgstr "Konnte Datenbank nicht löschen"
+
+#
+# File: bin/modules/gui/main.py, line: 1049
+# File: bin/widget/view/form_gtk/image.py, line: 110
+# File: bin/widget/view/form_gtk/url.py, line: 112
+# File: bin/openerp.glade, line: 7878
+# File: bin/modules/gui/main.py, line: 1049
+# File: bin/widget/view/form_gtk/image.py, line: 110
+# File: bin/widget/view/form_gtk/url.py, line: 112
+# File: bin/openerp.glade, line: 7878
+# File: bin/modules/gui/main.py, line: 1049
+# File: bin/widget/view/form_gtk/image.py, line: 110
+# File: bin/widget/view/form_gtk/url.py, line: 112
+# File: bin/openerp.glade, line: 7878
+#: bin/widget/view/form_gtk/image.py:112 bin/widget/view/form_gtk/url.py:118
+#: bin/modules/gui/main.py:1389 bin/openerp.glade:5817
+>>>>>>> MERGE-SOURCE
 msgid "Open..."
 msgstr "Öffnen ..."
 
+<<<<<<< TREE
 #: bin/widget/view/form_gtk/image.py:127
 msgid "There is no image to save as !"
 msgstr "Es gibt kein Bild zum speichern!"
@@ -360,12 +860,124 @@
 #: bin/widget/view/form_gtk/image.py:129
 #: bin/widget/view/form_gtk/binary.py:167 bin/printer/printer.py:231
 #: bin/modules/gui/window/win_export.py:359 bin/modules/gui/main.py:1493
+=======
+#
+# File: bin/modules/gui/main.py, line: 1060
+# File: bin/modules/gui/main.py, line: 1060
+# File: bin/modules/gui/main.py, line: 1060
+#: bin/modules/gui/main.py:1401
+msgid "Database restored successfully !"
+msgstr "Datenbank erfolgreich wiederhergestellt!"
+
+#
+# File: bin/modules/gui/main.py, line: 1063
+# File: bin/modules/gui/main.py, line: 1063
+# File: bin/modules/gui/main.py, line: 1063
+#: bin/modules/gui/main.py:1404
+msgid "Could not restore database."
+msgstr "Kann Datebank nicht wiederherstellen."
+
+#
+# File: bin/modules/gui/main.py, line: 1065
+# File: bin/modules/gui/main.py, line: 1065
+# File: bin/modules/gui/main.py, line: 1065
+#: bin/modules/gui/main.py:1406
+msgid "Couldn't restore database"
+msgstr "Kann Datebank nicht wiederherstellen."
+
+#: bin/modules/gui/main.py:1457
+msgid ""
+"Confirmation password does not match new password, operation cancelled!"
+msgstr ""
+"Die Kennwort Bestätigung entspricht nicht dem neuen Kennwort, Abbruch!."
+
+#
+# File: bin/modules/gui/main.py, line: 1100
+# File: bin/modules/gui/main.py, line: 1100
+# File: bin/modules/gui/main.py, line: 1100
+#: bin/modules/gui/main.py:1459
+msgid "Validation Error."
+msgstr "Fehler beim Überprüfen"
+
+#: bin/modules/gui/main.py:1476
+msgid "Could not change the Super Admin password."
+msgstr "Konnte das Super Administrator Kennwort nicht ändern"
+
+#: bin/modules/gui/main.py:1477 bin/modules/gui/main.py:1483
+msgid "Bad password provided !"
+msgstr "Falsches Kennwort eingegeben!"
+
+#
+# File: bin/modules/gui/main.py, line: 1111
+# File: bin/modules/gui/main.py, line: 1111
+# File: bin/modules/gui/main.py, line: 1111
+#: bin/modules/gui/main.py:1457
+msgid "Error, password not changed."
+msgstr "Fehler, Kennwort nicht geändert."
+
+#
+# File: bin/modules/gui/main.py, line: 1117
+# File: bin/modules/gui/main.py, line: 1134
+# File: bin/modules/gui/main.py, line: 1117
+# File: bin/modules/gui/main.py, line: 1134
+# File: bin/modules/gui/main.py, line: 1117
+# File: bin/modules/gui/main.py, line: 1134
+#: bin/modules/gui/main.py:1490 bin/modules/gui/main.py:1513
+msgid "Backup a database"
+msgstr "Datenbank sichern"
+
+#
+# File: bin/modules/gui/main.py, line: 1120
+# File: bin/modules/gui/window/win_export.py, line: 282
+# File: bin/printer/printer.py, line: 207
+# File: bin/widget/view/form_gtk/binary.py, line: 162
+# File: bin/widget/view/form_gtk/image.py, line: 117
+# File: bin/modules/gui/main.py, line: 1120
+# File: bin/modules/gui/window/win_export.py, line: 282
+# File: bin/printer/printer.py, line: 207
+# File: bin/widget/view/form_gtk/binary.py, line: 162
+# File: bin/widget/view/form_gtk/image.py, line: 117
+# File: bin/modules/gui/main.py, line: 1120
+# File: bin/modules/gui/window/win_export.py, line: 282
+# File: bin/printer/printer.py, line: 207
+# File: bin/widget/view/form_gtk/binary.py, line: 162
+# File: bin/widget/view/form_gtk/image.py, line: 117
+#: bin/widget/view/form_gtk/image.py:129
+#: bin/widget/view/form_gtk/binary.py:167 bin/printer/printer.py:231
+#: bin/modules/gui/window/win_export.py:359 bin/modules/gui/main.py:1493
+>>>>>>> MERGE-SOURCE
 msgid "Save As..."
 msgstr "Speichern unter ..."
 
+<<<<<<< TREE
 #: bin/widget/view/form_gtk/image.py:177
 msgid "Image corrupted"
+=======
+#: bin/modules/gui/main.py:1506
+msgid "Database backed up successfully !"
+msgstr "Datanbank erfolgreich gesichert"
+
+#: bin/modules/gui/main.py:1509
+msgid "Could not backup the database."
+msgstr "Konnte Datenbank nicht sichern."
+
+#
+# File: bin/modules/gui/main.py, line: 1132
+# File: bin/modules/gui/main.py, line: 1132
+# File: bin/modules/gui/main.py, line: 1132
+#: bin/modules/gui/main.py:1511
+msgid "Couldn't backup database."
+msgstr "Konnte Datenbank nicht sichern."
+
+#: bin/modules/gui/window/form.py:189
+msgid "Resource ID does not exist for this object!"
+msgstr "Keine Ressourcen-ID für dieses Objekt verfügbar!"
+
+#: bin/modules/gui/window/form.py:247
+msgid "No record selected ! You can only attach to existing record."
+>>>>>>> MERGE-SOURCE
 msgstr ""
+<<<<<<< TREE
 
 #: bin/widget/view/form_gtk/many2many.py:84
 #: bin/widget/view/form_gtk/one2many_list.py:210
@@ -518,14 +1130,94 @@
 # File: bin/widget/view/form_gtk/one2many_list.py, line: 269
 #: bin/widget/view/form_gtk/one2many_list.py:279
 msgid "You have to select a resource !"
+=======
+"Kein Datensatz ausgewählt! Anhänge können nur für bestehende Datensätze "
+"definiert werden."
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 269
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 269
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 269
+#: bin/modules/gui/window/form.py:264
+msgid "You have to select a record !"
+>>>>>>> MERGE-SOURCE
 msgstr "Sie müssen eine Quelle angeben!"
 
 #
-# File: bin/modules/gui/window/form.py, line: 233
-# File: bin/modules/gui/window/form.py, line: 233
-# File: bin/modules/gui/window/form.py, line: 233
-#: bin/widget/view/form_gtk/one2many_list.py:388
-#: bin/modules/gui/window/form.py:290
+<<<<<<< TREE
+# File: bin/modules/gui/window/form.py, line: 233
+# File: bin/modules/gui/window/form.py, line: 233
+# File: bin/modules/gui/window/form.py, line: 233
+#: bin/widget/view/form_gtk/one2many_list.py:388
+#: bin/modules/gui/window/form.py:290
+=======
+# File: bin/modules/gui/window/form.py, line: 215
+# File: bin/modules/gui/window/view_tree/view_tree_sc.py, line: 43
+# File: bin/modules/gui/window/form.py, line: 215
+# File: bin/modules/gui/window/view_tree/view_tree_sc.py, line: 43
+# File: bin/modules/gui/window/form.py, line: 215
+# File: bin/modules/gui/window/view_tree/view_tree_sc.py, line: 43
+#: bin/modules/gui/window/form.py:270
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:41
+#: bin/modules/gui/window/win_export.py:213
+msgid "ID"
+msgstr "ID"
+
+#
+# File: bin/modules/gui/window/form.py, line: 216
+# File: bin/modules/gui/window/form.py, line: 216
+# File: bin/modules/gui/window/form.py, line: 216
+#: bin/modules/gui/window/form.py:271
+msgid "Creation User"
+msgstr "Benutzer anlegen"
+
+#
+# File: bin/modules/gui/window/form.py, line: 217
+# File: bin/modules/gui/window/form.py, line: 217
+# File: bin/modules/gui/window/form.py, line: 217
+#: bin/modules/gui/window/form.py:272
+msgid "Creation Date"
+msgstr "Erstellungsdatum"
+
+#
+# File: bin/modules/gui/window/form.py, line: 218
+# File: bin/modules/gui/window/form.py, line: 218
+# File: bin/modules/gui/window/form.py, line: 218
+#: bin/modules/gui/window/form.py:273
+msgid "Latest Modification by"
+msgstr "Letzte Veränderung durch"
+
+#
+# File: bin/modules/gui/window/form.py, line: 219
+# File: bin/modules/gui/window/form.py, line: 219
+# File: bin/modules/gui/window/form.py, line: 219
+#: bin/modules/gui/window/form.py:274
+msgid "Latest Modification Date"
+msgstr "Datum der letzten Veränderung"
+
+#: bin/modules/gui/window/form.py:275
+msgid "Internal Module Data ID"
+msgstr "Interne Modul Daten ID"
+
+#
+# File: bin/modules/gui/window/form.py, line: 230
+# File: bin/modules/gui/window/form.py, line: 230
+# File: bin/modules/gui/window/form.py, line: 230
+#: bin/modules/gui/window/form.py:269
+msgid ""
+"Record is not saved ! \n"
+" Do You want to Clear Current Record ?"
+msgstr ""
+"Eintrag bicht gespeichert! \n"
+" Wollen Sie den aktuellen Eintrag löschen?"
+
+#
+# File: bin/modules/gui/window/form.py, line: 233
+# File: bin/modules/gui/window/form.py, line: 233
+# File: bin/modules/gui/window/form.py, line: 233
+#: bin/widget/view/form_gtk/one2many_list.py:388
+#: bin/modules/gui/window/form.py:290
+>>>>>>> MERGE-SOURCE
 msgid "Are you sure to remove this record ?"
 msgstr "Wollen Sie diesen Eintrag entfernen?"
 
@@ -538,6 +1230,7 @@
 msgid "Are you sure to remove those records ?"
 msgstr "Wollen Sie diese Einträge löschen?"
 
+<<<<<<< TREE
 #
 # File: bin/widget/view/form_gtk/parser.py, line: 61
 # File: bin/widget/view/form_gtk/parser.py, line: 61
@@ -559,8 +1252,186 @@
 # File: bin/modules/gui/window/form.py, line: 365
 #: bin/widget/view/form_gtk/parser.py:134 bin/modules/gui/window/form.py:365
 msgid "Input Error !"
+=======
+#: bin/modules/gui/window/form.py:296
+msgid "Resources cleared."
+msgstr "Quellen gelöscht!"
+
+#: bin/modules/gui/window/form.py:298
+msgid "Resources successfully removed."
+msgstr "Quellen erfolgreich entfernt."
+
+#
+# File: bin/modules/gui/window/form.py, line: 273
+# File: bin/modules/gui/window/form.py, line: 273
+# File: bin/modules/gui/window/form.py, line: 273
+#: bin/modules/gui/window/form.py:339
+msgid "Working now on the duplicated document !"
+msgstr "Arbeite nun am duplizierten Dokument!"
+
+#: bin/modules/gui/window/form.py:355
+msgid "Document Saved."
+msgstr "Dokument gespeichert!"
+
+#: bin/widget/view/list.py:584 bin/widget/view/list.py:585
+#: bin/widget/view/form_gtk/parser.py:135 bin/modules/gui/window/form.py:366
+msgid "Invalid form, correct red fields !"
+msgstr "ungültiges Formular, korrigieren Sie die roten Felder!"
+
+#: bin/widget/view/list.py:584
+msgid "Error !"
+msgstr "Fehler !"
+
+#: bin/modules/gui/window/form.py:368
+msgid "Warning !"
+msgstr "Warnung !"
+
+#
+# File: bin/modules/gui/window/form.py, line: 302
+# File: bin/modules/gui/window/form.py, line: 397
+# File: bin/modules/gui/window/form.py, line: 302
+# File: bin/modules/gui/window/form.py, line: 397
+# File: bin/modules/gui/window/form.py, line: 302
+# File: bin/modules/gui/window/form.py, line: 397
+#: bin/modules/gui/window/form.py:389 bin/modules/gui/window/form.py:497
+msgid ""
+"This record has been modified\n"
+"do you want to save it ?"
+msgstr ""
+"Dieser Eintrag wurde geändert\n"
+"Wollen Sie diesen speichern?"
+
+#
+# File: bin/widget/view/form_gtk/many2one.py, line: 369
+# File: bin/widget/view/list.py, line: 274
+# File: bin/widget/view/form_gtk/many2one.py, line: 369
+# File: bin/widget/view/list.py, line: 274
+# File: bin/widget/view/form_gtk/many2one.py, line: 369
+# File: bin/widget/view/list.py, line: 274
+#: bin/modules/gui/window/form.py:447
+msgid "You must select one or several records !"
+msgstr "Sie müssen eine Aufnahme auswählen, um diese Zurodnung zu verwenden!"
+
+#
+# File: bin/modules/gui/window/form.py, line: 358
+# File: bin/modules/gui/window/form.py, line: 358
+# File: bin/modules/gui/window/form.py, line: 358
+#: bin/modules/gui/window/form.py:456
+msgid "Print Screen"
+msgstr "Bildschirm ausdrucken"
+
+#
+# File: bin/modules/gui/window/form.py, line: 378
+# File: bin/modules/gui/window/form.py, line: 378
+# File: bin/modules/gui/window/form.py, line: 378
+#: bin/modules/gui/window/form.py:476
+msgid "No record selected"
+msgstr "Keine Eintrag ausgewählt"
+
+#
+# File: bin/modules/gui/window/form.py, line: 383
+# File: bin/modules/gui/window/form.py, line: 383
+# File: bin/modules/gui/window/form.py, line: 383
+#: bin/modules/gui/window/form.py:481
+msgid "New document"
+msgstr "Neues Dokument"
+
+#
+# File: bin/modules/gui/window/form.py, line: 385
+# File: bin/modules/gui/window/form.py, line: 385
+# File: bin/modules/gui/window/form.py, line: 385
+#: bin/modules/gui/window/form.py:483
+msgid "Editing document (id: "
+msgstr "Editiere Dokument (ID: "
+
+#
+# File: bin/modules/gui/window/form.py, line: 386
+# File: bin/modules/gui/window/form.py, line: 386
+# File: bin/modules/gui/window/form.py, line: 386
+#: bin/modules/gui/window/form.py:486
+msgid "Record: "
+msgstr "Eintrag: "
+
+#
+# File: bin/modules/gui/window/form.py, line: 387
+# File: bin/modules/gui/window/form.py, line: 387
+# File: bin/modules/gui/window/form.py, line: 387
+#: bin/modules/gui/window/form.py:487
+msgid " of "
+msgstr " von "
+
+#: bin/modules/gui/window/win_import.py:51
+msgid "The file is empty !"
+msgstr "Die Datei ist leer!"
+
+#: bin/modules/gui/window/win_import.py:51
+msgid "Importation !"
+msgstr "Import!"
+
+#
+# File: bin/modules/gui/window/win_import.py, line: 54
+# File: bin/modules/gui/window/win_import.py, line: 54
+# File: bin/modules/gui/window/win_import.py, line: 54
+#: bin/modules/gui/window/win_import.py:56
+msgid "XML-RPC error !"
+msgstr "XML-RPC Fehler!"
+
+#: bin/modules/gui/window/win_import.py:61
+msgid "Imported one object !"
+msgstr "Ein Objekt importiert!"
+
+#
+# File: bin/modules/gui/window/win_import.py, line: 57
+# File: bin/modules/gui/window/win_import.py, line: 57
+# File: bin/modules/gui/window/win_import.py, line: 57
+#: bin/modules/gui/window/win_import.py:63
+#, python-format
+msgid "Imported %d objects !"
+msgstr "Importierte %d Objekte"
+
+#: bin/modules/gui/window/win_import.py:68
+#, python-format
+msgid ""
+"Error trying to import this record:\n"
+"%s\n"
+"Error Message:\n"
+"%s\n"
+"\n"
+"%s"
+msgstr ""
+"Fehler beim Import dieses Eintrages:\n"
+"%s\n"
+"Fehlermeldung:\n"
+"%s\n"
+"\n"
+"%s"
+
+#: bin/modules/gui/window/win_import.py:72
+msgid "Importation Error !"
+msgstr "Fehler beim Import!"
+
+#
+# File: bin/modules/gui/window/win_import.py, line: 93
+# File: bin/modules/gui/window/win_import.py, line: 97
+# File: bin/modules/gui/window/win_import.py, line: 93
+# File: bin/modules/gui/window/win_import.py, line: 97
+# File: bin/modules/gui/window/win_import.py, line: 93
+# File: bin/modules/gui/window/win_import.py, line: 97
+#: bin/modules/gui/window/win_import.py:105
+#: bin/modules/gui/window/win_import.py:109
+msgid "Field name"
+msgstr "Feld Name"
+
+#: bin/modules/gui/window/win_import.py:181
+msgid "Error opening .CSV file"
+msgstr "Fehler beim Öffnen der .csv Datei"
+
+#: bin/modules/gui/window/win_import.py:181
+msgid "Input Error."
+>>>>>>> MERGE-SOURCE
 msgstr "Eingabefehler"
 
+<<<<<<< TREE
 #: bin/widget/view/form_gtk/parser.py:308
 msgid "Field"
 msgstr "Feld"
@@ -786,6 +1657,208 @@
 msgstr "Kann lokale %(lang_enc)s: %(exception)s nicht setzen."
 
 #: bin/options.py:121
+=======
+#: bin/modules/gui/window/win_import.py:199
+#, python-format
+msgid "You cannot import this field %s, because we cannot auto-detect it"
+msgstr ""
+"Das folgende Feld konnte nicht automatisch erkannt werden und kann deshalb "
+"nicht importiert werden: %s"
+
+#: bin/modules/gui/window/win_import.py:202
+#, python-format
+msgid ""
+"Error processing your first line of the file.\n"
+"Field %s is unknown !"
+msgstr ""
+"Fehler beim Verarbeiten der 1. Zeile:\n"
+"Feld %s ist unbekannt!"
+
+#: bin/modules/gui/window/win_import.py:202
+msgid "Import Error."
+msgstr "Import Fehler."
+
+#: bin/modules/gui/window/win_import.py:233
+msgid "You have not selected any fields to import"
+msgstr "Sie haben keine zu importierenden Felder augewählt"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Extension"
+msgstr "Erweiterung"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Application"
+msgstr "Anwendung"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Print Processor"
+msgstr "Druckprozessor"
+
+#: bin/modules/gui/window/win_extension.py:114
+msgid "This extension is already defined"
+msgstr "Diese Dateierweiterung ist bereits definiert"
+
+#: bin/modules/gui/window/win_extension.py:114 bin/openerp.glade:7642
+msgid "Extension Manager"
+msgstr "Erweiterungs Verwaltung"
+
+#
+# File: bin/modules/gui/window/win_selection.py, line: 52
+# File: bin/modules/gui/window/win_selection.py, line: 52
+# File: bin/modules/gui/window/win_selection.py, line: 52
+#: bin/modules/gui/window/win_selection.py:51
+msgid "Name"
+msgstr "Name"
+
+#
+# File: bin/modules/gui/window/win_selection.py, line: 56
+# File: bin/modules/gui/window/win_selection.py, line: 56
+# File: bin/modules/gui/window/win_selection.py, line: 56
+#: bin/modules/gui/window/win_selection.py:55
+msgid "Ressource Name"
+msgstr "Name der Quelle"
+
+#
+# File: bin/modules/gui/window/win_selection.py, line: 56
+# File: bin/modules/gui/window/win_selection.py, line: 56
+# File: bin/modules/gui/window/win_selection.py, line: 56
+#: bin/modules/gui/window/win_selection.py:55
+msgid "Names"
+msgstr "Namen"
+
+#
+# File: bin/modules/gui/window/__init__.py, line: 33
+# File: bin/modules/gui/window/__init__.py, line: 33
+# File: bin/modules/gui/window/__init__.py, line: 33
+#: bin/modules/gui/window/__init__.py:31
+msgid "Unknown Window"
+msgstr "Unbekanntes Fenster"
+
+#: bin/modules/gui/window/win_preference.py:68
+msgid "Preferences"
+msgstr "Voreinstellungen"
+
+#: bin/modules/gui/window/win_preference.py:86
+msgid ""
+"The default language of the interface has been modified, do not forget to "
+"restart the client to have the interface in your language"
+msgstr ""
+"Die Standardsprache dieser Oberfläche wurde verändert. Bitte starten Sie den "
+"Client neu, um die Oberfläche in Ihrer Sprache zu sehen."
+
+#: bin/modules/gui/window/win_preference.py:88
+msgid "Default language modified !"
+msgstr "Standardsprache geändert!"
+
+#
+# File: bin/modules/gui/window/view_tree/parse.py, line: 36
+# File: bin/modules/gui/window/view_tree/parse.py, line: 36
+# File: bin/modules/gui/window/view_tree/parse.py, line: 36
+#: bin/modules/gui/window/view_tree/parse.py:35
+msgid "Tree"
+msgstr "Baumansicht"
+
+#
+# File: bin/modules/gui/window/view_tree/view_tree_sc.py, line: 49
+# File: bin/modules/gui/window/view_tree/view_tree_sc.py, line: 49
+# File: bin/modules/gui/window/view_tree/view_tree_sc.py, line: 49
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:45
+msgid "Description"
+msgstr "Beschreibung"
+
+#
+# File: bin/modules/gui/window/tree.py, line: 190
+# File: bin/modules/gui/window/tree.py, line: 246
+# File: bin/modules/gui/window/tree.py, line: 190
+# File: bin/modules/gui/window/tree.py, line: 246
+# File: bin/modules/gui/window/tree.py, line: 190
+# File: bin/modules/gui/window/tree.py, line: 246
+#: bin/modules/gui/window/tree.py:205 bin/modules/gui/window/tree.py:261
+msgid "No resource selected!"
+msgstr "Keine Quelle ausgewählt!"
+
+#
+# File: bin/modules/gui/window/tree.py, line: 204
+# File: bin/modules/gui/window/tree.py, line: 204
+# File: bin/modules/gui/window/tree.py, line: 204
+#: bin/modules/gui/window/tree.py:219
+msgid ""
+"Are you sure you want\n"
+"to remove this record?"
+msgstr ""
+"Sind Sie sicher, daß\n"
+"Sie diesen Eintrag löschen wollen?"
+
+#
+# File: bin/modules/gui/window/tree.py, line: 209
+# File: bin/modules/gui/window/tree.py, line: 209
+# File: bin/modules/gui/window/tree.py, line: 209
+#: bin/modules/gui/window/tree.py:224
+msgid "Error removing resource!"
+msgstr "Fehler beim Entfernen der Quelle!"
+
+#
+# File: bin/modules/gui/window/tree.py, line: 220
+# File: bin/modules/gui/window/tree.py, line: 220
+# File: bin/modules/gui/window/tree.py, line: 220
+#: bin/modules/gui/window/tree.py:235
+msgid "Unable to chroot: no tree resource selected"
+msgstr "Kann Ursprung nicht wechseln, keine Bausansicht gewählt."
+
+#
+# File: bin/modules/gui/window/win_export.py, line: 52
+# File: bin/modules/gui/window/win_export.py, line: 52
+# File: bin/modules/gui/window/win_export.py, line: 52
+#: bin/modules/gui/window/win_export.py:50
+msgid " record(s) saved !"
+msgstr " Eintrag/Einträge gespeichert!"
+
+#
+# File: bin/modules/gui/window/win_export.py, line: 55
+# File: bin/modules/gui/window/win_export.py, line: 55
+# File: bin/modules/gui/window/win_export.py, line: 55
+#: bin/modules/gui/window/win_export.py:53
+msgid ""
+"Operation failed !\n"
+"I/O error"
+msgstr ""
+"Operation fehlgeschlagen!\n"
+"E/A Fehler"
+
+#
+# File: bin/modules/gui/window/win_export.py, line: 79
+# File: bin/modules/gui/window/win_export.py, line: 79
+# File: bin/modules/gui/window/win_export.py, line: 79
+#: bin/modules/gui/window/win_export.py:79
+#: bin/modules/gui/window/win_export.py:105
+msgid "Error Opening Excel !"
+msgstr "Fehler beim Öffnen einer Exceldatei!"
+
+#: bin/modules/gui/window/win_export.py:317
+msgid "What is the name of this export ?"
+msgstr "Wie soll dieser Export genannt werden?"
+
+#: bin/modules/gui/window/win_export.py:351
+msgid "Exportation Error !"
+msgstr "Export Fehler!"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1772
+#: bin/modules/gui/window/win_search.py:49
+msgid "OpenERP - Link"
+msgstr "OpenERP - Zeiger"
+
+#: bin/modules/gui/window/win_search.py:126
+#, python-format
+msgid "OpenERP Search: %s"
+msgstr "Open ERP Suche: %s"
+
+#: bin/modules/gui/window/win_search.py:127
+#, python-format
+msgid "OpenERP Search: %s (%%d result(s))"
+msgstr "OpenERP Suche: %s(%%d Resultat(e))"
+
+#: bin/options.py:121
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "OpenERP Client %s"
 msgstr "OpenERP Anwendung %s"
@@ -1071,6 +2144,7 @@
 #: bin/printer/printer.py:193
 #, python-format
 msgid ""
+<<<<<<< TREE
 "Error occurred while printing:\n"
 "%s"
 msgstr ""
@@ -1080,6 +2154,15 @@
 msgstr ""
 
 #: bin/printer/printer.py:212
+=======
+"Linux Automatic Printing not implemented.\n"
+"Use preview option !"
+msgstr ""
+"Automatisches Drucken bei Linux nicht implementiert.Verwenden Sie die "
+"Vorschau!"
+
+#: bin/printer/printer.py:212
+>>>>>>> MERGE-SOURCE
 msgid "Error! No Data found. Make sure you have enough data to print!"
 msgstr ""
 "Fehler! Keine Daten gefunden. Bitte prüfen ob Sie genügend Daten zum Drucken "
@@ -1093,14 +2176,84 @@
 msgid "Error writing the file!"
 msgstr "Fehler beim Schreiben der Datei!"
 
-#: bin/widget_search/form.py:492
+<<<<<<< TREE
+#: bin/widget_search/form.py:492
+=======
+#: bin/openerp-client.py:142
+msgid "Closing OpenERP, KeyboardInterrupt"
+msgstr "Schließe OpenERP, Unterbrechung von der Tastatur"
+
+#
+# File: bin/widget_search/checkbox.py, line: 55
+# File: bin/widget_search/spinbutton.py, line: 69
+# File: bin/widget_search/spinint.py, line: 73
+# File: bin/widget_search/calendar.py, line: 106
+# File: bin/widget_search/char.py, line: 47
+# File: bin/widget_search/reference.py, line: 74
+# File: bin/widget_search/checkbox.py, line: 55
+# File: bin/widget_search/spinbutton.py, line: 69
+# File: bin/widget_search/spinint.py, line: 73
+# File: bin/widget_search/calendar.py, line: 106
+# File: bin/widget_search/char.py, line: 47
+# File: bin/widget_search/reference.py, line: 74
+# File: bin/widget_search/checkbox.py, line: 55
+# File: bin/widget_search/spinbutton.py, line: 69
+# File: bin/widget_search/spinint.py, line: 73
+# File: bin/widget_search/calendar.py, line: 106
+# File: bin/widget_search/char.py, line: 47
+# File: bin/widget_search/reference.py, line: 74
+#: bin/widget/view/form_gtk/button.py:47 bin/widget_search/char.py:72
+#: bin/widget_search/calendar.py:125 bin/widget_search/calendar.py:250
+#: bin/widget_search/filter.py:77 bin/widget_search/reference.py:78
+#: bin/widget_search/spinbutton.py:92 bin/widget_search/selection.py:116
+#: bin/widget_search/custom_filter.py:140 bin/widget_search/spinint.py:95
+#: bin/widget_search/checkbox.py:68
+msgid "The content of the widget or ValueError if not valid"
+msgstr "Der Inhalt des Miniprogramms oder Wertfehler, wenn nicht gültig"
+
+#: bin/widget_search/form.py:492
+>>>>>>> MERGE-SOURCE
 msgid "The content of the form or exception if not valid"
 msgstr "Der Inhalt der Form oder die Ausnahme ist ungültig"
 
-#: bin/widget_search/char.py:45
+<<<<<<< TREE
+#: bin/widget_search/char.py:45
+=======
+#: bin/widget/view/form_gtk/date_widget.py:65
+#: bin/widget_search/date_widget.py:65
+msgid ""
+"You can use special operation by pressing +, - or =.  Plus/minus "
+"adds/decrease the variable to the current selected date. Equals set part of "
+"selected date. Available variables: 12h = 12 hours, 8d = 8 days, 4w = 4 "
+"weeks, 1m = 1 month, 2y = 2 years. Some examples:\n"
+"* +21d : adds 21 days to selected year\n"
+"* =23w : set date to the 23th week of the year\n"
+"* -4m : decrease 4 months to the current date\n"
+"You can also use \"=\" to set the date to the current date/time and '-' to "
+"clear the field."
+msgstr ""
+"Spezielle Funktionen sind verfügbar: +, - or =.\n"
+"Plus/minus erhöht/verringert das ausgewählte Datum. \n"
+"Ist Gleich setzt einen Teil des ausgewählten Datums\n"
+"Verfügbare Variablen: 12h = 12 Stunden, 8d = 8 Tage, 4w = 4 Wochen, 1m = 1 "
+"Monat, 2y = 2 Jahre. \n"
+"Einige Beispiele:\n"
+"* +21d : addiert 21 Tage zum ausgewählten Jahr\n"
+"* =23w : setzt das Datum auf die 23. Woche des Jahres\n"
+"* -4m : vermindert das laufende Datum um 4 Monate\n"
+"\"=\" setzt das aktuelle Datum/Zeit \n"
+"'-' löscht das Feld."
+
+#: bin/widget_search/wid_int.py:56
+msgid "The content of the widget or exception if not valid"
+msgstr "Der Inhalt eines Anzeigeelements oder einer Ausnahme im Fehlerfall"
+
+#: bin/widget_search/char.py:45
+>>>>>>> MERGE-SOURCE
 msgid "Error: "
 msgstr "Fehler: "
 
+<<<<<<< TREE
 #: bin/widget_search/custom_filter_widgets.py:36
 #: bin/widget_search/custom_filter_widgets.py:63
 #: bin/widget_search/custom_filter_widgets.py:128
@@ -1162,6 +2315,53 @@
 #: bin/widget_search/custom_filter_widgets.py:40
 #: bin/widget_search/custom_filter_widgets.py:67
 #: bin/widget_search/custom_filter_widgets.py:98
+=======
+#
+# File: bin/widget_search/calendar.py, line: 51
+# File: bin/widget_search/calendar.py, line: 51
+# File: bin/widget_search/calendar.py, line: 51
+#: bin/widget_search/calendar.py:49 bin/widget_search/calendar.py:177
+msgid "Start date"
+msgstr "Anfangsdatum"
+
+#
+# File: bin/widget_search/calendar.py, line: 55
+# File: bin/widget_search/calendar.py, line: 74
+# File: bin/widget/view/form_gtk/calendar.py, line: 60
+# File: bin/widget/view/form_gtk/calendar.py, line: 163
+# File: bin/widget_search/calendar.py, line: 55
+# File: bin/widget_search/calendar.py, line: 74
+# File: bin/widget/view/form_gtk/calendar.py, line: 60
+# File: bin/widget/view/form_gtk/calendar.py, line: 163
+# File: bin/widget_search/calendar.py, line: 55
+# File: bin/widget_search/calendar.py, line: 74
+# File: bin/widget/view/form_gtk/calendar.py, line: 60
+# File: bin/widget/view/form_gtk/calendar.py, line: 163
+#: bin/widget/view/form_gtk/calendar.py:57
+#: bin/widget/view/form_gtk/calendar.py:184 bin/widget_search/calendar.py:53
+#: bin/widget_search/calendar.py:73 bin/widget_search/calendar.py:181
+#: bin/widget_search/calendar.py:201
+msgid "Open the calendar widget"
+msgstr "Kalender Miniprogramm öffnen"
+
+#
+# File: bin/widget_search/calendar.py, line: 70
+# File: bin/widget_search/calendar.py, line: 70
+# File: bin/widget_search/calendar.py, line: 70
+#: bin/widget_search/calendar.py:69 bin/widget_search/calendar.py:197
+msgid "End date"
+msgstr "Enddatum"
+
+#: bin/widget/view/form_gtk/calendar.py:135
+#: bin/widget/view/form_gtk/calendar.py:249 bin/widget_search/calendar.py:128
+#: bin/widget_search/calendar.py:267
+msgid "OpenERP - Date selection"
+msgstr "OpenERP - Datumsauswahl"
+
+#: bin/widget_search/custom_filter_widgets.py:40
+#: bin/widget_search/custom_filter_widgets.py:67
+#: bin/widget_search/custom_filter_widgets.py:98
+>>>>>>> MERGE-SOURCE
 msgid "contains"
 msgstr "beinhaltet"
 
@@ -1171,6 +2371,7 @@
 msgid "doesn't contain"
 msgstr "enthält nicht"
 
+<<<<<<< TREE
 #: bin/widget_search/custom_filter_widgets.py:167
 msgid "Equals"
 msgstr ""
@@ -1203,6 +2404,10 @@
 
 #: bin/widget_search/custom_filter_widgets.py:290
 #: bin/widget_search/custom_filter_widgets.py:331
+=======
+#: bin/widget_search/custom_filter_widgets.py:290
+#: bin/widget_search/custom_filter_widgets.py:331
+>>>>>>> MERGE-SOURCE
 msgid "is equal to"
 msgstr "ist gleich"
 
@@ -1221,6 +2426,7 @@
 msgid "less than"
 msgstr "ist kleiner als"
 
+<<<<<<< TREE
 #: bin/widget_search/custom_filter_widgets.py:294
 #: bin/widget_search/custom_filter_widgets.py:335
 msgid "greater than equal to"
@@ -1268,6 +2474,35 @@
 # File: bin/widget_search/checkbox.py, line: 49
 #: bin/widget_search/checkbox.py:35 bin/widget_search/checkbox.py:42
 #: bin/widget_search/checkbox.py:55
+=======
+#: bin/widget_search/custom_filter.py:62
+msgid "in"
+msgstr "enthält"
+
+#: bin/widget_search/custom_filter.py:63
+msgid "not in"
+msgstr "enthält nicht"
+
+#: bin/widget_search/custom_filter.py:82
+msgid ""
+"Enter Values separated by ',' if operator 'in' or 'not in' is chosen.\n"
+"For Date and DateTime Formats, specify text in '%Y-%m-%d' and '%Y-%m-%d "
+"%H:%M:%S' formats respectively."
+msgstr ""
+"Für die Operatoren 'in' oder 'not in' sind die Werte durch ',' zu trennen.\n"
+"Für Datum und Zeitformate ist folgende Formatierung zu verwenden '%Y-%m-%d' "
+"and '%Y-%m-%d %H:%M:%S'."
+
+#
+# File: bin/widget_search/checkbox.py, line: 36
+# File: bin/widget_search/checkbox.py, line: 49
+# File: bin/widget_search/checkbox.py, line: 36
+# File: bin/widget_search/checkbox.py, line: 49
+# File: bin/widget_search/checkbox.py, line: 36
+# File: bin/widget_search/checkbox.py, line: 49
+#: bin/widget_search/checkbox.py:35 bin/widget_search/checkbox.py:42
+#: bin/widget_search/checkbox.py:55
+>>>>>>> MERGE-SOURCE
 msgid "Yes"
 msgstr "Ja"
 
@@ -1280,6 +2515,7 @@
 msgstr "Nein"
 
 #
+<<<<<<< TREE
 # File: bin/modules/action/wizard.py, line: 171
 # File: bin/rpc.py, line: 141
 # File: bin/modules/action/wizard.py, line: 171
@@ -1295,6 +2531,567 @@
 # File: bin/rpc.py, line: 142
 # File: bin/rpc.py, line: 142
 #: bin/rpc.py:158
+=======
+# File: bin/widget/view/form.py, line: 153
+# File: bin/widget/view/form.py, line: 153
+# File: bin/widget/view/form.py, line: 153
+#: bin/widget/view/form.py:137
+msgid "You must save this record to use the relate button !"
+msgstr ""
+"Sie müssen den Eintrag speichern, um die dazugehörige Schaltfläche benutzen "
+"zu können!"
+
+#: bin/widget/view/form.py:142
+msgid "Action not defined !"
+msgstr "Aktion ist nicht definiert!"
+
+#
+# File: bin/widget/view/form.py, line: 165
+# File: bin/widget/view/form.py, line: 165
+# File: bin/widget/view/form.py, line: 165
+#: bin/widget/view/form.py:211
+msgid "You must select a record to use the relate button !"
+msgstr ""
+"Sie müssen einen Eintrag auswählen, um die dazugehörige Schaltfläche "
+"benutzen zu können!"
+
+#
+# File: bin/widget/view/form.py, line: 183
+# File: bin/widget/view/form_gtk/parser.py, line: 490
+# File: bin/widget/view/form_gtk/parser.py, line: 647
+# File: bin/widget/view/form_gtk/parser.py, line: 704
+# File: bin/widget/view/form.py, line: 183
+# File: bin/widget/view/form_gtk/parser.py, line: 490
+# File: bin/widget/view/form_gtk/parser.py, line: 647
+# File: bin/widget/view/form_gtk/parser.py, line: 704
+# File: bin/widget/view/form.py, line: 183
+# File: bin/widget/view/form_gtk/parser.py, line: 490
+# File: bin/widget/view/form_gtk/parser.py, line: 647
+# File: bin/widget/view/form_gtk/parser.py, line: 704
+#: bin/widget/view/form.py:238 bin/widget/view/form_gtk/parser.py:635
+#: bin/widget/view/form_gtk/parser.py:756
+#: bin/widget/view/form_gtk/parser.py:813
+msgid "No other language available!"
+msgstr "Keine weitere Sprache verfügbar!"
+
+#
+# File: bin/widget/view/form.py, line: 190
+# File: bin/widget/view/form_gtk/parser.py, line: 549
+# File: bin/widget/view/form_gtk/parser.py, line: 653
+# File: bin/widget/view/form_gtk/parser.py, line: 710
+# File: bin/widget/view/form.py, line: 190
+# File: bin/widget/view/form_gtk/parser.py, line: 549
+# File: bin/widget/view/form_gtk/parser.py, line: 653
+# File: bin/widget/view/form_gtk/parser.py, line: 710
+# File: bin/widget/view/form.py, line: 190
+# File: bin/widget/view/form_gtk/parser.py, line: 549
+# File: bin/widget/view/form_gtk/parser.py, line: 653
+# File: bin/widget/view/form_gtk/parser.py, line: 710
+#: bin/widget/view/form.py:245 bin/widget/view/form_gtk/parser.py:647
+#: bin/widget/view/form_gtk/parser.py:762
+#: bin/widget/view/form_gtk/parser.py:819
+msgid "Add Translation"
+msgstr "Übersetzung hinzufügen"
+
+#
+# File: bin/widget/view/form.py, line: 241
+# File: bin/widget/view/form_gtk/parser.py, line: 766
+# File: bin/widget/view/form.py, line: 241
+# File: bin/widget/view/form_gtk/parser.py, line: 766
+# File: bin/widget/view/form.py, line: 241
+# File: bin/widget/view/form_gtk/parser.py, line: 766
+#: bin/widget/view/form.py:293 bin/widget/view/form_gtk/parser.py:875
+msgid "Translate label"
+msgstr "Bezeichnung übersetzen"
+
+#: bin/widget/view/calendar_gtk/parser.py:355 bin/openerp.glade:8064
+msgid "Week"
+msgstr "Woche"
+
+#: bin/widget/view/calendar_gtk/parser_dummy.py:30
+msgid "Calendar View Error !"
+msgstr "Kalenderansicht Fehler!"
+
+#: bin/widget/view/calendar_gtk/parser_dummy.py:31
+msgid "You must intall the library python-hippocanvas to use calendars."
+msgstr ""
+"Für die Benutzung des Kalenders muss die Bibliothek \"python-hippocanvas\" "
+"muss installiert werden"
+
+#: bin/widget/view/screen_container.py:74
+msgid "--Actions--"
+msgstr "--Aktionen--"
+
+#: bin/widget/view/screen_container.py:73
+msgid "Save as a Shortcut"
+msgstr "Als Lesezeichen speichern"
+
+#: bin/widget/view/screen_container.py:74
+msgid "Save as a Filter"
+msgstr "Als Filter speichern"
+
+#: bin/widget/view/screen_container.py:74
+msgid "Manage Filters"
+msgstr "Filter verwalten"
+
+#: bin/widget/view/tree_gtk/parser.py:61
+msgid ""
+"You have unsaved record(s) !  \n"
+"\n"
+"Please Save them before sorting !"
+msgstr ""
+"Sie haben ungespeicherte Einträge!\n"
+"\n"
+"Bitte speichern Sie vor dem Sortieren!"
+
+#: bin/widget/view/tree_gtk/editabletree.py:140
+#, python-format
+msgid "Shortcut: %s"
+msgstr "Abkürzungen %s"
+
+#: bin/widget/view/tree_gtk/editabletree.py:140
+msgid "F1 New - F2 Open/Search"
+msgstr "F1 Neu F2 Öffnen/Suchen"
+
+#: bin/widget/view/tree_gtk/editabletree.py:215
+#, python-format
+msgid "Warning; field %s is required!"
+msgstr "Hinweis: Feld '%s' wird benötigt!"
+
+#: bin/widget/view/tree_gtk/date_renderer.py:197
+msgid ""
+"Press <i>'+'</i>, <i>'-'</i> or <i>'='</i> for special date operations."
+msgstr ""
+"Drücken Sie <i>'+'</i>, <i>'-'</i> or <i>'='</i> für spezielle "
+"Datumsberechnungen"
+
+#: bin/widget/view/widget_parse.py:53
+#, python-format
+msgid "This type (%s) is not supported by the GTK client !"
+msgstr "Dieser Typ (%s) wird von der GTK Anwendung nicht unterstützt."
+
+#: bin/widget/view/widget_parse.py:64
+msgid "No valid view found for this object!"
+msgstr "Keine gültige Sicht für dieses Objekt vorhanden."
+
+#
+# File: bin/widget/view/graph_gtk/parser.py, line: 65
+# File: bin/widget/view/graph_gtk/parser.py, line: 65
+# File: bin/widget/view/graph_gtk/parser.py, line: 65
+#: bin/widget/view/graph_gtk/parser.py:64
+msgid "Can not generate graph !"
+msgstr "Kann keinen Graph erzeugen"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1422
+msgid "Dot Viewer"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1712
+msgid "Add New Node"
+msgstr "Neuen Knoten hinzufügen"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1713
+msgid "Add New Edge"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1714
+msgid "Enlarge the Diagram"
+msgstr "Diagramm vergrößern"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1715
+msgid "Shrink the Diagram"
+msgstr "Diagramm verkleinern"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1716
+msgid "Fit the diagram to the window"
+msgstr "Diagramm an Fenstergröße anpassen"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1717
+msgid "Show the diagram at its normal size"
+msgstr "Diagramm in normaler Größe anzeigen"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1718
+msgid "Print the Diagram"
+msgstr "Diagramm drucken"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1789
+#, python-format
+msgid "Close Current %s"
+msgstr "aktuelle %s schließen"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1790
+#, python-format
+msgid "Delete Current %s"
+msgstr "aktuelle %s löschen"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1791
+#, python-format
+msgid "Edit Current %s"
+msgstr "aktuelle %s bearbeiten"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1875
+msgid " - Dot Viewer"
+msgstr ""
+
+#
+# File: bin/widget/view/form_gtk/reference.py, line: 92
+# File: bin/openerp.glade, line: 1214
+# File: bin/widget/view/form_gtk/reference.py, line: 92
+# File: bin/openerp.glade, line: 1214
+# File: bin/widget/view/form_gtk/reference.py, line: 92
+# File: bin/openerp.glade, line: 1214
+#: bin/widget/view/form_gtk/reference.py:76 bin/openerp.glade:1258
+msgid "Create a new resource"
+msgstr "Eine neue Quelle erzeugen"
+
+#
+# File: bin/widget/view/form_gtk/reference.py, line: 93
+# File: bin/widget/view/form_gtk/reference.py, line: 93
+# File: bin/widget/view/form_gtk/reference.py, line: 93
+#: bin/widget/view/form_gtk/reference.py:89
+msgid "Search / Open a resource"
+msgstr "Suchen / Öffnen einer Quelle"
+
+#
+# File: bin/widget/view/form_gtk/parser.py, line: 61
+# File: bin/widget/view/form_gtk/parser.py, line: 61
+# File: bin/widget/view/form_gtk/parser.py, line: 61
+#: bin/widget/view/form_gtk/parser.py:61
+msgid "Wrong icon for the button !"
+msgstr "Falsches Piktogramm für diese Schaltfläche"
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Field"
+msgstr "Feld"
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Object"
+msgstr "Objekt"
+
+#: bin/widget/view/form_gtk/parser.py:619
+msgid "Enter some text to the related field before adding translations!"
+msgstr ""
+"Bitte geben Sie vor dem Hinzufügen von Übersetzungen Text im entsprechenden "
+"Feld ein!"
+
+#
+# File: bin/widget/view/form_gtk/parser.py, line: 480
+# File: bin/widget/view/form_gtk/parser.py, line: 480
+# File: bin/widget/view/form_gtk/parser.py, line: 480
+#: bin/widget/view/form_gtk/parser.py:626
+msgid "You need to save resource before adding translations!"
+msgstr ""
+"Sie müssen die Quelle speichern, bevor Übersetzungen hinzugefügt werden"
+
+#
+# File: bin/widget/view/form_gtk/parser.py, line: 772
+# File: bin/widget/view/form_gtk/parser.py, line: 772
+# File: bin/widget/view/form_gtk/parser.py, line: 772
+#: bin/widget/view/form_gtk/parser.py:880
+msgid "Translate view"
+msgstr "Ansicht der Übersetzung"
+
+#: bin/widget/view/form_gtk/one2many_list.py:64
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: bin/widget/view/form_gtk/one2many_list.py:70
+msgid "Save & Close"
+msgstr "Speichern & Beenden"
+
+#: bin/widget/view/form_gtk/one2many_list.py:75
+msgid "Save & New"
+msgstr "Speichern & Neu"
+
+#
+# File: bin/widget/view/form_gtk/interface.py, line: 47
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 148
+# File: bin/widget/view/form_gtk/interface.py, line: 47
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 148
+# File: bin/widget/view/form_gtk/interface.py, line: 47
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 148
+#: bin/widget/view/form_gtk/one2many_list.py:164
+#: bin/widget/view/form_gtk/interface.py:48
+msgid "Set to default value"
+msgstr "auf die Voreinstellung zurücksetzen"
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 151
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 151
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 151
+#: bin/widget/view/form_gtk/one2many_list.py:167
+msgid "Set Default"
+msgstr "Als Standard verwenden"
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 162
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 162
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 162
+#: bin/widget/view/form_gtk/one2many_list.py:196
+msgid "Create a new entry"
+msgstr "Einen neuen Eintrag erzeugen"
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 172
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 172
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 172
+#: bin/widget/view/form_gtk/one2many_list.py:200
+msgid "Edit this entry"
+msgstr "Diesen Eintrag editieren"
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 182
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 182
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 182
+#: bin/widget/view/form_gtk/one2many_list.py:204
+msgid "Remove this entry"
+msgstr "Diesen Eintrag löschen"
+
+#: bin/widget/view/form_gtk/many2many.py:84
+#: bin/widget/view/form_gtk/one2many_list.py:210
+msgid "Previous Page"
+msgstr "Vorherige Seite"
+
+#: bin/widget/view/form_gtk/many2many.py:88
+#: bin/widget/view/form_gtk/one2many_list.py:214
+msgid "Previous Record"
+msgstr "Vorheriger Datensatz"
+
+#: bin/widget/view/form_gtk/many2many.py:96
+#: bin/widget/view/form_gtk/one2many_list.py:222
+msgid "Next Record"
+msgstr "Nächster Datensatz"
+
+#: bin/widget/view/form_gtk/many2many.py:100
+#: bin/widget/view/form_gtk/one2many_list.py:226
+msgid "Next Page"
+msgstr "Nächste Seite"
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 219
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 219
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 219
+#: bin/widget/view/form_gtk/one2many_list.py:232
+msgid "Switch"
+msgstr "Umschalten"
+
+#: bin/widget/view/form_gtk/many2many.py:106
+#: bin/widget/view/form_gtk/one2many_list.py:238
+msgid "Choose Limit"
+msgstr "Limit wählen"
+
+#
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 269
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 269
+# File: bin/widget/view/form_gtk/one2many_list.py, line: 269
+#: bin/widget/view/form_gtk/one2many_list.py:279
+msgid "You have to select a resource !"
+msgstr "Sie müssen eine Quelle angeben!"
+
+#
+# File: bin/widget/view/form_gtk/image.py, line: 70
+# File: bin/widget/view/form_gtk/image.py, line: 70
+# File: bin/widget/view/form_gtk/image.py, line: 70
+#: bin/widget/view/form_gtk/image.py:73
+msgid "Set Image"
+msgstr "Setzen Bild"
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 85
+# File: bin/widget/view/form_gtk/image.py, line: 79
+# File: bin/widget/view/form_gtk/binary.py, line: 85
+# File: bin/widget/view/form_gtk/image.py, line: 79
+# File: bin/widget/view/form_gtk/binary.py, line: 85
+# File: bin/widget/view/form_gtk/image.py, line: 79
+#: bin/widget/view/form_gtk/image.py:82 bin/widget/view/form_gtk/binary.py:84
+msgid "Save As"
+msgstr "Speichern unter"
+
+#
+# File: bin/widget/view/form_gtk/binary.py, line: 89
+# File: bin/widget/view/form_gtk/image.py, line: 88
+# File: bin/widget/view/form_gtk/binary.py, line: 89
+# File: bin/widget/view/form_gtk/image.py, line: 88
+# File: bin/widget/view/form_gtk/binary.py, line: 89
+# File: bin/widget/view/form_gtk/image.py, line: 88
+#: bin/widget/view/form_gtk/image.py:93 bin/widget/view/form_gtk/binary.py:88
+msgid "Clear"
+msgstr "Leeren"
+
+#
+# File: bin/widget/view/form_gtk/image.py, line: 100
+# File: bin/widget/view/form_gtk/image.py, line: 100
+# File: bin/widget/view/form_gtk/image.py, line: 100
+#: bin/widget/view/form_gtk/image.py:102
+msgid "All files"
+msgstr "Alle Dateien"
+
+#
+# File: bin/widget/view/form_gtk/image.py, line: 104
+# File: bin/widget/view/form_gtk/image.py, line: 104
+# File: bin/widget/view/form_gtk/image.py, line: 104
+#: bin/widget/view/form_gtk/image.py:106
+msgid "Images"
+msgstr "Bilder"
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "There is no image to save as !"
+msgstr "Es gibt kein Bild zum speichern!"
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "Warning"
+msgstr "Warnung"
+
+#: bin/widget/view/form_gtk/many2one.py:158 bin/widget/view/form_gtk/url.py:53
+msgid "Open this resource"
+msgstr "Öffnen dieses Datensatzes"
+
+#: bin/widget/view/form_gtk/many2one.py:163
+#: bin/widget_search/custom_filter_widgets.py:87
+msgid "Search a resource"
+msgstr "Suchen eines Datensatzes"
+
+#
+# File: bin/widget/view/form_gtk/many2one.py, line: 168
+# File: bin/openerp.glade, line: 1356
+# File: bin/widget/view/form_gtk/many2one.py, line: 168
+# File: bin/openerp.glade, line: 1356
+# File: bin/widget/view/form_gtk/many2one.py, line: 168
+# File: bin/openerp.glade, line: 1356
+#: bin/widget/view/form_gtk/many2one.py:174 bin/openerp.glade:1412
+msgid "Action"
+msgstr "Aktion"
+
+#
+# File: bin/widget/view/form_gtk/many2one.py, line: 169
+# File: bin/widget/view/form_gtk/many2one.py, line: 169
+# File: bin/widget/view/form_gtk/many2one.py, line: 169
+#: bin/widget/view/form_gtk/many2one.py:175
+msgid "Report"
+msgstr "Bericht"
+
+#
+# File: bin/widget/view/form_gtk/many2one.py, line: 369
+# File: bin/widget/view/list.py, line: 274
+# File: bin/widget/view/form_gtk/many2one.py, line: 369
+# File: bin/widget/view/list.py, line: 274
+# File: bin/widget/view/form_gtk/many2one.py, line: 369
+# File: bin/widget/view/list.py, line: 274
+#: bin/widget/view/list.py:633 bin/widget/view/form_gtk/many2one.py:387
+msgid "You must select a record to use the relation !"
+msgstr "Sie müssen eine Aufnahme auswählen, um diese Zurodnung zu verwenden!"
+
+#
+# File: bin/widget/view/form_gtk/interface.py, line: 48
+# File: bin/widget/view/form_gtk/interface.py, line: 48
+# File: bin/widget/view/form_gtk/interface.py, line: 48
+#: bin/widget/view/form_gtk/interface.py:49
+msgid "Set as default"
+msgstr "Als Vorgabewert setzen"
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "You can not set to the default value here !"
+msgstr "Sie können hier nicht auf den Vorgabewert zurücksetzen!"
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "Operation not permited"
+msgstr "Operation nicht erlaubt!"
+
+#: bin/widget/view/form_gtk/binary.py:76
+msgid "Select"
+msgstr "Auswählen"
+
+#: bin/widget/view/form_gtk/binary.py:80
+msgid "Open"
+msgstr "Öffnen"
+
+#: bin/widget/view/form_gtk/binary.py:119
+#: bin/widget/view/form_gtk/binary.py:163
+msgid "Unable to read the file data"
+msgstr "Fehler beim Lesen der Datei"
+
+#: bin/widget/view/form_gtk/binary.py:129
+#: bin/widget/view/form_gtk/binary.py:155
+#, python-format
+msgid "Error reading the file: %s"
+msgstr "Fehler beim Lesen der Datei: %s"
+
+#: bin/widget/view/form_gtk/binary.py:138
+msgid "All Files"
+msgstr "Alle Dateien"
+
+#: bin/widget/view/form_gtk/binary.py:148
+msgid "Select a file..."
+msgstr "Datei auswählen"
+
+#
+# File: bin/printer/printer.py, line: 215
+# File: bin/printer/printer.py, line: 215
+# File: bin/printer/printer.py, line: 215
+#: bin/widget/view/form_gtk/binary.py:177
+#, python-format
+msgid "Error writing the file: %s"
+msgstr "Fehler beim Schreiben der Datei: %s"
+
+#
+# File: bin/widget/view/form_gtk/wid_common.py, line: 60
+# File: bin/widget/view/form_gtk/wid_common.py, line: 60
+# File: bin/widget/view/form_gtk/wid_common.py, line: 60
+#: bin/widget/view/form_gtk/wid_common.py:59
+msgid "Always applicable !"
+msgstr "Immer anwendbar!"
+
+#: bin/widget/view/form_gtk/calendar.py:99
+#: bin/widget/view/form_gtk/calendar.py:163
+msgid "Invalid date value! Year must be greater than 1899 !"
+msgstr "Ungültiger Datumswert. Das Jahr muß größer als 1899 sein!"
+
+#
+# File: bin/widget/view/form_gtk/calendar.py, line: 247
+# File: bin/widget/view/form_gtk/calendar.py, line: 247
+# File: bin/widget/view/form_gtk/calendar.py, line: 247
+#: bin/widget/view/form_gtk/calendar.py:255 bin/widget_search/calendar.py:273
+msgid "Hour:"
+msgstr "Stunde:"
+
+#
+# File: bin/widget/view/form_gtk/calendar.py, line: 250
+# File: bin/widget/view/form_gtk/calendar.py, line: 250
+# File: bin/widget/view/form_gtk/calendar.py, line: 250
+#: bin/widget/view/form_gtk/calendar.py:258 bin/widget_search/calendar.py:276
+msgid "Minute:"
+msgstr "Minute:"
+
+#: bin/widget/view/form_gtk/calendar.py:291 bin/widget_search/calendar.py:312
+msgid "Invalid datetime value! Year must be greater than 1899 !"
+msgstr "Ungültiger Datums- oder Zeitwert. Das Jahr muß größer als 1899 sein!"
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:30
+msgid "Gantt view not yet implemented !"
+msgstr "Gantt Ansicht ist noch nicht programmiert."
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:31
+msgid ""
+"The gantt view is not available in this GTK Client, you should use the web "
+"interface or switch to the calendar view."
+msgstr ""
+"Die Gantt Ansicht ist noch nicht programmiert. Sie können die Web-Anwendunge "
+"oder die Kalenderansicht verwenden."
+
+#: bin/widget/screen/screen.py:337
+msgid ""
+"(Any existing filter with the \n"
+"same name will be replaced)"
+msgstr ""
+"(Jeder Filter mit dem selben \n"
+"Namen wird ersetzt!)"
+
+#
+# File: bin/rpc.py, line: 142
+# File: bin/rpc.py, line: 142
+# File: bin/rpc.py, line: 142
+#: bin/rpc.py:158
+>>>>>>> MERGE-SOURCE
 msgid "Connection refused!"
 msgstr "Verbindung abgelehnt!"
 
@@ -2428,6 +4225,7 @@
 msgstr "_Einstellungen..."
 
 #
+<<<<<<< TREE
 # File: bin/openerp.glade, line: 9299
 # File: bin/openerp.glade, line: 9299
 # File: bin/openerp.glade, line: 9299
@@ -2440,6 +4238,12 @@
 # File: bin/openerp.glade, line: 445
 # File: bin/openerp.glade, line: 445
 #: bin/openerp.glade:496
+=======
+# File: bin/openerp.glade, line: 445
+# File: bin/openerp.glade, line: 445
+# File: bin/openerp.glade, line: 445
+#: bin/openerp.glade:496
+>>>>>>> MERGE-SOURCE
 msgid "_Send a request"
 msgstr "Anfrage senden"
 
@@ -3239,7 +5043,19 @@
 msgid "<b>Predefined Exports</b>"
 msgstr "<b> Vordefiniert Exporte</b>"
 
-#: bin/openerp.glade:2880
+<<<<<<< TREE
+#: bin/openerp.glade:2880
+=======
+#: bin/openerp.glade:3134
+msgid "Import Compatible"
+msgstr "Import kompatibel"
+
+#: bin/openerp.glade:2862
+msgid "<b>Select an Option to Export</b>"
+msgstr "<b>Wähle Option für Export</b>"
+
+#: bin/openerp.glade:2880
+>>>>>>> MERGE-SOURCE
 msgid "Available Fields"
 msgstr "Verfügbare Felder"
 
@@ -3280,6 +5096,7 @@
 #: bin/openerp.glade:3115
 msgid "Add Field Names"
 msgstr ""
+<<<<<<< TREE
 
 #: bin/openerp.glade:3134
 msgid "Import Compatible"
@@ -3290,6 +5107,24 @@
 # File: bin/openerp.glade, line: 3035
 # File: bin/openerp.glade, line: 3035
 #: bin/openerp.glade:3156
+=======
+"Mit Excel öffnen\n"
+"Als CSV speichern"
+
+#
+# File: bin/openerp.glade, line: 3018
+# File: bin/openerp.glade, line: 3018
+# File: bin/openerp.glade, line: 3018
+#: bin/openerp.glade:3151
+msgid "Add _field names"
+msgstr "_Feldnamen hinzufügen"
+
+#
+# File: bin/openerp.glade, line: 3035
+# File: bin/openerp.glade, line: 3035
+# File: bin/openerp.glade, line: 3035
+#: bin/openerp.glade:3156
+>>>>>>> MERGE-SOURCE
 msgid "<b>Opti_ons</b>"
 msgstr "<b>_Optionen</b>"
 
@@ -3879,6 +5714,7 @@
 msgstr "_Nichts"
 
 #
+<<<<<<< TREE
 # File: bin/openerp.glade, line: 7833
 # File: bin/openerp.glade, line: 7833
 # File: bin/openerp.glade, line: 7833
@@ -3900,14 +5736,43 @@
 # File: bin/openerp.glade, line: 7778
 # File: bin/openerp.glade, line: 7778
 #: bin/openerp.glade:5852
+=======
+# File: bin/openerp.glade, line: 7778
+# File: bin/openerp.glade, line: 7778
+# File: bin/openerp.glade, line: 7778
+#: bin/openerp.glade:5852
+>>>>>>> MERGE-SOURCE
 msgid "Auto-Detect"
 msgstr "Automatisch erkennen"
 
 #
-# File: bin/openerp.glade, line: 7942
-# File: bin/openerp.glade, line: 7942
-# File: bin/openerp.glade, line: 7942
-#: bin/openerp.glade:5930
+<<<<<<< TREE
+# File: bin/openerp.glade, line: 7942
+# File: bin/openerp.glade, line: 7942
+# File: bin/openerp.glade, line: 7942
+#: bin/openerp.glade:5930
+=======
+# File: bin/openerp.glade, line: 7833
+# File: bin/openerp.glade, line: 7833
+# File: bin/openerp.glade, line: 7833
+#: bin/openerp.glade:5772
+msgid "<b>Fields to import</b>"
+msgstr "<b>zu importierende Felder</b>"
+
+#
+# File: bin/openerp.glade, line: 7868
+# File: bin/openerp.glade, line: 7868
+# File: bin/openerp.glade, line: 7868
+#: bin/openerp.glade:5891
+msgid "File to Import:"
+msgstr "Datei zu Importieren:"
+
+#
+# File: bin/openerp.glade, line: 7942
+# File: bin/openerp.glade, line: 7942
+# File: bin/openerp.glade, line: 7942
+#: bin/openerp.glade:5930
+>>>>>>> MERGE-SOURCE
 msgid "Lines to Skip:"
 msgstr "Zu überspringende Zeilen:"
 
@@ -4181,10 +6046,25 @@
 "Demonstrationsdaten:"
 
 #
-# File: bin/openerp.glade, line: 9316
-# File: bin/openerp.glade, line: 9316
-# File: bin/openerp.glade, line: 9316
-#: bin/openerp.glade:7321
+<<<<<<< TREE
+# File: bin/openerp.glade, line: 9316
+# File: bin/openerp.glade, line: 9316
+# File: bin/openerp.glade, line: 9316
+#: bin/openerp.glade:7321
+=======
+# File: bin/openerp.glade, line: 9299
+# File: bin/openerp.glade, line: 9299
+# File: bin/openerp.glade, line: 9299
+#: bin/openerp.glade:483 bin/openerp.glade:7304
+msgid "Change password"
+msgstr "Kennwort ändern"
+
+#
+# File: bin/openerp.glade, line: 9316
+# File: bin/openerp.glade, line: 9316
+# File: bin/openerp.glade, line: 9316
+#: bin/openerp.glade:7321
+>>>>>>> MERGE-SOURCE
 msgid "<b>Change your super admin password</b>"
 msgstr "<b> Super Administrator Kennwort ändern</b>"
 
@@ -4282,7 +6162,36 @@
 msgid "Month"
 msgstr "Monat"
 
-#: bin/openerp.glade:8230
+<<<<<<< TREE
+#: bin/openerp.glade:8230
+=======
+#: bin/openerp.glade:8276
+msgid "Fields on which Search criteria to be applied"
+msgstr "Felder die durchsucht werden sollen"
+
+#: bin/openerp.glade:8289
+msgid "Conditional Operators"
+msgstr "Bedingende Operatoren"
+
+#: bin/openerp.glade:8316
+msgid "The Choice will be applied with next filter if any"
+msgstr ""
+"Die Auswahl wird mit dem nächsten Filter angewendet, falls einer exsistiert"
+
+#: bin/openerp.glade:8317
+msgid ""
+"AND\n"
+"OR"
+msgstr ""
+"UND\n"
+"ODER"
+
+#: bin/openerp.glade:8330
+msgid "Remove Filter"
+msgstr "Filter entfernen"
+
+#: bin/openerp.glade:8230
+>>>>>>> MERGE-SOURCE
 msgid "Filter Entry"
 msgstr "Eintrag filtern"
 

=== modified file 'bin/po/el.po'
--- bin/po/el.po	2011-10-11 05:32:10 +0000
+++ bin/po/el.po	2011-10-24 01:06:26 +0000
@@ -7,15 +7,26 @@
 msgstr ""
 "Project-Id-Version: openobject-client\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-07-28 15:22+0530\n"
 "PO-Revision-Date: 2011-07-25 16:14+0000\n"
 "Last-Translator: Naresh(OpenERP) <nch@xxxxxxxxxxx>\n"
+=======
+"POT-Creation-Date: 2010-12-13 18:11+0100\n"
+"PO-Revision-Date: 2011-05-03 09:34+0000\n"
+"Last-Translator: Andreas Ntakas <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Greek <el@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2011-10-11 05:30+0000\n"
 "X-Generator: Launchpad (build 14123)\n"
+=======
+"X-Launchpad-Export-Date: 2011-09-15 05:09+0000\n"
+"X-Generator: Launchpad (build 13921)\n"
+>>>>>>> MERGE-SOURCE
 "Language: el\n"
 
 #: bin/widget/view/gantt_gtk/parser_dummy.py:30
@@ -746,6 +757,7 @@
 msgid "Choose a Plugin"
 msgstr "Επιλέξτε πρόσθετο (plugin)"
 
+<<<<<<< TREE
 #: bin/printer/printer.py:184
 #, python-format
 msgid "Unable to handle %s filetype"
@@ -940,9 +952,13 @@
 msgstr "Όχι"
 
 #: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
+=======
+#: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
+>>>>>>> MERGE-SOURCE
 msgid "Connection refused !"
 msgstr "Άρνηση σύνδεσης !"
 
+<<<<<<< TREE
 #: bin/rpc.py:158
 msgid "Connection refused!"
 msgstr "Άρνηση σύνδεσης!"
@@ -962,6 +978,11 @@
 #: bin/rpc.py:203 bin/rpc.py:205 bin/modules/action/wizard.py:162
 #: bin/modules/action/wizard.py:168 bin/modules/action/wizard.py:170
 #: bin/modules/gui/main.py:195 bin/modules/gui/main.py:201
+=======
+#: bin/rpc.py:203 bin/rpc.py:205 bin/modules/action/wizard.py:162
+#: bin/modules/action/wizard.py:168 bin/modules/action/wizard.py:170
+#: bin/modules/gui/main.py:195 bin/modules/gui/main.py:201
+>>>>>>> MERGE-SOURCE
 msgid "Application Error"
 msgstr "Σφάλμα Προγράμματος"
 
@@ -985,6 +1006,7 @@
 msgid "Select your action"
 msgstr "Επιλέξτε ενέργεια"
 
+<<<<<<< TREE
 #: bin/modules/gui/window/win_extension.py:43
 msgid "Extension"
 msgstr "Επέκταση"
@@ -1006,6 +1028,308 @@
 msgstr "Διαχειριστής Επεκτάσεων"
 
 #: bin/modules/gui/window/form.py:189
+=======
+#: bin/modules/gui/main.py:89 bin/modules/gui/main.py:341
+msgid "Could not connect to server !"
+msgstr "Αδυναμία σύνδεσης με τον εξυπηρετητή !"
+
+#: bin/modules/gui/main.py:93 bin/openerp.glade:72 bin/openerp.glade:6233
+#: bin/openerp.glade:6479 bin/openerp.glade:6802 bin/openerp.glade:7466
+msgid "Server:"
+msgstr "Εξυπηρετητής:"
+
+#: bin/modules/gui/main.py:104 bin/openerp.glade:98 bin/openerp.glade:6515
+#: bin/openerp.glade:6759 bin/openerp.glade:7058 bin/openerp.glade:7423
+msgid "Change"
+msgstr "Αλλαγή"
+
+#: bin/modules/gui/main.py:111
+msgid "Super Administrator Password:"
+msgstr "Κωδικός Super Administrator:"
+
+#: bin/modules/gui/main.py:193
+msgid "Bad Super Administrator Password"
+msgstr "Λάθος κωδικός Υπερδιαχειριστή"
+
+#: bin/modules/gui/main.py:217
+msgid "Migration Scripts"
+msgstr "Εντολές αναβάθμισης"
+
+#: bin/modules/gui/main.py:220
+msgid "Contract ID:"
+msgstr "Αναγνωριστικό συμβολαίου:"
+
+#: bin/modules/gui/main.py:226
+msgid "Contract Password:"
+msgstr "Κωδικός συμβολαίου:"
+
+#: bin/modules/gui/main.py:241
+msgid "You already have the latest version"
+msgstr "Έχετε ήδη την τελευταία έκδοση"
+
+#: bin/modules/gui/main.py:246
+msgid "The following updates are available:"
+msgstr "Οι παρακάτω ενημρώσεις είναι διαθέσιμες:"
+
+#: bin/modules/gui/main.py:258
+msgid "You can now migrate your databases."
+msgstr "Τώρα μπορείτε να ανβαθμίσετε τις βάσεις δεδομένων σας."
+
+#: bin/modules/gui/main.py:263
+msgid "Migrate Database"
+msgstr "Αναβάθμιση βάσης δεδομένων"
+
+#: bin/modules/gui/main.py:280
+msgid "Database"
+msgstr "Βάση δεδομένων"
+
+#: bin/modules/gui/main.py:292
+msgid "Your database has been upgraded."
+msgstr "Η βάσης δεδομένων σας αναβαθμίστηκε."
+
+#: bin/modules/gui/main.py:294
+msgid "Your databases have been upgraded."
+msgstr "Οι βάσεις δεδομένων σας αναβαθμίστηκαν."
+
+#: bin/modules/gui/main.py:296
+msgid "You have not selected a database"
+msgstr "Δεν έχετε επιλέξει καμία βάση δεδομένων"
+
+#: bin/modules/gui/main.py:360
+msgid "No database found, you must create one !"
+msgstr "Καμία βάση δεδομένων δεν βρέθηκε, θα πρέπει να δημιουργήσετε μία!"
+
+#: bin/modules/gui/main.py:468
+msgid "Unknown"
+msgstr "Άγνωστο"
+
+#: bin/modules/gui/main.py:474
+#, python-format
+msgid ""
+"The versions of the server (%s) and the client (%s) missmatch. The client "
+"may not work properly. Use it at your own risks."
+msgstr ""
+"Οι εκδόσεις του εξυπηρετητή (%s) και του πελάτη (%s) δεν συμβαδίζουν. Ο "
+"πελάτης μπορεί να μην λειτουργήσει σωστά. Προχωρήστε με δική σας ευθύνη."
+
+#: bin/modules/gui/main.py:610
+msgid "Sorry,'"
+msgstr "Λυπάμαι."
+
+#: bin/modules/gui/main.py:610 bin/modules/gui/main.py:613
+msgid "Bad database name !"
+msgstr "Λανθασμένο όνομα βάσης δεδομένων!"
+
+#: bin/modules/gui/main.py:613
+msgid ""
+"The database name must contain only normal characters or \"_\".\n"
+"You must avoid all accents, space or special characters."
+msgstr ""
+"Η βάση δεδομένων θα πρέπει να περιέχει μόνο κανονικούς χαρακτήρες ή \"_\".\n"
+"Θα πρέπει να αποφεύγετε τονισμούς, κενά ή ειδικούς χαρακτήρες."
+
+#: bin/modules/gui/main.py:637 bin/modules/gui/main.py:650
+#: bin/modules/gui/main.py:652 bin/modules/gui/main.py:654
+msgid "Could not create database."
+msgstr "Αδυναμία δημιουργίας βάσης δεδομένων"
+
+#: bin/modules/gui/main.py:638 bin/modules/gui/main.py:650
+msgid "Database already exists !"
+msgstr "Η βάση δεδομένων υπάρχει ήδη!"
+
+#: bin/modules/gui/main.py:652 bin/modules/gui/main.py:1384
+#: bin/modules/gui/main.py:1404 bin/modules/gui/main.py:1509
+msgid "Bad database administrator password !"
+msgstr "Λανθασμένος κωδικός διαχειριστή βάσης δεδομένων!"
+
+#: bin/modules/gui/main.py:654 bin/modules/gui/main.py:661
+msgid "Error during database creation !"
+msgstr "Σφάλμα κατα την δημιουργία βάσης δεδομένων!"
+
+#: bin/modules/gui/main.py:661
+msgid ""
+"The server crashed during installation.\n"
+"We suggest you to drop this database."
+msgstr ""
+"Ο εξυπηρετητής δεν ανταποκρίθηκε κατα την εγκατάσταση.\n"
+"Προτείνουμε να διαγράψετε την βάση δεδομένων."
+
+#: bin/modules/gui/main.py:707 bin/modules/gui/main.py:1072
+msgid "Press Ctrl+O to login"
+msgstr "Πληκτρολογήστε Ctrl+O για εισαγωγή στο σύστημα"
+
+#: bin/modules/gui/main.py:881
+msgid "Edit"
+msgstr "Επεξεργασία"
+
+#: bin/modules/gui/main.py:974
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: bin/modules/gui/main.py:976
+msgid "No Company"
+msgstr "Χωρίς Εταιρεία"
+
+#: bin/modules/gui/main.py:989
+#, python-format
+msgid "%s request(s)"
+msgstr "%s αιτήση(σεις)"
+
+#: bin/modules/gui/main.py:991
+msgid "No request"
+msgstr "Καμία αίτηση"
+
+#: bin/modules/gui/main.py:993
+#, python-format
+msgid " - %s request(s) sent"
+msgstr " - %s αιτήσεις απεστάλησαν"
+
+#: bin/modules/gui/main.py:1031
+msgid ""
+"Please double-check the database name or contact your administrator to "
+"verify the database status."
+msgstr ""
+"Παρακαλώ ελέξτε ξανά το όνομα της βάσης δεδομένων ή επικοινωνήστε με τον "
+"διαχειριστή σας για να επιβεβαιώσετε την κατάσταση της βάσης δεδομένων."
+
+#: bin/modules/gui/main.py:1031
+msgid "Database cannot be accessed or does not exist"
+msgstr "Η βάση δεδομένων δεν είναι προσβάσιμη ή δεν υπάρχει"
+
+#: bin/modules/gui/main.py:1035
+msgid ""
+"Connection error !\n"
+"Unable to connect to the server !"
+msgstr ""
+"Σφάλμα σύνδεσης!\n"
+"Αδυναμία σύνδεσης με τον εξυπηρετητή!"
+
+#: bin/modules/gui/main.py:1037
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password !"
+msgstr ""
+"Λάθος πιστοποίησης!\n"
+"Λάθος όνομα χρήστη ή κωδικός!"
+
+#: bin/modules/gui/main.py:1050
+#, python-format
+msgid "OpenERP - %s"
+msgstr ""
+
+#: bin/modules/gui/main.py:1070
+msgid "Not logged !"
+msgstr "Δεν είστε συνδεμένος!"
+
+#: bin/widget/view/form_gtk/one2many_list.py:52 bin/modules/gui/main.py:1079
+#: bin/openerp.glade:6081
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#: bin/modules/gui/main.py:1153
+msgid ""
+"You can not log into the system !\n"
+"Ask the administrator to verify\n"
+"you have an action defined for your user."
+msgstr ""
+"Δεν μπορείτε να μπείτε στο σύστημα!\n"
+"Ζητήστε απο τον διαχειριστή σας να ελέγξει\n"
+"και να ορίσει μιά ενέργεια για τον χρήστη σας."
+
+#: bin/modules/gui/main.py:1187 bin/modules/gui/main.py:1194
+msgid "Do you really want to quit ?"
+msgstr "Θέλετε να αποσυνδεθείτε;"
+
+#: bin/modules/gui/main.py:1263
+#, python-format
+msgid "Attachments (%d)"
+msgstr "Συνημμένα (%d)"
+
+#: bin/modules/gui/main.py:1276
+msgid "Attachments"
+msgstr "Συνημμένα"
+
+#: bin/modules/gui/main.py:1375
+msgid "Delete a database"
+msgstr "Διαγραφή μιάς βάσης δεδομένων"
+
+#: bin/modules/gui/main.py:1381
+msgid "Database dropped successfully !"
+msgstr "Η διαγραφή της βάσης δεδομένων έγινε με επιτυχία!"
+
+#: bin/modules/gui/main.py:1384
+msgid "Could not drop database."
+msgstr "Αδυναμία διαγραφής της βάσης δεδομένων."
+
+#: bin/modules/gui/main.py:1386
+msgid "Couldn't drop database"
+msgstr "Αδυναμία διαγραφής της βάσης δεδομένων"
+
+#: bin/widget/view/form_gtk/image.py:112 bin/widget/view/form_gtk/url.py:118
+#: bin/modules/gui/main.py:1389 bin/openerp.glade:5817
+msgid "Open..."
+msgstr "Άνοιγμα..."
+
+#: bin/modules/gui/main.py:1401
+msgid "Database restored successfully !"
+msgstr "Η βάση δεδομένων αποκαταστάθηκε με επιτυχία!"
+
+#: bin/modules/gui/main.py:1404
+msgid "Could not restore database."
+msgstr "Αδυναμία αποκατάστασης της βάσης δεδομένων."
+
+#: bin/modules/gui/main.py:1406
+msgid "Couldn't restore database"
+msgstr "Αδυναμία αποκατάστασης της βάσης δεδομένων."
+
+#: bin/modules/gui/main.py:1457
+msgid ""
+"Confirmation password does not match new password, operation cancelled!"
+msgstr ""
+"Ο κωδικός επαλήθευσης δεν ταιριάζει με τον νέο κωδικό, η λειτουργία "
+"ακυρώθηκε!"
+
+#: bin/modules/gui/main.py:1459
+msgid "Validation Error."
+msgstr "Σφάλμα επαλήθευσης."
+
+#: bin/modules/gui/main.py:1476
+msgid "Could not change the Super Admin password."
+msgstr "Αδυναμία αλλαγής του κωδικού πρόσβασης για τον χρήστη Super Admin."
+
+#: bin/modules/gui/main.py:1477 bin/modules/gui/main.py:1483
+msgid "Bad password provided !"
+msgstr "Παρασχέθηκε λανθασμένος κωδικός!"
+
+#: bin/modules/gui/main.py:1457
+msgid "Error, password not changed."
+msgstr "Σφάλμα, ο κωδικός δεν άλλαξε"
+
+#: bin/modules/gui/main.py:1490 bin/modules/gui/main.py:1513
+msgid "Backup a database"
+msgstr "Αντίγραφο ασφαλείας βάσης δεδομένων"
+
+#: bin/widget/view/form_gtk/image.py:129
+#: bin/widget/view/form_gtk/binary.py:167 bin/printer/printer.py:231
+#: bin/modules/gui/window/win_export.py:359 bin/modules/gui/main.py:1493
+msgid "Save As..."
+msgstr "Αποθήκευση ως..."
+
+#: bin/modules/gui/main.py:1506
+msgid "Database backed up successfully !"
+msgstr "Δημιουργήθηκε αντίγραφο ασφαλείας της βάσης δεδομένων με επιτυχία!"
+
+#: bin/modules/gui/main.py:1509
+msgid "Could not backup the database."
+msgstr "Αδυναμία δημιουργίας αντίγραφου ασφαλείας της βάσης δεδομένων."
+
+#: bin/modules/gui/main.py:1511
+msgid "Couldn't backup database."
+msgstr "Αδυναμία δημιουργίας αντίγραφου ασφαλείας της βάσης δεδομένων."
+
+#: bin/modules/gui/window/form.py:189
+>>>>>>> MERGE-SOURCE
 msgid "Resource ID does not exist for this object!"
 msgstr "Δεν υπάρχει ο κωδικός του πόρου για αυτό το αντικείμενο!"
 
@@ -1055,7 +1379,21 @@
 "Η εγγραφή δεν αποθηκεύτηκε!\n"
 " Θέλετε να διαγράψετε την τρέχουσα εγγραφή;"
 
-#: bin/modules/gui/window/form.py:296
+<<<<<<< TREE
+#: bin/modules/gui/window/form.py:296
+=======
+#: bin/widget/view/form_gtk/one2many_list.py:388
+#: bin/modules/gui/window/form.py:290
+msgid "Are you sure to remove this record ?"
+msgstr "Θέλετε σίγουρα να διαγράψετε αυτήν την εγγραφή;"
+
+#: bin/widget/view/form_gtk/one2many_list.py:390
+#: bin/modules/gui/window/form.py:292
+msgid "Are you sure to remove those records ?"
+msgstr "Θέλετε σίγουρα να διαγράψετε αυτές τις εγγραφές;"
+
+#: bin/modules/gui/window/form.py:296
+>>>>>>> MERGE-SOURCE
 msgid "Resources cleared."
 msgstr "Οι πόροι καθαρίστηκαν"
 
@@ -1071,7 +1409,20 @@
 msgid "Document Saved."
 msgstr "Το αρχείο αποθηκεύτηκε."
 
-#: bin/modules/gui/window/form.py:368
+<<<<<<< TREE
+#: bin/modules/gui/window/form.py:368
+=======
+#: bin/widget/view/list.py:584 bin/widget/view/list.py:585
+#: bin/widget/view/form_gtk/parser.py:135 bin/modules/gui/window/form.py:366
+msgid "Invalid form, correct red fields !"
+msgstr "Μη έγκυρη φόρμα, διορθώστε τα κόκκινα πεδία!"
+
+#: bin/widget/view/list.py:584
+msgid "Error !"
+msgstr "Σφάλμα !"
+
+#: bin/modules/gui/window/form.py:368
+>>>>>>> MERGE-SOURCE
 msgid "Warning !"
 msgstr "Προειδοποίηση!"
 
@@ -1140,12 +1491,21 @@
 "\n"
 "%(err_msg)s"
 msgstr ""
+<<<<<<< TREE
 "Σφάλμα κατά την προσπάθεια εισαγωγής της εγγραφής:\n"
 "%(err_import_record)s\n"
 "Μήνυμα Λάθους:\n"
 "%(err_type)s\n"
 "\n"
 "%(err_msg)s"
+=======
+"Σφάλμα κατά την προσπάθεια εισαγωγής της εγγραφής:\n"
+"%s\n"
+"Μήνυμα Λάθους:\n"
+"%s\n"
+"\n"
+"%s"
+>>>>>>> MERGE-SOURCE
 
 #: bin/modules/gui/window/win_import.py:72
 msgid "Importation Error !"
@@ -1156,6 +1516,7 @@
 msgid "Field name"
 msgstr "Όνομα πεδίου"
 
+<<<<<<< TREE
 #: bin/modules/gui/window/win_import.py:142
 #: bin/modules/gui/window/win_import.py:144
 #: bin/modules/gui/window/win_export.py:214
@@ -1163,6 +1524,9 @@
 msgstr ""
 
 #: bin/modules/gui/window/win_import.py:181
+=======
+#: bin/modules/gui/window/win_import.py:181
+>>>>>>> MERGE-SOURCE
 msgid "Error opening .CSV file"
 msgstr "Σφάλμα άνοιγμα .CSV αρχείο"
 
@@ -1194,6 +1558,29 @@
 msgid "You have not selected any fields to import"
 msgstr "Δεν επιλέξατε πεδία για εισαγωγή"
 
+<<<<<<< TREE
+=======
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Extension"
+msgstr "Επέκταση"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Application"
+msgstr "Εφαρμογή"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Print Processor"
+msgstr "Επεξεργαστής Εκτύπωσης"
+
+#: bin/modules/gui/window/win_extension.py:114
+msgid "This extension is already defined"
+msgstr "Αυτή η επέκταση έχει ήδη καθοριστεί."
+
+#: bin/modules/gui/window/win_extension.py:114 bin/openerp.glade:7642
+msgid "Extension Manager"
+msgstr "Διαχειριστής Επεκτάσεων"
+
+>>>>>>> MERGE-SOURCE
 #: bin/modules/gui/window/win_selection.py:51
 msgid "Name"
 msgstr "Όνομα"
@@ -1230,6 +1617,7 @@
 msgid "Tree"
 msgstr "Δένδρο"
 
+<<<<<<< TREE
 #: bin/modules/gui/window/win_search.py:126
 #, python-format
 msgid "OpenERP Search: %s"
@@ -1245,6 +1633,13 @@
 msgstr "Άγνωστο παράθυρο"
 
 #: bin/modules/gui/window/tree.py:205 bin/modules/gui/window/tree.py:261
+=======
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:45
+msgid "Description"
+msgstr "Περιγραφή"
+
+#: bin/modules/gui/window/tree.py:205 bin/modules/gui/window/tree.py:261
+>>>>>>> MERGE-SOURCE
 msgid "No resource selected!"
 msgstr "Κανένας πόρος δεν επιλέχθηκε!"
 
@@ -1281,6 +1676,7 @@
 msgid "Error Opening Excel !"
 msgstr "Σφάλμα ανοίγματος Excel!"
 
+<<<<<<< TREE
 #: bin/modules/gui/window/win_export.py:142
 #: bin/modules/gui/window/win_export.py:146
 msgid "Field Name"
@@ -1295,6 +1691,9 @@
 msgstr ""
 
 #: bin/modules/gui/window/win_export.py:317
+=======
+#: bin/modules/gui/window/win_export.py:317
+>>>>>>> MERGE-SOURCE
 msgid "What is the name of this export ?"
 msgstr "Ποιό είναι το όνομα αυτής της εξαγωγής;"
 
@@ -1302,6 +1701,7 @@
 msgid "Exportation Error !"
 msgstr "Λάθος εξαγωγής!"
 
+<<<<<<< TREE
 #: bin/modules/gui/main.py:89 bin/modules/gui/main.py:341
 msgid "Could not connect to server !"
 msgstr "Αδυναμία σύνδεσης με τον εξυπηρετητή !"
@@ -1314,8 +1714,607 @@
 #: bin/modules/gui/main.py:104 bin/openerp.glade:98 bin/openerp.glade:6515
 #: bin/openerp.glade:6759 bin/openerp.glade:7058 bin/openerp.glade:7423
 msgid "Change"
+=======
+#: bin/widget/view/diagram_gtk/xdot.py:1772
+#: bin/modules/gui/window/win_search.py:49
+msgid "OpenERP - Link"
+msgstr "OpenERP - Σύνδεσμος"
+
+#: bin/modules/gui/window/win_search.py:126
+#, python-format
+msgid "OpenERP Search: %s"
+msgstr "Αναζήτηση OpenERP: %s"
+
+#: bin/modules/gui/window/win_search.py:127
+#, python-format
+msgid "OpenERP Search: %s (%%d result(s))"
+msgstr "Αναζήτηση OpenERP: %s (%%d αποτέλεσμα(τα))"
+
+#: bin/options.py:121
+#, python-format
+msgid "OpenERP Client %s"
+msgstr "Πελάτης OpenERP %s"
+
+#: bin/options.py:122
+msgid "specify alternate config file"
+msgstr "δηλώστε εναλλακτικό αρχείο config"
+
+#: bin/options.py:123
+msgid "Enable basic debugging. Alias for '--log-level=debug'"
+msgstr "Επιτρέπει την αποσφαλμάτωση. Εναλλακτικό του '--log-level=debug'"
+
+#: bin/options.py:124
+#, python-format
+msgid "specify the log level: %s"
+msgstr "καθορίζει το επίπεδο καταγραφής: %s"
+
+#: bin/options.py:125
+msgid "specify the user login"
+msgstr "δηλώστε την είσοδο χρήστη"
+
+#: bin/options.py:126
+msgid "specify the server port"
+msgstr "δηλώστε τη θύρα του εξυπηρετητή"
+
+#: bin/options.py:127
+msgid "specify the server ip/name"
+msgstr "δηλώστε το όνομα/ip του εξυπηρετητή"
+
+#: bin/common/common.py:89
+msgid "Close current tip"
+msgstr "Κλείσιμο τρέχουσας συμβουλής"
+
+#: bin/common/common.py:90
+msgid ""
+"<span foreground=\"darkred\"><b>Close Current Tip:</b></span>\n"
+"This will hide the current tip. It will be displayed again next time you "
+"open this menu item, unless you disable all tips using the <b>'Menu "
+"Tips'</b> option in the user preferences."
+msgstr ""
+"<span foreground=\"darkred\"><b>Κλείσιμο Τρέχουσας Συμβουλής:</b></span>\n"
+"Αυτή η επιλογή θα αποκλύψει την τρέχουσα συμβουλή. Θα εμφανιστεί ξανά την "
+"επόμενη φορά που θα ανοίξετε αυτή την επιλογή του μενού, εκτός αν "
+"απενεργοποιήσετε όλες τις συμβουλές χρησιμοποίόντας την επιλογή "
+"<b>'Συμβουλές Μενού'</b> στις ρυθμήσεις του χρήστη."
+
+#: bin/common/common.py:100
+msgid "Disable all tips"
+msgstr "Απενεργοποίηση όλων των συμβουλών"
+
+#: bin/common/common.py:101
+msgid ""
+"<span foreground=\"darkred\"><b>Disable all tips:</b></span>\n"
+"This will disable the display of tips on all menu items.\n"
+"To re-enable tips you need to check the <b>'Menu Tips'</b> option in the "
+"user preferences."
+msgstr ""
+"<span foreground=\"darkred\"><b>Απενεργοποίηση όλων των "
+"συμβουλών:</b></span>\n"
+"Αυτή η επιλογή θα απενεργοποιήσει την εμφάνηση των συμβουλών σε όλα τα "
+"μενού. Για να επαναενεργοποιήσετε τις συμβουλές πρέπει να τσεκάρετε την "
+"επιλογή <b>'Συμβουλές Μενού'</b> στις ρυθμίσεις του χρήστη."
+
+#: bin/common/common.py:115 bin/common/common.py:117
+msgid "Tips"
+msgstr "Συμβουλές"
+
+#: bin/common/common.py:168
+msgid "OpenERP Computing"
+msgstr "OpenERP Computing"
+
+#: bin/common/common.py:187
+msgid "Operation in progress"
+msgstr "Λειτουργία σε εξέλιξη"
+
+#: bin/common/common.py:191
+msgid ""
+"Please wait,\n"
+"this operation may take a while..."
+msgstr ""
+"Παρακαλώ περιμένετε,\n"
+"αυτή η λειτουργία θα πάρει λίγο χρόνο..."
+
+#: bin/common/common.py:225
+#, python-format
+msgid "Ensure that the file %s is correct"
+msgstr "Επιβεβαιώστε ότι το αρχείο %s είναι σωστό"
+
+#: bin/common/common.py:399
+msgid " has reported the following bug:\n"
+msgstr " ανέφερε το εξής πρόβλημα:\n"
+
+#: bin/common/common.py:399
+msgid "remarks"
+msgstr ""
+
+#: bin/common/common.py:402
+msgid "Support request sent !"
+msgstr "Η αίτηση για υποστήριξη απεστάλη!"
+
+#: bin/common/common.py:425 bin/common/common.py:469
+msgid ""
+"\n"
+"<b>An unknown error has been reported.</b>\n"
+"\n"
+"<b>You do not have a valid OpenERP publisher warranty contract !</b>\n"
+"If you are using OpenERP in production, it is highly suggested to subscribe\n"
+"a publisher warranty program.\n"
+"\n"
+"The OpenERP publisher warranty contract provides you a bugfix guarantee and "
+"an\n"
+"automatic migration system so that we can fix your problems within a few\n"
+"hours. If you had a publisher warranty contract, this error would have been "
+"sent\n"
+"to the quality team of the OpenERP editor.\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"
+"\n"
+"You can use the link bellow for more information. The detail of the error\n"
+"is displayed on the second tab.\n"
+msgstr ""
+
+#: bin/common/common.py:448
+#, python-format
+msgid ""
+"\n"
+"<b>An unknown error has been reported.</b>\n"
+"\n"
+"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:\n"
+"%s\n"
+"\n"
+"You can use the link bellow for more information. The detail of the error\n"
+"is displayed on the second tab."
+msgstr ""
+
+#: bin/common/common.py:525
+msgid ""
+"Your problem has been sent to the quality team !\n"
+"We will recontact you after analysing the problem."
+msgstr ""
+"Το πρόβλημά σας απεστάλη στην ομάδα ποιότητας!\n"
+"Θα επικοινωνήσουμε μαζί σας μετά την ανάλυση του προβλήματος."
+
+#: bin/common/common.py:528
+#, python-format
+msgid ""
+"Your problem could *NOT* be sent to the quality team !\n"
+"Please report this error manually at:\n"
+"\t%s"
+msgstr ""
+"Το πρόβλημα σας ΔΕΝ μπόρεσε να αποσταλεί στην ομάδα ποιότητας!\n"
+"Παρακαλώ αναφέρατε το πρόβλημα μόνος σας στο:\n"
+"\t%s"
+
+#: bin/common/common.py:528
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: bin/common/common.py:682
+msgid "Open with..."
+msgstr "Άνοιγμα με..."
+
+#: bin/translate.py:183
+#, python-format
+msgid "Unable to set locale %s: %s"
+msgstr "Αδυναμία ορισμού του locale σε %s: %s"
+
+#: bin/printer/printer.py:184
+#, python-format
+msgid "Unable to handle %s filetype"
+msgstr "Αδυναμία χειρισμού %s τυπου αρχείου"
+
+#: bin/printer/printer.py:189
+msgid ""
+"Linux Automatic Printing not implemented.\n"
+"Use preview option !"
+msgstr ""
+"Αυτόματη εκτύπωση Linux δεν έχει υλοποιηθεί.\n"
+"Χρησιμοποιήστε την επιλογή προεπισκόπησης!"
+
+#: bin/printer/printer.py:212
+msgid "Error! No Data found. Make sure you have enough data to print!"
+msgstr ""
+"Σφάλμα! Δεν βρέθηκαν δεδομένα. Σιγουρευτείτε ότι υπάρχουν δεδομένα για "
+"εκτύπωση!"
+
+#: bin/printer/printer.py:239
+msgid "Error writing the file!"
+msgstr "Σφάλμα κατά την εγγραφή του αρχείου!"
+
+#: bin/openerp-client.py:142
+msgid "Closing OpenERP, KeyboardInterrupt"
+msgstr "Το OpenERP κλείνει, KeyboardInterrupt"
+
+#: bin/widget/view/form_gtk/button.py:47 bin/widget_search/char.py:72
+#: bin/widget_search/calendar.py:125 bin/widget_search/calendar.py:250
+#: bin/widget_search/filter.py:77 bin/widget_search/reference.py:78
+#: bin/widget_search/spinbutton.py:92 bin/widget_search/selection.py:116
+#: bin/widget_search/custom_filter.py:140 bin/widget_search/spinint.py:95
+#: bin/widget_search/checkbox.py:68
+msgid "The content of the widget or ValueError if not valid"
+msgstr "Το περιεχόμενο του Widget ή της τιμής σφάλματος δεν είναι έγκυρα"
+
+#: bin/widget_search/form.py:492
+msgid "The content of the form or exception if not valid"
+msgstr "Το περιεχόμενο της φόρμας ή της εξαίρεσης δεν είναι έγκυρη"
+
+#: bin/widget/view/form_gtk/date_widget.py:65
+#: bin/widget_search/date_widget.py:65
+msgid ""
+"You can use special operation by pressing +, - or =.  Plus/minus "
+"adds/decrease the variable to the current selected date. Equals set part of "
+"selected date. Available variables: 12h = 12 hours, 8d = 8 days, 4w = 4 "
+"weeks, 1m = 1 month, 2y = 2 years. Some examples:\n"
+"* +21d : adds 21 days to selected year\n"
+"* =23w : set date to the 23th week of the year\n"
+"* -4m : decrease 4 months to the current date\n"
+"You can also use \"=\" to set the date to the current date/time and '-' to "
+"clear the field."
+msgstr ""
+"Μπορείτε να χρησιμοποιείσετε ειδικές λειτουργίες πληκτρολογώντας +, - ή =. "
+"Σύν/Πλήν αυξάνει/μειώνει την μεταβλητή στην επιλεγμένη ημερομηνία. Το ίσον "
+"καθορίζει μέρος της επιλεγμένης ημερομηνίας. Διαθέσιμες παράμετροι: 12h = 12 "
+"ώρες, 8d = 8 ημέρες, 4w = 4 εβδομάδες, 1m = 1 μήνας, 2y = 2 χρόνια. Μερικά "
+"παραδείγματα:\n"
+"* +21d : προσθέτει 21 ημέρες στο επιλεγμένο έτος\n"
+"* =23w : ορίζει την ημερομηνία στην 23η εβδομάδα του έτους\n"
+"* -4m : μειώνει 4 μήνες στην τρέχουσα ημερομηνία\n"
+"Μπορείτε επίσης να χρησιμοποιείσετε \"=\" για να ορίσετε την ημερομηνία στην "
+"τρέχουσα ημερομηνία/ώρα και '-' για να καθαρίσετε το πεδίο."
+
+#: bin/widget_search/wid_int.py:56
+msgid "The content of the widget or exception if not valid"
+msgstr "Το περιεχόμενο του widget ή εξαίρεση αν μη έγκυρο"
+
+#: bin/widget_search/char.py:45
+msgid "Error: "
+msgstr "Σφάλμα: "
+
+#: bin/widget_search/calendar.py:49 bin/widget_search/calendar.py:177
+msgid "Start date"
+msgstr "Ημερομηνία από"
+
+#: bin/widget/view/form_gtk/calendar.py:57
+#: bin/widget/view/form_gtk/calendar.py:184 bin/widget_search/calendar.py:53
+#: bin/widget_search/calendar.py:73 bin/widget_search/calendar.py:181
+#: bin/widget_search/calendar.py:201
+msgid "Open the calendar widget"
+msgstr "Ανοίγμα του παράθυρου ημερολογίου"
+
+#: bin/widget_search/calendar.py:69 bin/widget_search/calendar.py:197
+msgid "End date"
+msgstr "Ημερομηνία έως"
+
+#: bin/widget/view/form_gtk/calendar.py:135
+#: bin/widget/view/form_gtk/calendar.py:249 bin/widget_search/calendar.py:128
+#: bin/widget_search/calendar.py:267
+msgid "OpenERP - Date selection"
+msgstr "OpenERP - Επιλογή ημερομηνίας"
+
+#: bin/widget_search/custom_filter_widgets.py:40
+#: bin/widget_search/custom_filter_widgets.py:67
+#: bin/widget_search/custom_filter_widgets.py:98
+msgid "contains"
+msgstr "περιέχει"
+
+#: bin/widget_search/custom_filter_widgets.py:41
+#: bin/widget_search/custom_filter_widgets.py:68
+#: bin/widget_search/custom_filter_widgets.py:98
+msgid "doesn't contain"
+msgstr "δεν περιέχει"
+
+#: bin/widget_search/custom_filter_widgets.py:290
+#: bin/widget_search/custom_filter_widgets.py:331
+msgid "is equal to"
+msgstr "είναι ίσο του"
+
+#: bin/widget_search/custom_filter_widgets.py:291
+#: bin/widget_search/custom_filter_widgets.py:332
+msgid "is not equal to"
+msgstr "δεν είναι ίσο του"
+
+#: bin/widget_search/custom_filter_widgets.py:292
+#: bin/widget_search/custom_filter_widgets.py:333
+msgid "greater than"
+msgstr "μεγαλύτερο από"
+
+#: bin/widget_search/custom_filter_widgets.py:293
+#: bin/widget_search/custom_filter_widgets.py:334
+msgid "less than"
+msgstr "μικρότερο από"
+
+#: bin/widget_search/custom_filter.py:62
+msgid "in"
+msgstr "στο"
+
+#: bin/widget_search/custom_filter.py:63
+msgid "not in"
+msgstr "όχι στο"
+
+#: bin/widget_search/custom_filter.py:82
+msgid ""
+"Enter Values separated by ',' if operator 'in' or 'not in' is chosen.\n"
+"For Date and DateTime Formats, specify text in '%Y-%m-%d' and '%Y-%m-%d "
+"%H:%M:%S' formats respectively."
+msgstr ""
+
+#: bin/widget_search/checkbox.py:35 bin/widget_search/checkbox.py:42
+#: bin/widget_search/checkbox.py:55
+msgid "Yes"
+msgstr "Ναι"
+
+#: bin/widget_search/checkbox.py:36 bin/widget_search/checkbox.py:44
+msgid "No"
+msgstr "Όχι"
+
+#: bin/widget/view/form.py:137
+msgid "You must save this record to use the relate button !"
+msgstr ""
+"Θα πρέπει να αποθηκεύσετε την τρέχουσα εγγραφή για να χρησιμοποιήσετε το "
+"πλήκτρο συσχετισμού!"
+
+#: bin/widget/view/form.py:142
+msgid "Action not defined !"
+msgstr "Δεν ορίστηκε ενέργεια!"
+
+#: bin/widget/view/form.py:211
+msgid "You must select a record to use the relate button !"
+msgstr ""
+"Θα πρέπει να επιλέξετε μια εγγραφή για να μπορέσετε να χρησιμοποιήσετε το "
+"πλήκτρο συσχετισμού!"
+
+#: bin/widget/view/form.py:238 bin/widget/view/form_gtk/parser.py:635
+#: bin/widget/view/form_gtk/parser.py:756
+#: bin/widget/view/form_gtk/parser.py:813
+msgid "No other language available!"
+msgstr "Δεν υπάρχει άλλη διαθέσιμη γλώσσα!"
+
+#: bin/widget/view/form.py:245 bin/widget/view/form_gtk/parser.py:647
+#: bin/widget/view/form_gtk/parser.py:762
+#: bin/widget/view/form_gtk/parser.py:819
+msgid "Add Translation"
+msgstr "Προσθήκη Μετάφρασης"
+
+#: bin/widget/view/form.py:293 bin/widget/view/form_gtk/parser.py:875
+msgid "Translate label"
+msgstr "Μετάφραση ετικέτας"
+
+#: bin/widget/view/calendar_gtk/parser.py:355 bin/openerp.glade:8064
+msgid "Week"
+msgstr "Εβδομάδα"
+
+#: bin/widget/view/calendar_gtk/parser_dummy.py:30
+msgid "Calendar View Error !"
+msgstr "Σφάλμα Εμφάνισης Ημερολογίου!"
+
+#: bin/widget/view/calendar_gtk/parser_dummy.py:31
+msgid "You must intall the library python-hippocanvas to use calendars."
+msgstr ""
+"Πρέπει να εγκαταστήσετε την βιβλιοθήκη python-hippocanvas για να "
+"χρησιμοποιήσετε τα ημερολόγια."
+
+#: bin/widget/view/screen_container.py:74
+msgid "--Actions--"
+msgstr "--Ενέργειες--"
+
+#: bin/widget/view/screen_container.py:73
+msgid "Save as a Shortcut"
+msgstr "Αποθήκευση ως Συντόμευση"
+
+#: bin/widget/view/screen_container.py:74
+msgid "Save as a Filter"
+msgstr "Αποθήκευση ως Φίλτρο"
+
+#: bin/widget/view/screen_container.py:74
+msgid "Manage Filters"
+msgstr "Διαχείριση Φίλτρων"
+
+#: bin/widget/view/tree_gtk/parser.py:61
+msgid ""
+"You have unsaved record(s) !  \n"
+"\n"
+"Please Save them before sorting !"
+msgstr ""
+"Υπάρχουν μη αποθηκευμένες εγγραφές!\n"
+"\n"
+"Παρακαλώ Αποθηκεύστε τις πριν την ταξινόμηση!"
+
+#: bin/widget/view/tree_gtk/editabletree.py:140
+#, python-format
+msgid "Shortcut: %s"
+msgstr "Συντόμευση: %s"
+
+#: bin/widget/view/tree_gtk/editabletree.py:140
+msgid "F1 New - F2 Open/Search"
+msgstr "F1 Νέο - F2 Άνοιγμα/Αναζήτηση"
+
+#: bin/widget/view/tree_gtk/editabletree.py:215
+#, python-format
+msgid "Warning; field %s is required!"
+msgstr "Προσοχή: Το πεδίο %s απαιτείται!"
+
+#: bin/widget/view/tree_gtk/date_renderer.py:197
+msgid ""
+"Press <i>'+'</i>, <i>'-'</i> or <i>'='</i> for special date operations."
+msgstr ""
+"Πληκτρολογήστε <i>'+'</i>, <i>'-'</i> ή <i>'='</i> για ειδικές λειτουργίες "
+"ημερομηνίας."
+
+#: bin/widget/view/widget_parse.py:53
+#, python-format
+msgid "This type (%s) is not supported by the GTK client !"
+msgstr "Αυτός ο τύπος (%s) δεν υποστηρίζεται από τον πελάτη GTK !"
+
+#: bin/widget/view/widget_parse.py:64
+msgid "No valid view found for this object!"
+msgstr "Καμία έγκυρη όψη δεν βρέθηκε για αυτό το αντικείμενο!"
+
+#: bin/widget/view/graph_gtk/parser.py:64
+msgid "Can not generate graph !"
+msgstr "Αδυναμία δημιουργίας γραφήματος!"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1422
+msgid "Dot Viewer"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1712
+msgid "Add New Node"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1713
+msgid "Add New Edge"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1714
+msgid "Enlarge the Diagram"
+msgstr "Μεγένθηση Διαγράμματος"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1715
+msgid "Shrink the Diagram"
+msgstr "Σμίκρυνση Διαγράμματος"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1716
+msgid "Fit the diagram to the window"
+msgstr "Προσαρμογή Διαγράμματος στο Παράθυρο"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1717
+msgid "Show the diagram at its normal size"
+msgstr "Εμφάνιση Διαγράμματος στο Κανονικό του Μέγεθος"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1718
+msgid "Print the Diagram"
+msgstr "Εκτύπωση Διαγράμματος"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1789
+#, python-format
+msgid "Close Current %s"
+msgstr "Κλείσιμο Τρέχοντος %s"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1790
+#, python-format
+msgid "Delete Current %s"
+msgstr "Διαγραφή Τρέχοντος %s"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1791
+#, python-format
+msgid "Edit Current %s"
+msgstr "Επεξεργασία Τρέχοντος %s"
+
+#: bin/widget/view/diagram_gtk/xdot.py:1875
+msgid " - Dot Viewer"
+msgstr ""
+
+#: bin/widget/view/form_gtk/reference.py:76 bin/openerp.glade:1258
+msgid "Create a new resource"
+msgstr "Δημιουργία νέου πόρου"
+
+#: bin/widget/view/form_gtk/reference.py:89
+msgid "Search / Open a resource"
+msgstr "Ανεύρεση / Άνοιγμα ενός πόρου"
+
+#: bin/widget/view/form_gtk/parser.py:61
+msgid "Wrong icon for the button !"
+msgstr "Λάθος εικονίδιο για το κουμπί!"
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Field"
+msgstr "Πεδίο"
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Object"
+msgstr "Αντικείμενο"
+
+#: bin/widget/view/form_gtk/parser.py:619
+msgid "Enter some text to the related field before adding translations!"
+msgstr ""
+"Εισάγετε κάποιο κείμενο στο σχετικό πεδίο πριν προσθέσετε μεταφράσεις!"
+
+#: bin/widget/view/form_gtk/parser.py:626
+msgid "You need to save resource before adding translations!"
+msgstr "Πρέπει να αποθηκεύσετε τους πόρους πρίν προσθέσετε μεταφράσεις!"
+
+#: bin/widget/view/form_gtk/parser.py:880
+msgid "Translate view"
+msgstr "Μετάφραση καρτέλας"
+
+#: bin/widget/view/form_gtk/one2many_list.py:64
+msgid "Cancel"
+msgstr "Ακύρωση"
+
+#: bin/widget/view/form_gtk/one2many_list.py:70
+msgid "Save & Close"
+msgstr "Αποθήκευση & Κλείσιμο"
+
+#: bin/widget/view/form_gtk/one2many_list.py:75
+msgid "Save & New"
+msgstr "Αποθήκευση  & Δημιουργία Νέου"
+
+#: bin/widget/view/form_gtk/one2many_list.py:164
+#: bin/widget/view/form_gtk/interface.py:48
+msgid "Set to default value"
+msgstr "Ορισμός προεπιλεγμένης τιμής"
+
+#: bin/widget/view/form_gtk/one2many_list.py:167
+msgid "Set Default"
+msgstr "Ορισμός ως Προεπιλογή"
+
+#: bin/widget/view/form_gtk/one2many_list.py:196
+msgid "Create a new entry"
+msgstr "Δημιουργία νέας εγγραφής"
+
+#: bin/widget/view/form_gtk/one2many_list.py:200
+msgid "Edit this entry"
+msgstr "Επεξεργασία τρέχουσας εγγραφής"
+
+#: bin/widget/view/form_gtk/one2many_list.py:204
+msgid "Remove this entry"
+msgstr "Διαγραφή τρέχουσας εγγραφής"
+
+#: bin/widget/view/form_gtk/many2many.py:84
+#: bin/widget/view/form_gtk/one2many_list.py:210
+msgid "Previous Page"
+msgstr "Προηγούμενη Σελίδα"
+
+#: bin/widget/view/form_gtk/many2many.py:88
+#: bin/widget/view/form_gtk/one2many_list.py:214
+msgid "Previous Record"
+msgstr "Προηγούμενη Εγγραφή"
+
+#: bin/widget/view/form_gtk/many2many.py:96
+#: bin/widget/view/form_gtk/one2many_list.py:222
+msgid "Next Record"
+msgstr "Επόμενη Εγγραφή"
+
+#: bin/widget/view/form_gtk/many2many.py:100
+#: bin/widget/view/form_gtk/one2many_list.py:226
+msgid "Next Page"
+msgstr "Επόμενη Σελίδα"
+
+#: bin/widget/view/form_gtk/one2many_list.py:232
+msgid "Switch"
+>>>>>>> MERGE-SOURCE
 msgstr "Αλλαγή"
 
+<<<<<<< TREE
 #: bin/modules/gui/main.py:111
 msgid "Super Administrator Password:"
 msgstr "Κωδικός Super Administrator:"
@@ -1588,6 +2587,168 @@
 #: bin/modules/gui/main.py:1511
 msgid "Couldn't backup database."
 msgstr "Αδυναμία δημιουργίας αντίγραφου ασφαλείας της βάσης δεδομένων."
+=======
+#: bin/widget/view/form_gtk/many2many.py:106
+#: bin/widget/view/form_gtk/one2many_list.py:238
+msgid "Choose Limit"
+msgstr "Επιλογή Ορίου"
+
+#: bin/widget/view/form_gtk/one2many_list.py:279
+msgid "You have to select a resource !"
+msgstr "Πρέπει να επιλέξετε έναν πόρο!"
+
+#: bin/widget/view/form_gtk/image.py:73
+msgid "Set Image"
+msgstr "Ορισμός Εικόνας"
+
+#: bin/widget/view/form_gtk/image.py:82 bin/widget/view/form_gtk/binary.py:84
+msgid "Save As"
+msgstr "Αποθήκευση ως"
+
+#: bin/widget/view/form_gtk/image.py:93 bin/widget/view/form_gtk/binary.py:88
+msgid "Clear"
+msgstr "Εκκαθάριση"
+
+#: bin/widget/view/form_gtk/image.py:102
+msgid "All files"
+msgstr "Όλα τα αρχεία"
+
+#: bin/widget/view/form_gtk/image.py:106
+msgid "Images"
+msgstr "Εικόνες"
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "There is no image to save as !"
+msgstr "Δεν υπάρχει εικόνα για αποθήκευση!"
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "Warning"
+msgstr "Προειδοποίηση"
+
+#: bin/widget/view/form_gtk/many2one.py:158 bin/widget/view/form_gtk/url.py:53
+msgid "Open this resource"
+msgstr "Άνοιγμα αυτού του πόρου"
+
+#: bin/widget/view/form_gtk/many2one.py:163
+#: bin/widget_search/custom_filter_widgets.py:87
+msgid "Search a resource"
+msgstr "Αναζήτηση πόρου"
+
+#: bin/widget/view/form_gtk/many2one.py:174 bin/openerp.glade:1412
+msgid "Action"
+msgstr "Ενέργεια"
+
+#: bin/widget/view/form_gtk/many2one.py:175
+msgid "Report"
+msgstr "Αναφορά"
+
+#: bin/widget/view/list.py:633 bin/widget/view/form_gtk/many2one.py:387
+msgid "You must select a record to use the relation !"
+msgstr "Πρέπει να επιλέξετε μια εγγραφή για να χρησιμοποιήσετε τη σχέση!"
+
+#: bin/widget/view/form_gtk/interface.py:49
+msgid "Set as default"
+msgstr "Ορισμός ως προεπιλογή"
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "You can not set to the default value here !"
+msgstr "Δεν μπορείτε να ορίσετε την αρχική τιμή από εδώ!"
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "Operation not permited"
+msgstr "Η ενέργεια δεν επιτρέπεται"
+
+#: bin/widget/view/form_gtk/binary.py:76
+msgid "Select"
+msgstr "Επιλογή"
+
+#: bin/widget/view/form_gtk/binary.py:80
+msgid "Open"
+msgstr "Άνοιγμα"
+
+#: bin/widget/view/form_gtk/binary.py:119
+#: bin/widget/view/form_gtk/binary.py:163
+msgid "Unable to read the file data"
+msgstr "Αδυναμία ανάγνωσης δεδομένων αρχείου"
+
+#: bin/widget/view/form_gtk/binary.py:129
+#: bin/widget/view/form_gtk/binary.py:155
+#, python-format
+msgid "Error reading the file: %s"
+msgstr "Σφάλμα ανάγνωσης του αρχείου: %s"
+
+#: bin/widget/view/form_gtk/binary.py:138
+msgid "All Files"
+msgstr "Όλα τα Αρχεία"
+
+#: bin/widget/view/form_gtk/binary.py:148
+msgid "Select a file..."
+msgstr "Επιλογή αρχείου..."
+
+#: bin/widget/view/form_gtk/binary.py:177
+#, python-format
+msgid "Error writing the file: %s"
+msgstr "Σφάλμα εγγραφής του αρχείου: %s"
+
+#: bin/widget/view/form_gtk/wid_common.py:59
+msgid "Always applicable !"
+msgstr "Πάντα σε ισχύει !"
+
+#: bin/widget/view/form_gtk/calendar.py:99
+#: bin/widget/view/form_gtk/calendar.py:163
+msgid "Invalid date value! Year must be greater than 1899 !"
+msgstr ""
+"Λανθασμένη ημερομηνία! Το έτος πρέπει να είναι μεγαλύτερο από το 1899 !"
+
+#: bin/widget/view/form_gtk/calendar.py:255 bin/widget_search/calendar.py:273
+msgid "Hour:"
+msgstr "Ώρα:"
+
+#: bin/widget/view/form_gtk/calendar.py:258 bin/widget_search/calendar.py:276
+msgid "Minute:"
+msgstr "Λεπτό:"
+
+#: bin/widget/view/form_gtk/calendar.py:291 bin/widget_search/calendar.py:312
+msgid "Invalid datetime value! Year must be greater than 1899 !"
+msgstr ""
+"Λανθασμένη ημερομηνία! Το έτος πρέπει να είναι μεγαλύτερο από το 1899 !"
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:30
+msgid "Gantt view not yet implemented !"
+msgstr "Η λειτουργία Gantt δεν έχει υλοποιηθεί ακόμα!"
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:31
+msgid ""
+"The gantt view is not available in this GTK Client, you should use the web "
+"interface or switch to the calendar view."
+msgstr ""
+"Η όψη gantt δεν είναι διαθέσιμη στον πελάτη GTK, θα πρέπει να "
+"χρησιμοποιήσετε το περιβάλλον web ή την όψη ημερολογίου."
+
+#: bin/widget/screen/screen.py:337
+msgid ""
+"(Any existing filter with the \n"
+"same name will be replaced)"
+msgstr ""
+"(Κάθε υπάρχον φίλτρο με το \n"
+"ίδιο όνομα θα αντικατασταθεί)"
+
+#: bin/rpc.py:158
+msgid "Connection refused!"
+msgstr "Άρνηση σύνδεσης!"
+
+#: bin/rpc.py:188
+msgid ""
+"Unable to reach to OpenERP server !\n"
+"You should check your connection to the network and the OpenERP server."
+msgstr ""
+"Αδυναμία επικοινωνίας με τον εξυπηρετητή OpenERP !\n"
+"Θα πρέπει να ελέγξετε τη σύνδεσή σας στο δίκτυο και τον εξυπηρετητή OpenERP."
+
+#: bin/rpc.py:188
+msgid "Connection Error"
+msgstr "Σφάλμα Σύνδεσης"
+>>>>>>> MERGE-SOURCE
 
 #: bin/openerp.glade:6
 msgid "OpenERP - Login"
@@ -1657,11 +2818,15 @@
 msgid "_Preferences"
 msgstr "Π_ροτιμήσεις"
 
+<<<<<<< TREE
 #: bin/openerp.glade:483 bin/openerp.glade:7304
 msgid "Change password"
 msgstr "Αλλαγή κωδικού"
 
 #: bin/openerp.glade:496
+=======
+#: bin/openerp.glade:496
+>>>>>>> MERGE-SOURCE
 msgid "_Send a request"
 msgstr "Αποστολή _μιας αίτησης"
 
@@ -2142,7 +3307,19 @@
 msgid "<b>Predefined Exports</b>"
 msgstr "<b>Προκαθορισμένες Εξαγωγές</b>"
 
-#: bin/openerp.glade:2880
+<<<<<<< TREE
+#: bin/openerp.glade:2880
+=======
+#: bin/openerp.glade:3134
+msgid "Import Compatible"
+msgstr "Συμβατή εισαγωγή"
+
+#: bin/openerp.glade:2862
+msgid "<b>Select an Option to Export</b>"
+msgstr "<b>Κάντε μια επιλογή για εξαγωγή</b>"
+
+#: bin/openerp.glade:2880
+>>>>>>> MERGE-SOURCE
 msgid "Available Fields"
 msgstr "Διαθεσιμα Πεδία"
 
@@ -2165,12 +3342,23 @@
 #: bin/openerp.glade:3115
 msgid "Add Field Names"
 msgstr ""
+<<<<<<< TREE
 
 #: bin/openerp.glade:3134
 msgid "Import Compatible"
 msgstr "Συμβατή εισαγωγή"
 
 #: bin/openerp.glade:3156
+=======
+"Άνοιγμα σε Excel\n"
+"Αποθήκευση σε CSV"
+
+#: bin/openerp.glade:3151
+msgid "Add _field names"
+msgstr "Πρόσθεσε ονόματα _πεδίων"
+
+#: bin/openerp.glade:3156
+>>>>>>> MERGE-SOURCE
 msgid "<b>Opti_ons</b>"
 msgstr "<b>_Επιλογές</b>"
 
@@ -2482,6 +3670,7 @@
 msgid "N_othing"
 msgstr "N_othing"
 
+<<<<<<< TREE
 #: bin/openerp.glade:5772
 msgid "<b>Fields to import</b>"
 msgstr "<b>Πεδία προς εισαγωγή</b>"
@@ -2493,10 +3682,25 @@
 msgstr "Αρχείο προς Εισαγωγή: "
 
 #: bin/openerp.glade:5852
+=======
+#: bin/openerp.glade:5852
+>>>>>>> MERGE-SOURCE
 msgid "Auto-Detect"
 msgstr "Αυτόματη ανίχνευση"
 
-#: bin/openerp.glade:5930
+<<<<<<< TREE
+#: bin/openerp.glade:5930
+=======
+#: bin/openerp.glade:5772
+msgid "<b>Fields to import</b>"
+msgstr "<b>Πεδία προς εισαγωγή</b>"
+
+#: bin/openerp.glade:5891
+msgid "File to Import:"
+msgstr "Αρχείο προς Εισαγωγή:"
+
+#: bin/openerp.glade:5930
+>>>>>>> MERGE-SOURCE
 msgid "Lines to Skip:"
 msgstr "Γραμμές προς παράβλεψη:"
 
@@ -2689,10 +3893,21 @@
 "<sup><b><span foreground=\"dark green\">?</span></b></sup>Load Demonstration "
 "Data:"
 msgstr ""
-"<sup><b><span foreground=\"dark green\">?</span></b></sup>Φόρτωση Δεδομένων "
-"Επίδειξης:"
-
-#: bin/openerp.glade:7321
+<<<<<<< TREE
+"<sup><b><span foreground=\"dark green\">?</span></b></sup>Φόρτωση Δεδομένων "
+"Επίδειξης:"
+
+#: bin/openerp.glade:7321
+=======
+"<sup><b><span foreground=\"dark green\">?</span></b></sup>Φόρτωση Δεδομένων "
+"Επίδειξης:"
+
+#: bin/openerp.glade:483 bin/openerp.glade:7304
+msgid "Change password"
+msgstr "Αλλαγή κωδικού"
+
+#: bin/openerp.glade:7321
+>>>>>>> MERGE-SOURCE
 msgid "<b>Change your super admin password</b>"
 msgstr "<b>Αλλάξτε τον κωδικό του super admin</b>"
 
@@ -2769,6 +3984,35 @@
 msgstr "Φιλτράρισμα Εγγραφής"
 
 #: bin/openerp.glade:8276
+<<<<<<< TREE
+=======
+msgid "Fields on which Search criteria to be applied"
+msgstr ""
+
+#: bin/openerp.glade:8289
+msgid "Conditional Operators"
+msgstr ""
+
+#: bin/openerp.glade:8316
+msgid "The Choice will be applied with next filter if any"
+msgstr ""
+
+#: bin/openerp.glade:8317
+msgid ""
+"AND\n"
+"OR"
+msgstr ""
+
+#: bin/openerp.glade:8330
+msgid "Remove Filter"
+msgstr "Αφαίρεση Φίλτρου"
+
+#: bin/openerp.glade:8230
+msgid "Filter Entry"
+msgstr "Φιλτράρισμα Εγγραφής"
+
+#: bin/openerp.glade:8276
+>>>>>>> MERGE-SOURCE
 msgid "Enter Filter Name:"
 msgstr "Δώστε Όνομα Φίλτρου:"
 
@@ -2802,8 +4046,13 @@
 msgstr ""
 
 #: bin/win_error.glade:318
+<<<<<<< TREE
 msgid "Problems summary:"
 msgstr ""
+=======
+msgid "Summary of the problem:"
+msgstr "Περιγραφή προβλήματος:"
+>>>>>>> MERGE-SOURCE
 
 #: bin/win_error.glade:360
 msgid "<i>_Support Request</i>"

=== added file 'bin/po/en_AU.po'
--- bin/po/en_AU.po	1970-01-01 00:00:00 +0000
+++ bin/po/en_AU.po	2011-10-24 01:06:26 +0000
@@ -0,0 +1,2522 @@
+# English (Australia) translation for openobject-client
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-13 18:11+0100\n"
+"PO-Revision-Date: 2011-03-28 14:27+0000\n"
+"Last-Translator: Harmel Delphine (OpenERP) <Unknown>\n"
+"Language-Team: English (Australia) <en_AU@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-15 05:11+0000\n"
+"X-Generator: Launchpad (build 13921)\n"
+
+#: bin/plugins/__init__.py:27
+msgid "Print Workflow"
+msgstr "Print Workflow"
+
+#: bin/plugins/__init__.py:28
+msgid "Print Workflow (with subflows)"
+msgstr ""
+
+#: bin/plugins/__init__.py:40
+msgid "No available plugin for this resource !"
+msgstr ""
+
+#: bin/plugins/__init__.py:42
+msgid "Choose a Plugin"
+msgstr "Choose a Plug-in"
+
+#: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
+msgid "Connection refused !"
+msgstr "Connection refused !"
+
+#: bin/rpc.py:203 bin/rpc.py:205 bin/modules/action/wizard.py:162
+#: bin/modules/action/wizard.py:168 bin/modules/action/wizard.py:170
+#: bin/modules/gui/main.py:195 bin/modules/gui/main.py:201
+msgid "Application Error"
+msgstr ""
+
+#: bin/rpc.py:205 bin/modules/action/wizard.py:170
+msgid "View details"
+msgstr ""
+
+#: bin/modules/action/main.py:48
+msgid "Nothing to print!"
+msgstr ""
+
+#: bin/modules/action/main.py:66
+msgid "Printing aborted, too long delay !"
+msgstr ""
+
+#: bin/modules/action/main.py:195
+msgid "Select your action"
+msgstr ""
+
+#: bin/modules/gui/main.py:89 bin/modules/gui/main.py:341
+msgid "Could not connect to server !"
+msgstr ""
+
+#: bin/modules/gui/main.py:93 bin/openerp.glade:72 bin/openerp.glade:6233
+#: bin/openerp.glade:6479 bin/openerp.glade:6802 bin/openerp.glade:7466
+msgid "Server:"
+msgstr "Server:"
+
+#: bin/modules/gui/main.py:104 bin/openerp.glade:98 bin/openerp.glade:6515
+#: bin/openerp.glade:6759 bin/openerp.glade:7058 bin/openerp.glade:7423
+msgid "Change"
+msgstr "Change"
+
+#: bin/modules/gui/main.py:111
+msgid "Super Administrator Password:"
+msgstr ""
+
+#: bin/modules/gui/main.py:193
+msgid "Bad Super Administrator Password"
+msgstr ""
+
+#: bin/modules/gui/main.py:217
+msgid "Migration Scripts"
+msgstr ""
+
+#: bin/modules/gui/main.py:220
+msgid "Contract ID:"
+msgstr ""
+
+#: bin/modules/gui/main.py:226
+msgid "Contract Password:"
+msgstr ""
+
+#: bin/modules/gui/main.py:241
+msgid "You already have the latest version"
+msgstr ""
+
+#: bin/modules/gui/main.py:246
+msgid "The following updates are available:"
+msgstr ""
+
+#: bin/modules/gui/main.py:258
+msgid "You can now migrate your databases."
+msgstr ""
+
+#: bin/modules/gui/main.py:263
+msgid "Migrate Database"
+msgstr ""
+
+#: bin/modules/gui/main.py:280
+msgid "Database"
+msgstr "Database"
+
+#: bin/modules/gui/main.py:292
+msgid "Your database has been upgraded."
+msgstr ""
+
+#: bin/modules/gui/main.py:294
+msgid "Your databases have been upgraded."
+msgstr ""
+
+#: bin/modules/gui/main.py:296
+msgid "You have not selected a database"
+msgstr ""
+
+#: bin/modules/gui/main.py:360
+msgid "No database found, you must create one !"
+msgstr ""
+
+#: bin/modules/gui/main.py:468
+msgid "Unknown"
+msgstr "Unknown"
+
+#: bin/modules/gui/main.py:474
+#, python-format
+msgid ""
+"The versions of the server (%s) and the client (%s) missmatch. The client "
+"may not work properly. Use it at your own risks."
+msgstr ""
+
+#: bin/modules/gui/main.py:610
+msgid "Sorry,'"
+msgstr ""
+
+#: bin/modules/gui/main.py:610 bin/modules/gui/main.py:613
+msgid "Bad database name !"
+msgstr ""
+
+#: bin/modules/gui/main.py:613
+msgid ""
+"The database name must contain only normal characters or \"_\".\n"
+"You must avoid all accents, space or special characters."
+msgstr ""
+
+#: bin/modules/gui/main.py:637 bin/modules/gui/main.py:650
+#: bin/modules/gui/main.py:652 bin/modules/gui/main.py:654
+msgid "Could not create database."
+msgstr ""
+
+#: bin/modules/gui/main.py:638 bin/modules/gui/main.py:650
+msgid "Database already exists !"
+msgstr ""
+
+#: bin/modules/gui/main.py:652 bin/modules/gui/main.py:1384
+#: bin/modules/gui/main.py:1404 bin/modules/gui/main.py:1509
+msgid "Bad database administrator password !"
+msgstr ""
+
+#: bin/modules/gui/main.py:654 bin/modules/gui/main.py:661
+msgid "Error during database creation !"
+msgstr ""
+
+#: bin/modules/gui/main.py:661
+msgid ""
+"The server crashed during installation.\n"
+"We suggest you to drop this database."
+msgstr ""
+
+#: bin/modules/gui/main.py:707 bin/modules/gui/main.py:1072
+msgid "Press Ctrl+O to login"
+msgstr ""
+
+#: bin/modules/gui/main.py:881
+msgid "Edit"
+msgstr "Edit"
+
+#: bin/modules/gui/main.py:974
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: bin/modules/gui/main.py:976
+msgid "No Company"
+msgstr ""
+
+#: bin/modules/gui/main.py:989
+#, python-format
+msgid "%s request(s)"
+msgstr ""
+
+#: bin/modules/gui/main.py:991
+msgid "No request"
+msgstr ""
+
+#: bin/modules/gui/main.py:993
+#, python-format
+msgid " - %s request(s) sent"
+msgstr ""
+
+#: bin/modules/gui/main.py:1031
+msgid ""
+"Please double-check the database name or contact your administrator to "
+"verify the database status."
+msgstr ""
+
+#: bin/modules/gui/main.py:1031
+msgid "Database cannot be accessed or does not exist"
+msgstr ""
+
+#: bin/modules/gui/main.py:1035
+msgid ""
+"Connection error !\n"
+"Unable to connect to the server !"
+msgstr ""
+
+#: bin/modules/gui/main.py:1037
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password !"
+msgstr ""
+
+#: bin/modules/gui/main.py:1050
+#, python-format
+msgid "OpenERP - %s"
+msgstr ""
+
+#: bin/modules/gui/main.py:1070
+msgid "Not logged !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:52 bin/modules/gui/main.py:1079
+#: bin/openerp.glade:6081
+msgid "OpenERP"
+msgstr ""
+
+#: bin/modules/gui/main.py:1153
+msgid ""
+"You can not log into the system !\n"
+"Ask the administrator to verify\n"
+"you have an action defined for your user."
+msgstr ""
+
+#: bin/modules/gui/main.py:1187 bin/modules/gui/main.py:1194
+msgid "Do you really want to quit ?"
+msgstr ""
+
+#: bin/modules/gui/main.py:1263
+#, python-format
+msgid "Attachments (%d)"
+msgstr ""
+
+#: bin/modules/gui/main.py:1276
+msgid "Attachments"
+msgstr "Attachments"
+
+#: bin/modules/gui/main.py:1375
+msgid "Delete a database"
+msgstr ""
+
+#: bin/modules/gui/main.py:1381
+msgid "Database dropped successfully !"
+msgstr ""
+
+#: bin/modules/gui/main.py:1384
+msgid "Could not drop database."
+msgstr ""
+
+#: bin/modules/gui/main.py:1386
+msgid "Couldn't drop database"
+msgstr ""
+
+#: bin/widget/view/form_gtk/image.py:112 bin/widget/view/form_gtk/url.py:118
+#: bin/modules/gui/main.py:1389 bin/openerp.glade:5817
+msgid "Open..."
+msgstr "Open…"
+
+#: bin/modules/gui/main.py:1401
+msgid "Database restored successfully !"
+msgstr ""
+
+#: bin/modules/gui/main.py:1404
+msgid "Could not restore database."
+msgstr ""
+
+#: bin/modules/gui/main.py:1406
+msgid "Couldn't restore database"
+msgstr ""
+
+#: bin/modules/gui/main.py:1457
+msgid ""
+"Confirmation password does not match new password, operation cancelled!"
+msgstr ""
+
+#: bin/modules/gui/main.py:1459
+msgid "Validation Error."
+msgstr ""
+
+#: bin/modules/gui/main.py:1476
+msgid "Could not change the Super Admin password."
+msgstr ""
+
+#: bin/modules/gui/main.py:1477 bin/modules/gui/main.py:1483
+msgid "Bad password provided !"
+msgstr ""
+
+#: bin/modules/gui/main.py:1457
+msgid "Error, password not changed."
+msgstr ""
+
+#: bin/modules/gui/main.py:1490 bin/modules/gui/main.py:1513
+msgid "Backup a database"
+msgstr ""
+
+#: bin/widget/view/form_gtk/image.py:129
+#: bin/widget/view/form_gtk/binary.py:167 bin/printer/printer.py:231
+#: bin/modules/gui/window/win_export.py:359 bin/modules/gui/main.py:1493
+msgid "Save As..."
+msgstr "Save As..."
+
+#: bin/modules/gui/main.py:1506
+msgid "Database backed up successfully !"
+msgstr ""
+
+#: bin/modules/gui/main.py:1509
+msgid "Could not backup the database."
+msgstr ""
+
+#: bin/modules/gui/main.py:1511
+msgid "Couldn't backup database."
+msgstr ""
+
+#: bin/modules/gui/window/form.py:189
+msgid "Resource ID does not exist for this object!"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:247
+msgid "No record selected ! You can only attach to existing record."
+msgstr ""
+
+#: bin/modules/gui/window/form.py:264
+msgid "You have to select a record !"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:270
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:41
+#: bin/modules/gui/window/win_export.py:213
+msgid "ID"
+msgstr "ID"
+
+#: bin/modules/gui/window/form.py:271
+msgid "Creation User"
+msgstr "Creation User"
+
+#: bin/modules/gui/window/form.py:272
+msgid "Creation Date"
+msgstr "Creation Date"
+
+#: bin/modules/gui/window/form.py:273
+msgid "Latest Modification by"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:274
+msgid "Latest Modification Date"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:275
+msgid "Internal Module Data ID"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:269
+msgid ""
+"Record is not saved ! \n"
+" Do You want to Clear Current Record ?"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:388
+#: bin/modules/gui/window/form.py:290
+msgid "Are you sure to remove this record ?"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:390
+#: bin/modules/gui/window/form.py:292
+msgid "Are you sure to remove those records ?"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:296
+msgid "Resources cleared."
+msgstr ""
+
+#: bin/modules/gui/window/form.py:298
+msgid "Resources successfully removed."
+msgstr ""
+
+#: bin/modules/gui/window/form.py:339
+msgid "Working now on the duplicated document !"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:355
+msgid "Document Saved."
+msgstr ""
+
+#: bin/widget/view/list.py:584 bin/widget/view/list.py:585
+#: bin/widget/view/form_gtk/parser.py:135 bin/modules/gui/window/form.py:366
+msgid "Invalid form, correct red fields !"
+msgstr ""
+
+#: bin/widget/view/list.py:584
+msgid "Error !"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:368
+msgid "Warning !"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:389 bin/modules/gui/window/form.py:497
+msgid ""
+"This record has been modified\n"
+"do you want to save it ?"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:447
+msgid "You must select one or several records !"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:456
+msgid "Print Screen"
+msgstr "Print Screen"
+
+#: bin/modules/gui/window/form.py:476
+msgid "No record selected"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:481
+msgid "New document"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:483
+msgid "Editing document (id: "
+msgstr ""
+
+#: bin/modules/gui/window/form.py:486
+msgid "Record: "
+msgstr ""
+
+#: bin/modules/gui/window/form.py:487
+msgid " of "
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:51
+msgid "The file is empty !"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:51
+msgid "Importation !"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:56
+msgid "XML-RPC error !"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:61
+msgid "Imported one object !"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:63
+#, python-format
+msgid "Imported %d objects !"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:68
+#, python-format
+msgid ""
+"Error trying to import this record:\n"
+"%s\n"
+"Error Message:\n"
+"%s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:72
+msgid "Importation Error !"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:105
+#: bin/modules/gui/window/win_import.py:109
+msgid "Field name"
+msgstr "Field name"
+
+#: bin/modules/gui/window/win_import.py:181
+msgid "Error opening .CSV file"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:181
+msgid "Input Error."
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:199
+#, python-format
+msgid "You cannot import this field %s, because we cannot auto-detect it"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:202
+#, python-format
+msgid ""
+"Error processing your first line of the file.\n"
+"Field %s is unknown !"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:202
+msgid "Import Error."
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:233
+msgid "You have not selected any fields to import"
+msgstr ""
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Extension"
+msgstr "Extension"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Application"
+msgstr "Application"
+
+#: bin/modules/gui/window/win_extension.py:43
+msgid "Print Processor"
+msgstr ""
+
+#: bin/modules/gui/window/win_extension.py:114
+msgid "This extension is already defined"
+msgstr ""
+
+#: bin/modules/gui/window/win_extension.py:114 bin/openerp.glade:7642
+msgid "Extension Manager"
+msgstr ""
+
+#: bin/modules/gui/window/win_selection.py:51
+msgid "Name"
+msgstr "Name"
+
+#: bin/modules/gui/window/win_selection.py:55
+msgid "Ressource Name"
+msgstr ""
+
+#: bin/modules/gui/window/win_selection.py:55
+msgid "Names"
+msgstr "Names"
+
+#: bin/modules/gui/window/__init__.py:31
+msgid "Unknown Window"
+msgstr ""
+
+#: bin/modules/gui/window/win_preference.py:68
+msgid "Preferences"
+msgstr "Preferences"
+
+#: bin/modules/gui/window/win_preference.py:86
+msgid ""
+"The default language of the interface has been modified, do not forget to "
+"restart the client to have the interface in your language"
+msgstr ""
+
+#: bin/modules/gui/window/win_preference.py:88
+msgid "Default language modified !"
+msgstr ""
+
+#: bin/modules/gui/window/view_tree/parse.py:35
+msgid "Tree"
+msgstr ""
+
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:45
+msgid "Description"
+msgstr "Description"
+
+#: bin/modules/gui/window/tree.py:205 bin/modules/gui/window/tree.py:261
+msgid "No resource selected!"
+msgstr "No resource selected!"
+
+#: bin/modules/gui/window/tree.py:219
+msgid ""
+"Are you sure you want\n"
+"to remove this record?"
+msgstr ""
+
+#: bin/modules/gui/window/tree.py:224
+msgid "Error removing resource!"
+msgstr ""
+
+#: bin/modules/gui/window/tree.py:235
+msgid "Unable to chroot: no tree resource selected"
+msgstr ""
+
+#: bin/modules/gui/window/win_export.py:50
+msgid " record(s) saved !"
+msgstr ""
+
+#: bin/modules/gui/window/win_export.py:53
+msgid ""
+"Operation failed !\n"
+"I/O error"
+msgstr ""
+
+#: bin/modules/gui/window/win_export.py:79
+#: bin/modules/gui/window/win_export.py:105
+msgid "Error Opening Excel !"
+msgstr ""
+
+#: bin/modules/gui/window/win_export.py:317
+msgid "What is the name of this export ?"
+msgstr ""
+
+#: bin/modules/gui/window/win_export.py:351
+msgid "Exportation Error !"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1772
+#: bin/modules/gui/window/win_search.py:49
+msgid "OpenERP - Link"
+msgstr ""
+
+#: bin/modules/gui/window/win_search.py:126
+#, python-format
+msgid "OpenERP Search: %s"
+msgstr ""
+
+#: bin/modules/gui/window/win_search.py:127
+#, python-format
+msgid "OpenERP Search: %s (%%d result(s))"
+msgstr ""
+
+#: bin/options.py:121
+#, python-format
+msgid "OpenERP Client %s"
+msgstr ""
+
+#: bin/options.py:122
+msgid "specify alternate config file"
+msgstr ""
+
+#: bin/options.py:123
+msgid "Enable basic debugging. Alias for '--log-level=debug'"
+msgstr ""
+
+#: bin/options.py:124
+#, python-format
+msgid "specify the log level: %s"
+msgstr ""
+
+#: bin/options.py:125
+msgid "specify the user login"
+msgstr ""
+
+#: bin/options.py:126
+msgid "specify the server port"
+msgstr ""
+
+#: bin/options.py:127
+msgid "specify the server ip/name"
+msgstr ""
+
+#: bin/common/common.py:89
+msgid "Close current tip"
+msgstr ""
+
+#: bin/common/common.py:90
+msgid ""
+"<span foreground=\"darkred\"><b>Close Current Tip:</b></span>\n"
+"This will hide the current tip. It will be displayed again next time you "
+"open this menu item, unless you disable all tips using the <b>'Menu "
+"Tips'</b> option in the user preferences."
+msgstr ""
+
+#: bin/common/common.py:100
+msgid "Disable all tips"
+msgstr ""
+
+#: bin/common/common.py:101
+msgid ""
+"<span foreground=\"darkred\"><b>Disable all tips:</b></span>\n"
+"This will disable the display of tips on all menu items.\n"
+"To re-enable tips you need to check the <b>'Menu Tips'</b> option in the "
+"user preferences."
+msgstr ""
+
+#: bin/common/common.py:115 bin/common/common.py:117
+msgid "Tips"
+msgstr "Tips"
+
+#: bin/common/common.py:168
+msgid "OpenERP Computing"
+msgstr ""
+
+#: bin/common/common.py:187
+msgid "Operation in progress"
+msgstr "Operation in progress"
+
+#: bin/common/common.py:191
+msgid ""
+"Please wait,\n"
+"this operation may take a while..."
+msgstr ""
+
+#: bin/common/common.py:225
+#, python-format
+msgid "Ensure that the file %s is correct"
+msgstr ""
+
+#: bin/common/common.py:399
+msgid " has reported the following bug:\n"
+msgstr ""
+
+#: bin/common/common.py:399
+msgid "remarks"
+msgstr ""
+
+#: bin/common/common.py:402
+msgid "Support request sent !"
+msgstr ""
+
+#: bin/common/common.py:425 bin/common/common.py:469
+msgid ""
+"\n"
+"<b>An unknown error has been reported.</b>\n"
+"\n"
+"<b>You do not have a valid OpenERP publisher warranty contract !</b>\n"
+"If you are using OpenERP in production, it is highly suggested to subscribe\n"
+"a publisher warranty program.\n"
+"\n"
+"The OpenERP publisher warranty contract provides you a bugfix guarantee and "
+"an\n"
+"automatic migration system so that we can fix your problems within a few\n"
+"hours. If you had a publisher warranty contract, this error would have been "
+"sent\n"
+"to the quality team of the OpenERP editor.\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"
+"\n"
+"You can use the link bellow for more information. The detail of the error\n"
+"is displayed on the second tab.\n"
+msgstr ""
+
+#: bin/common/common.py:448
+#, python-format
+msgid ""
+"\n"
+"<b>An unknown error has been reported.</b>\n"
+"\n"
+"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:\n"
+"%s\n"
+"\n"
+"You can use the link bellow for more information. The detail of the error\n"
+"is displayed on the second tab."
+msgstr ""
+
+#: bin/common/common.py:525
+msgid ""
+"Your problem has been sent to the quality team !\n"
+"We will recontact you after analysing the problem."
+msgstr ""
+
+#: bin/common/common.py:528
+#, python-format
+msgid ""
+"Your problem could *NOT* be sent to the quality team !\n"
+"Please report this error manually at:\n"
+"\t%s"
+msgstr ""
+
+#: bin/common/common.py:528
+msgid "Error"
+msgstr "Error"
+
+#: bin/common/common.py:682
+msgid "Open with..."
+msgstr ""
+
+#: bin/translate.py:183
+#, python-format
+msgid "Unable to set locale %s: %s"
+msgstr ""
+
+#: bin/printer/printer.py:184
+#, python-format
+msgid "Unable to handle %s filetype"
+msgstr ""
+
+#: bin/printer/printer.py:189
+msgid ""
+"Linux Automatic Printing not implemented.\n"
+"Use preview option !"
+msgstr ""
+
+#: bin/printer/printer.py:212
+msgid "Error! No Data found. Make sure you have enough data to print!"
+msgstr ""
+
+#: bin/printer/printer.py:239
+msgid "Error writing the file!"
+msgstr ""
+
+#: bin/openerp-client.py:142
+msgid "Closing OpenERP, KeyboardInterrupt"
+msgstr ""
+
+#: bin/widget/view/form_gtk/button.py:47 bin/widget_search/char.py:72
+#: bin/widget_search/calendar.py:125 bin/widget_search/calendar.py:250
+#: bin/widget_search/filter.py:77 bin/widget_search/reference.py:78
+#: bin/widget_search/spinbutton.py:92 bin/widget_search/selection.py:116
+#: bin/widget_search/custom_filter.py:140 bin/widget_search/spinint.py:95
+#: bin/widget_search/checkbox.py:68
+msgid "The content of the widget or ValueError if not valid"
+msgstr ""
+
+#: bin/widget_search/form.py:492
+msgid "The content of the form or exception if not valid"
+msgstr ""
+
+#: bin/widget/view/form_gtk/date_widget.py:65
+#: bin/widget_search/date_widget.py:65
+msgid ""
+"You can use special operation by pressing +, - or =.  Plus/minus "
+"adds/decrease the variable to the current selected date. Equals set part of "
+"selected date. Available variables: 12h = 12 hours, 8d = 8 days, 4w = 4 "
+"weeks, 1m = 1 month, 2y = 2 years. Some examples:\n"
+"* +21d : adds 21 days to selected year\n"
+"* =23w : set date to the 23th week of the year\n"
+"* -4m : decrease 4 months to the current date\n"
+"You can also use \"=\" to set the date to the current date/time and '-' to "
+"clear the field."
+msgstr ""
+
+#: bin/widget_search/wid_int.py:56
+msgid "The content of the widget or exception if not valid"
+msgstr ""
+
+#: bin/widget_search/char.py:45
+msgid "Error: "
+msgstr ""
+
+#: bin/widget_search/calendar.py:49 bin/widget_search/calendar.py:177
+msgid "Start date"
+msgstr "Start date"
+
+#: bin/widget/view/form_gtk/calendar.py:57
+#: bin/widget/view/form_gtk/calendar.py:184 bin/widget_search/calendar.py:53
+#: bin/widget_search/calendar.py:73 bin/widget_search/calendar.py:181
+#: bin/widget_search/calendar.py:201
+msgid "Open the calendar widget"
+msgstr ""
+
+#: bin/widget_search/calendar.py:69 bin/widget_search/calendar.py:197
+msgid "End date"
+msgstr "End date"
+
+#: bin/widget/view/form_gtk/calendar.py:135
+#: bin/widget/view/form_gtk/calendar.py:249 bin/widget_search/calendar.py:128
+#: bin/widget_search/calendar.py:267
+msgid "OpenERP - Date selection"
+msgstr ""
+
+#: bin/widget_search/custom_filter_widgets.py:40
+#: bin/widget_search/custom_filter_widgets.py:67
+#: bin/widget_search/custom_filter_widgets.py:98
+msgid "contains"
+msgstr "contains"
+
+#: bin/widget_search/custom_filter_widgets.py:41
+#: bin/widget_search/custom_filter_widgets.py:68
+#: bin/widget_search/custom_filter_widgets.py:98
+msgid "doesn't contain"
+msgstr ""
+
+#: bin/widget_search/custom_filter_widgets.py:290
+#: bin/widget_search/custom_filter_widgets.py:331
+msgid "is equal to"
+msgstr "is equal to"
+
+#: bin/widget_search/custom_filter_widgets.py:291
+#: bin/widget_search/custom_filter_widgets.py:332
+msgid "is not equal to"
+msgstr "is not equal to"
+
+#: bin/widget_search/custom_filter_widgets.py:292
+#: bin/widget_search/custom_filter_widgets.py:333
+msgid "greater than"
+msgstr "greater than"
+
+#: bin/widget_search/custom_filter_widgets.py:293
+#: bin/widget_search/custom_filter_widgets.py:334
+msgid "less than"
+msgstr "less than"
+
+#: bin/widget_search/custom_filter.py:62
+msgid "in"
+msgstr "in"
+
+#: bin/widget_search/custom_filter.py:63
+msgid "not in"
+msgstr "not in"
+
+#: bin/widget_search/custom_filter.py:82
+msgid ""
+"Enter Values separated by ',' if operator 'in' or 'not in' is chosen.\n"
+"For Date and DateTime Formats, specify text in '%Y-%m-%d' and '%Y-%m-%d "
+"%H:%M:%S' formats respectively."
+msgstr ""
+
+#: bin/widget_search/checkbox.py:35 bin/widget_search/checkbox.py:42
+#: bin/widget_search/checkbox.py:55
+msgid "Yes"
+msgstr "Yes"
+
+#: bin/widget_search/checkbox.py:36 bin/widget_search/checkbox.py:44
+msgid "No"
+msgstr "No"
+
+#: bin/widget/view/form.py:137
+msgid "You must save this record to use the relate button !"
+msgstr ""
+
+#: bin/widget/view/form.py:142
+msgid "Action not defined !"
+msgstr ""
+
+#: bin/widget/view/form.py:211
+msgid "You must select a record to use the relate button !"
+msgstr ""
+
+#: bin/widget/view/form.py:238 bin/widget/view/form_gtk/parser.py:635
+#: bin/widget/view/form_gtk/parser.py:756
+#: bin/widget/view/form_gtk/parser.py:813
+msgid "No other language available!"
+msgstr ""
+
+#: bin/widget/view/form.py:245 bin/widget/view/form_gtk/parser.py:647
+#: bin/widget/view/form_gtk/parser.py:762
+#: bin/widget/view/form_gtk/parser.py:819
+msgid "Add Translation"
+msgstr ""
+
+#: bin/widget/view/form.py:293 bin/widget/view/form_gtk/parser.py:875
+msgid "Translate label"
+msgstr ""
+
+#: bin/widget/view/calendar_gtk/parser.py:355 bin/openerp.glade:8064
+msgid "Week"
+msgstr "Week"
+
+#: bin/widget/view/calendar_gtk/parser_dummy.py:30
+msgid "Calendar View Error !"
+msgstr ""
+
+#: bin/widget/view/calendar_gtk/parser_dummy.py:31
+msgid "You must intall the library python-hippocanvas to use calendars."
+msgstr ""
+
+#: bin/widget/view/screen_container.py:74
+msgid "--Actions--"
+msgstr ""
+
+#: bin/widget/view/screen_container.py:73
+msgid "Save as a Shortcut"
+msgstr ""
+
+#: bin/widget/view/screen_container.py:74
+msgid "Save as a Filter"
+msgstr ""
+
+#: bin/widget/view/screen_container.py:74
+msgid "Manage Filters"
+msgstr "Manage Filters"
+
+#: bin/widget/view/tree_gtk/parser.py:61
+msgid ""
+"You have unsaved record(s) !  \n"
+"\n"
+"Please Save them before sorting !"
+msgstr ""
+
+#: bin/widget/view/tree_gtk/editabletree.py:140
+#, python-format
+msgid "Shortcut: %s"
+msgstr ""
+
+#: bin/widget/view/tree_gtk/editabletree.py:140
+msgid "F1 New - F2 Open/Search"
+msgstr ""
+
+#: bin/widget/view/tree_gtk/editabletree.py:215
+#, python-format
+msgid "Warning; field %s is required!"
+msgstr ""
+
+#: bin/widget/view/tree_gtk/date_renderer.py:197
+msgid ""
+"Press <i>'+'</i>, <i>'-'</i> or <i>'='</i> for special date operations."
+msgstr ""
+
+#: bin/widget/view/widget_parse.py:53
+#, python-format
+msgid "This type (%s) is not supported by the GTK client !"
+msgstr ""
+
+#: bin/widget/view/widget_parse.py:64
+msgid "No valid view found for this object!"
+msgstr ""
+
+#: bin/widget/view/graph_gtk/parser.py:64
+msgid "Can not generate graph !"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1422
+msgid "Dot Viewer"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1712
+msgid "Add New Node"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1713
+msgid "Add New Edge"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1714
+msgid "Enlarge the Diagram"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1715
+msgid "Shrink the Diagram"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1716
+msgid "Fit the diagram to the window"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1717
+msgid "Show the diagram at its normal size"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1718
+msgid "Print the Diagram"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1789
+#, python-format
+msgid "Close Current %s"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1790
+#, python-format
+msgid "Delete Current %s"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1791
+#, python-format
+msgid "Edit Current %s"
+msgstr ""
+
+#: bin/widget/view/diagram_gtk/xdot.py:1875
+msgid " - Dot Viewer"
+msgstr ""
+
+#: bin/widget/view/form_gtk/reference.py:76 bin/openerp.glade:1258
+msgid "Create a new resource"
+msgstr ""
+
+#: bin/widget/view/form_gtk/reference.py:89
+msgid "Search / Open a resource"
+msgstr ""
+
+#: bin/widget/view/form_gtk/parser.py:61
+msgid "Wrong icon for the button !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Field"
+msgstr "Field"
+
+#: bin/widget/view/form_gtk/parser.py:308
+msgid "Object"
+msgstr "Object"
+
+#: bin/widget/view/form_gtk/parser.py:619
+msgid "Enter some text to the related field before adding translations!"
+msgstr ""
+
+#: bin/widget/view/form_gtk/parser.py:626
+msgid "You need to save resource before adding translations!"
+msgstr ""
+
+#: bin/widget/view/form_gtk/parser.py:880
+msgid "Translate view"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:64
+msgid "Cancel"
+msgstr "Cancel"
+
+#: bin/widget/view/form_gtk/one2many_list.py:70
+msgid "Save & Close"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:75
+msgid "Save & New"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:164
+#: bin/widget/view/form_gtk/interface.py:48
+msgid "Set to default value"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:167
+msgid "Set Default"
+msgstr "Set Default"
+
+#: bin/widget/view/form_gtk/one2many_list.py:196
+msgid "Create a new entry"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:200
+msgid "Edit this entry"
+msgstr "Edit this entry"
+
+#: bin/widget/view/form_gtk/one2many_list.py:204
+msgid "Remove this entry"
+msgstr ""
+
+#: bin/widget/view/form_gtk/many2many.py:84
+#: bin/widget/view/form_gtk/one2many_list.py:210
+msgid "Previous Page"
+msgstr "Previous Page"
+
+#: bin/widget/view/form_gtk/many2many.py:88
+#: bin/widget/view/form_gtk/one2many_list.py:214
+msgid "Previous Record"
+msgstr ""
+
+#: bin/widget/view/form_gtk/many2many.py:96
+#: bin/widget/view/form_gtk/one2many_list.py:222
+msgid "Next Record"
+msgstr ""
+
+#: bin/widget/view/form_gtk/many2many.py:100
+#: bin/widget/view/form_gtk/one2many_list.py:226
+msgid "Next Page"
+msgstr "Next Page"
+
+#: bin/widget/view/form_gtk/one2many_list.py:232
+msgid "Switch"
+msgstr "Switch"
+
+#: bin/widget/view/form_gtk/many2many.py:106
+#: bin/widget/view/form_gtk/one2many_list.py:238
+msgid "Choose Limit"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:279
+msgid "You have to select a resource !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/image.py:73
+msgid "Set Image"
+msgstr "Set Image"
+
+#: bin/widget/view/form_gtk/image.py:82 bin/widget/view/form_gtk/binary.py:84
+msgid "Save As"
+msgstr "Save As"
+
+#: bin/widget/view/form_gtk/image.py:93 bin/widget/view/form_gtk/binary.py:88
+msgid "Clear"
+msgstr "Clear"
+
+#: bin/widget/view/form_gtk/image.py:102
+msgid "All files"
+msgstr "All files"
+
+#: bin/widget/view/form_gtk/image.py:106
+msgid "Images"
+msgstr "Images"
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "There is no image to save as !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/image.py:127
+msgid "Warning"
+msgstr "Warning"
+
+#: bin/widget/view/form_gtk/many2one.py:158 bin/widget/view/form_gtk/url.py:53
+msgid "Open this resource"
+msgstr ""
+
+#: bin/widget/view/form_gtk/many2one.py:163
+#: bin/widget_search/custom_filter_widgets.py:87
+msgid "Search a resource"
+msgstr ""
+
+#: bin/widget/view/form_gtk/many2one.py:174 bin/openerp.glade:1412
+msgid "Action"
+msgstr "Action"
+
+#: bin/widget/view/form_gtk/many2one.py:175
+msgid "Report"
+msgstr "Report"
+
+#: bin/widget/view/list.py:633 bin/widget/view/form_gtk/many2one.py:387
+msgid "You must select a record to use the relation !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/interface.py:49
+msgid "Set as default"
+msgstr "Set as default"
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "You can not set to the default value here !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/interface.py:64
+msgid "Operation not permited"
+msgstr ""
+
+#: bin/widget/view/form_gtk/binary.py:76
+msgid "Select"
+msgstr "Select"
+
+#: bin/widget/view/form_gtk/binary.py:80
+msgid "Open"
+msgstr "Open"
+
+#: bin/widget/view/form_gtk/binary.py:119
+#: bin/widget/view/form_gtk/binary.py:163
+msgid "Unable to read the file data"
+msgstr ""
+
+#: bin/widget/view/form_gtk/binary.py:129
+#: bin/widget/view/form_gtk/binary.py:155
+#, python-format
+msgid "Error reading the file: %s"
+msgstr ""
+
+#: bin/widget/view/form_gtk/binary.py:138
+msgid "All Files"
+msgstr "All Files"
+
+#: bin/widget/view/form_gtk/binary.py:148
+msgid "Select a file..."
+msgstr ""
+
+#: bin/widget/view/form_gtk/binary.py:177
+#, python-format
+msgid "Error writing the file: %s"
+msgstr ""
+
+#: bin/widget/view/form_gtk/wid_common.py:59
+msgid "Always applicable !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/calendar.py:99
+#: bin/widget/view/form_gtk/calendar.py:163
+msgid "Invalid date value! Year must be greater than 1899 !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/calendar.py:255 bin/widget_search/calendar.py:273
+msgid "Hour:"
+msgstr ""
+
+#: bin/widget/view/form_gtk/calendar.py:258 bin/widget_search/calendar.py:276
+msgid "Minute:"
+msgstr ""
+
+#: bin/widget/view/form_gtk/calendar.py:291 bin/widget_search/calendar.py:312
+msgid "Invalid datetime value! Year must be greater than 1899 !"
+msgstr ""
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:30
+msgid "Gantt view not yet implemented !"
+msgstr ""
+
+#: bin/widget/view/gantt_gtk/parser_dummy.py:31
+msgid ""
+"The gantt view is not available in this GTK Client, you should use the web "
+"interface or switch to the calendar view."
+msgstr ""
+
+#: bin/widget/screen/screen.py:337
+msgid ""
+"(Any existing filter with the \n"
+"same name will be replaced)"
+msgstr ""
+
+#: bin/rpc.py:158
+msgid "Connection refused!"
+msgstr "Connection refused!"
+
+#: bin/rpc.py:188
+msgid ""
+"Unable to reach to OpenERP server !\n"
+"You should check your connection to the network and the OpenERP server."
+msgstr ""
+
+#: bin/rpc.py:188
+msgid "Connection Error"
+msgstr "Connection Error"
+
+#: bin/openerp.glade:6
+msgid "OpenERP - Login"
+msgstr ""
+
+#: bin/openerp.glade:116 bin/openerp.glade:6405
+msgid "Database:"
+msgstr "Database:"
+
+#: bin/openerp.glade:131
+msgid "User:"
+msgstr "User:"
+
+#: bin/openerp.glade:146 bin/openerp.glade:6391 bin/openerp.glade:6702
+msgid "Password:"
+msgstr "Password:"
+
+#: bin/openerp.glade:265
+msgid "_File"
+msgstr "_File"
+
+#: bin/openerp.glade:272
+msgid "_Connect..."
+msgstr "_Connect..."
+
+#: bin/openerp.glade:288
+msgid "_Disconnect"
+msgstr "_Disconnect"
+
+#: bin/openerp.glade:308
+msgid "Databases"
+msgstr "Databases"
+
+#: bin/openerp.glade:315
+msgid "_New database"
+msgstr ""
+
+#: bin/openerp.glade:330
+msgid "_Restore database"
+msgstr ""
+
+#: bin/openerp.glade:345
+msgid "_Backup database"
+msgstr ""
+
+#: bin/openerp.glade:360
+msgid "Dro_p database"
+msgstr ""
+
+#: bin/openerp.glade:380
+msgid "_Download Migrations Code"
+msgstr ""
+
+#: bin/openerp.glade:395
+msgid "_Migrate Database(s)"
+msgstr ""
+
+#: bin/openerp.glade:415
+msgid "Administrator Password"
+msgstr ""
+
+#: bin/openerp.glade:460
+msgid "_User"
+msgstr "_User"
+
+#: bin/openerp.glade:468
+msgid "_Preferences"
+msgstr "_Preferences"
+
+#: bin/openerp.glade:496
+msgid "_Send a request"
+msgstr ""
+
+#: bin/openerp.glade:511
+msgid "_Read my requests"
+msgstr ""
+
+#: bin/openerp.glade:531
+msgid "_Waiting Requests"
+msgstr ""
+
+#: bin/openerp.glade:544
+msgid "For_m"
+msgstr ""
+
+#: bin/openerp.glade:552
+msgid "_New"
+msgstr "_New"
+
+#: bin/openerp.glade:568
+msgid "_Save"
+msgstr "_Save"
+
+#: bin/openerp.glade:584
+msgid "Copy this resource"
+msgstr ""
+
+#: bin/openerp.glade:585
+msgid "_Duplicate"
+msgstr "_Duplicate"
+
+#: bin/openerp.glade:601
+msgid "_Delete"
+msgstr "_Delete"
+
+#: bin/openerp.glade:622
+msgid "Find"
+msgstr "Find"
+
+#: bin/openerp.glade:638
+msgid "Ne_xt"
+msgstr "Ne_xt"
+
+#: bin/openerp.glade:654
+msgid "Pre_vious"
+msgstr "Pre_vious"
+
+#: bin/openerp.glade:670
+msgid "Switch to list/form"
+msgstr ""
+
+#: bin/openerp.glade:686
+msgid "_Menu"
+msgstr ""
+
+#: bin/openerp.glade:707
+msgid "_New Home Tab"
+msgstr ""
+
+#: bin/openerp.glade:723 bin/openerp.glade:4995
+msgid "Close Tab"
+msgstr "Close Tab"
+
+#: bin/openerp.glade:739
+msgid "Previous Tab"
+msgstr ""
+
+#: bin/openerp.glade:748 bin/openerp.glade:5051
+msgid "Next Tab"
+msgstr ""
+
+#: bin/openerp.glade:762
+msgid "View _logs"
+msgstr ""
+
+#: bin/openerp.glade:770
+msgid "_Go to resource ID..."
+msgstr ""
+
+#: bin/openerp.glade:784
+msgid "_Open"
+msgstr "_Open"
+
+#: bin/openerp.glade:799
+msgid "Reloa_d / Undo"
+msgstr ""
+
+#: bin/openerp.glade:820
+msgid "Repeat latest _action"
+msgstr ""
+
+#: bin/openerp.glade:834
+msgid "_Preview in PDF"
+msgstr ""
+
+#: bin/openerp.glade:850
+msgid "Previe_w in editor"
+msgstr ""
+
+#: bin/openerp.glade:870
+msgid "Expor_t data..."
+msgstr ""
+
+#: bin/openerp.glade:885
+msgid "I_mport data..."
+msgstr ""
+
+#: bin/openerp.glade:897
+msgid "_Options"
+msgstr "_Options"
+
+#: bin/openerp.glade:904
+msgid "_Extension Manager"
+msgstr ""
+
+#: bin/openerp.glade:912
+msgid "_Menubar"
+msgstr ""
+
+#: bin/openerp.glade:920
+msgid "Text _and Icons"
+msgstr ""
+
+#: bin/openerp.glade:928
+msgid "_Icons only"
+msgstr "_Icons only"
+
+#: bin/openerp.glade:937
+msgid "_Text only"
+msgstr "_Text only"
+
+#: bin/openerp.glade:950
+msgid "_Forms"
+msgstr ""
+
+#: bin/openerp.glade:958
+msgid "Right Toolbar"
+msgstr ""
+
+#: bin/openerp.glade:966
+msgid "Tabs default position"
+msgstr ""
+
+#: bin/openerp.glade:974
+msgid "Top"
+msgstr "Top"
+
+#: bin/openerp.glade:982
+msgid "Left"
+msgstr "Left"
+
+#: bin/openerp.glade:991
+msgid "Right"
+msgstr "Right"
+
+#: bin/openerp.glade:1000
+msgid "Bottom"
+msgstr "Bottom"
+
+#: bin/openerp.glade:1013
+msgid "Tabs default orientation"
+msgstr ""
+
+#: bin/openerp.glade:1021
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#: bin/openerp.glade:1029
+msgid "Vertical"
+msgstr "Vertical"
+
+#: bin/openerp.glade:1046
+msgid "_Print"
+msgstr "_Print"
+
+#: bin/openerp.glade:1053
+msgid "Previe_w before print"
+msgstr ""
+
+#: bin/openerp.glade:1077
+msgid "_Save options"
+msgstr "_Save options"
+
+#: bin/openerp.glade:1097
+msgid "_Plugins"
+msgstr "_Plugins"
+
+#: bin/openerp.glade:1105
+msgid "_Execute a plugin"
+msgstr ""
+
+#: bin/openerp.glade:1125
+msgid "_Shortcuts"
+msgstr ""
+
+#: bin/openerp.glade:1133
+msgid "_Help"
+msgstr "_Help"
+
+#: bin/openerp.glade:1140
+msgid "Enable Debug Mode Tooltips"
+msgstr ""
+
+#: bin/openerp.glade:1148 bin/openerp.glade:4366
+msgid "Support Request"
+msgstr ""
+
+#: bin/openerp.glade:1168
+msgid "User _Manual"
+msgstr ""
+
+#: bin/openerp.glade:1183
+msgid "_Contextual Help"
+msgstr ""
+
+#: bin/openerp.glade:1199
+msgid "Keyboard Shortcuts"
+msgstr "Keyboard Shortcuts"
+
+#: bin/openerp.glade:1212
+msgid "_License"
+msgstr "_License"
+
+#: bin/openerp.glade:1227
+msgid "_About..."
+msgstr "_About..."
+
+#: bin/openerp.glade:1269
+msgid "Edit / Save this resource"
+msgstr ""
+
+#: bin/openerp.glade:1285
+msgid "Delete this resource"
+msgstr ""
+
+#: bin/openerp.glade:1298
+msgid "Go to previous matched search"
+msgstr ""
+
+#: bin/openerp.glade:1299
+msgid "Previous"
+msgstr "Previous"
+
+#: bin/openerp.glade:1310
+msgid "Go to next matched resource"
+msgstr ""
+
+#: bin/openerp.glade:1311
+msgid "Next"
+msgstr "Next"
+
+#: bin/openerp.glade:1324
+msgid "List"
+msgstr "List"
+
+#: bin/openerp.glade:1336
+msgid "Form"
+msgstr "Form"
+
+#: bin/openerp.glade:1349
+msgid "Calendar"
+msgstr "Calendar"
+
+#: bin/openerp.glade:1359
+msgid "Diagram"
+msgstr ""
+
+#: bin/openerp.glade:1369
+msgid "Graph"
+msgstr "Graph"
+
+#: bin/openerp.glade:1382
+msgid "Gantt"
+msgstr ""
+
+#: bin/openerp.glade:1400
+msgid "Print documents"
+msgstr ""
+
+#: bin/openerp.glade:1411
+msgid "Launch actions about this resource"
+msgstr ""
+
+#: bin/openerp.glade:1424
+msgid "Add an attachment to this resource"
+msgstr ""
+
+#: bin/openerp.glade:1425
+msgid "Attachment"
+msgstr "Attachment"
+
+#: bin/openerp.glade:1440 bin/openerp.glade:1441
+msgid "Menu"
+msgstr "Menu"
+
+#: bin/openerp.glade:1458 bin/openerp.glade:1459
+msgid "Reload"
+msgstr "Reload"
+
+#: bin/openerp.glade:1476
+msgid "Close this window"
+msgstr "Close this window"
+
+#: bin/openerp.glade:1520
+msgid "Company:"
+msgstr ""
+
+#: bin/openerp.glade:1543
+msgid "Requests:"
+msgstr ""
+
+#: bin/openerp.glade:1566
+msgid "Read my Requests"
+msgstr ""
+
+#: bin/openerp.glade:1587
+msgid "Send a new request"
+msgstr ""
+
+#: bin/openerp.glade:1627
+msgid "OpenERP - Tree Resources"
+msgstr ""
+
+#: bin/openerp.glade:1680
+msgid "Shortcuts"
+msgstr "Shortcuts"
+
+#: bin/openerp.glade:1789
+msgid "OpenERP - Forms"
+msgstr "OpenERP - Forms"
+
+#: bin/openerp.glade:1813
+msgid "State:"
+msgstr "State:"
+
+#: bin/openerp.glade:1845
+msgid "OpenERP - About"
+msgstr ""
+
+#: bin/openerp.glade:1859
+msgid ""
+"<b>About OpenERP</b>\n"
+"<i>The most advanced Open Source ERP &amp; CRM !</i>"
+msgstr ""
+
+#: bin/openerp.glade:1890
+msgid ""
+"\n"
+"OpenERP - GTK Client - v%s\n"
+"\n"
+"OpenERP is an Open Source ERP+CRM\n"
+"for small to medium businesses.\n"
+"\n"
+"The whole source code is distributed under\n"
+"the terms of the GNU Public Licence.\n"
+"\n"
+"(c) 2003-TODAY, Tiny sprl\n"
+"\n"
+"More Info on www.openerp.com !"
+msgstr ""
+
+#: bin/openerp.glade:1931
+msgid "_OpenERP"
+msgstr ""
+
+#: bin/openerp.glade:1946
+msgid ""
+"\n"
+"(c) 2003-TODAY - Tiny sprl\n"
+"OpenERP is a product of Tiny sprl:\n"
+"\n"
+"Tiny sprl\n"
+"40 Chaussée de Namur\n"
+"1367 Gérompont\n"
+"Belgium\n"
+"\n"
+"Tel : (+32)81.81.37.00\n"
+"Mail: sales@xxxxxxx\n"
+"Web: http://tiny.be";
+msgstr ""
+
+#: bin/openerp.glade:1991
+msgid "_Contact"
+msgstr "_Contact"
+
+#: bin/openerp.glade:2043
+msgid "Open ERP - Forms widget"
+msgstr ""
+
+#: bin/openerp.glade:2222 bin/openerp.glade:4712
+msgid "OpenERP - Confirmation"
+msgstr ""
+
+#: bin/openerp.glade:2301
+msgid "OpenERP - Selection"
+msgstr ""
+
+#: bin/openerp.glade:2315
+msgid "Your selection:"
+msgstr ""
+
+#: bin/openerp.glade:2395
+msgid "OpenERP - Dialog"
+msgstr ""
+
+#: bin/openerp.glade:2419
+msgid "OpenERP, Field Preference target"
+msgstr ""
+
+#: bin/openerp.glade:2450
+msgid "_only for you"
+msgstr ""
+
+#: bin/openerp.glade:2464
+msgid "for _all users"
+msgstr ""
+
+#: bin/openerp.glade:2484
+msgid "<b>Value applicable for:</b>"
+msgstr ""
+
+#: bin/openerp.glade:2520
+msgid "<b>Value applicable if:</b>"
+msgstr ""
+
+#: bin/openerp.glade:2538
+msgid "Field _Name:"
+msgstr ""
+
+#: bin/openerp.glade:2552
+msgid "_Domain:"
+msgstr "_Domain:"
+
+#: bin/openerp.glade:2611
+msgid "Default _value:"
+msgstr ""
+
+#: bin/openerp.glade:2666
+msgid "OpenERP - Export to CSV"
+msgstr ""
+
+#: bin/openerp.glade:2714
+msgid "Save List"
+msgstr "Save List"
+
+#: bin/openerp.glade:2762
+msgid "Remove List"
+msgstr "Remove List"
+
+#: bin/openerp.glade:2817
+msgid "<b>Exports List</b>"
+msgstr ""
+
+#: bin/openerp.glade:2834
+msgid "<b>Predefined Exports</b>"
+msgstr ""
+
+#: bin/openerp.glade:3134
+msgid "Import Compatible"
+msgstr ""
+
+#: bin/openerp.glade:2862
+msgid "<b>Select an Option to Export</b>"
+msgstr ""
+
+#: bin/openerp.glade:2880
+msgid "Available Fields"
+msgstr "Available Fields"
+
+#: bin/openerp.glade:2923 bin/openerp.glade:5620
+msgid "_Add"
+msgstr "_Add"
+
+#: bin/openerp.glade:2970 bin/openerp.glade:5667
+msgid "_Remove"
+msgstr "_Remove"
+
+#: bin/openerp.glade:3018
+msgid "_Nothing"
+msgstr ""
+
+#: bin/openerp.glade:3073
+msgid "Fields to Export"
+msgstr ""
+
+#: bin/openerp.glade:3132
+msgid ""
+"Open in Excel\n"
+"Save as CSV"
+msgstr ""
+
+#: bin/openerp.glade:3151
+msgid "Add _field names"
+msgstr ""
+
+#: bin/openerp.glade:3156
+msgid "<b>Opti_ons</b>"
+msgstr ""
+
+#: bin/openerp.glade:3215
+msgid "OpenERP - Search"
+msgstr ""
+
+#: bin/openerp.glade:3281
+msgid "OpenERP - Preferences"
+msgstr ""
+
+#: bin/openerp.glade:3295
+msgid "<b>User preferences</b>"
+msgstr ""
+
+#: bin/openerp.glade:3361
+msgid "Tip of the Day"
+msgstr "Tip of the Day"
+
+#: bin/openerp.glade:3408
+msgid "_Display a new tip next time?"
+msgstr ""
+
+#: bin/openerp.glade:3461
+msgid "Pre_vious Tip"
+msgstr ""
+
+#: bin/openerp.glade:3507
+msgid "Ne_xt Tip"
+msgstr ""
+
+#: bin/openerp.glade:3553
+msgid "OpenERP - License"
+msgstr ""
+
+#: bin/openerp.glade:3568
+msgid "OpenERP license"
+msgstr ""
+
+#: bin/openerp.glade:4263
+msgid "Go to resource ID"
+msgstr ""
+
+#: bin/openerp.glade:4313
+msgid "Search ID:"
+msgstr ""
+
+#: bin/openerp.glade:4392
+msgid ""
+"<b>Complete this form to submit your bug and/or send a support request.</b>\n"
+"<i>\n"
+"Your request will be sent to the OpenERP team and we will reply shortly.\n"
+"Note that we may not reply if you do not have a support contract with Tiny "
+"or an official partner.</i>"
+msgstr ""
+
+#: bin/openerp.glade:4451
+msgid "Phone number:"
+msgstr "Phone number:"
+
+#: bin/openerp.glade:4464
+msgid "Emergency:"
+msgstr ""
+
+#: bin/openerp.glade:4478
+msgid ""
+"Not Urgent\n"
+"Medium\n"
+"Urgent\n"
+"Very Urgent"
+msgstr ""
+
+#: bin/openerp.glade:4511
+msgid "<b>Support contract id:</b>"
+msgstr ""
+
+#: bin/openerp.glade:4568 bin/win_error.glade:200
+msgid "Other comments:"
+msgstr ""
+
+#: bin/openerp.glade:4582
+msgid "Explain your problem:"
+msgstr ""
+
+#: bin/openerp.glade:4621
+msgid "<b>Your email:</b>"
+msgstr ""
+
+#: bin/openerp.glade:4635
+msgid "<b>Your Company:</b>"
+msgstr ""
+
+#: bin/openerp.glade:4649
+msgid "<b>Your name:</b>"
+msgstr ""
+
+#: bin/openerp.glade:4740 bin/openerp.glade:6110
+msgid "Hello World!"
+msgstr ""
+
+#: bin/openerp.glade:4802
+msgid "Keyboard shortcuts"
+msgstr "Keyboard shortcuts"
+
+#: bin/openerp.glade:4824
+msgid "<b>Shortcuts for OpenERP</b>"
+msgstr ""
+
+#: bin/openerp.glade:4838
+msgid "Close window without saving"
+msgstr ""
+
+#: bin/openerp.glade:4853
+msgid "<Ctrl> + <Esc>"
+msgstr ""
+
+#: bin/openerp.glade:4867
+msgid "<i>When editing a resource in a popup window</i>"
+msgstr ""
+
+#: bin/openerp.glade:4883
+msgid "Save and Close window"
+msgstr ""
+
+#: bin/openerp.glade:4898
+msgid "<Ctrl> + <Enter>"
+msgstr ""
+
+#: bin/openerp.glade:4911
+msgid "Switch view mode"
+msgstr ""
+
+#: bin/openerp.glade:4926
+msgid "<Ctrl> + L"
+msgstr ""
+
+#: bin/openerp.glade:4939
+msgid "Next record"
+msgstr ""
+
+#: bin/openerp.glade:4954
+msgid "Previous record"
+msgstr ""
+
+#: bin/openerp.glade:4969
+msgid "<PgDn>"
+msgstr ""
+
+#: bin/openerp.glade:4982
+msgid "<PgUp>"
+msgstr ""
+
+#: bin/openerp.glade:5010
+msgid "Save"
+msgstr "Save"
+
+#: bin/openerp.glade:5025
+msgid "<Ctrl> + W"
+msgstr ""
+
+#: bin/openerp.glade:5038
+msgid "<Ctrl> + S"
+msgstr ""
+
+#: bin/openerp.glade:5066
+msgid "<Ctrl> + <PgDn>"
+msgstr ""
+
+#: bin/openerp.glade:5079
+msgid "Previous tab"
+msgstr ""
+
+#: bin/openerp.glade:5094
+msgid "<Ctrl> + <PgUp>"
+msgstr ""
+
+#: bin/openerp.glade:5107
+msgid "New"
+msgstr "New"
+
+#: bin/openerp.glade:5122
+msgid "<Ctrl> + N"
+msgstr ""
+
+#: bin/openerp.glade:5135
+msgid "Delete"
+msgstr "Delete"
+
+#: bin/openerp.glade:5150
+msgid "<Ctrl> + D"
+msgstr ""
+
+#: bin/openerp.glade:5163
+msgid "Find / Search"
+msgstr ""
+
+#: bin/openerp.glade:5178
+msgid "<Ctrl> + F"
+msgstr ""
+
+#: bin/openerp.glade:5191
+msgid "Connect"
+msgstr "Connect"
+
+#: bin/openerp.glade:5206
+msgid "<Ctrl> + O"
+msgstr ""
+
+#: bin/openerp.glade:5220
+msgid "Main Shortcuts"
+msgstr ""
+
+#: bin/openerp.glade:5237
+msgid "F2"
+msgstr "F2"
+
+#: bin/openerp.glade:5250
+msgid "<b>Shortcuts in relation fields</b>"
+msgstr ""
+
+#: bin/openerp.glade:5265
+msgid "<b>Shortcuts in text entries</b>"
+msgstr ""
+
+#: bin/openerp.glade:5278
+msgid "Open current field"
+msgstr ""
+
+#: bin/openerp.glade:5293
+msgid "Add a new line/field"
+msgstr ""
+
+#: bin/openerp.glade:5308
+msgid "F1"
+msgstr "F1"
+
+#: bin/openerp.glade:5321
+msgid "Auto-Complete text field"
+msgstr ""
+
+#: bin/openerp.glade:5336
+msgid "<Enter>"
+msgstr ""
+
+#: bin/openerp.glade:5349
+msgid "Previous editable widget"
+msgstr ""
+
+#: bin/openerp.glade:5364
+msgid "<Shift> + <Tab>"
+msgstr ""
+
+#: bin/openerp.glade:5377
+msgid "Next editable widget"
+msgstr ""
+
+#: bin/openerp.glade:5392
+msgid "<Tab>"
+msgstr ""
+
+#: bin/openerp.glade:5405
+msgid "Paste selected text"
+msgstr ""
+
+#: bin/openerp.glade:5420
+msgid "Copy selected text"
+msgstr ""
+
+#: bin/openerp.glade:5435
+msgid "Cut selected text"
+msgstr ""
+
+#: bin/openerp.glade:5450
+msgid "<Ctrl> + V"
+msgstr ""
+
+#: bin/openerp.glade:5463
+msgid "<Ctrl> + C"
+msgstr ""
+
+#: bin/openerp.glade:5476
+msgid "<Ctrl> + X"
+msgstr ""
+
+#: bin/openerp.glade:5493
+msgid "Edition Widgets"
+msgstr ""
+
+#: bin/openerp.glade:5533
+msgid "Import from CSV"
+msgstr ""
+
+#: bin/openerp.glade:5578
+msgid "<b>All fields</b>"
+msgstr ""
+
+#: bin/openerp.glade:5715
+msgid "N_othing"
+msgstr ""
+
+#: bin/openerp.glade:5852
+msgid "Auto-Detect"
+msgstr "Auto-Detect"
+
+#: bin/openerp.glade:5772
+msgid "<b>Fields to import</b>"
+msgstr ""
+
+#: bin/openerp.glade:5891
+msgid "File to Import:"
+msgstr ""
+
+#: bin/openerp.glade:5930
+msgid "Lines to Skip:"
+msgstr ""
+
+#: bin/openerp.glade:5959
+msgid "Text Delimiter:"
+msgstr ""
+
+#: bin/openerp.glade:5987
+msgid "Encoding:"
+msgstr "Encoding:"
+
+#: bin/openerp.glade:6035
+msgid "Field Separater:"
+msgstr ""
+
+#: bin/openerp.glade:6012
+msgid "CSV Parameters"
+msgstr ""
+
+#: bin/openerp.glade:6177
+msgid "Server"
+msgstr "Server"
+
+#: bin/openerp.glade:6187
+msgid "<b>Connect to a OpenERP server</b>"
+msgstr ""
+
+#: bin/openerp.glade:6246
+msgid "Protocol connection:"
+msgstr ""
+
+#: bin/openerp.glade:6292
+msgid "Port:"
+msgstr "Port:"
+
+#: bin/openerp.glade:6344
+msgid "Choose a database..."
+msgstr ""
+
+#: bin/openerp.glade:6359
+msgid "<b>Backup a database</b>"
+msgstr ""
+
+#: bin/openerp.glade:6600
+msgid "Restore a database"
+msgstr ""
+
+#: bin/openerp.glade:6613
+msgid "<b>Restore a database</b>"
+msgstr ""
+
+#: bin/openerp.glade:6657
+msgid "(must not contain any special char)"
+msgstr ""
+
+#: bin/openerp.glade:6687
+msgid "New database name:"
+msgstr ""
+
+#: bin/openerp.glade:6787 bin/openerp.glade:6933 bin/openerp.glade:7451
+msgid "http://localhost:8069";
+msgstr ""
+
+#: bin/openerp.glade:6861
+msgid "Create a new database"
+msgstr "Create a new database"
+
+#: bin/openerp.glade:6874
+msgid "<b>Create a new database</b>"
+msgstr ""
+
+#: bin/openerp.glade:6945
+msgid ""
+"This is the URL of the OpenERP server. Use 'localhost' if the server is "
+"installed on this computer. Click on 'Change' to change the address."
+msgstr ""
+
+#: bin/openerp.glade:6949
+msgid ""
+"<sup><b><span foreground=\"dark green\">?</span></b></sup>OpenERP Server:"
+msgstr ""
+
+#: bin/openerp.glade:6980
+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 ""
+
+#: bin/openerp.glade:6984
+msgid ""
+"<sup><b><span foreground=\"dark green\">?</span></b></sup>Super "
+"Administrator Password:"
+msgstr ""
+
+#: bin/openerp.glade:7003
+msgid "admin"
+msgstr ""
+
+#: bin/openerp.glade:7017
+msgid "(<i>admin</i>, by default)"
+msgstr ""
+
+#: bin/openerp.glade:7082
+msgid ""
+"Choose the name of the database that will be created. The name must not "
+"contain any special character. Exemple: 'terp'."
+msgstr ""
+
+#: bin/openerp.glade:7084
+msgid ""
+"<sup><b><span foreground=\"dark green\">?</span></b></sup>New Database Name:"
+msgstr ""
+
+#: bin/openerp.glade:7109
+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 ""
+
+#: bin/openerp.glade:7111
+msgid ""
+"<sup><b><span foreground=\"dark green\">?</span></b></sup>Default Language:"
+msgstr ""
+
+#: bin/openerp.glade:7124
+msgid ""
+"This is the password of the 'admin' user that will be created in your new "
+"database."
+msgstr ""
+
+#: bin/openerp.glade:7126
+msgid ""
+"<sup><b><span foreground=\"dark green\">?</span></b></sup>Administrator "
+"Password:"
+msgstr ""
+
+#: bin/openerp.glade:7139
+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 ""
+
+#: bin/openerp.glade:7141
+msgid ""
+"<sup><b><span foreground=\"dark green\">?</span></b></sup>Confirm Password:"
+msgstr ""
+
+#: bin/openerp.glade:7234
+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 ""
+
+#: bin/openerp.glade:7237
+msgid ""
+"<sup><b><span foreground=\"dark green\">?</span></b></sup>Load Demonstration "
+"Data:"
+msgstr ""
+
+#: bin/openerp.glade:483 bin/openerp.glade:7304
+msgid "Change password"
+msgstr "Change password"
+
+#: bin/openerp.glade:7321
+msgid "<b>Change your super admin password</b>"
+msgstr ""
+
+#: bin/openerp.glade:7477
+msgid "Old password:"
+msgstr ""
+
+#: bin/openerp.glade:7490
+msgid "New password:"
+msgstr "New password:"
+
+#: bin/openerp.glade:7503
+msgid "New password confirmation:"
+msgstr ""
+
+#: bin/openerp.glade:7562
+msgid "OpenERP Message"
+msgstr ""
+
+#: bin/openerp.glade:7746
+msgid "Concurrency exception"
+msgstr ""
+
+#: bin/openerp.glade:7771
+msgid ""
+"<b>\n"
+"Write concurrency warning:\n"
+"</b>\n"
+"This document has been modified while you were editing it.\n"
+"  Choose:\n"
+"   - \"Cancel\" to cancel saving.\n"
+"   - \"Compare\" to see the modified version.\n"
+"   - \"Write anyway\" to save your current version.\n"
+msgstr ""
+
+#: bin/openerp.glade:7834
+msgid "Compare"
+msgstr "Compare"
+
+#: bin/openerp.glade:7880
+msgid "Write anyway"
+msgstr ""
+
+#: bin/openerp.glade:7910 bin/openerp.glade:7920
+msgid "window1"
+msgstr ""
+
+#: bin/openerp.glade:7992
+msgid "Today"
+msgstr "Today"
+
+#: bin/openerp.glade:8038
+msgid "September 2008"
+msgstr "September 2008"
+
+#: bin/openerp.glade:8052
+msgid "Day"
+msgstr "Day"
+
+#: bin/openerp.glade:8076
+msgid "Month"
+msgstr "Month"
+
+#: bin/openerp.glade:8276
+msgid "Fields on which Search criteria to be applied"
+msgstr ""
+
+#: bin/openerp.glade:8289
+msgid "Conditional Operators"
+msgstr ""
+
+#: bin/openerp.glade:8316
+msgid "The Choice will be applied with next filter if any"
+msgstr ""
+
+#: bin/openerp.glade:8317
+msgid ""
+"AND\n"
+"OR"
+msgstr ""
+
+#: bin/openerp.glade:8330
+msgid "Remove Filter"
+msgstr "Remove Filter"
+
+#: bin/openerp.glade:8230
+msgid "Filter Entry"
+msgstr ""
+
+#: bin/openerp.glade:8276
+msgid "Enter Filter Name:"
+msgstr ""
+
+#: bin/win_error.glade:40
+msgid "label"
+msgstr "label"
+
+#: bin/win_error.glade:100
+msgid "Click here for details about the publisher warranty proposition"
+msgstr ""
+
+#: bin/win_error.glade:120
+msgid "<i>_Publisher Warranty</i>"
+msgstr ""
+
+#: bin/win_error.glade:151
+msgid ""
+"<b>Publisher Warranty Contract.</b>\n"
+"<i>\n"
+"Your request will be send to OpenERP and publisher warranty team will reply "
+"you shortly.\n"
+"</i>"
+msgstr ""
+
+#: bin/win_error.glade:186
+msgid "Explain what you did:"
+msgstr ""
+
+#: bin/win_error.glade:200
+msgid "Others Comments:"
+msgstr ""
+
+#: bin/win_error.glade:285
+msgid "Send to Publisher Warranty Team"
+msgstr ""
+
+#: bin/win_error.glade:318
+msgid "Summary of the problem:"
+msgstr ""
+
+#: bin/win_error.glade:360
+msgid "<i>_Support Request</i>"
+msgstr ""
+
+#: bin/win_error.glade:387
+msgid "Details"
+msgstr "Details"
+
+#: bin/win_error.glade:404
+msgid "<i>_Details</i>"
+msgstr ""

=== renamed file 'bin/po/en_AU.po' => 'bin/po/en_AU.po.moved'
=== added file 'bin/po/en_CA.po'
--- bin/po/en_CA.po	1970-01-01 00:00:00 +0000
+++ bin/po/en_CA.po	2011-10-24 01:06:26 +0000
@@ -0,0 +1,2539 @@
+# English (Canada) translation for openobject-client
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-client package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-client\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-13 18:11+0100\n"
+"PO-Revision-Date: 2011-03-28 15:21+0000\n"
+"Last-Translator: Harmel Delphine (OpenERP) <Unknown>\n"
+"Language-Team: English (Canada) <en_CA@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-15 05:11+0000\n"
+"X-Generator: Launchpad (build 13921)\n"
+
+#: bin/plugins/__init__.py:27
+msgid "Print Workflow"
+msgstr ""
+
+#: bin/plugins/__init__.py:28
+msgid "Print Workflow (with subflows)"
+msgstr ""
+
+#: bin/plugins/__init__.py:40
+msgid "No available plugin for this resource !"
+msgstr ""
+
+#: bin/plugins/__init__.py:42
+msgid "Choose a Plugin"
+msgstr ""
+
+#: bin/rpc.py:157 bin/modules/action/wizard.py:150 bin/modules/gui/main.py:187
+msgid "Connection refused !"
+msgstr ""
+
+#: bin/rpc.py:203 bin/rpc.py:205 bin/modules/action/wizard.py:162
+#: bin/modules/action/wizard.py:168 bin/modules/action/wizard.py:170
+#: bin/modules/gui/main.py:195 bin/modules/gui/main.py:201
+msgid "Application Error"
+msgstr "Application Error"
+
+#: bin/rpc.py:205 bin/modules/action/wizard.py:170
+msgid "View details"
+msgstr ""
+
+#: bin/modules/action/main.py:48
+msgid "Nothing to print!"
+msgstr ""
+
+#: bin/modules/action/main.py:66
+msgid "Printing aborted, too long delay !"
+msgstr ""
+
+#: bin/modules/action/main.py:195
+msgid "Select your action"
+msgstr "Select your action"
+
+#: bin/modules/gui/main.py:89 bin/modules/gui/main.py:341
+msgid "Could not connect to server !"
+msgstr ""
+
+#: bin/modules/gui/main.py:93 bin/openerp.glade:72 bin/openerp.glade:6233
+#: bin/openerp.glade:6479 bin/openerp.glade:6802 bin/openerp.glade:7466
+msgid "Server:"
+msgstr "Server:"
+
+#: bin/modules/gui/main.py:104 bin/openerp.glade:98 bin/openerp.glade:6515
+#: bin/openerp.glade:6759 bin/openerp.glade:7058 bin/openerp.glade:7423
+msgid "Change"
+msgstr "Change"
+
+#: bin/modules/gui/main.py:111
+msgid "Super Administrator Password:"
+msgstr ""
+
+#: bin/modules/gui/main.py:193
+msgid "Bad Super Administrator Password"
+msgstr ""
+
+#: bin/modules/gui/main.py:217
+msgid "Migration Scripts"
+msgstr ""
+
+#: bin/modules/gui/main.py:220
+msgid "Contract ID:"
+msgstr ""
+
+#: bin/modules/gui/main.py:226
+msgid "Contract Password:"
+msgstr ""
+
+#: bin/modules/gui/main.py:241
+msgid "You already have the latest version"
+msgstr ""
+
+#: bin/modules/gui/main.py:246
+msgid "The following updates are available:"
+msgstr ""
+
+#: bin/modules/gui/main.py:258
+msgid "You can now migrate your databases."
+msgstr ""
+
+#: bin/modules/gui/main.py:263
+msgid "Migrate Database"
+msgstr ""
+
+#: bin/modules/gui/main.py:280
+msgid "Database"
+msgstr "Database"
+
+#: bin/modules/gui/main.py:292
+msgid "Your database has been upgraded."
+msgstr ""
+
+#: bin/modules/gui/main.py:294
+msgid "Your databases have been upgraded."
+msgstr ""
+
+#: bin/modules/gui/main.py:296
+msgid "You have not selected a database"
+msgstr ""
+
+#: bin/modules/gui/main.py:360
+msgid "No database found, you must create one !"
+msgstr ""
+
+#: bin/modules/gui/main.py:468
+msgid "Unknown"
+msgstr "Unknown"
+
+#: bin/modules/gui/main.py:474
+#, python-format
+msgid ""
+"The versions of the server (%s) and the client (%s) missmatch. The client "
+"may not work properly. Use it at your own risks."
+msgstr ""
+
+#: bin/modules/gui/main.py:610
+msgid "Sorry,'"
+msgstr ""
+
+#: bin/modules/gui/main.py:610 bin/modules/gui/main.py:613
+msgid "Bad database name !"
+msgstr ""
+
+#: bin/modules/gui/main.py:613
+msgid ""
+"The database name must contain only normal characters or \"_\".\n"
+"You must avoid all accents, space or special characters."
+msgstr ""
+
+#: bin/modules/gui/main.py:637 bin/modules/gui/main.py:650
+#: bin/modules/gui/main.py:652 bin/modules/gui/main.py:654
+msgid "Could not create database."
+msgstr "Could not create database."
+
+#: bin/modules/gui/main.py:638 bin/modules/gui/main.py:650
+msgid "Database already exists !"
+msgstr ""
+
+#: bin/modules/gui/main.py:652 bin/modules/gui/main.py:1384
+#: bin/modules/gui/main.py:1404 bin/modules/gui/main.py:1509
+msgid "Bad database administrator password !"
+msgstr ""
+
+#: bin/modules/gui/main.py:654 bin/modules/gui/main.py:661
+msgid "Error during database creation !"
+msgstr ""
+
+#: bin/modules/gui/main.py:661
+msgid ""
+"The server crashed during installation.\n"
+"We suggest you to drop this database."
+msgstr ""
+"The server crashed during installation.\n"
+"We suggest you drop this database."
+
+#: bin/modules/gui/main.py:707 bin/modules/gui/main.py:1072
+msgid "Press Ctrl+O to login"
+msgstr ""
+
+#: bin/modules/gui/main.py:881
+msgid "Edit"
+msgstr "Edit"
+
+#: bin/modules/gui/main.py:974
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: bin/modules/gui/main.py:976
+msgid "No Company"
+msgstr ""
+
+#: bin/modules/gui/main.py:989
+#, python-format
+msgid "%s request(s)"
+msgstr ""
+
+#: bin/modules/gui/main.py:991
+msgid "No request"
+msgstr ""
+
+#: bin/modules/gui/main.py:993
+#, python-format
+msgid " - %s request(s) sent"
+msgstr ""
+
+#: bin/modules/gui/main.py:1031
+msgid ""
+"Please double-check the database name or contact your administrator to "
+"verify the database status."
+msgstr ""
+
+#: bin/modules/gui/main.py:1031
+msgid "Database cannot be accessed or does not exist"
+msgstr ""
+
+#: bin/modules/gui/main.py:1035
+msgid ""
+"Connection error !\n"
+"Unable to connect to the server !"
+msgstr ""
+
+#: bin/modules/gui/main.py:1037
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password !"
+msgstr ""
+
+#: bin/modules/gui/main.py:1050
+#, python-format
+msgid "OpenERP - %s"
+msgstr ""
+
+#: bin/modules/gui/main.py:1070
+msgid "Not logged !"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:52 bin/modules/gui/main.py:1079
+#: bin/openerp.glade:6081
+msgid "OpenERP"
+msgstr ""
+
+#: bin/modules/gui/main.py:1153
+msgid ""
+"You can not log into the system !\n"
+"Ask the administrator to verify\n"
+"you have an action defined for your user."
+msgstr ""
+
+#: bin/modules/gui/main.py:1187 bin/modules/gui/main.py:1194
+msgid "Do you really want to quit ?"
+msgstr ""
+
+#: bin/modules/gui/main.py:1263
+#, python-format
+msgid "Attachments (%d)"
+msgstr ""
+
+#: bin/modules/gui/main.py:1276
+msgid "Attachments"
+msgstr "Attachments"
+
+#: bin/modules/gui/main.py:1375
+msgid "Delete a database"
+msgstr ""
+
+#: bin/modules/gui/main.py:1381
+msgid "Database dropped successfully !"
+msgstr ""
+
+#: bin/modules/gui/main.py:1384
+msgid "Could not drop database."
+msgstr ""
+
+#: bin/modules/gui/main.py:1386
+msgid "Couldn't drop database"
+msgstr ""
+
+#: bin/widget/view/form_gtk/image.py:112 bin/widget/view/form_gtk/url.py:118
+#: bin/modules/gui/main.py:1389 bin/openerp.glade:5817
+msgid "Open..."
+msgstr "Open..."
+
+#: bin/modules/gui/main.py:1401
+msgid "Database restored successfully !"
+msgstr ""
+
+#: bin/modules/gui/main.py:1404
+msgid "Could not restore database."
+msgstr ""
+
+#: bin/modules/gui/main.py:1406
+msgid "Couldn't restore database"
+msgstr ""
+
+#: bin/modules/gui/main.py:1457
+msgid ""
+"Confirmation password does not match new password, operation cancelled!"
+msgstr ""
+
+#: bin/modules/gui/main.py:1459
+msgid "Validation Error."
+msgstr ""
+
+#: bin/modules/gui/main.py:1476
+msgid "Could not change the Super Admin password."
+msgstr ""
+
+#: bin/modules/gui/main.py:1477 bin/modules/gui/main.py:1483
+msgid "Bad password provided !"
+msgstr ""
+
+#: bin/modules/gui/main.py:1457
+msgid "Error, password not changed."
+msgstr "Error, password not changed."
+
+#: bin/modules/gui/main.py:1490 bin/modules/gui/main.py:1513
+msgid "Backup a database"
+msgstr ""
+
+#: bin/widget/view/form_gtk/image.py:129
+#: bin/widget/view/form_gtk/binary.py:167 bin/printer/printer.py:231
+#: bin/modules/gui/window/win_export.py:359 bin/modules/gui/main.py:1493
+msgid "Save As..."
+msgstr "Save As..."
+
+#: bin/modules/gui/main.py:1506
+msgid "Database backed up successfully !"
+msgstr ""
+
+#: bin/modules/gui/main.py:1509
+msgid "Could not backup the database."
+msgstr ""
+
+#: bin/modules/gui/main.py:1511
+msgid "Couldn't backup database."
+msgstr ""
+
+#: bin/modules/gui/window/form.py:189
+msgid "Resource ID does not exist for this object!"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:247
+msgid "No record selected ! You can only attach to existing record."
+msgstr "No record selected ! You can only attach to existing record."
+
+#: bin/modules/gui/window/form.py:264
+msgid "You have to select a record !"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:270
+#: bin/modules/gui/window/view_tree/view_tree_sc.py:41
+#: bin/modules/gui/window/win_export.py:213
+msgid "ID"
+msgstr "ID"
+
+#: bin/modules/gui/window/form.py:271
+msgid "Creation User"
+msgstr "Creation User"
+
+#: bin/modules/gui/window/form.py:272
+msgid "Creation Date"
+msgstr "Creation Date"
+
+#: bin/modules/gui/window/form.py:273
+msgid "Latest Modification by"
+msgstr "Latest Modification by"
+
+#: bin/modules/gui/window/form.py:274
+msgid "Latest Modification Date"
+msgstr "Latest Modification Date"
+
+#: bin/modules/gui/window/form.py:275
+msgid "Internal Module Data ID"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:269
+msgid ""
+"Record is not saved ! \n"
+" Do You want to Clear Current Record ?"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:388
+#: bin/modules/gui/window/form.py:290
+msgid "Are you sure to remove this record ?"
+msgstr ""
+
+#: bin/widget/view/form_gtk/one2many_list.py:390
+#: bin/modules/gui/window/form.py:292
+msgid "Are you sure to remove those records ?"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:296
+msgid "Resources cleared."
+msgstr ""
+
+#: bin/modules/gui/window/form.py:298
+msgid "Resources successfully removed."
+msgstr ""
+
+#: bin/modules/gui/window/form.py:339
+msgid "Working now on the duplicated document !"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:355
+msgid "Document Saved."
+msgstr ""
+
+#: bin/widget/view/list.py:584 bin/widget/view/list.py:585
+#: bin/widget/view/form_gtk/parser.py:135 bin/modules/gui/window/form.py:366
+msgid "Invalid form, correct red fields !"
+msgstr ""
+
+#: bin/widget/view/list.py:584
+msgid "Error !"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:368
+msgid "Warning !"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:389 bin/modules/gui/window/form.py:497
+msgid ""
+"This record has been modified\n"
+"do you want to save it ?"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:447
+msgid "You must select one or several records !"
+msgstr "You must select one or several records !"
+
+#: bin/modules/gui/window/form.py:456
+msgid "Print Screen"
+msgstr "Print Screen"
+
+#: bin/modules/gui/window/form.py:476
+msgid "No record selected"
+msgstr "No record selected"
+
+#: bin/modules/gui/window/form.py:481
+msgid "New document"
+msgstr ""
+
+#: bin/modules/gui/window/form.py:483
+msgid "Editing document (id: "
+msgstr ""
+
+#: bin/modules/gui/window/form.py:486
+msgid "Record: "
+msgstr ""
+
+#: bin/modules/gui/window/form.py:487
+msgid " of "
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:51
+msgid "The file is empty !"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:51
+msgid "Importation !"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:56
+msgid "XML-RPC error !"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:61
+msgid "Imported one object !"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:63
+#, python-format
+msgid "Imported %d objects !"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:68
+#, python-format
+msgid ""
+"Error trying to import this record:\n"
+"%s\n"
+"Error Message:\n"
+"%s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:72
+msgid "Importation Error !"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:105
+#: bin/modules/gui/window/win_import.py:109
+msgid "Field name"
+msgstr "Field name"
+
+#: bin/modules/gui/window/win_import.py:181
+msgid "Error opening .CSV file"
+msgstr "Error opening .CSV file"
+
+#: bin/modules/gui/window/win_import.py:181
+msgid "Input Error."
+msgstr "Input Error."
+
+#: bin/modules/gui/window/win_import.py:199
+#, python-format
+msgid "You cannot import this field %s, because we cannot auto-detect it"
+msgstr ""
+
+#: bin/modules/gui/window/win_import.py:202
+#, python-format
+msgid ""
+"Error processing your first line of the file.\n"
+