Re: svn commit: r989394 - in /ofbiz/branches/release09.04: ./ applications/marketing/config/MarketingUiLabels.xml framework/common/config/CommonUiLabels.xml framework/common/widget/LookupScreens.xml

Thu, 26 Aug 2010 15:57:54 -0700 

Thanks Jacques, much appreciated.

Regards
Scott

On 27/08/2010, at 10:38 AM, Jacques Le Roux wrote:

> No worries, it's done for R9.04 and R10.04
> 
> Jacques
> 
> Scott Gray wrote:
>> It would be preferable if you could take care of reverting it Jacques.
>> 
>> Thanks
>> Scott
>> 
>> On 26/08/2010, at 8:19 PM, Jacques Le Roux wrote:
>> 
>>> Yes, I wondered too, but as I saw no pb doing it... I did it...
>>> Please revert if you think it should be so.
>>> 
>>> Jacques
>>> 
>>> Scott Gray wrote:
>>>> +1
>>>> 
>>>> Regards
>>>> Scott
>>>> 
>>>> HotWax Media
>>>> http://www.hotwaxmedia.com
>>>> 
>>>> On 26/08/2010, at 10:49 AM, Bruno Busco wrote:
>>>> 
>>>>> No, we should not. It is not a "bug"
>>>>> 
>>>>> 2010/8/26 Adrian Crum <[email protected]>
>>>>> 
>>>>>> Removing this kind of dependency is a worthy goal, but do we want to do 
>>>>>> it
>>>>>> in the releases?
>>>>>> 
>>>>>> -Adrian
>>>>>> 
>>>>>> 
>>>>>> On 8/25/2010 3:38 PM, [email protected] wrote:
>>>>>> 
>>>>>>> Author: jleroux
>>>>>>> Date: Wed Aug 25 22:38:22 2010
>>>>>>> New Revision: 989394
>>>>>>> 
>>>>>>> URL: http://svn.apache.org/viewvc?rev=989394&view=rev
>>>>>>> Log:
>>>>>>> "Applied fix from trunk for revision: 989389"  (handled conflict in
>>>>>>> marketing labels by hand)
>>>>>>> ------------------------------------------------------------------------
>>>>>>> r989389 | jleroux | 2010-08-26 00:20:18 +0200 (jeu. 26 ao-t 2010) | 1
>>>>>>> ligne
>>>>>>> 
>>>>>>> Removes a framework dependency on Marketing component
>>>>>>> ------------------------------------------------------------------------
>>>>>>> 
>>>>>>> Modified:
>>>>>>>  ofbiz/branches/release09.04/   (props changed)
>>>>>>> 
>>>>>>> ofbiz/branches/release09.04/applications/marketing/config/MarketingUiLabels.xml
>>>>>>>  ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml
>>>>>>>  ofbiz/branches/release09.04/framework/common/widget/LookupScreens.xml
>>>>>>> 
>>>>>>> Propchange: ofbiz/branches/release09.04/
>>>>>>> 
>>>>>>> ------------------------------------------------------------------------------
>>>>>>> --- svn:ignore (original)
>>>>>>> +++ svn:ignore Wed Aug 25 22:38:22 2010
>>>>>>> @@ -7,4 +7,3 @@ bin
>>>>>>> *.time
>>>>>>> .settings
>>>>>>> .project
>>>>>>> -comment.tmp
>>>>>>> 
>>>>>>> Propchange: ofbiz/branches/release09.04/
>>>>>>> 
>>>>>>> ------------------------------------------------------------------------------
>>>>>>> --- svn:mergeinfo (original)
>>>>>>> +++ svn:mergeinfo Wed Aug 25 22:38:22 2010
>>>>>>> @@ -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,771477,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,806914,808786-808787,808792,809141,810370,810438,810
> 46
>>>>>>> 5,
>>>>>>> 
>>>>>> 810
>>>>>> 
>>>>>>> 
>>>>>>> 807,810809,810814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,812724,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,832698,832776,832880,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107,890245,891378,891620,896649,899188,899833,900024,900026,900050,900217,900273,901628,907342-907343,910460,912587,915332,916252,916703,916925,917435,922042,923828,927870
> ,9
>>>>>>> 
>>>>>> 2803
>>>>>> 
>>>>>>> 
>>>>>>> 7,928166,928171,928180,928470,928477,929582,931594-931595,933157,935494,936817,941047,941431,941440,942884,943168,944895,945118,948017,950866,950870,950893,951005,951062,951098,951367,951381,951672,953294,953671,954135,954956,958343,958514,958521,960997,964558,965470,965916,966785,967098,978893,980641-980642,980935,981051,981104,981123,981288,983920,985718,985856,985902
>>>>>>> 
>>>>>>> +/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,771477,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,806914,808786-808787,808792,809141,810370,810438,810
> 46
>>>>>>> 5,
>>>>>>> 
>>>>>> 810
>>>>>> 
>>>>>>> 
>>>>>>> 807,810809,810814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,812724,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,832698,832776,832880,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107,890245,891378,891620,896649,899188,899833,900024,900026,900050,900217,900273,901628,907342-907343,910460,912587,915332,916252,916703,916925,917435,922042,923828,927870
> ,9
>>>>>>> 
>>>>>> 2803
>>>>>> 
>>>>>>> 
>>>>>>> 7,928166,928171,928180,928470,928477,929582,931594-931595,933157,935494,936817,941047,941431,941440,942884,943168,944895,945118,948017,950866,950870,950893,951005,951062,951098,951367,951381,951672,953294,953671,954135,954956,958343,958514,958521,960997,964558,965470,965916,966785,967098,978893,980641-980642,980935,981051,981104,981123,981288,983920,985718,985856,985902,989389
>>>>>>> 
>>>>>>> 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=989394&r1=989393&r2=989394&view=diff
>>>>>>> 
>>>>>>> ==============================================================================
>>>>>>> ---
>>>>>>> ofbiz/branches/release09.04/applications/marketing/config/MarketingUiLabels.xml
>>>>>>> (original)
>>>>>>> +++
>>>>>>> ofbiz/branches/release09.04/applications/marketing/config/MarketingUiLabels.xml
>>>>>>> Wed Aug 25 22:38:22 2010
>>>>>>> @@ -1512,14 +1512,6 @@
>>>>>>>       <value xml:lang="th">à¸"à¹?à¸Tหาà¸,à¹?ภมูลรายà¸
>>>>>>> ารà¸.ิà¸"à¸.à¹^ภ</value>
>>>>>>>       <value xml:lang="zh">æY¥æ?¾è "ç³»å^-表</value>
>>>>>>>   </property>
>>>>>>> -<property key="PageTitleLookupGeo">
>>>>>>> -<value xml:lang="en">Lookup Geo</value>
>>>>>>> -<value xml:lang="fr">Consulter la zone géographique</value>
>>>>>>> -<value xml:lang="it">Ricerca Geografia</value>
>>>>>>> -<value xml:lang="ro">Cauta Geografia</value>
>>>>>>> -<value
>>>>>>> xml:lang="th">à¸"à¹?à¸Tหาà¸,à¹?ภ
>>>>>>> มูลà¹,à¸"รà¸?สรà¹?าà¸?</value>
>>>>>>> -<value xml:lang="zh">æY¥æ?¾åo°ç ?</value>
>>>>>>> -</property>
>>>>>>>   <property key="PageTitleLookupSalesForecast">
>>>>>>>       <value xml:lang="en">Lookup Sales Forecast</value>
>>>>>>>       <value xml:lang="fr">Consulter la prévision des ventes</value>
>>>>>>> 
>>>>>>> Modified:
>>>>>>> ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml
>>>>>>> URL:
>>>>>>> http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml?rev=989394&r1=989393&r2=989394&view=diff
>>>>>>> 
>>>>>>> ==============================================================================
>>>>>>> --- 
>>>>>>> ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml
>>>>>>> (original)
>>>>>>> +++ 
>>>>>>> ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml
>>>>>>> Wed Aug 25 22:38:22 2010
>>>>>>> @@ -8446,6 +8446,15 @@
>>>>>>>       <value xml:lang="th">à¹?à¸,à¹?าสูà¹^ระà¸sà¸s</value>
>>>>>>>       <value xml:lang="zh">çT»å½.</value>
>>>>>>>   </property>
>>>>>>> +<property key="PageTitleLookupGeo">
>>>>>>> +<value xml:lang="en">Lookup Geo</value>
>>>>>>> +<value xml:lang="fr">Consulter la zone géographique</value>
>>>>>>> +<value xml:lang="it">Ricerca Geografia</value>
>>>>>>> +<value xml:lang="pt_BR">Buscar localização</value>
>>>>>>> +<value xml:lang="ro">Cauta Geografia</value>
>>>>>>> +<value
>>>>>>> xml:lang="th">à¸"à¹?à¸Tหาà¸,à¹?ภ
>>>>>>> มูลà¹,à¸"รà¸?สรà¹?าà¸?</value>
>>>>>>> +<value xml:lang="zh">æY¥æ?¾åo°ç ?</value>
>>>>>>> +</property>
>>>>>>>   <property key="PageTitleMain">
>>>>>>>       <value xml:lang="cs">úvodnà strana</value>
>>>>>>>       <value xml:lang="de">Startseite</value>
>>>>>>> 
>>>>>>> Modified:
>>>>>>> ofbiz/branches/release09.04/framework/common/widget/LookupScreens.xml
>>>>>>> URL:
>>>>>>> http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/widget/LookupScreens.xml?rev=989394&r1=989393&r2=989394&view=diff
>>>>>>> 
>>>>>>> ==============================================================================
>>>>>>> --- 
>>>>>>> ofbiz/branches/release09.04/framework/common/widget/LookupScreens.xml
>>>>>>> (original)
>>>>>>> +++ 
>>>>>>> ofbiz/branches/release09.04/framework/common/widget/LookupScreens.xml
>>>>>>> Wed Aug 25 22:38:22 2010
>>>>>>> @@ -25,7 +25,6 @@ under the License.
>>>>>>>   <screen name="LookupGeo">
>>>>>>>       <section>
>>>>>>>           <actions>
>>>>>>> -<property-map resource="MarketingUiLabels" map-name="uiLabelMap"
>>>>>>> global="true"/>
>>>>>>> 
>>>>>>>               <set field="title"
>>>>>>> value="${uiLabelMap.PageTitleLookupGeo}"/>
>>>>>>>               <set field="queryString"
>>>>>>> from-field="result.queryString"/> 
> 
>

Attachment: smime.p7s
Description: S/MIME cryptographic signature

Reply via email to