[MERGE]: Merge with lp:openobject-addons

bzr revid: rpa@tinyerp.com-20101022051217-1lui0rbtq9d03n0a

1 files changed, 60 insertions, 28 deletions

diff --git a/addons/crm_profiling/i18n/it.po b/addons/crm_profiling/i18n/it.po
index 610d86e505a..2c57b5b6f8d 100644
--- a/addons/crm_profiling/i18n/it.po
+++ b/addons/crm_profiling/i18n/it.po
@@ -6,17 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 09:49+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-21 16:07+0000\n"
+"Last-Translator: simone.sandri <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-09-29 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+msgid "Questions List"
+msgstr "Lista delle Domande"
+
+#. module: crm_profiling
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -25,6 +30,11 @@ msgstr ""
 "speciali!"
 
 #. module: crm_profiling
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nome di modulo non valido nella definizione dell'azione."
+
+#. module: crm_profiling
 #: field:crm_profiling.answer,question_id:0
 #: field:crm_profiling.question,name:0
 #: model:ir.model,name:crm_profiling.model_crm_profiling_question
@@ -42,14 +52,14 @@ msgid "Child Profiles"
 msgstr "Profili figli"
 
 #. module: crm_profiling
-#: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
-msgid "crm_profiling management"
-msgstr "Gestione crm_profiling"
+#: view:crm.segmentation:0
+msgid "Partner Segmentations"
+msgstr "Segmentazione Partner"
 
 #. module: crm_profiling
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome di modulo non valido nella definizione dell'azione."
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Errore ! Non puoi creare un menù ricorsivo"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,name:0
@@ -58,11 +68,22 @@ msgid "Answer"
 msgstr "Risposta"
 
 #. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_crm_segmentation
+msgid "Partner Segmentation"
+msgstr "Segmentazione Partner"
+
+#. module: crm_profiling
 #: view:res.partner:0
 msgid "Profiling"
 msgstr "Profilatura"
 
 #. module: crm_profiling
+#: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
+msgid "Crm Profiling management - To Perform Segmentation within Partners"
+msgstr ""
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
 #: field:crm_profiling.questionnaire,description:0
 msgid "Description"
 msgstr "Descrizione"
@@ -102,11 +123,12 @@ msgid "Questionnaires"
 msgstr "Questionari"
 
 #. module: crm_profiling
-#: field:crm_profiling.questionnaire,name:0
-#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
-#: wizard_view:open_questionnaire,init:0
-msgid "Questionnaire"
-msgstr "Questionario"
+#: help:crm.segmentation,profiling_active:0
+msgid ""
+"Check                             this box if you want to use this tab as "
+"part of the                              segmentation rule. If not checked, "
+"the criteria beneath will be ignored"
+msgstr ""
 
 #. module: crm_profiling
 #: constraint:crm.segmentation:0
@@ -130,16 +152,6 @@ msgid "Included Answers"
 msgstr "Includi Risposte"
 
 #. module: crm_profiling
-#: help:crm.segmentation,profiling_active:0
-msgid ""
-"Check this box if you want to use this tab as part of the segmentation rule. "
-"If not checked, the criteria beneath will be ignored"
-msgstr ""
-"Seleziona questa casella se si desidera utilizzare questa scheda come parte "
-"della regola di segmentazione. Se non è selezionata, i criteri di sotto "
-"verranno ignorati"
-
-#. module: crm_profiling
 #: view:crm_profiling.question:0
 #: field:crm_profiling.questionnaire,questions_ids:0
 #: model:ir.actions.act_window,name:crm_profiling.open_questions
@@ -159,9 +171,18 @@ msgid "Cancel"
 msgstr "Annulla"
 
 #. module: crm_profiling
-#: view:crm.segmentation:0
-msgid "Partner Segmentations"
-msgstr "Segmentazione Partner"
+#: model:ir.model,name:crm_profiling.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: crm_profiling
+#: code:addons/crm_profiling/crm_profiling.py:0
+#: field:crm_profiling.questionnaire,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
+#: wizard_view:open_questionnaire,init:0
+#, python-format
+msgid "Questionnaire"
+msgstr "Questionario"
 
 #. module: crm_profiling
 #: model:ir.actions.wizard,name:crm_profiling.wizard_open_questionnaire
@@ -172,3 +193,14 @@ msgstr "Utilizzare un Questionario"
 #: wizard_button:open_questionnaire,open,compute:0
 msgid "Save Data"
 msgstr "Salva Dati"
+
+#~ msgid "crm_profiling management"
+#~ msgstr "Gestione crm_profiling"
+
+#~ msgid ""
+#~ "Check this box if you want to use this tab as part of the segmentation rule. "
+#~ "If not checked, the criteria beneath will be ignored"
+#~ msgstr ""
+#~ "Seleziona questa casella se si desidera utilizzare questa scheda come parte "
+#~ "della regola di segmentazione. Se non è selezionata, i criteri di sotto "
+#~ "verranno ignorati"