[MERGE] Sync with trunk.

bzr revid: tde@openerp.com-20121219093924-5rqmhb6ve7bv7qzl

2 files changed, 61 insertions, 36 deletions

diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
index b5421cc65e3..b91bb5d871f 100644
--- a/addons/project_long_term/i18n/de.po
+++ b/addons/project_long_term/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-05-10 18:01+0000\n"
-"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 08:02+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -82,12 +82,12 @@ msgstr "geplante Phasen"
 #: view:project.phase:0
 #: field:project.phase,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Action"
-msgstr ""
+msgstr "Aktion"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -119,7 +119,7 @@ msgstr "Neu"
 #. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration Unit of Measure"
-msgstr ""
+msgstr "Zeiteineit"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
@@ -146,7 +146,7 @@ msgstr "Fortschritts Phasen"
 #: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (Kopie)"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:48
@@ -158,7 +158,7 @@ msgstr "Bitte wählen Si eine Projekt für die  Planung"
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -180,13 +180,15 @@ msgstr "Frühestes Startdatum"
 #: help:project.phase,product_uom:0
 msgid ""
 "Unit of Measure (Unit of Measure) is the unit of measurement for Duration"
-msgstr ""
+msgstr "Masseinheit für die Dauer"
 
 #. module: project_long_term
 #: help:project.phase,user_ids:0
 msgid ""
 "The resources on the project can be computed automatically by the scheduler."
 msgstr ""
+"Der Resourcenbedarf für dieses Projekt kann automatisch durch den Scheduler "
+"ermittelt werden."
 
 #. module: project_long_term
 #: field:project.phase,sequence:0
@@ -197,6 +199,7 @@ msgstr "Reihenfolge"
 #: help:account.analytic.account,use_phases:0
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
+"Aktivieren Sie dieses Feld, um die Phasen basierte Planung zu verwenden"
 
 #. module: project_long_term
 #: help:project.user.allocation,date_start:0
@@ -212,6 +215,11 @@ msgid ""
 "           \n"
 " If the phase is over, the status is set to 'Done'."
 msgstr ""
+"Phasen \n"
+" Nach Erzeugung:  'Entwurf'.\n"
+" Nach dem Start: 'Verarbeitung'.\n"
+" Überprüfung notwendig 'Schwebend'.                                  \n"
+" Fertig 'Erledigt'."
 
 #. module: project_long_term
 #: field:project.phase,progress:0
@@ -318,7 +326,7 @@ msgstr "Aufgabendetails"
 #. module: project_long_term
 #: field:project.project,phase_count:0
 msgid "Open Phases"
-msgstr ""
+msgstr "Offene Phasen"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
@@ -416,7 +424,7 @@ msgstr "Erzeugt die Reihenfolge bei Anzeige der Phasen."
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
 msgid "Tasks"
-msgstr ""
+msgstr "Aufgaben"
 
 #. module: project_long_term
 #: help:project.user.allocation,date_end:0
@@ -461,7 +469,7 @@ msgstr "Monat"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analytisches Konto"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_end:0
diff --git a/addons/project_long_term/i18n/it.po b/addons/project_long_term/i18n/it.po
index 34bff4f69e4..4df0a792155 100644
--- a/addons/project_long_term/i18n/it.po
+++ b/addons/project_long_term/i18n/it.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-05-10 18:25+0000\n"
-"Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
-"<lorenzo.battistini@agilebg.com>\n"
+"PO-Revision-Date: 2012-12-18 22:27+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@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: 2012-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -50,7 +49,7 @@ msgstr "Prossime fasi"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_user_allocation
 msgid "Phase User Allocation"
-msgstr ""
+msgstr "Assegnazione Fase Utente"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -64,6 +63,9 @@ msgid ""
 "view.\n"
 "               "
 msgstr ""
+"Per pianificare fasi di tutti o di un specifico progetto. Aprirà una vista "
+"gantt.\n"
+"               "
 
 #. module: project_long_term
 #: field:project.phase,task_ids:0
@@ -75,18 +77,18 @@ msgstr "Attività del Progetto"
 #: model:ir.ui.menu,name:project_long_term.menu_compute_phase
 #: view:project.compute.phases:0
 msgid "Schedule Phases"
-msgstr ""
+msgstr "Pianificazione Fasi"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,state:0
 msgid "Status"
-msgstr ""
+msgstr "Stato"
 
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Action"
-msgstr ""
+msgstr "Azione"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -118,7 +120,7 @@ msgstr "Nuovo"
 #. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration Unit of Measure"
-msgstr ""
+msgstr "Unità di Misura Durata"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
@@ -134,7 +136,7 @@ msgstr "In sospeso"
 #. module: project_long_term
 #: help:project.phase,progress:0
 msgid "Computed based on related tasks"
-msgstr ""
+msgstr "Calcolo basato sulle attività collegate"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -145,19 +147,19 @@ msgstr "Fasi di avanzamento"
 #: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (copia)"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Please specify a project to schedule."
-msgstr ""
+msgstr "Si prega di specificare un progetto da pianificare."
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "or"
-msgstr ""
+msgstr "o"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -179,13 +181,15 @@ msgstr "Data inizio minima"
 #: help:project.phase,product_uom:0
 msgid ""
 "Unit of Measure (Unit of Measure) is the unit of measurement for Duration"
-msgstr ""
+msgstr "Unità di Misura (Unita di Misura) è l'unità di misura della Durata"
 
 #. module: project_long_term
 #: help:project.phase,user_ids:0
 msgid ""
 "The resources on the project can be computed automatically by the scheduler."
 msgstr ""
+"Le risorse sul progetto possono essere calcolate automaticamente dal "
+"pianificatore."
 
 #. module: project_long_term
 #: field:project.phase,sequence:0
@@ -196,6 +200,8 @@ msgstr "Sequenza"
 #: help:account.analytic.account,use_phases:0
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
+"Selezionare questo campo se si prevede di usare una pianificare basata sulle "
+"fasi"
 
 #. module: project_long_term
 #: help:project.user.allocation,date_start:0
@@ -211,6 +217,11 @@ msgid ""
 "           \n"
 " If the phase is over, the status is set to 'Done'."
 msgstr ""
+"Se la fase è creata lo stato è 'Bozza'.\n"
+" Se la fase è avviata, lo stato diventa 'In Corso'.\n"
+" Se è necessario revisionarla la fase è in stato 'Sospeso'.                  "
+"                \n"
+" Se la fase è conclusa, lo stato è impostato a 'Fatto'."
 
 #. module: project_long_term
 #: field:project.phase,progress:0
@@ -247,7 +258,7 @@ msgstr "Tempo di lavoro"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Pending Phases"
-msgstr ""
+msgstr "Fasi in Sospeso"
 
 #. module: project_long_term
 #: code:addons/project_long_term/project_long_term.py:126
@@ -286,6 +297,12 @@ msgid ""
 "users, convert your phases into a series of tasks when you start working on "
 "the project."
 msgstr ""
+"Un progetto può essere suddiviso in diverse fasi. Per ogni fase, è possibile "
+"definire la collocazione degli utenti, descrivere diversi attività e "
+"collegare le fasi alle precedenti o a quelle successive, aggiungere vincoli "
+"di date per le pianificazioni automatiche. Usare la pianificazione a lunga "
+"durata per pianificare gli utenti disponibili, convertire le fasi in una "
+"serie di attività quando si inizia a lavorare sul progetto."
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
@@ -311,7 +328,7 @@ msgstr "Dettagli Attività"
 #. module: project_long_term
 #: field:project.project,phase_count:0
 msgid "Open Phases"
-msgstr ""
+msgstr "Fasi Aperte"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
@@ -409,7 +426,7 @@ msgstr "Fornisce l'ordinamento quando viene visualizzata la lista di fasi."
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
 msgid "Tasks"
-msgstr ""
+msgstr "Attività"
 
 #. module: project_long_term
 #: help:project.user.allocation,date_end:0
@@ -454,7 +471,7 @@ msgstr "Mese"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "Conto analitico"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_end:0
@@ -464,7 +481,7 @@ msgstr "Scadenza"
 #. module: project_long_term
 #: view:project.user.allocation:0
 msgid "Project User Allocation"
-msgstr ""
+msgstr "Assegnazione Utenti al Progetto"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
@@ -482,12 +499,12 @@ msgstr "Completato"
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute All My Projects"
-msgstr ""
+msgstr "Calcola Tutti i Miei Progetti"
 
 #. module: project_long_term
 #: field:project.phase,user_force_ids:0
 msgid "Force Assigned Users"
-msgstr ""
+msgstr "Forza gli Utenti Assegnati"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -511,7 +528,7 @@ msgstr "Nome"
 #: view:project.phase:0
 #: view:project.user.allocation:0
 msgid "Planning of Users"
-msgstr ""
+msgstr "Pianificazione degli Utenti"
 
 #~ msgid "Displaying settings"
 #~ msgstr "Visualizza impostazioni"