svn commit: r755005 - in /ofbiz/trunk: applications/content/config/ applications/content/webapp/co
Locked
svn commit: r755005 - in /ofbiz/trunk: applications/content/config/ applications/content/webapp/co
 
|
Author: mrisaliti
Date: Mon Mar 16 21:08:21 2009 New Revision: 755005 URL: http://svn.apache.org/viewvc?rev=755005&view=rev Log: A lot of hardcoded labels cleaning and changes some wrong references Modified: ofbiz/trunk/applications/content/config/ContentEntityLabels.xml ofbiz/trunk/applications/content/config/ContentUiLabels.xml ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml ofbiz/trunk/applications/content/widget/content/ContentForms.xml ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml ofbiz/trunk/applications/party/config/PartyUiLabels.xml ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml ofbiz/trunk/applications/product/config/ProductUiLabels.xml ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml ofbiz/trunk/specialpurpose/myportal/widget/login.ftl ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml ofbiz/trunk/specialpurpose/shark/widget/RepositoryScreens.xml Modified: ofbiz/trunk/applications/content/config/ContentEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentEntityLabels.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/applications/content/config/ContentEntityLabels.xml (original) +++ ofbiz/trunk/applications/content/config/ContentEntityLabels.xml Mon Mar 16 21:08:21 2009 @@ -797,6 +797,22 @@ <value xml:lang="th">à¸à¸³à¸à¸à¸´à¸à¸²à¸¢à¸à¸£à¸°à¸à¸à¸</value> <value xml:lang="zh">说æ</value> </property> + <property key="ContentType.description.BLOG_ROOT"> + <value xml:lang="en">Blog Root</value> + <value xml:lang="it">Blog principale</value> + </property> + <property key="ContentType.description.DECORATOR"> + <value xml:lang="en">Decorator</value> + <value xml:lang="it">Decoratore</value> + </property> + <property key="ContentType.description.FAQ_ROOT"> + <value xml:lang="en">FAQ Root</value> + <value xml:lang="it">FAQ principale</value> + </property> + <property key="ContentType.description.MENU_CONTAINER"> + <value xml:lang="en">Menu Container</value> + <value xml:lang="it">Contenitore menu</value> + </property> <property key="ContentType.description.COMPDOC_INSTANCE"> <value xml:lang="de">Zusammengesetzte Dokumenteninstanz</value> <value xml:lang="en">Composite Document Instance</value> Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original) +++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Mon Mar 16 21:08:21 2009 @@ -1318,6 +1318,10 @@ <value xml:lang="th">à¸à¸³à¸à¸²à¸¡</value> <value xml:lang="zh">é®é¢</value> </property> + <property key="ContentSurveyQuestionNumber"> + <value xml:lang="en">Question #</value> + <value xml:lang="it">Domanda #</value> + </property> <property key="ContentSurveyQuestions"> <value xml:lang="ar">أسئÙØ©</value> <value xml:lang="de">Fragen</value> Modified: ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml Mon Mar 16 21:08:21 2009 @@ -169,7 +169,7 @@ <auto-fields-service service-name="updateSurveyQuestion" map-name="surveyQuestion"/> <field name="surveyId"><hidden/></field> - <field name="surveyQuestionSeqId" title="Question #"><display/></field> + <field name="surveyQuestionSeqId" title="${uiLabelMap.ContentSurveyQuestionNumber}"><display/></field> <!-- <field name="surveyQuestionTypeId" title="Question Type"><display description="${surveyQuestionType.description}"/></field> --> <field name="surveyQuestionTypeId"> Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Mon Mar 16 21:08:21 2009 @@ -275,7 +275,7 @@ <field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType" description="${description}"></display-entity></field> <field name="mapKey"><display/></field> <field name="fromDate"><display description="${bsh:fromDate.toString().substring(0,10)}"/></field> - <field name="deleteLink" title=" " widget-style="buttontext"> + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssoc?contentId=${contentId}&contentIdTo=${contentIdTo}&contentAssocTypeId=${contentAssocTypeId}&fromDate=${fromDate}"/> </field> <field name="thruDate"><date-time/></field> @@ -299,7 +299,7 @@ <field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType" description="${description}"></display-entity></field> <field name="mapKey"><display/></field> <field name="fromDate"><display description="${bsh:fromDate.toString().substring(0,10)}"/></field> - <field name="deleteLink" title=" " widget-style="buttontext"> + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssoc?contentId=${contentId}&contentIdTo=${contentIdTo}&contentAssocTypeId=${contentAssocTypeId}&fromDate=${fromDate}"/> </field> <field name="thruDate"><date-time/></field> Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original) +++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Mon Mar 16 21:08:21 2009 @@ -539,6 +539,18 @@ <value xml:lang="th">สรà¹à¸²à¸à¸à¸²à¸£à¸à¸±à¸à¹à¸à¹à¸à¸à¸£à¸°à¹à¸ à¸à¸à¸à¸à¸à¸¥à¸¸à¹à¸¡à¹à¸«à¸¡à¹</value> <value xml:lang="zh">æ°å»ºååºç»åç±»</value> </property> + <property key="MarketingSegmentGroupClassificationCreatePermissionError"> + <value xml:lang="en">Error on creation Segment Group Classification</value> + <value xml:lang="it">Errore durante la creazione di una nuova classificazione gruppo segmento</value> + </property> + <property key="MarketingSegmentGroupClassificationDeletePermissionError"> + <value xml:lang="en">Error on delete Segment Group Classification</value> + <value xml:lang="it">Errore durante la cancellazione di una classificazione gruppo segmento</value> + </property> + <property key="MarketingSegmentGroupClassificationUpdatePermissionError"> + <value xml:lang="en">Error on update Segment Group Classification</value> + <value xml:lang="it">Errore durante l'aggiornamento di una classificazione gruppo segmento</value> + </property> <property key="MarketingSegmentGroupCreate"> <value xml:lang="en">Create New Segment Group</value> <value xml:lang="es">Nuevo segmento</value> @@ -548,6 +560,14 @@ <value xml:lang="th">สรà¹à¸²à¸à¸ªà¹à¸§à¸à¸à¸à¸à¸à¸¥à¸¸à¹à¸¡à¹à¸«à¸¡à¹</value> <value xml:lang="zh">æ°å»ºååºç»</value> </property> + <property key="MarketingSegmentGroupCreatePermissionError"> + <value xml:lang="en">Error on creation Segment Group</value> + <value xml:lang="it">Errore durante la creazione di un nuovo gruppo segmento</value> + </property> + <property key="MarketingSegmentGroupDeletePermissionError"> + <value xml:lang="en">Error on delete Segment Group</value> + <value xml:lang="it">Errore durante la cancellazione di un gruppo segmento</value> + </property> <property key="MarketingSegmentGroupDescription"> <value xml:lang="de">Beschreibung</value> <value xml:lang="en">Description</value> @@ -567,6 +587,22 @@ <value xml:lang="th">สรà¹à¸²à¸à¸ªà¹à¸§à¸à¸à¸à¸à¹à¸à¸£à¸à¸ªà¸£à¹à¸²à¸à¸à¸¥à¸¸à¹à¸¡à¹à¸«à¸¡à¹</value> <value xml:lang="zh">æ°å»ºååºç»å°ç</value> </property> + <property key="MarketingSegmentGroupGeoCreatePermissionError"> + <value xml:lang="en">Error on creation Segment Group Geo</value> + <value xml:lang="it">Errore durante la creazione di una nuova geo gruppo segmento</value> + </property> + <property key="MarketingSegmentGroupGeoDeletePermissionError"> + <value xml:lang="en">Error on delete Segment Group Geo</value> + <value xml:lang="it">Errore durante la cancellazione di un geo gruppo segmento</value> + </property> + <property key="MarketingSegmentGroupGeoUpdatePermissionError"> + <value xml:lang="en">Error on update Segment Group Geo</value> + <value xml:lang="it">Errore durante l'aggiornamento di un nuovo geo gruppo segmento</value> + </property> + <property key="MarketingSegmentGroupMgrViewPermissionError"> + <value xml:lang="en">Segment Group View Permission Error</value> + <value xml:lang="it">Errore permesso di visualizzare i gruppi segmento</value> + </property> <property key="MarketingSegmentGroupNoSegmentGroupFoundWithId"> <value xml:lang="en">No SegmentGroup found with ID:</value> <value xml:lang="es">No se encontraron segmentos con el ID:</value> @@ -576,6 +612,10 @@ <value xml:lang="th">à¹à¸¡à¹à¸¡à¸µà¸ªà¹à¸§à¸à¸à¸à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸µà¹à¸à¸à¸à¸²à¸à¸£à¸«à¸±à¸ªà¸à¸µà¹ :</value> <value xml:lang="zh">没ææ¾å°ååºç»ï¼æ è¯ï¼</value> </property> + <property key="MarketingSegmentGroupPartyClassificationGroupId"> + <value xml:lang="en">Segment GroupParty ClassificationGroup Id</value> + <value xml:lang="it">Soggetto gruppo segmento classificazione</value> + </property> <property key="MarketingSegmentGroupProductStoreId"> <value xml:lang="de">Produktgeschäfts-ID</value> <value xml:lang="en">Product Store Id</value> @@ -595,6 +635,18 @@ <value xml:lang="th">สรà¹à¸²à¸à¸ªà¸à¸²à¸à¸°à¸à¸à¸à¸à¸¥à¸¸à¹à¸¡à¹à¸«à¸¡à¹</value> <value xml:lang="zh">æ°å»ºååºç»è§è²</value> </property> + <property key="MarketingSegmentGroupRoleCreatePermissionError"> + <value xml:lang="en">Error on creation Segment Group Role</value> + <value xml:lang="it">Errore durante la creazione di un nuovo ruolo gruppo segmento</value> + </property> + <property key="MarketingSegmentGroupRoleDeletePermissionError"> + <value xml:lang="en">Error on delete Segment Group Role</value> + <value xml:lang="it">Errore durante la cancellazione di un nuovo ruolo gruppo segmento</value> + </property> + <property key="MarketingSegmentGroupRoleUpdatePermissionError"> + <value xml:lang="en">Error on update Segment Group Role</value> + <value xml:lang="it">Errore durante l'aggiornamento di un nuovo ruolo gruppo segmento</value> + </property> <property key="MarketingSegmentGroupSegmentGroup"> <value xml:lang="en">Segment</value> <value xml:lang="es">Segmentos</value> @@ -670,6 +722,10 @@ <value xml:lang="th">รหัสà¸à¸£à¸°à¹à¸ à¸à¸à¸à¸à¸à¸¥à¸¸à¹à¸¡</value> <value xml:lang="zh">ååºç»ç±»åæ è¯</value> </property> + <property key="MarketingSegmentGroupUpdatePermissionError"> + <value xml:lang="en">Error on update Segment Group</value> + <value xml:lang="it">Errore durante l'aggiornamento di un gruppo segmento</value> + </property> <property key="MarketingServiceError"> <value xml:lang="en">There was a problem processing your request. Please try again. If the problem persists, please contact us.</value> <value xml:lang="fr">Il y a eu un problème durant le traitement de votre demande. SVP, essayez encore. Si le problème persiste, contactez-nous, merci.</value> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml Mon Mar 16 21:08:21 2009 @@ -24,7 +24,7 @@ <!-- SegmentGroup services --> <simple-method method-name="createSegmentGroup" short-description="createSegmentGroup"> <check-permission permission="MARKETING" action="_CREATE"> - <fail-property resource="MarketingUiLabels" property="SegmentCreateSegmentGroupPermissionError"/> + <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupCreatePermissionError"/> </check-permission> <check-errors/> @@ -37,7 +37,7 @@ </simple-method> <simple-method method-name="updateSegmentGroup" short-description="updateSegmentGroup"> <check-permission permission="MARKETING" action="_UPDATE"> - <fail-property resource="MarketingUiLabels" property="SegmentUpdateSegmentGroupPermissionError"/> + <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupUpdatePermissionError"/> </check-permission> <check-errors/> @@ -47,7 +47,7 @@ </simple-method> <simple-method method-name="deleteSegmentGroup" short-description="deleteSegmentGroup"> <check-permission permission="MARKETING" action="_DELETE"> - <fail-property resource="MarketingUiLabels" property="SegmentDeleteSegmentGroupPermissionError"/> + <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupDeletePermissionError"/> </check-permission> <check-errors/> @@ -58,7 +58,7 @@ <!-- SegmentGroupClassification methods --> <simple-method method-name="createSegmentGroupClassification" short-description="create a SegmentGroupClassification"> - <check-permission permission="MARKETING" action="_CREATE"><fail-property resource="MarketingUiLabels" property="SegmentGroupCreateSegmentGroupClassificationPermissionError"/></check-permission> + <check-permission permission="MARKETING" action="_CREATE"><fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupClassificationCreatePermissionError"/></check-permission> <check-errors/> <make-value entity-name="SegmentGroupClassification" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> @@ -66,14 +66,14 @@ <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateSegmentGroupClassification" short-description="update a SegmentGroupClassification"> - <check-permission permission="MARKETING" action="_UPDATE"><fail-property resource="MarketingUiLabels" property="SegmentGroupUpdateSegmentGroupClassificationPermissionError"/></check-permission> + <check-permission permission="MARKETING" action="_UPDATE"><fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupClassificationUpdatePermissionError"/></check-permission> <check-errors/> <entity-one entity-name="SegmentGroupClassification" value-field="lookedUpValue"/> <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteSegmentGroupClassification" short-description="delete a SegmentGroupClassification"> - <check-permission permission="MARKETING" action="_DELETE"><fail-property resource="MarketingUiLabels" property="SegmentGroupRemoveSegmentGroupClassificationPermissionError"/></check-permission> + <check-permission permission="MARKETING" action="_DELETE"><fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupClassificationDeletePermissionError"/></check-permission> <check-errors/> <entity-one entity-name="SegmentGroupClassification" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> @@ -81,7 +81,7 @@ <!-- SegmentGroupGeo methods --> <simple-method method-name="createSegmentGroupGeo" short-description="create a SegmentGroupGeo"> - <check-permission permission="MARKETING" action="_CREATE"><fail-property resource="MarketingUiLabels" property="SegmentGroupCreateSegmentGroupGeoPermissionError"/></check-permission> + <check-permission permission="MARKETING" action="_CREATE"><fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupGeoCreatePermissionError"/></check-permission> <check-errors/> <make-value entity-name="SegmentGroupGeo" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> @@ -89,14 +89,14 @@ <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateSegmentGroupGeo" short-description="update a SegmentGroupGeo"> - <check-permission permission="MARKETING" action="_UPDATE"><fail-property resource="MarketingUiLabels" property="SegmentGroupUpdateSegmentGroupGeoPermissionError"/></check-permission> + <check-permission permission="MARKETING" action="_UPDATE"><fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupGeoUpdatePermissionError"/></check-permission> <check-errors/> <entity-one entity-name="SegmentGroupGeo" value-field="lookedUpValue"/> <set-nonpk-fields value-field="lookedUpValue" map="parameters"/> <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteSegmentGroupGeo" short-description="delete a SegmentGroupGeo"> - <check-permission permission="MARKETING" action="_DELETE"><fail-property resource="MarketingUiLabels" property="SegmentGroupRemoveSegmentGroupGeoPermissionError"/></check-permission> + <check-permission permission="MARKETING" action="_DELETE"><fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupGeoDeletePermissionError"/></check-permission> <check-errors/> <entity-one entity-name="SegmentGroupGeo" value-field="lookedUpValue"/> <remove-value value-field="lookedUpValue"/> @@ -104,7 +104,7 @@ <!-- SegmentGroupRole methods --> <simple-method method-name="createSegmentGroupRole" short-description="create a SegmentGroupRole"> - <check-permission permission="MARKETING" action="_CREATE"><fail-property resource="MarketingUiLabels" property="SegmentGroupCreateSegmentGroupRolePermissionError"/></check-permission> + <check-permission permission="MARKETING" action="_CREATE"><fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupRoleCreatePermissionError"/></check-permission> <check-errors/> <make-value entity-name="SegmentGroupRole" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> @@ -112,14 +112,14 @@ <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateSegmentGroupRole" short-description="update a SegmentGroupRole"> - <check-permission permission="MARKETING" action="_UPDATE"><fail-property resource="MarketingUiLabels" property="SegmentGroupUpdateSegmentGroupRolePermissionError"/></check-permission> + <check-permission permission="MARKETING" action="_UPDATE"><fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupRoleUpdatePermissionError"/></check-permission> <check-errors/> <entity-one entity-name="SegmentGroupRole" value-field="lookedUpValue"/> <set-pk-fields value-field="lookedUpValue" map="parameters"/> <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteSegmentGroupRole" short-description="delete a SegmentGroupRole"> - <check-permission permission="MARKETING" action="_DELETE"><fail-property resource="MarketingUiLabels" property="SegmentGroupRemoveSegmentGroupRolePermissionError"/></check-permission> + <check-permission permission="MARKETING" action="_DELETE"><fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupRoleDeletePermissionError"/></check-permission> <check-errors/> <entity-one entity-name="SegmentGroupRole" value-field="lookedUpValue"/> <!-- <field-to-result field="lookedUpValue.partyId" result-name="partyId"/> --> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml Mon Mar 16 21:08:21 2009 @@ -56,7 +56,7 @@ <field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}"> <hyperlink also-hidden="false" target-type="intra-app" description="${segmentGroupId}" target="viewSegmentGroup?segmentGroupId=${segmentGroupId}"/> </field> - <field name="partyClassificationGroupId" title="${uiLabelMap.SegmentGroupPartyClassificationGroupId}"><display/></field> + <field name="partyClassificationGroupId" title="${uiLabelMap.MarketingSegmentGroupPartyClassificationGroupId}"><display/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteSegmentGroupClass?segmentGroupId=${segmentGroupId}&partyClassificationGroupId=${partyClassificationGroupId}" description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml Mon Mar 16 21:08:21 2009 @@ -84,10 +84,12 @@ <hyperlink target="deleteTrackingCode?trackingCodeId=${trackingCodeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> + <!-- UNUSED FORM <form name="FindTrackingCode" type="single" target="ListTrackingCode" title="" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="TrackingCode"/> </form> + --> <form name="EditTrackingCodeOrder" type="single" target="updateTrackingCodeOrder" title="" default-map-name="trackingCodeOrder" header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="trackingCodeOrder==null" target="createTrackingCodeOrder"/> Modified: ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml Mon Mar 16 21:08:21 2009 @@ -65,7 +65,7 @@ </container> </widgets> <fail-widgets> - <label style="h3">${uiLabelMap.SegmentGroupMgrViewPermissionError}</label> + <label style="h3">${uiLabelMap.MarketingSegmentGroupMgrViewPermissionError}</label> </fail-widgets> </section> </decorator-section> @@ -182,7 +182,7 @@ <include-form name="listSegmentGroupClass" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> </widgets> <fail-widgets> - <label style="h3">${uiLabelMap.SegmentGroupMgrViewPermissionError}</label> + <label style="h3">${uiLabelMap.MarketingSegmentGroupMgrViewPermissionError}</label> </fail-widgets> </section> </decorator-section> @@ -224,7 +224,7 @@ <include-form name="listSegmentGroupGeo" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> </widgets> <fail-widgets> - <label style="h3">${uiLabelMap.SegmentGroupMgrViewPermissionError}</label> + <label style="h3">${uiLabelMap.MarketingSegmentGroupMgrViewPermissionError}</label> </fail-widgets> </section> </decorator-section> @@ -266,7 +266,7 @@ <include-form name="listSegmentGroupRole" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> </widgets> <fail-widgets> - <label style="h3">${uiLabelMap.SegmentGroupMgrViewPermissionError}</label> + <label style="h3">${uiLabelMap.MarketingSegmentGroupMgrViewPermissionError}</label> </fail-widgets> </section> </decorator-section> Modified: ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml Mon Mar 16 21:08:21 2009 @@ -146,6 +146,7 @@ </widgets> </section> </screen> + <!-- UNUSED FORM <screen name="FindTrackingCode"> <section> <actions> @@ -173,7 +174,7 @@ </widgets> </section> </screen> - + --> <screen name="EditTrackingCodeOrder"> <section> <actions> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml Mon Mar 16 21:08:21 2009 @@ -97,7 +97,7 @@ <field name="ordersLink" widget-style="buttontext"> <hyperlink description="${uiLabelMap.CommonOrders}" target="ListRequirementOrders?requirementId=${requirementId}"/> </field> - <field name="deleteLink" widget-style="buttontext" title=" "> + <field name="deleteLink" widget-style="buttontext" title="${uiLabelMap.CommonEmptyHeader}"> <hyperlink description="${uiLabelMap.CommonRemove}" target="deleteRequirement?requirementId=${requirementId}"/> </field> </form> Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Mon Mar 16 21:08:21 2009 @@ -123,6 +123,10 @@ <value xml:lang="th">รหัสà¸à¸£à¸°à¹à¸ à¸à¸à¸¥à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸ªà¸·à¹à¸à¸ªà¸²à¸£</value> <value xml:lang="zh">æ²éäºä»¶ç±»åæ è¯</value> </property> + <property key="FormFieldTitle_communicationPartyId"> + <value xml:lang="en">Communication Party Id</value> + <value xml:lang="it">Soggetto comuicazione</value> + </property> <property key="FormFieldTitle_contactListId"> <value xml:lang="de">Kontaktliste ID</value> <value xml:lang="en">Contact List Id</value> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Mon Mar 16 21:08:21 2009 @@ -933,6 +933,6 @@ </drop-down> </field> - <field name="submit" title=" "><submit/></field> + <field name="submit" title="${uiLabelMap.CommonSubmit}"><submit/></field> </form> </forms> Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Mon Mar 16 21:08:21 2009 @@ -624,6 +624,14 @@ <value xml:lang="it">Quantità Annullata</value> <value xml:lang="th">ยà¸à¹à¸¥à¸´à¸à¸à¸³à¸à¸§à¸</value> </property> + <property key="FormFieldTitle_canclAutmExtTime"> + <value xml:lang="en">The time period (before the end of the thruedate) after which the automatic extension of the subscription will be executed.</value> + <value xml:lang="it">Il periodo di tempo (prima della fine di thruedate) dopo che l'estensione automatica della sottoscrizione eseguita.</value> + </property> + <property key="FormFieldTitle_canclAutmExtTimeUomId"> + <value xml:lang="en">The subscription will be extended at the end of the subscription period with a new order</value> + <value xml:lang="it">La sottoscrizione sarà estessa all fine del periodo della sottoscrizione con un nuovo ordine</value> + </property> <property key="FormFieldTitle_carrierId"> <value xml:lang="de">Transportunternehmen ID</value> <value xml:lang="en">carrier Id</value> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Mon Mar 16 21:08:21 2009 @@ -418,7 +418,7 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> - <field name="deleteLink" title=" " widget-style="buttontext"> + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteProductPrice" description="${uiLabelMap.CommonDelete}" link-type="hidden-form" also-hidden="false"> <parameter param-name="productId"/><parameter param-name="productPriceTypeId"/><parameter param-name="productPricePurposeId"/> <parameter param-name="currencyUomId"/><parameter param-name="productStoreGroupId"/><parameter param-name="fromDate"/> @@ -1661,7 +1661,7 @@ <display description="${facilityLocation.areaId} ${facilityLocation.aisleId} ${facilityLocation.sectionId} ${facilityLocation.levelId} ${facilityLocation.positionId} [${locationSeqId}] (${locationType.description})"/> </field> <field name="submitButton" position="2" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> - <field name="deleteLink" position="2" title=" " widget-style="buttontext"> + <field name="deleteLink" position="2" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteProductFacilityLocation" description="${uiLabelMap.CommonDelete}" also-hidden="false" link-type="hidden-form"> <parameter param-name="productId"/><parameter param-name="facilityId"/><parameter param-name="locationSeqId"/> </hyperlink> Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Mon Mar 16 21:08:21 2009 @@ -714,7 +714,7 @@ <field name="oversizeUnit" title="${uiLabelMap.ProductOversizeUnit}" tooltip="${uiLabelMap.ProductEach} ((${uiLabelMap.ProductHeight} * 2) + (${uiLabelMap.ProductWidth} * 2) + ${uiLabelMap.ProductDept}) >= ${uiLabelMap.CommonThis} ${uiLabelMap.ProductNumber}"><text/></field> <field name="oversizePrice" title="${uiLabelMap.ProductOversizeSurcharge}" tooltip="${uiLabelMap.ProductShipamount} : ${uiLabelMap.ProductShipamount} + (${uiLabelMap.ProductOversizeNumber} * ${uiLabelMap.ProductSurcharge})"><text/></field> - <field name="WeightTitle2" title=" " tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> + <field name="WeightTitle2" title="${uiLabelMap.CommonEmptyHeader}" tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> <field name="wmin" title="${uiLabelMap.ProductMinWt}"><text/></field> <field name="wmax" title="${uiLabelMap.ProductMaxWt}"><text/></field> <field name="weightBreakId"> @@ -736,7 +736,7 @@ </field> <field name="wprice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><text/></field> - <field name="QuantityTitle2" title=" " tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> + <field name="QuantityTitle2" title="${uiLabelMap.CommonEmptyHeader}" tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> <field name="qmin" title="${uiLabelMap.ProductMinQt}"><text/></field> <field name="qmax" title="${uiLabelMap.ProductMaxQt}"><text/></field> <field name="quantityBreakId"> @@ -757,7 +757,7 @@ </field> <field name="qprice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><text/></field> - <field name="PriceTitle2" title=" " tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> + <field name="PriceTitle2" title="${uiLabelMap.CommonEmptyHeader}" tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> <field name="pmin" title="${uiLabelMap.ProductMinPr}"><text/></field> <field name="pmax" title="${uiLabelMap.ProductMaxPr}"><text/></field> <field name="priceBreakId"> @@ -861,7 +861,7 @@ <field name="oversizePrice" title="${uiLabelMap.ProductOversizeSurcharge}" tooltip="${uiLabelMap.ProductShipamount} : ${uiLabelMap.ProductShipamount} + (${uiLabelMap.ProductNumber} ${uiLabelMap.ProductOversize} ${uiLabelMap.ProductProducts} * ${uiLabelMap.ProductSurcharge})"><display/></field> <field name="WeightTitle1" title="${uiLabelMap.ProductWeightTitle1}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> - <field name="WeightTitle2" title=" " tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> + <field name="WeightTitle2" title="${uiLabelMap.CommonEmptyHeader}" tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> <field name="weightBreakId"> <display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity}"/> </field> @@ -871,7 +871,7 @@ <field name="weightUnitPrice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><display/></field> <field name="QuantityTitle1" title="${uiLabelMap.ProductQuantityTitle1}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> - <field name="QuantityTitle2" title=" " tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> + <field name="QuantityTitle2" title="${uiLabelMap.CommonEmptyHeader}" tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> <field name="quantityBreakId"> <display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity}"/> </field> @@ -881,7 +881,7 @@ <field name="quantityUnitPrice" title="${uiLabelMap.ProductPerUnitPrice}" tooltip="${uiLabelMap.ProductOnlyAppliesWithinSpan}"><display/></field> <field name="PriceTitle1" title="${uiLabelMap.ProductPriceTitle1}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> - <field name="PriceTitle2" title=" " tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> + <field name="PriceTitle2" title="${uiLabelMap.CommonEmptyHeader}" tooltip="${uiLabelMap.ProductMinMax}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> <field name="priceBreakId"> <display-entity entity-name="QuantityBreak" key-field-name="quantityBreakId" description="${fromQuantity} - ${thruQuantity}"/> </field> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Mon Mar 16 21:08:21 2009 @@ -1142,7 +1142,7 @@ <field name="allocatedCost"><text/></field> <field name="comments"><text size="60" maxlength="255"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field> - <field name="deleteLink" title=" " widget-style="buttontext"> + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortFixedAssetAssign?workEffortId=${workEffortId}&fixedAssetId=${fixedAssetId}&fromDate=${fromDate}"/> </field> </form> @@ -1206,7 +1206,7 @@ <field name="repeatInterval"><text/></field> <field name="recurrenceOffset"><text/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field> - <field name="deleteLink" title=" " widget-style="buttontext"> + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortEventReminder?workEffortId=${workEffortId}&contactMechId=${contactMechId}&sequenceId=${sequenceId}"/> </field> </form> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml Mon Mar 16 21:08:21 2009 @@ -393,7 +393,7 @@ <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl"/></html></platform-specific> </widgets> <fail-widgets> - <container><label style="head2" text="Sorry, digital product upload is not enabled."></label></container> + <container><label style="head2" text="${uiLabelMap.EcommerceSorryDigitalProductUploadNotEnabled}"></label></container> </fail-widgets> </section> </decorator-section> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml Mon Mar 16 21:08:21 2009 @@ -48,10 +48,10 @@ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"> <submit button-type="button"/> </field> - <field name="createBlog" title=" " widget-style="buttontext"> + <field name="createBlog" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonNew} ${uiLabelMap.ContentForum}" target="EditBlogArticle"/> </field> - <field name="createForum" title=" " widget-style="buttontext"> + <field name="createForum" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonNew} ${uiLabelMap.ContentForum}" target="EditForumArticle"/> </field> </form> Modified: ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml Mon Mar 16 21:08:21 2009 @@ -19,30 +19,18 @@ under the License. --> <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <property key="CaptchaMissingError"> - <value xml:lang="en">Verify code captcha is missing or wrong</value> - <value xml:lang="fr">Vérifier le code captcha, il est absent ou erroné</value> - <value xml:lang="it">Verifica il codice captcha, è mancante o errato</value> - <value xml:lang="th">รหัสà¸à¸±à¸§à¹à¸¥à¸à¸à¸µà¹à¸à¹à¸²à¸à¸à¸£à¸à¸à¸¡à¸µà¸à¹à¸à¸à¸´à¸à¸à¸¥à¸²à¸</value> - </property> - <property key="FirstName_Missing"> - <value xml:lang="en">Your firstName is missing</value> - <value xml:lang="fr">Votre prénom est absent</value> - <value xml:lang="it">Nome mancante</value> - <value xml:lang="th">à¸à¸£à¸¸à¸à¸²à¸à¸£à¸à¸à¸à¸·à¹à¸à¸à¸à¸à¸à¹à¸²à¸</value> - </property> - <property key="LastName_Missing"> - <value xml:lang="en">Your lastname is missing</value> - <value xml:lang="fr">Votre nom est absent</value> - <value xml:lang="it">Cognome mancante</value> - <value xml:lang="th">à¸à¸£à¸¸à¸à¸²à¸à¸£à¸à¸à¸à¸²à¸¡à¸ªà¸à¸¸à¸¥à¸à¸à¸à¸à¹à¸²à¸</value> - </property> <property key="MyPortalAppBar"> <value xml:lang="en">My Page App Bar</value> <value xml:lang="fr">Menu des applications</value> <value xml:lang="it">Mia pagina</value> <value xml:lang="th">à¹à¸à¸à¸à¸£à¸´à¹à¸à¸à¸±à¸à¸à¸à¸à¸à¸±à¸</value> </property> + <property key="MyPortalCaptchaMissingError"> + <value xml:lang="en">Verify code captcha is missing or wrong</value> + <value xml:lang="fr">Vérifier le code captcha, il est absent ou erroné</value> + <value xml:lang="it">Verifica il codice captcha, è mancante o errato</value> + <value xml:lang="th">รหัสà¸à¸±à¸§à¹à¸¥à¸à¸à¸µà¹à¸à¹à¸²à¸à¸à¸£à¸à¸à¸¡à¸µà¸à¹à¸à¸à¸´à¸à¸à¸¥à¸²à¸</value> + </property> <property key="MyPortalCommunicationEventId"> <value xml:lang="en">Communication Event id:</value> <value xml:lang="fr">Réf. d'évènement de comm.</value> @@ -55,6 +43,10 @@ <value xml:lang="it">Mie comunicazioni</value> <value xml:lang="th">à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸±à¸</value> </property> + <property key="MyPortalCommunicationsOfParty"> + <value xml:lang="en">Communications Of Party</value> + <value xml:lang="it">Comunicazioni dai soggetti</value> + </property> <property key="MyPortalCompanyComms"> <value xml:lang="en">Company communications</value> <value xml:lang="fr">Communications de l'entreprise</value> @@ -85,6 +77,12 @@ <value xml:lang="it">Mio portale</value> <value xml:lang="th">สà¹à¸§à¸à¸à¸±à¸§</value> </property> + <property key="MyPortalFirstNameMissing"> + <value xml:lang="en">Your firstName is missing</value> + <value xml:lang="fr">Votre prénom est absent</value> + <value xml:lang="it">Nome mancante</value> + <value xml:lang="th">à¸à¸£à¸¸à¸à¸²à¸à¸£à¸à¸à¸à¸·à¹à¸à¸à¸à¸à¸à¹à¸²à¸</value> + </property> <property key="MyPortalIncomingCustRequests"> <value xml:lang="en">Incoming customer requests</value> <value xml:lang="fr">Nouvelles demandes utilisateur</value> @@ -97,6 +95,12 @@ <value xml:lang="it">Mie informazioni</value> <value xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸à¸à¸à¸±à¸</value> </property> + <property key="MyPortalLastNameMissing"> + <value xml:lang="en">Your lastname is missing</value> + <value xml:lang="fr">Votre nom est absent</value> + <value xml:lang="it">Cognome mancante</value> + <value xml:lang="th">à¸à¸£à¸¸à¸à¸²à¸à¸£à¸à¸à¸à¸²à¸¡à¸ªà¸à¸¸à¸¥à¸à¸à¸à¸à¹à¸²à¸</value> + </property> <property key="MyPortalMyTasks"> <value xml:lang="en">myTasks</value> <value xml:lang="it">Miei compiti</value> @@ -111,6 +115,18 @@ <value xml:lang="it">Nuovo messaggio</value> <value xml:lang="th">à¸à¹à¸à¸à¸§à¸²à¸¡à¹à¸«à¸¡à¹</value> </property> + <property key="MyPortalNewRegistration"> + <value xml:lang="en">New Registration </value> + <value xml:lang="fr">Nouvel enregistrement</value> + <value xml:lang="it">Nuova utente</value> + <value xml:lang="th">ลà¸à¸à¸°à¹à¸à¸µà¸¢à¸ </value> + </property> + <property key="MyPortalNoAccess"> + <value xml:lang="en">You do not have access to this information</value> + <value xml:lang="fr">Vous n'avez pas accès à cette information</value> + <value xml:lang="it">Non hai l'accesso a queste informazioni</value> + <value xml:lang="th">à¸à¸¸à¸à¹à¸¡à¹à¸¡à¸µà¸à¹à¸à¸¡à¸¹à¸¥à¸à¸¢à¸¹à¹à¹à¸à¸£à¸°à¸à¸</value> + </property> <property key="MyPortalNoAccess1"> <value xml:lang="en">No Access priviledges has been setup.</value> <value xml:lang="fr">Aucun accès privilégié n'a été paramétré.</value> @@ -137,12 +153,6 @@ <value xml:lang="it">Usare l'utente 'DemoCustomer' o 'DemoEmployee' per una dimostrazione.</value> <value xml:lang="th">à¸à¸³à¸¥à¸à¸à¸à¸¹à¹à¹à¸à¹à¹à¸à¹à¸ DemoCustomer à¹à¸¥à¸° DemoEmployee à¹à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸</value> </property> - <property key="MyPortalNoAccess"> - <value xml:lang="en">You do not have access to this information</value> - <value xml:lang="fr">Vous n'avez pas accès à cette information</value> - <value xml:lang="it">Non hai l'accesso a queste informazioni</value> - <value xml:lang="th">à¸à¸¸à¸à¹à¸¡à¹à¸¡à¸µà¸à¹à¸à¸¡à¸¹à¸¥à¸à¸¢à¸¹à¹à¹à¸à¸£à¸°à¸à¸</value> - </property> <property key="MyPortalOpenCustomerRequests"> <value xml:lang="en">My Open Customer Requests</value> <value xml:lang="fr">Mes demandes de clients en-cours</value> @@ -167,12 +177,30 @@ <value xml:lang="it">pagine visibili dalla pagina principale.</value> <value xml:lang="th">สามารà¸à¹à¸«à¹à¸à¸«à¸à¹à¸²à¸à¸·à¹à¸à¸à¸à¸«à¸à¹à¸²à¸«à¸¥à¸±à¸à¹à¸à¹</value> </property> + <property key="MyPortalPicCaptcha"> + <value xml:lang="en">Code Captcha</value> + <value xml:lang="fr">Code captcha</value> + <value xml:lang="it">Codice captcha</value> + <value xml:lang="th">รหัสà¸à¸£à¸§à¸à¸ªà¸à¸</value> + </property> <property key="MyPortalProfile"> <value xml:lang="en">My Profile</value> <value xml:lang="fr">Mon Profil</value> <value xml:lang="it">Mio profilo</value> <value xml:lang="th">à¸à¸£à¸°à¸§à¸±à¸à¸´à¸ªà¹à¸§à¸à¸à¸±à¸§à¸à¸à¸à¸à¸±à¸</value> </property> + <property key="MyPortalRegisterComplete"> + <value xml:lang="en">Register of new person is complete...Please </value> + <value xml:lang="fr">L'enregistrement de la nouvelle personne est complet...SVP</value> + <value xml:lang="it">Creazione nuovo utente completata...prego </value> + <value xml:lang="th">à¸à¸²à¸£à¸¥à¸à¸à¸°à¹à¸à¸µà¸¢à¸à¹à¸«à¸¡à¹à¸ªà¸³à¸«à¸£à¸±à¸à¸à¸¸à¸à¸à¸¥à¹à¸à¹à¸à¸³à¸à¸²à¸£à¹à¸ªà¸£à¹à¸à¸ªà¸´à¹à¸à¸ªà¸¡à¸à¸¹à¸£à¸à¹à¹à¸¥à¹à¸§...สามารà¸à¹à¸à¹à¸²à¸ªà¸¹à¹à¸£à¸°à¸à¸à¹à¸à¹ </value> + </property> + <property key="MyPortalRegisterForCustomer"> + <value xml:lang="en">Register for customer</value> + <value xml:lang="fr">Enregistrement pour le client</value> + <value xml:lang="it">Registrazione per cliente</value> + <value xml:lang="th">ลà¸à¸à¸°à¹à¸à¸µà¸¢à¸à¸ªà¸³à¸«à¸£à¸±à¸à¸¥à¸¹à¸à¸à¹à¸²</value> + </property> <property key="MyPortalReloadImage"> <value xml:lang="en">reload image</value> <value xml:lang="it">Ricarica immagine</value> @@ -225,11 +253,21 @@ <value xml:lang="it">Mie timbrature</value> <value xml:lang="th">à¸à¸²à¸£à¸²à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸à¸à¸à¸à¸à¸±à¸</value> </property> - <property key="NewRegistration"> - <value xml:lang="en">New Registration </value> - <value xml:lang="fr">Nouvel enregistrement</value> - <value xml:lang="it">Nuovo utente</value> - <value xml:lang="th">ลà¸à¸à¸°à¹à¸à¸µà¸¢à¸ </value> + <property key="MyPortalToComplete"> + <value xml:lang="en">To Complete</value> + <value xml:lang="it">Da completare</value> + </property> + <property key="MyPortalUserLogin"> + <value xml:lang="en">User Login</value> + <value xml:lang="fr">Identifiant de connexion</value> + <value xml:lang="it">Login utente</value> + <value xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¸¥à¸à¸à¸°à¹à¸à¸µà¸¢à¸</value> + </property> + <property key="MyPortalVerifyCaptcha"> + <value xml:lang="en">Verify captcha code</value> + <value xml:lang="fr">Vérifier le code captcha</value> + <value xml:lang="it">Verifica codice captcha</value> + <value xml:lang="th">à¹à¸ªà¹à¸£à¸«à¸±à¸ªà¸à¸²à¸¡à¸£à¸¹à¸</value> </property> <property key="PageTitleMyPortal"> <value xml:lang="en">My Portal for : </value> @@ -243,34 +281,4 @@ <value xml:lang="it">Pagina mio portale</value> <value xml:lang="th">หà¸à¹à¸²à¸ªà¹à¸§à¸à¸à¸±à¸§à¸à¸à¸à¸à¸±à¸</value> </property> - <property key="PicCaptcha"> - <value xml:lang="en">Code Captcha</value> - <value xml:lang="fr">Code captcha</value> - <value xml:lang="it">Codice captcha</value> - <value xml:lang="th">รหัสà¸à¸£à¸§à¸à¸ªà¸à¸</value> - </property> - <property key="RegisterComplete"> - <value xml:lang="en">Register of new person is complete...Please </value> - <value xml:lang="fr">L'enregistrement de la nouvelle personne est complet...SVP</value> - <value xml:lang="it">Creazione nuovo utente completata...prego </value> - <value xml:lang="th">à¸à¸²à¸£à¸¥à¸à¸à¸°à¹à¸à¸µà¸¢à¸à¹à¸«à¸¡à¹à¸ªà¸³à¸«à¸£à¸±à¸à¸à¸¸à¸à¸à¸¥à¹à¸à¹à¸à¸³à¸à¸²à¸£à¹à¸ªà¸£à¹à¸à¸ªà¸´à¹à¸à¸ªà¸¡à¸à¸¹à¸£à¸à¹à¹à¸¥à¹à¸§...สามารà¸à¹à¸à¹à¸²à¸ªà¸¹à¹à¸£à¸°à¸à¸à¹à¸à¹ </value> - </property> - <property key="RegisterForCustomer"> - <value xml:lang="en">Register for customer</value> - <value xml:lang="fr">Enregistrement pour le client</value> - <value xml:lang="it">Registrazione per cliente</value> - <value xml:lang="th">ลà¸à¸à¸°à¹à¸à¸µà¸¢à¸à¸ªà¸³à¸«à¸£à¸±à¸à¸¥à¸¹à¸à¸à¹à¸²</value> - </property> - <property key="UserLogin"> - <value xml:lang="en">User Login</value> - <value xml:lang="fr">Identifiant de connexion</value> - <value xml:lang="it">Login utente</value> - <value xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¸¥à¸à¸à¸°à¹à¸à¸µà¸¢à¸</value> - </property> - <property key="VerifyCaptcha"> - <value xml:lang="en">Verify captcha code</value> - <value xml:lang="fr">Vérifier le code captcha</value> - <value xml:lang="it">Verifica codice captcha</value> - <value xml:lang="th">à¹à¸ªà¹à¸£à¸«à¸±à¸ªà¸à¸²à¸¡à¸£à¸¹à¸</value> - </property> </resource> Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Mon Mar 16 21:08:21 2009 @@ -315,8 +315,8 @@ <call-bsh><![CDATA[ org.ofbiz.common.Captcha.getCodeCaptcha(request,response); ]]></call-bsh> - <if-empty field="parameters.firstName"><property-to-field field="errorMessage" resource="MyPortalUiLabels" property="FirstName_Missing"/><field-to-list field="errorMessage" list="error_list"/></if-empty> - <if-empty field="parameters.lastName"><property-to-field field="errorMessage" resource="MyPortalUiLabels" property="LastName_Missing"/><field-to-list field="errorMessage" list="error_list"/></if-empty> + <if-empty field="parameters.firstName"><property-to-field field="errorMessage" resource="MyPortalUiLabels" property="MyPortalFirstNameMissing"/><field-to-list field="errorMessage" list="error_list"/></if-empty> + <if-empty field="parameters.lastName"><property-to-field field="errorMessage" resource="MyPortalUiLabels" property="MyPortalLastNameMissing"/><field-to-list field="errorMessage" list="error_list"/></if-empty> <if-empty field="parameters.USERNAME"><property-to-field field="errorMessage" resource="PartyUiLabels" property="PartyUserNameMissing"/><field-to-list field="errorMessage" list="error_list"/></if-empty> <if-empty field="parameters.PASSWORD"><property-to-field field="errorMessage" resource="PartyUiLabels" property="PartyPasswordMissing"/><field-to-list field="errorMessage" list="error_list"/></if-empty> <if-empty field="parameters.USER_EMAIL"><property-to-field field="errorMessage" resource="PartyUiLabels" property="PartyEmailAddressMissing"/><field-to-list field="errorMessage" list="error_list"/></if-empty> @@ -411,7 +411,7 @@ <field-to-request field="emailPurposeContext.contactMechId" request-name="contactMechId"/> <return response-code="resultPage"/> <else> - <property-to-field field="errorMessage" resource="MyPortalUiLabels" property="CaptchaMissingError"/><field-to-list field="errorMessage" list="error_list"/> + <property-to-field field="errorMessage" resource="MyPortalUiLabels" property="MyPortalCaptchaMissingError"/><field-to-list field="errorMessage" list="error_list"/> </else> </if-compare> <else> Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Mon Mar 16 21:08:21 2009 @@ -179,7 +179,7 @@ <set field="partyId" from-field="parameters.partyId"/> </actions> <widgets> - <label style="h2" text="${uiLabelMap.RegisterComplete}"/><link target="main" style="h2" text="${uiLabelMap.CommonBeLogged}"></link> + <label style="h2" text="${uiLabelMap.MyPortalRegisterComplete}"/><link target="main" style="h2" text="${uiLabelMap.CommonBeLogged}"></link> <screenlet title="${uiLabelMap.PartyPersonalInformation}"> <include-form name="ViewPartyPerson" location="component://myportal/widget/MyPortalForms.xml"/> </screenlet> @@ -188,7 +188,7 @@ <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.NewRegistration}"/> + <label text="${uiLabelMap.MyPortalNewRegistration}"/> </container> </container> <container style="screenlet-body"> Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Mon Mar 16 21:08:21 2009 @@ -260,14 +260,14 @@ <field name="middleName" title="${uiLabelMap.PartyMiddleName}" ><text size="40" maxlength="60"/></field> <field name="lastName" title="${uiLabelMap.PartyLastName}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="40" maxlength="60"/></field> <field name="USER_EMAIL" title="${uiLabelMap.CommonEmail}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="60" maxlength="250"/></field> - <field name="UserLogin" title="${uiLabelMap.UserLogin}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> + <field name="UserLogin" title="${uiLabelMap.MyPortalUserLogin}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> <field name="USERNAME" title="${uiLabelMap.CommonUsername}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="250"/></field> <field name="PASSWORD" title="${uiLabelMap.CommonPassword}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><password size="15" maxlength="250"/></field> <field name="CONFIRM_PASSWORD" title="${uiLabelMap.CommonPassword}" tooltip="* ${uiLabelMap.CommonConfirm}" widget-style="required"><password size="15" maxlength="250"/></field> - <field name="VerifyCaptchaTitle" title="${uiLabelMap.VerifyCaptcha}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> - <field name="picOfcaptcha" title="${uiLabelMap.PicCaptcha}"><image value="${parameters.captchaFileName}" height="40" width="149"/></field> - <field name="reload" title=" "><hyperlink target="newRegisterLogin" description="${uiLabelMap.MyPortalReloadImage}"/></field> - <field name="captcha" title="${uiLabelMap.VerifyCaptcha}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="23" maxlength="30"/></field> + <field name="VerifyCaptchaTitle" title="${uiLabelMap.MyPortalVerifyCaptcha}" title-area-style="group-label"><display description=" " also-hidden="false"/></field> + <field name="picOfcaptcha" title="${uiLabelMap.MyPortalPicCaptcha}"><image value="${parameters.captchaFileName}" height="40" width="149"/></field> + <field name="reload" title="${uiLabelMap.CommonEmptyHeader}"><hyperlink target="newRegisterLogin" description="${uiLabelMap.MyPortalReloadImage}"/></field> + <field name="captcha" title="${uiLabelMap.MyPortalVerifyCaptcha}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="23" maxlength="30"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" title-area-style="group-label"><submit button-type="button"/></field> <field name="captchaCode"><hidden value="${parameters.ID_KEY}"/></field> </form> Modified: ofbiz/trunk/specialpurpose/myportal/widget/login.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/login.ftl?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/login.ftl (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/login.ftl Mon Mar 16 21:08:21 2009 @@ -52,7 +52,7 @@ <br/> <a href="<@ofbizUrl>forgotPassword</@ofbizUrl>">${uiLabelMap.CommonForgotYourPassword}?</a> <br/> - <a href="<@ofbizUrl>newRegisterLogin</@ofbizUrl>">${uiLabelMap.NewRegistration}</a> + <a href="<@ofbizUrl>newRegisterLogin</@ofbizUrl>">${uiLabelMap.MyPortalNewRegistration}</a> </form> </div> </div> Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Mon Mar 16 21:08:21 2009 @@ -281,6 +281,10 @@ <value xml:lang="th">à¹à¸à¹à¹à¸à¹à¸à¸£à¹à¸à¸</value> <value xml:lang="zh">ç¼è¾é¡¹ç®</value> </property> + <property key="PageTitleEditProjectOrder"> + <value xml:lang="en">Edit Project Order</value> + <value xml:lang="it">Aggiorna progetto ordine</value> + </property> <property key="PageTitleEditSkill"> <value xml:lang="en">Edit Requirement</value> <value xml:lang="fr">Modifier le besoin</value> @@ -752,6 +756,10 @@ <value xml:lang="th">à¹à¸à¸à¸à¸±à¸à¸à¸¸à¸¡à¸à¸²à¸£à¸à¸³à¸«à¸à¸à¸à¸²à¸</value> <value xml:lang="zh">çç¹å¾</value> </property> + <property key="ProjectMgrListOrder"> + <value xml:lang="en">List Order</value> + <value xml:lang="it">Lista Ordini</value> + </property> <property key="ProjectMgrMon"> <value xml:lang="en">Mon</value> <value xml:lang="fr">lun</value> @@ -1014,6 +1022,10 @@ <value xml:lang="th">à¸à¸²à¸£à¸¢à¸à¹à¸§à¹à¸</value> <value xml:lang="zh">åå¸</value> </property> + <property key="ProjectMgrRemoveLinkFromProject"> + <value xml:lang="en">Remove Link From The Project</value> + <value xml:lang="it">Rimuovi legame dal progetto</value> + </property> <property key="ProjectMgrRequestWorkEffortList"> <value xml:lang="en">Cust Request WorkEffort List</value> <value xml:lang="fr">List des demandes de tâches client</value> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Mon Mar 16 21:08:21 2009 @@ -118,7 +118,7 @@ </condition> <link target="EditProjectTasks?projectId=${projectId}"/> </menu-item> - <menu-item name="orders" title="${uiLabelMap.Orders}"> + <menu-item name="orders" title="${uiLabelMap.OrderOrders}"> <condition> <and> <if-compare field="hasUpdatePermission" operator="equals" value="true"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Mon Mar 16 21:08:21 2009 @@ -320,7 +320,7 @@ <screenlet title="${uiLabelMap.OrderFindOrder}"> <include-form name="FindOrders" location="component://projectmgr/widget/forms/ProjectForms.xml"/> </screenlet> - <screenlet title="List Order"> + <screenlet title="${uiLabelMap.ProjectMgrListOrder}"> <include-form name="ListOrderInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/> </screenlet> </decorator-section> @@ -643,7 +643,7 @@ </entity-and> </actions> <widgets> - <screenlet title="List Order"> + <screenlet title="${uiLabelMap.ProjectMgrListOrder}"> <include-form name="ListOrderInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/> </screenlet> </widgets> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Mon Mar 16 21:08:21 2009 @@ -364,7 +364,7 @@ <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field> <field name="orderDate"><display/></field> <field name="entryDate"><display/></field> - <field name="linkProjectOrder" title=" " widget-style="buttontext" use-when="headerItem.equals("editProjectOrders")"><hyperlink target="unLinkProjectOrder?workEffortId=${projectId}&orderId=${orderId}&projectId=${projectId}" description="Remove Link From The Project"/></field> + <field name="linkProjectOrder" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="headerItem.equals("editProjectOrders")"><hyperlink target="unLinkProjectOrder?workEffortId=${projectId}&orderId=${orderId}&projectId=${projectId}" description="${uiLabelMap.ProjectMgrRemoveLinkFromProject}"/></field> </form> <form name="projectAssoOrder" type="list" list-name="listProjectAssoOrder" extends="ListProjects" extends-resource="component://projectmgr/widget/forms/ProjectForms.xml"> Modified: ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml Mon Mar 16 21:08:21 2009 @@ -87,4 +87,8 @@ <value xml:lang="en">Work List</value> <value xml:lang="it">Lista lavoro</value> </property> + <property key="SharkXPDLRepository"> + <value xml:lang="en">XPDL Repository</value> + <value xml:lang="it">Repository XPDL</value> + </property> </resource> Modified: ofbiz/trunk/specialpurpose/shark/widget/RepositoryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/widget/RepositoryScreens.xml?rev=755005&r1=755004&r2=755005&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/shark/widget/RepositoryScreens.xml (original) +++ ofbiz/trunk/specialpurpose/shark/widget/RepositoryScreens.xml Mon Mar 16 21:08:21 2009 @@ -24,7 +24,7 @@ <section> <actions> <set field="headerItem" value="main"/> - <set field="titleProperty" value="XPDL Repository"/> + <set field="titleProperty" value="SharkXPDLRepository"/> <script location="component://shark/webapp/shark/WEB-INF/actions/repository/showRepository.bsh"/> </actions> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |