svn commit: r1715466 - in /ofbiz/branches/release14.12: ./ applications/content/config/ applications/content/data/ applications/order/data/ applications/product/config/ applications/product/data/help
Locked
svn commit: r1715466 - in /ofbiz/branches/release14.12: ./ applications/content/config/ applications/content/data/ applications/order/data/ applications/product/config/ applications/product/data/help
 
|
Author: deepak
Date: Sat Nov 21 06:34:36 2015 New Revision: 1715466 URL: http://svn.apache.org/viewvc?rev=1715466&view=rev Log: Applied fix from trunk for revision: 1706593 === [OFBIZ-6171] Replacing 'Open for Business' references with 'Apache OFBiz'from remaining occurences. Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/applications/content/config/ContentEntityLabels.xml ofbiz/branches/release14.12/applications/content/data/DataCategoryData.xml ofbiz/branches/release14.12/applications/order/data/SalesOrderDemoData.xml ofbiz/branches/release14.12/applications/product/config/ProductEntityLabels.xml ofbiz/branches/release14.12/applications/product/config/ProductUiLabels.xml ofbiz/branches/release14.12/applications/product/data/helpdata/HELP_PRODUCT_Catalog_Promos.xml ofbiz/branches/release14.12/applications/product/data/helpdata/HELP_PRODUCT_Features.xml ofbiz/branches/release14.12/applications/product/data/helpdata/HELP_PRODUCT_Product Stores.xml ofbiz/branches/release14.12/framework/common/config/CommonHelpUiLabels.xml ofbiz/branches/release14.12/framework/start/build.xml ofbiz/branches/release14.12/macros.xml ofbiz/branches/release14.12/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl ofbiz/branches/release14.12/specialpurpose/exampleext/webapp/exampleext/error/error.jsp ofbiz/branches/release14.12/themes/bizznesstime/webapp/bizznesstime/js/application.js ofbiz/branches/release14.12/themes/bluelight/webapp/bluelight/docbook.css ofbiz/branches/release14.12/themes/bluelight/webapp/bluelight/help.css ofbiz/branches/release14.12/themes/droppingcrumbs/webapp/droppingcrumbs/css/docbook.css ofbiz/branches/release14.12/themes/droppingcrumbs/webapp/droppingcrumbs/css/help.css ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/docbook.css ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/help.css ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/js/application.js ofbiz/branches/release14.12/themes/tomahawk/includes/header.ftl ofbiz/branches/release14.12/themes/tomahawk/webapp/tomahawk/css/docbook.css ofbiz/branches/release14.12/themes/tomahawk/webapp/tomahawk/css/help.css Propchange: ofbiz/branches/release14.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 21 06:34:36 2015 @@ -8,4 +8,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207, 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065 77,1706589,1706591,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657 +/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207, 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065 77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657 Modified: ofbiz/branches/release14.12/applications/content/config/ContentEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/config/ContentEntityLabels.xml?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/content/config/ContentEntityLabels.xml (original) +++ ofbiz/branches/release14.12/applications/content/config/ContentEntityLabels.xml Sat Nov 21 06:34:36 2015 @@ -1637,7 +1637,7 @@ <value xml:lang="th">ระà¸à¸à¸à¸à¸´à¸à¸±à¸à¸´à¸à¸²à¸£à¸¥à¸µà¸à¸¸à¸à¸à¹</value> </property> <property key="DataCategory.categoryName.TECH_SOFT_OFBIZ"> - <value xml:lang="en">Open for Business</value> + <value xml:lang="en">Apache OFBiz</value> <value xml:lang="ja">OFBiz</value> <value xml:lang="th">à¹à¸à¸´à¸à¸ªà¸³à¸«à¸£à¸±à¸à¸à¸²à¸à¸à¸¸à¸£à¸à¸´à¸</value> <value xml:lang="zh">OFBiz</value> Modified: ofbiz/branches/release14.12/applications/content/data/DataCategoryData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/data/DataCategoryData.xml?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/content/data/DataCategoryData.xml (original) +++ ofbiz/branches/release14.12/applications/content/data/DataCategoryData.xml Sat Nov 21 06:34:36 2015 @@ -29,7 +29,7 @@ under the License. <DataCategory dataCategoryId="BUS_SERVICE" parentCategoryId="BUSINESS" categoryName="Service"/> <DataCategory dataCategoryId="BUS_MANU" parentCategoryId="BUSINESS" categoryName="Manufacturing"/> <DataCategory dataCategoryId="TECH_SOFT" parentCategoryId="TECHNOLOGY" categoryName="Software"/> - <DataCategory dataCategoryId="TECH_SOFT_OFBIZ" parentCategoryId="TECH_SOFT" categoryName="Open for Business"/> + <DataCategory dataCategoryId="TECH_SOFT_OFBIZ" parentCategoryId="TECH_SOFT" categoryName="Apache OFBiz"/> <DataCategory dataCategoryId="TECH_SOFT_LINUX" parentCategoryId="TECH_SOFT" categoryName="Linux"/> <DataCategory dataCategoryId="TECH_SOFT_JAVA" parentCategoryId="TECH_SOFT" categoryName="Java"/> <DataCategory dataCategoryId="TECH_HARD" parentCategoryId="TECHNOLOGY" categoryName="Hardware"/> Modified: ofbiz/branches/release14.12/applications/order/data/SalesOrderDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/data/SalesOrderDemoData.xml?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/order/data/SalesOrderDemoData.xml (original) +++ ofbiz/branches/release14.12/applications/order/data/SalesOrderDemoData.xml Sat Nov 21 06:34:36 2015 @@ -23,11 +23,11 @@ under the License. <Facility facilityId="WebStoreWarehouse"/> <!-- PRODUCT STORE --> - <ProductStore productStoreId="B2CStore" storeName="OFBiz the B2C Store" companyName="Open For Business" autoApproveReviews="Y" title="Open For Business to Customer" + <ProductStore productStoreId="B2CStore" storeName="OFBiz the B2C Store" companyName="Apache OFBiz" autoApproveReviews="Y" title="Apache OFBiz to Customer" subtitle="" prorateShipping="Y" prorateTaxes="Y" defaultLocaleString="en_US" defaultCurrencyUomId="USD" autoApproveInvoice="Y" autoApproveOrder="Y" shipIfCaptureFails="Y" requireInventory="N" reserveInventory="Y" inventoryFacilityId="WebStoreWarehouse" orderNumberPrefix="B2CS" visualThemeId="EC_DEFAULT" payToPartyId="Company" defaultSalesChannelEnumId="WEB_SALES_CHANNEL"/> - <ProductStore productStoreId="B2BStore" storeName="OFBiz the B2B Store" companyName="Open For Business" autoApproveReviews="Y" title="Open For Business to Business" + <ProductStore productStoreId="B2BStore" storeName="OFBiz the B2B Store" companyName="Apache OFBiz" autoApproveReviews="Y" title="Apache OFBiz to Business" subtitle="" prorateShipping="Y" prorateTaxes="Y" defaultLocaleString="en_US" defaultCurrencyUomId="USD" autoApproveInvoice="Y" autoApproveOrder="Y" shipIfCaptureFails="Y" requireInventory="N" reserveInventory="Y" inventoryFacilityId="WebStoreWarehouse" orderNumberPrefix="B2BS" visualThemeId="EC_DEFAULT" payToPartyId="Company" defaultSalesChannelEnumId="WEB_SALES_CHANNEL"/> Modified: ofbiz/branches/release14.12/applications/product/config/ProductEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/config/ProductEntityLabels.xml?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/product/config/ProductEntityLabels.xml (original) +++ ofbiz/branches/release14.12/applications/product/config/ProductEntityLabels.xml Sat Nov 21 06:34:36 2015 @@ -4418,7 +4418,7 @@ </property> <property key="FieldDescription.ProductStore.itemApprovedStatus"> <value xml:lang="de">Auf welchen Status sollen Bestellpositionen gesetzt werden, wenn Bestellungen freigegeben, abgelehnt oder storniert werden. Basierend auf den standardmässig definierten Statuscodes in OFBiz.</value> - <value xml:lang="en">What to set order items status to when orders are approved, declined, or canceled. Based on the standard defined status codes in Open for Business.</value> + <value xml:lang="en">What to set order items status to when orders are approved, declined, or canceled. Based on the standard defined status codes in Apache OFBiz.</value> <value xml:lang="fr">à quel statut doit on positionner la ligne de commande lorsque un article est approuvé, refusé ou annulé. Basé sur les codes statut standards définis dans Apache OFBiz</value> <value xml:lang="ja">注æãæ¿èªãå¦èªãã¾ãã¯åæ¶ãããæã«ã注æã¢ã¤ãã ã¹ãã¼ã¿ã¹ã«ä½ãè¨å®ãã¾ãããOFBizã§æ¨æºå®ç¾©ãããã¹ãã¼ã¿ã¹ã³ã¼ãã«åºã¥ãã¾ãã</value> <value xml:lang="vi">Äá» thiết láºp tráºt tá»± các mục tình trạng khi ÄÆ¡n Äặt hà ng Äược phê duyá»t , từ chá»i hoặc hủy bá». Dá»±a trên mã trạng thái quy Äá»nh tiêu chuẩn má» cho doanh nghiá»p.</value> @@ -4427,7 +4427,7 @@ </property> <property key="FieldDescription.ProductStore.digitalItemApprovedStatus"> <value xml:lang="de">Auf welchen Status sollen Bestellpositionen gesetzt werden, wenn digitale Bestellungen freigegeben, abgelehnt oder storniert werden. Basierend auf den standardmässig definierten Statuscodes in OFBiz.</value> - <value xml:lang="en">What to set order items status to when Digital Item orders are approved, declined, or canceled. Based on the standard defined status codes in Open for Business.</value> + <value xml:lang="en">What to set order items status to when Digital Item orders are approved, declined, or canceled. Based on the standard defined status codes in Apache OFBiz.</value> <value xml:lang="fr">à quel statut doit on positionner la ligne de commande lorsque un article numérique est approuvé, refusé ou annulé. Basé sur les codes statut standards définis dans Apache OFBiz</value> <value xml:lang="ja">ãã¸ã¿ã«ååã®æ³¨æãæ¿èªãå¦èªãã¾ãã¯åæ¶ãããæã«ã注æã¢ã¤ãã ã¹ãã¼ã¿ã¹ã«ä½ãè¨å®ãã¾ãããOFBizã§æ¨æºå®ç¾©ãããã¹ãã¼ã¿ã¹ã³ã¼ãã«åºã¥ãã¾ãã</value> <value xml:lang="vi">Äá» thiết láºp tráºt tá»± các mục tình trạng khi các ÄÆ¡n Äặt hà ng mục kỹ thuáºt sá» Äược phê duyá»t , từ chá»i hoặc hủy bá». Dá»±a trên các mã trạng thái quy Äá»nh tiêu chuẩn má» cho doanh nghiá»p.</value> @@ -4436,7 +4436,7 @@ </property> <property key="FieldDescription.ProductStore.headerDeclinedStatus"> <value xml:lang="de">Auf welchen Status sollen Bestellpositionen gesetzt werden, wenn digitale Bestellungen freigegeben, abgelehnt oder storniert werden. Basierend auf den standardmässig definierten Statuscodes in OFBiz.</value> - <value xml:lang="en">This is the message you want your customers to see when their order is declined. Based on the standard defined status codes in Open for Business.</value> + <value xml:lang="en">This is the message you want your customers to see when their order is declined. Based on the standard defined status codes in Apache OFBiz.</value> <value xml:lang="fr">à quel statut doit on positionner la ligne de commande lorsque un article numérique est approuvé, refusé ou annulé. Basé sur les codes statut standards définis dans Apache OFBiz</value> <value xml:lang="ja">注æãå¦èªãããæã«é¡§å®¢ã«è¦ãããã¡ãã»ã¼ã¸ãæå®ãã¾ããOFBizã§æ¨æºå®ç¾©ãããã¹ãã¼ã¿ã¹ã³ã¼ãã«åºã¥ãã¾ãã</value> <value xml:lang="vi">Tin nhắn mà bạn muá»n khách hà ng của bạn nhìn thấy khi Äặt hà ng của há» bá» từ chá»i. Dá»±a trên các mã trạng thái quy Äá»nh tiêu chuẩn má» cho doanh nghiá»p.</value> Modified: ofbiz/branches/release14.12/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/config/ProductUiLabels.xml?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/branches/release14.12/applications/product/config/ProductUiLabels.xml Sat Nov 21 06:34:36 2015 @@ -114,6 +114,7 @@ <value xml:lang="zh_TW">OFBiz:å ´æ管çç¨å¼</value> </property> <property key="FacilityCompanySubtitle"> + <value xml:lang="de">Teil der Open For Business Familie von Open Source Software</value> <value xml:lang="en">Part of the Open For Business Family of Open Source Software</value> <value xml:lang="fr">Un module de la famille Open For Business, logiciel libre de gestion d'entreprise.</value> <value xml:lang="it">Un modulo della famiglia di software open source Open For Business</value> Modified: ofbiz/branches/release14.12/applications/product/data/helpdata/HELP_PRODUCT_Catalog_Promos.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/data/helpdata/HELP_PRODUCT_Catalog_Promos.xml?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/product/data/helpdata/HELP_PRODUCT_Catalog_Promos.xml (original) +++ ofbiz/branches/release14.12/applications/product/data/helpdata/HELP_PRODUCT_Catalog_Promos.xml Sat Nov 21 06:34:36 2015 @@ -39,7 +39,7 @@ </section> <section> <title> Promo tab</title> - <para>At the top is general information about this promotion. Each promotion has an ID, a name and a longer descriptive text, which are shown to customers. If no text is entered, Open for Business will automatically generate text for you. + <para>At the top is general information about this promotion. Each promotion has an ID, a name and a longer descriptive text, which are shown to customers. If no text is entered, Apache OFBiz will automatically generate text for you. </para> </section> <note> Modified: ofbiz/branches/release14.12/applications/product/data/helpdata/HELP_PRODUCT_Features.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/data/helpdata/HELP_PRODUCT_Features.xml?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/product/data/helpdata/HELP_PRODUCT_Features.xml (original) +++ ofbiz/branches/release14.12/applications/product/data/helpdata/HELP_PRODUCT_Features.xml Sat Nov 21 06:34:36 2015 @@ -21,7 +21,7 @@ <title>Catalog Features overview </title> <anchor xml:id="ProductCatalogFeatures"/> <para>To Sell and to Differentiate Products -Features are characteristics used to sell and to differentiate products. The Open for Business catalog manager allows you to define any feature set you wish for your products. Typical features include size and color. In Open for Business, features are associated, or applied, to products as Standard Features, Selectable Features, or Distinguishing Features. +Features are characteristics used to sell and to differentiate products. The Apache OFBiz catalog manager allows you to define any feature set you wish for your products. Typical features include size and color. In Apache OFBiz, features are associated, or applied, to products as Standard Features, Selectable Features, or Distinguishing Features. </para> Modified: ofbiz/branches/release14.12/applications/product/data/helpdata/HELP_PRODUCT_Product Stores.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/data/helpdata/HELP_PRODUCT_Product%20Stores.xml?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/product/data/helpdata/HELP_PRODUCT_Product Stores.xml (original) +++ ofbiz/branches/release14.12/applications/product/data/helpdata/HELP_PRODUCT_Product Stores.xml Sat Nov 21 06:34:36 2015 @@ -67,7 +67,7 @@ Stores tab (with a store selected) bring </section> <section> <title> Why use stores?</title> - <para>The 'Stores' tab in the catalog manager as used to define all the properties of a working store, is a group of products sold together under the same policies. Stores greatly improve the flexibility of Open for business applications. It is possible for a company to set up multiple stores, each with its warehouses, fulfillment policies, currencies, languages, promotions, and look-and-feel. These stores can be web-based b2b or consumer ecommerce stores or for internal order entry and POS applications. They could even be in different countries with different shipping and taxation rules. + <para>The 'Stores' tab in the catalog manager as used to define all the properties of a working store, is a group of products sold together under the same policies. Stores greatly improve the flexibility of Apache OFBiz applications. It is possible for a company to set up multiple stores, each with its warehouses, fulfillment policies, currencies, languages, promotions, and look-and-feel. These stores can be web-based b2b or consumer ecommerce stores or for internal order entry and POS applications. They could even be in different countries with different shipping and taxation rules. </para> </section> <section> @@ -104,7 +104,7 @@ NOTE: It is possible for a web applicati </section> <section> <title>Payments</title> -<para>his is used to set up payment processing for the store. The payment processing interfaces are defined as Open for business services. Each payment method will have a series of service types available to it, such as for authorizing, capturing, and refunding payment. This page links the payment types and the services together by their purpose. Thus, one service would be used for credit card authorizations, another for credit card capture, and so forth +<para>his is used to set up payment processing for the store. The payment processing interfaces are defined as Apache OFBiz services. Each payment method will have a series of service types available to it, such as for authorizing, capturing, and refunding payment. This page links the payment types and the services together by their purpose. Thus, one service would be used for credit card authorizations, another for credit card capture, and so forth </para> </section> <section> Modified: ofbiz/branches/release14.12/framework/common/config/CommonHelpUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/common/config/CommonHelpUiLabels.xml?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/framework/common/config/CommonHelpUiLabels.xml (original) +++ ofbiz/branches/release14.12/framework/common/config/CommonHelpUiLabels.xml Sat Nov 21 06:34:36 2015 @@ -34,11 +34,11 @@ <value xml:lang="zh_TW">說æ主é¡æ²ææ¾å°.</value> </property> <property key="PageTitleHelp"> - <value xml:lang="da">Open for Business hjælp</value> - <value xml:lang="de">Open for Business Hilfe</value> - <value xml:lang="en">Open for Business Help</value> - <value xml:lang="es">Ayuda de Open for Business</value> - <value xml:lang="fr">Aide OFBiz (Open for Business)</value> + <value xml:lang="da">Apache OFBiz hjælp</value> + <value xml:lang="de">Apache OFBiz Hilfe</value> + <value xml:lang="en">Apache OFBiz Help</value> + <value xml:lang="es">Ayuda de Apache OFBiz</value> + <value xml:lang="fr">Aide OFBiz (Apache OFBiz)</value> <value xml:lang="it">Aiuto</value> <value xml:lang="ja">OFBizãã«ã</value> <value xml:lang="pt_BR">Ajuda do OFBiz</value> Modified: ofbiz/branches/release14.12/framework/start/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/start/build.xml?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/framework/start/build.xml (original) +++ ofbiz/branches/release14.12/framework/start/build.xml Sat Nov 21 06:34:36 2015 @@ -43,7 +43,7 @@ under the License. <manifest> <attribute name="Manifest-Version" value="1.0"/> <attribute name="Implementation-Title" value="Apache OFBiz Startup"/> - <attribute name="Implementation-Vendor" value="The Apache Open for Business Project"/> + <attribute name="Implementation-Vendor" value="The Apache Apache OFBiz Project"/> <attribute name="Main-Class" value="org.ofbiz.base.start.Start"/> </manifest> </main-elements> Modified: ofbiz/branches/release14.12/macros.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/macros.xml?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/macros.xml (original) +++ ofbiz/branches/release14.12/macros.xml Sat Nov 21 06:34:36 2015 @@ -84,7 +84,7 @@ under the License. <presetdef name="default-javadoc"> <javadoc classpathref="local.class.path" destdir="${build.dir}/javadocs" - windowtitle="Apache Open for Business - ${desc}" + windowtitle="Apache OFBiz - ${desc}" useexternalfile="yes" maxmemory="512M" encoding="UTF-8" Modified: ofbiz/branches/release14.12/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl (original) +++ ofbiz/branches/release14.12/specialpurpose/cmssite/template/ofbiz/ofbizMain.ftl Sat Nov 21 06:34:36 2015 @@ -147,7 +147,7 @@ under the License. <p>2007-02-22 "<a href="http://www.computerworld.com/action/article.do?command=viewArticleBasic&articleId=9011649" target="_blank">More midmarket firms choose open-source ERP</a>" on <a href="http://www.computerworld.com/" target="_blank">ComputerWorld</a></p> <p>2006-12-06 "<a href="http://feathercast.org/?p=37" target="_blank">Feathercast Episode 22: OFBiz</a>" on <a href="http://feathercast.org/" target="_blank">FeatherCast</a></p> - <p>2006-11-30 "<a href="http://www.linuxworld.com/podcasts/linux/ean_schuessler_on_apache_open.html" target="_blank">LinuxWorld LinuxCast: Ean Schuessler on Apache Open For Business</a>" on <a href="http://www.linuxworld.com/" target="_blank">LinuxWorld</a></p> + <p>2006-11-30 "<a href="http://www.linuxworld.com/podcasts/linux/ean_schuessler_on_apache_open.html" target="_blank">LinuxWorld LinuxCast: Ean Schuessler on Apache Apache OFBiz</a>" on <a href="http://www.linuxworld.com/" target="_blank">LinuxWorld</a></p> <p>2006-10-25 "<a href="http://www.sema.org/main/semaorghome.aspx?id=56095" target="_blank">SEMA Technology: Open Source Explained</a>" on <a href="http://www.sema.org/main/semaorghome.aspx?ID=/content/SEMAorg/HomePage" target="_blank">SEMA.org</a></p> <p>2006-10-02 "<a href="http://joss4biz.interition.net/roller/page/joss4biz/20061002" target="_blank">JOSS4BIZ Episode 5 - David E Jones and Apache OfBiz</a>" on <a href="http://joss4biz.interition.net/" target="_blank">JOSS4BIZ Podcast</a></p> @@ -233,9 +233,9 @@ under the License. <p>2005-06-16 "<a href="http://searchenterpriselinux.techtarget.com/originalContent/0,289142,sid39_gci1098875,00.html" target="_blank">SMBs no longer shut out of ERP</a>" on <a href="http://searchenterpriselinux.techtarget.com/" target="_blank">SearchEnterpriseLinux.com</a></p> <!--p>2005-01-26 "<a href="http://newsvac.newsforge.com/article.pl?sid=05/01/26/1648214" target="_blank">ObjectWeb announces Winners of Best Use Cases Award</a>" on <a href="http://www.newsforge.com/" target="_blank">NewsForge</a></p--> - <p>2004-09-11 "<a href="http://www.cio.com.au/index.php?id=318248421" target="_blank">Open For Business</a>" on <a href="http://www.cio.com.au/index.php" target="_blank">CIO Australia</a></p> - <p>2004-09-07 "<a href="http://www.technology-evaluation.com/Research/ResearchHighlights/FreeOpenSource/2004/09/research_notes/prn_VN_FS_JC_09_07_04_1.asp" target="_blank">TEC Talks to the Open For Business Project - Free and Open Source Software Business Models Part One: OFBiz</a>" on <a href="http://www.technology-evaluation.com/" target="_blank">Technology Evaluation Centers</a></p> - <p>2004-06-01 "<a href="http://today.java.net/pub/a/today/2004/06/01/ofbiz.html" target="_blank">java.net Success Story: Open For Business</a>" on <a href="http://www.java.net/" target="_blank">java.net</a></p> + <p>2004-09-11 "<a href="http://www.cio.com.au/index.php?id=318248421" target="_blank">Apache OFBiz</a>" on <a href="http://www.cio.com.au/index.php" target="_blank">CIO Australia</a></p> + <p>2004-09-07 "<a href="http://www.technology-evaluation.com/Research/ResearchHighlights/FreeOpenSource/2004/09/research_notes/prn_VN_FS_JC_09_07_04_1.asp" target="_blank">TEC Talks to the Apache OFBiz Project - Free and Open Source Software Business Models Part One: OFBiz</a>" on <a href="http://www.technology-evaluation.com/" target="_blank">Technology Evaluation Centers</a></p> + <p>2004-06-01 "<a href="http://today.java.net/pub/a/today/2004/06/01/ofbiz.html" target="_blank">java.net Success Story: Apache OFBiz</a>" on <a href="http://www.java.net/" target="_blank">java.net</a></p> <p>2004-03-10 "<a href="http://www.ecsforum.org/ecsforum.asp?page=AnnualConf2004" target="_blank">The Open Source Alternative for Direct Commerce (presentation)</a>" on <a href="http://www.ecsforum.org/home.asp" target="_blank">eCSForum</a></p> <p>2003-06-01 "<a href="http://www.connect-utah.com/article.asp?r=39&iid=4&sid=1" target="_blank">A New Business Model for Web Services</a>" on <a href="http://www.connect-utah.com/" target="_blank">Connect Magazine</a></p> Modified: ofbiz/branches/release14.12/specialpurpose/exampleext/webapp/exampleext/error/error.jsp URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/exampleext/webapp/exampleext/error/error.jsp?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/specialpurpose/exampleext/webapp/exampleext/error/error.jsp (original) +++ ofbiz/branches/release14.12/specialpurpose/exampleext/webapp/exampleext/error/error.jsp Sat Nov 21 06:34:36 2015 @@ -19,7 +19,7 @@ under the License. <%@ page import="org.ofbiz.base.util.*" %> <html> <head> -<title>Open For Business Message</title> +<title>Apache OFBiz Message</title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> Modified: ofbiz/branches/release14.12/themes/bizznesstime/webapp/bizznesstime/js/application.js URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/themes/bizznesstime/webapp/bizznesstime/js/application.js?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/themes/bizznesstime/webapp/bizznesstime/js/application.js (original) +++ ofbiz/branches/release14.12/themes/bizznesstime/webapp/bizznesstime/js/application.js Sat Nov 21 06:34:36 2015 @@ -1,5 +1,5 @@ /*********************************************** -APACHE OPEN FOR BUSINESS +APACHE OFBIZ Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information Modified: ofbiz/branches/release14.12/themes/bluelight/webapp/bluelight/docbook.css URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/themes/bluelight/webapp/bluelight/docbook.css?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/themes/bluelight/webapp/bluelight/docbook.css (original) +++ ofbiz/branches/release14.12/themes/bluelight/webapp/bluelight/docbook.css Sat Nov 21 06:34:36 2015 @@ -1,5 +1,5 @@ /*********************************************** -APACHE OPEN FOR BUSINESS +APACHE OFBIZ Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information Modified: ofbiz/branches/release14.12/themes/bluelight/webapp/bluelight/help.css URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/themes/bluelight/webapp/bluelight/help.css?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/themes/bluelight/webapp/bluelight/help.css (original) +++ ofbiz/branches/release14.12/themes/bluelight/webapp/bluelight/help.css Sat Nov 21 06:34:36 2015 @@ -1,5 +1,5 @@ /*********************************************** -APACHE OPEN FOR BUSINESS +APACHE OFBIZ Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information Modified: ofbiz/branches/release14.12/themes/droppingcrumbs/webapp/droppingcrumbs/css/docbook.css URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/themes/droppingcrumbs/webapp/droppingcrumbs/css/docbook.css?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/themes/droppingcrumbs/webapp/droppingcrumbs/css/docbook.css (original) +++ ofbiz/branches/release14.12/themes/droppingcrumbs/webapp/droppingcrumbs/css/docbook.css Sat Nov 21 06:34:36 2015 @@ -1,5 +1,5 @@ /*********************************************** -APACHE OPEN FOR BUSINESS +APACHE OFBIZ Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information Modified: ofbiz/branches/release14.12/themes/droppingcrumbs/webapp/droppingcrumbs/css/help.css URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/themes/droppingcrumbs/webapp/droppingcrumbs/css/help.css?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/themes/droppingcrumbs/webapp/droppingcrumbs/css/help.css (original) +++ ofbiz/branches/release14.12/themes/droppingcrumbs/webapp/droppingcrumbs/css/help.css Sat Nov 21 06:34:36 2015 @@ -1,5 +1,5 @@ /*********************************************** -APACHE OPEN FOR BUSINESS +APACHE OFBIZ Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information Modified: ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/docbook.css URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/docbook.css?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/docbook.css (original) +++ ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/docbook.css Sat Nov 21 06:34:36 2015 @@ -1,5 +1,5 @@ /*********************************************** -APACHE OPEN FOR BUSINESS +APACHE OFBIZ Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information Modified: ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/help.css URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/help.css?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/help.css (original) +++ ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/help.css Sat Nov 21 06:34:36 2015 @@ -1,5 +1,5 @@ /*********************************************** -APACHE OPEN FOR BUSINESS +APACHE OFBIZ Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information Modified: ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/js/application.js URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/js/application.js?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/js/application.js (original) +++ ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/js/application.js Sat Nov 21 06:34:36 2015 @@ -1,5 +1,5 @@ /*********************************************** -APACHE OPEN FOR BUSINESS +APACHE OFBiz Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information Modified: ofbiz/branches/release14.12/themes/tomahawk/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/themes/tomahawk/includes/header.ftl?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/themes/tomahawk/includes/header.ftl (original) +++ ofbiz/branches/release14.12/themes/tomahawk/includes/header.ftl Sat Nov 21 06:34:36 2015 @@ -119,7 +119,7 @@ under the License. <#if organizationLogoLinkURL?has_content> <li id="org-logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${StringUtil.wrapString(organizationLogoLinkURL)}</@ofbizContentUrl>"></a></li> <#else> - <li id="logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>" title="${layoutSettings.companyName}"></a></li> + <li id="logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>" title="${layoutSettings}"></a></li> </#if> </#if> <#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " "> Modified: ofbiz/branches/release14.12/themes/tomahawk/webapp/tomahawk/css/docbook.css URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/themes/tomahawk/webapp/tomahawk/css/docbook.css?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/themes/tomahawk/webapp/tomahawk/css/docbook.css (original) +++ ofbiz/branches/release14.12/themes/tomahawk/webapp/tomahawk/css/docbook.css Sat Nov 21 06:34:36 2015 @@ -1,5 +1,5 @@ /*********************************************** -APACHE OPEN FOR BUSINESS +APACHE OFBIZ Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information Modified: ofbiz/branches/release14.12/themes/tomahawk/webapp/tomahawk/css/help.css URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/themes/tomahawk/webapp/tomahawk/css/help.css?rev=1715466&r1=1715465&r2=1715466&view=diff ============================================================================== --- ofbiz/branches/release14.12/themes/tomahawk/webapp/tomahawk/css/help.css (original) +++ ofbiz/branches/release14.12/themes/tomahawk/webapp/tomahawk/css/help.css Sat Nov 21 06:34:36 2015 @@ -1,5 +1,5 @@ /*********************************************** -APACHE OPEN FOR BUSINESS +APACHE OFBIZ Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |