svn commit: r832367 - in /ofbiz/branches/release09.04: ./ applications/marketing/config/ applications/marketing/widget/sfa/ specialpurpose/oagis/widget/

Author: jleroux
Date: Tue Nov  3 09:55:02 2009
New Revision: 832367

URL: http://svn.apache.org/viewvc?rev=832367&view=rev
Log:
"Applied fix from trunk for revision: 832361  "
Done by hand (got  conflict), + removed a bunch of other <label>&lt;br/&gt;</label>
------------------------------------------------------------------------
r832361 | jleroux | 2009-11-03 10:30:00 +0100 (mar. 03 nov. 2009) | 3 lignes

A patch from Erwan de FERRIERES "<br> is displayed in NewLeadFromVCard and is not necessary" (https://issues.apache.org/jira/browse/OFBIZ-3143) - OFBIZ-3143
a label just with <br/> was wrongly included in the NewLeadFromVCard screen
+ Better French label
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/marketing/config/MarketingUiLabels.xml
    ofbiz/branches/release09.04/applications/marketing/widget/sfa/ContactScreens.xml
    ofbiz/branches/release09.04/applications/marketing/widget/sfa/LeadScreens.xml
    ofbiz/branches/release09.04/specialpurpose/oagis/widget/MessageInfoScreens.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  3 09:55:02 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810
 814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810
 814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361

Modified: ofbiz/branches/release09.04/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/marketing/config/MarketingUiLabels.xml?rev=832367&r1=832366&r2=832367&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/branches/release09.04/applications/marketing/config/MarketingUiLabels.xml Tue Nov  3 09:55:02 2009
@@ -1160,7 +1160,7 @@
     <property key="PageTitleCreateLeadFromVCard">
         <value xml:lang="en">Create Lead from vCard</value>
         <value xml:lang="es">Crear nuevo lead desde vCard</value>
-        <value xml:lang="fr">Créer un prospect depuis la vCard</value>
+        <value xml:lang="fr">Créer un prospect depuis une vCard</value>
         <value xml:lang="it">Creare lead dalla vCard</value>
     </property>
     <property key="PageTitleEditAccount">

Modified: ofbiz/branches/release09.04/applications/marketing/widget/sfa/ContactScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/marketing/widget/sfa/ContactScreens.xml?rev=832367&r1=832366&r2=832367&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/marketing/widget/sfa/ContactScreens.xml (original)
+++ ofbiz/branches/release09.04/applications/marketing/widget/sfa/ContactScreens.xml Tue Nov  3 09:55:02 2009
@@ -111,7 +111,6 @@
                                 </container>
                             </container>
                             <container style="screenlet-body">
-                                <label>&lt;br/&gt;</label>
                                 <include-form name="MergeContacts" location="component://marketing/widget/sfa/forms/ContactForms.xml"/>
                             </container>
                         </container>

Modified: ofbiz/branches/release09.04/applications/marketing/widget/sfa/LeadScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/marketing/widget/sfa/LeadScreens.xml?rev=832367&r1=832366&r2=832367&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/marketing/widget/sfa/LeadScreens.xml (original)
+++ ofbiz/branches/release09.04/applications/marketing/widget/sfa/LeadScreens.xml Tue Nov  3 09:55:02 2009
@@ -173,7 +173,6 @@
                                 <container style="h3"><label text="${uiLabelMap.SfaMergeLeads}"/></container>
                             </container>
                             <container style="screenlet-body">
-                                <label>&lt;br/&gt;</label>
                                 <include-form name="MergeLeads" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
                             </container>
                         </container>
@@ -213,7 +212,6 @@
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>
-                                        <label>&lt;br/&gt;</label>
                                         <include-form  name="CreateLeadFromVCard" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
                                     </widgets>
                                 </section>

Modified: ofbiz/branches/release09.04/specialpurpose/oagis/widget/MessageInfoScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/oagis/widget/MessageInfoScreens.xml?rev=832367&r1=832366&r2=832367&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/oagis/widget/MessageInfoScreens.xml (original)
+++ ofbiz/branches/release09.04/specialpurpose/oagis/widget/MessageInfoScreens.xml Tue Nov  3 09:55:02 2009
@@ -41,7 +41,6 @@
                                         <container>
                                             <link target="EditMessageInfo" text="${uiLabelMap.OagisNewMessageInfo}" style="buttontext"/>
                                         </container>
-                                        <label>&lt;br/&gt;</label>
                                         <include-form name="FindMessageInfos" location="component://oagis/widget/forms/MessageInfoForms.xml"/>
                                     </widgets>
                                 </section>
@@ -122,7 +121,6 @@
                                         <container>
                                             <link target="EditMessageErrorInfo" text="${uiLabelMap.OagisNewMessageErrorInfo}" style="buttontext"/>
                                         </container>
-                                        <label>&lt;br/&gt;</label>
                                         <include-form name="FindMessageErrorInfos" location="component://oagis/widget/forms/MessageInfoForms.xml"/>
                                     </widgets>
                                 </section>