[MERGE]: Merged with team1.

bzr revid: uco@tinyerp.com-20101110074011-271q113upbcysg52

3 files changed, 65 insertions, 55 deletions

diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po
index ad5d90d91a7..04080dc1812 100644
--- a/addons/base_setup/i18n/de.po
+++ b/addons/base_setup/i18n/de.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: 2009-11-17 08:51+0000\n"
-"Last-Translator: Ferdinand-chricar <Unknown>\n"
+"PO-Revision-Date: 2010-11-06 07:03+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-11-07 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -26,16 +26,18 @@ msgstr "Stadt"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen "
+"beinhalten !"
 
 #. module: base_setup
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ungültiger Modellname in der Aktionsdefinition."
 
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Rechnungsstellung"
 
 #. module: base_setup
 #: field:base.setup.company,name:0
@@ -50,7 +52,7 @@ msgstr "E-Mail"
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr ""
+msgstr "Bankkonto"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
@@ -77,7 +79,7 @@ msgstr ""
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Your database is now created."
-msgstr ""
+msgstr "Ihre Datenbank ist jetzt vollständig installiert"
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
@@ -107,7 +109,7 @@ msgstr ""
 #: field:base.setup.company,progress:0
 #: field:base.setup.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Abfolge Konfiguration"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
@@ -128,17 +130,17 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
 msgid "Marketing"
-msgstr ""
+msgstr "Marketing"
 
 #. module: base_setup
 #: field:base.setup.company,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Unternehmen"
 
 #. module: base_setup
 #: field:base.setup.installer,sale:0
 msgid "Sales Management"
-msgstr ""
+msgstr "Verkauf"
 
 #. module: base_setup
 #: help:base.setup.installer,profile_tools:0
@@ -165,7 +167,7 @@ msgstr ""
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
-msgstr ""
+msgstr "Bezeichnung"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -175,7 +177,7 @@ msgstr "Verwende direkt"
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
 msgid "Knowledge Management"
-msgstr ""
+msgstr "Knowledge Management"
 
 #. module: base_setup
 #: help:base.setup.installer,product_expiry:0
@@ -216,12 +218,12 @@ msgstr ""
 #. module: base_setup
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Fehlerhafter XML Quellcode für diese Ansicht !"
 
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr ""
+msgstr "Personal"
 
 #. module: base_setup
 #: help:base.setup.installer,purchase:0
@@ -244,7 +246,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,street2:0
 msgid "Street 2"
-msgstr ""
+msgstr "Strasse"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_installer
@@ -274,7 +276,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,zip:0
 msgid "Zip Code"
-msgstr ""
+msgstr "Postleitzahl"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -291,7 +293,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr ""
+msgstr "Konfiguration Unternehmen"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
@@ -301,7 +303,7 @@ msgstr "Logo"
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr ""
+msgstr "Einkauf"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
@@ -316,7 +318,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Projekte"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
@@ -372,7 +374,7 @@ msgstr ""
 #: field:base.setup.config,config_logo:0
 #: field:base.setup.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Bild"
 
 #. module: base_setup
 #: field:base.setup.installer,product_expiry:0
@@ -382,7 +384,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr ""
+msgstr "Fertigung"
 
 #. module: base_setup
 #: view:base.setup.company:0
diff --git a/addons/base_setup/i18n/it.po b/addons/base_setup/i18n/it.po
index 2fc226f7175..174070ac863 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-03 07:52+0000\n"
-"Last-Translator: Lorenzo Battistini <lorenzo.battistini@domsense.com>\n"
+"PO-Revision-Date: 2010-11-07 07:50+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-04 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-11-08 05:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -26,11 +26,13 @@ msgstr "Città"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Il nome dell'oggetto deve cominciare con \"x_\" e non deve contenere "
+"caratteri speciali!"
 
 #. module: base_setup
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome del modello non valida nella definizione dell'azione"
 
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
@@ -55,7 +57,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
 msgid "Extra Tools"
-msgstr ""
+msgstr "Strumenti extra"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
@@ -79,7 +81,7 @@ msgstr "Aiuta a gestire passo passo la campagne di marketing."
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Your database is now created."
-msgstr ""
+msgstr "Il nuovo database è creato."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
@@ -106,6 +108,8 @@ msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
 msgstr ""
+"E' possibile iniziare a configurare il sistema oppure connetterti "
+"direttamente al database come amministratore."
 
 #. module: base_setup
 #: field:base.setup.company,progress:0
@@ -127,17 +131,17 @@ msgstr "Valuta"
 #. module: base_setup
 #: field:base.setup.company,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Stato fed."
 
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
 msgid "Marketing"
-msgstr ""
+msgstr "Marketing"
 
 #. module: base_setup
 #: field:base.setup.company,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Company"
 
 #. module: base_setup
 #: field:base.setup.installer,sale:0
@@ -164,12 +168,12 @@ msgstr "Telefono"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "Copy text   \t res_config_contents"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
-msgstr ""
+msgstr "titolo"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -179,7 +183,7 @@ msgstr "Usa Direttamente"
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
 msgid "Knowledge Management"
-msgstr ""
+msgstr "Gestione conoscenze"
 
 #. module: base_setup
 #: help:base.setup.installer,product_expiry:0
@@ -227,12 +231,12 @@ msgstr ""
 #. module: base_setup
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valido per la struttura della vista!"
 
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr ""
+msgstr "Risorse Umane"
 
 #. module: base_setup
 #: help:base.setup.installer,purchase:0
@@ -257,12 +261,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,street2:0
 msgid "Street 2"
-msgstr ""
+msgstr "Via (2)"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_installer
 msgid "base.setup.installer"
-msgstr ""
+msgstr "base.setup.installer"
 
 #. module: base_setup
 #: field:base.setup.company,country_id:0
@@ -277,7 +281,7 @@ msgstr "Configurazione"
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Contabilità & Finanza"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
@@ -287,7 +291,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,zip:0
 msgid "Zip Code"
-msgstr ""
+msgstr "CAP"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -304,7 +308,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr ""
+msgstr "Configurazione Company"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
@@ -314,7 +318,7 @@ msgstr "Logo"
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr ""
+msgstr "Gestione Acquisti"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
@@ -325,7 +329,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,stock:0
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Gestione Magazzino"
 
 #. module: base_setup
 #: field:base.setup.installer,project:0
@@ -335,12 +339,12 @@ msgstr "Gestione progetti"
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
 msgid "Installed Users"
-msgstr ""
+msgstr "Utenti installati"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "New Database"
-msgstr ""
+msgstr "Nuovo Database"
 
 #. module: base_setup
 #: field:base.setup.installer,crm:0
@@ -371,6 +375,8 @@ msgid ""
 "Lets you install various tools to simplify and enhance OpenERP's report "
 "creation."
 msgstr ""
+"Permette di installare una serie di strumenti per semplificare e potenziare "
+"la creazione dei report in OpenERP"
 
 #. module: base_setup
 #: field:base.setup.company,rml_header1:0
@@ -380,7 +386,7 @@ msgstr "Report - Intestazione"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Information about your new database"
-msgstr ""
+msgstr "Informazioni ralative al nuovo database"
 
 #. module: base_setup
 #: field:base.setup.company,config_logo:0
@@ -392,7 +398,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,product_expiry:0
 msgid "Food Industry"
-msgstr ""
+msgstr "Industria alimentare"
 
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
@@ -418,12 +424,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,website:0
 msgid "Company Website"
-msgstr ""
+msgstr "Sito internet della Company"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install Specific Industry Applications"
-msgstr ""
+msgstr "Installa applicazioni specifiche per l'industria"
 
 #. module: base_setup
 #: field:base.setup.company,street:0
@@ -433,12 +439,12 @@ msgstr "Indirizzo"
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_company
 msgid "base.setup.company"
-msgstr ""
+msgstr "base.setup.company"
 
 #. module: base_setup
 #: help:base.setup.company,website:0
 msgid "Example: http://openerp.com"
-msgstr ""
+msgstr "Esempio: http://openerp.com"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
@@ -477,17 +483,19 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your association more efficiently."
 msgstr ""
+"Installa un gruppo prestabilito di applicazioni OpenERP che permetterà di "
+"gestire l'associazione in maniera più efficiente."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
-msgstr ""
+msgstr "base.setup.config"
 
 #. module: base_setup
 #: code:addons/base_setup/__init__.py:0
 #, python-format
 msgid "The following users have been installed : \n"
-msgstr ""
+msgstr "I seguenti utenti sono stati installati: \n"
 
 #~ msgid ""
 #~ "You can start configuring the system or connect directly to the database "
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index 30a3dc22808..470ba851f36 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.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-03 07:05+0000\n"
+"PO-Revision-Date: 2010-11-04 08:55+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.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-04 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-11-06 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup