[MERGE] with trunk

bzr revid: tfr@openerp.com-20101110120902-k60lls4irx842pq2

3 files changed, 50 insertions, 39 deletions

diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index eabeef61334..2c4f8f46323 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -23,7 +23,7 @@
         <group colspan="8" col="8">
           <separator string="" colspan="8"/>
           <label string="" colspan="6"/>
-          <button name="menu" icon="gtk-ok" type="object" string="Use Directly" colspan="1"/>
+          <button name="menu" icon="gtk-ok" type="object" string="Skip Configuration Wizards" help="Only for experimented users" colspan="1"/>
           <button name="config" icon="gtk-go-forward" type="object" string="Start Configuration" colspan="1"/>
         </group>
     </form>
diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po
index 02e81083ddc..3582df6bc9f 100644
--- a/addons/base_setup/i18n/el.po
+++ b/addons/base_setup/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2009-09-08 12:34+0000\n"
-"Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
+"PO-Revision-Date: 2010-11-09 18:30+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-11-10 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -27,6 +27,8 @@ msgstr "Πόλη"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Το όνομα του Αντικειμένου(Object) θα πρέπει να ξεκινά με x_ και δεν θα "
+"πρέπει να περιέχει ειδικούς χαρακτήρες."
 
 #. module: base_setup
 #: constraint:ir.actions.act_window:0
@@ -36,7 +38,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Τιμολόγηση"
 
 #. module: base_setup
 #: field:base.setup.company,name:0
@@ -51,12 +53,12 @@ msgstr "E-mail"
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr ""
+msgstr "Αρ. Λογαριασμού Τραπέζης"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
 msgid "Extra Tools"
-msgstr ""
+msgstr "Επιπλέον Εργαλεία"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
@@ -69,21 +71,23 @@ msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
 msgstr ""
+"Βοηθά στην διαχείρηση των διαδικασιών παραγωγής και παράγει αναφορές γι' "
+"αυτές"
 
 #. module: base_setup
 #: help:base.setup.installer,marketing:0
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr ""
+msgstr "Βοηθά στην διαχείρηση των εξτρατειών μάρκετινγκ βήμα προς βήμα"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Your database is now created."
-msgstr ""
+msgstr "Η βάση σου έχει δημιουργηθεί"
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
 msgid "Point of Sales"
-msgstr ""
+msgstr "Εντατική Λιανική"
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
@@ -96,6 +100,8 @@ msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing "
 msgstr ""
+"Σε βοηθά να διαχειριστείς τις λογιστικές σου ανάγκες, εάν δεν είσαι "
+"λογιστής, σας προτείνουμε να εγκαταστήσετε μόνο την Τιμολόγηση "
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -108,7 +114,7 @@ msgstr ""
 #: field:base.setup.company,progress:0
 #: field:base.setup.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Πρόοδος Ρυθμίσεων"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
@@ -129,17 +135,17 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
 msgid "Marketing"
-msgstr ""
+msgstr "Μάρκετινγκ"
 
 #. module: base_setup
 #: field:base.setup.company,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Εταιρία"
 
 #. module: base_setup
 #: field:base.setup.installer,sale:0
 msgid "Sales Management"
-msgstr ""
+msgstr "Διαχείρηση Πωλήσεων"
 
 #. module: base_setup
 #: help:base.setup.installer,profile_tools:0
@@ -151,7 +157,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
 msgid "Advanced Reporting"
-msgstr ""
+msgstr "Προχωρημένες Αναφορές"
 
 #. module: base_setup
 #: field:base.setup.company,phone:0
@@ -166,7 +172,7 @@ msgstr ""
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
-msgstr ""
+msgstr "τίτλος"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -176,7 +182,7 @@ msgstr "Χρήση Απευθείας"
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
 msgid "Knowledge Management"
-msgstr ""
+msgstr "Διαχείρηση Γνώσης"
 
 #. module: base_setup
 #: help:base.setup.installer,product_expiry:0
@@ -184,6 +190,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your industry."
 msgstr ""
+"Εγκαθίστανται μια σειρά από προεγκατεστημένες εφαρμογές του OpenERP που θα "
+"σε βοηθήσουν να διαχειριστείς την εταιρία σου"
 
 #. module: base_setup
 #: help:base.setup.installer,project:0
@@ -191,6 +199,7 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Βοηθά στην παρακολούθηση των έργων και εργασιών παράγωντας σχέδια , κλπ..."
 
 #. module: base_setup
 #: help:base.setup.installer,point_of_sale:0
@@ -222,7 +231,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr ""
+msgstr "Διαχείρηση Ανθρώπινων Πόρων"
 
 #. module: base_setup
 #: help:base.setup.installer,purchase:0
@@ -245,7 +254,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,street2:0
 msgid "Street 2"
-msgstr ""
+msgstr "Οδός 2"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_installer
@@ -265,7 +274,7 @@ msgstr "Εγκατάσταση"
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Λογιστική &Οικονομικά"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
@@ -275,7 +284,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,zip:0
 msgid "Zip Code"
-msgstr ""
+msgstr "Ταχυδρομικός Κώδικας"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -292,7 +301,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr ""
+msgstr "Ρύθμιση Εταιρίας"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
@@ -302,7 +311,7 @@ msgstr "Logo"
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr ""
+msgstr "Διαχείρηση Αγορών"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
@@ -312,27 +321,27 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,stock:0
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Διαχείρηση Αποθήκης"
 
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Διαχείρηση Έργων"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
 msgid "Installed Users"
-msgstr ""
+msgstr "Εγκατεστημένοι χρήστες"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "New Database"
-msgstr ""
+msgstr "Νέα Βάση Δεδομένων"
 
 #. module: base_setup
 #: field:base.setup.installer,crm:0
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Διαχείρηση Πελατών"
 
 #. module: base_setup
 #: help:base.setup.installer,auction:0
@@ -358,6 +367,8 @@ msgid ""
 "Lets you install various tools to simplify and enhance OpenERP's report "
 "creation."
 msgstr ""
+"Γίνεται εγκατάσταση εργαλείων για την απλοποίηση και την ενίσχυση των "
+"αναφορών του OpenERP"
 
 #. module: base_setup
 #: field:base.setup.company,rml_header1:0
@@ -367,24 +378,24 @@ msgstr "Κεφαλίδα Αναφοράς"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Information about your new database"
-msgstr ""
+msgstr "Πληροφορίες σχετικά με την νέα βάση δεδομένων"
 
 #. module: base_setup
 #: field:base.setup.company,config_logo:0
 #: field:base.setup.config,config_logo:0
 #: field:base.setup.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Εικόνα"
 
 #. module: base_setup
 #: field:base.setup.installer,product_expiry:0
 msgid "Food Industry"
-msgstr ""
+msgstr "Βιομηχανία Τροφίμων"
 
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr ""
+msgstr "Παραγωγή"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -405,7 +416,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,website:0
 msgid "Company Website"
-msgstr ""
+msgstr "Ιστοσελίδα Εταιρίας"
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -425,12 +436,12 @@ msgstr ""
 #. module: base_setup
 #: help:base.setup.company,website:0
 msgid "Example: http://openerp.com"
-msgstr ""
+msgstr "Παράδειγμα:http://openerp.com"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
 msgid "Install Applications"
-msgstr ""
+msgstr "Εγκτάσταση Εφαρμογών"
 
 #. module: base_setup
 #: help:base.setup.installer,crm:0
diff --git a/addons/base_setup/i18n/it.po b/addons/base_setup/i18n/it.po
index 174070ac863..732d594058d 100644
--- a/addons/base_setup/i18n/it.po
+++ b/addons/base_setup/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-11-07 07:50+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-11-09 08:55+0000\n"
+"Last-Translator: Davide Corio - Domsense <davide.corio@domsense.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-08 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-11-10 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -146,7 +146,7 @@ msgstr "Company"
 #. module: base_setup
 #: field:base.setup.installer,sale:0
 msgid "Sales Management"
-msgstr "Gesione vendite"
+msgstr "Gestione Vendite"
 
 #. module: base_setup
 #: help:base.setup.installer,profile_tools:0