Commit 067fef86 authored by holivier's avatar holivier

upgrade with svn release 1846502 from ofbiz.apache.org

parent cc469bee
......@@ -18,5 +18,5 @@
*/
dependencies {
pluginLibsCompile 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.7'
}
\ No newline at end of file
pluginLibsCompile 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.10'
}
......@@ -19,6 +19,20 @@
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
<!-- Entity descriptions. The Web Tools component will use these properties
for online documentation. Entity description property keys have the form:
EntityDescription.[entityname].
-->
<property key="EntityDescription.Example">
<value xml:lang="en">Example Entity</value>
<value xml:lang="zh">样例实体</value>
</property>
<!-- Entity field descriptions. The Web Tools component will use these properties
for online documentation. Field description property keys have two forms:
FieldDescription.[fieldname] - will be used for all fields of that name
FieldDescription.[entityname].[fieldname] - will be used for the specified
entity field
-->
<property key="ExampleFeatureApplType.description.DESIRED">
<value xml:lang="en">Desired</value>
<value xml:lang="fr">Désiré</value>
......@@ -46,6 +60,7 @@
<value xml:lang="zh">必须的</value>
<value xml:lang="zh-TW">必須的</value>
</property>
<!-- Example entity labels -->
<property key="ExampleType.description.CONTRIVED">
<value xml:lang="en">Contrived</value>
<value xml:lang="fr">Arrangé</value>
......@@ -73,7 +88,6 @@
<value xml:lang="zh">制定</value>
<value xml:lang="zh-TW">制定</value>
</property>
<!-- Example entity labels -->
<property key="ExampleType.description.REAL_WORLD">
<value xml:lang="en">Real World</value>
<value xml:lang="fr">Monde réel</value>
......@@ -83,20 +97,6 @@
<value xml:lang="zh">真实世界</value>
<value xml:lang="zh-TW">真實世界</value>
</property>
<!-- Entity descriptions. The Web Tools component will use these properties
for online documentation. Entity description property keys have the form:
EntityDescription.[entityname].
-->
<property key="EntityDescription.Example">
<value xml:lang="en">Example Entity</value>
<value xml:lang="zh">样例实体</value>
</property>
<!-- Entity field descriptions. The Web Tools component will use these properties
for online documentation. Field description property keys have two forms:
FieldDescription.[fieldname] - will be used for all fields of that name
FieldDescription.[entityname].[fieldname] - will be used for the specified
entity field
-->
<property key="FieldDescription.Example.exampleId">
<value xml:lang="en">A unique Example ID. If you don't assign an ID, one will be generated automatically</value>
<value xml:lang="fr">Une réf. unique d'exemple. Si vous n'entrez pas de réf., elle sera générée automatiquement</value>
......@@ -106,6 +106,12 @@
<value xml:lang="zh">一个唯一的样例表示。如果你没有指定一个标识,那么会自动生成一个</value>
<value xml:lang="zh-TW">一個唯一的範例表示.如果你沒有指定一個識別,那麼會自動產生一個</value>
</property>
<property key="FieldDescription.Example.exampleTypeId">
<value xml:lang="en">The type of Example.</value>
<value xml:lang="fr">Le type de l'exemple.</value>
<value xml:lang="zh">样例类型。</value>
<value xml:lang="zh-TW">範例類型.</value>
</property>
<property key="FieldDescription.ExampleItem.exampleItemSeqId">
<value xml:lang="en">A unique Example Item sequence ID. If you don't assign an ID, one will be generated automatically</value>
<value xml:lang="fr">Une réf. unique d'article exemple. Si vous n'entrez pas de réf., elle sera générée automatiquement</value>
......@@ -124,12 +130,6 @@
<value xml:lang="zh">一个唯一的样例类型序号。如果你没有指定一个标识,那么会自动生成一个</value>
<value xml:lang="zh-TW">一個唯一的範例類型序號.如果你沒有指定一個識別,那麼會自動產生一個</value>
</property>
<property key="FieldDescription.Example.exampleTypeId">
<value xml:lang="en">The type of Example.</value>
<value xml:lang="fr">Le type de l'exemple.</value>
<value xml:lang="zh">样例类型。</value>
<value xml:lang="zh-TW">範例類型.</value>
</property>
<property key="FieldDescription.amount">
<value xml:lang="de">Betrag</value>
<value xml:lang="en">Amount</value>
......@@ -157,7 +157,6 @@
<value xml:lang="ja">別のテキスト</value>
<value xml:lang="th">ตัวอักษรอื่น ๆ</value>
<value xml:lang="zh">另一个文本</value>
<!--value xml:lang="zh_TW">另一個文本</value-->
<value xml:lang="zh-TW">另一個本文</value>
</property>
<property key="FieldDescription.comments">
......@@ -239,4 +238,4 @@
<value xml:lang="zh">详细描述</value>
<value xml:lang="zh-TW">詳細描述</value>
</property>
</resource>
</resource>
\ No newline at end of file
......@@ -66,16 +66,6 @@
<value xml:lang="zh">基于国家类型的样例,使用Geo.Geoid和Geo.GeoName等Entity.fields来填充</value>
<value xml:lang="zh-TW">基於國家類型的範例,使用Geo.Geoid和Geo.GeoName等Entity.fields來完成</value>
</property>
<property key="ExampleSpecifyOtherDropdown">
<value xml:lang="en">Specify-other Dropdown</value>
<value xml:lang="zh">指定其它输入的下拉框</value>
<value xml:lang="zh-TW">指定其它輸入的下拉清單</value>
</property>
<property key="ExampleSpecifyOtherTooltip">
<value xml:lang="en">Select "specify other" option, an input box will be shown next to dropdown. See tootip of other-field-size attribute of drop-down form element</value>
<value xml:lang="zh">如果选择"specify other",下拉框旁边会出现本文框。参考form的drop-down元素的other-field-size属性说明</value>
<value xml:lang="zh-TW">如果選擇"specify other",下拉清單旁邊會出現本文框.參考form的drop-down元素的other-field-size屬性說明</value>
</property>
<property key="ExampleBarChart">
<value xml:lang="en">Bar Chart</value>
<value xml:lang="fr">Histogramme</value>
......@@ -95,6 +85,11 @@
<value xml:lang="zh">日历数据项(仅用于测试)</value>
<value xml:lang="zh-TW">日曆資料項目(僅用於測試)</value>
</property>
<property key="ExampleChart">
<value xml:lang="en">Chart examples</value>
<value xml:lang="fr">Graphes</value>
<value xml:lang="zh">绘图样例</value>
</property>
<property key="ExampleCompanyName">
<value xml:lang="en">OFBiz: Example</value>
<value xml:lang="fr">OFBiz : Exemple</value>
......@@ -107,36 +102,23 @@
<value xml:lang="zh-TW">OFBiz: 範例</value>
</property>
<property key="ExampleCompanySubtitle">
<!--value xml:lang="ar">جزء من عائلة أوفبيز للبرمجيات الحرة</value-->
<value xml:lang="ar">جزء من عائلة أوفبيز للتطبيقات الحرة للتسيير</value>
<value xml:lang="de">Teil der Apache OFBiz Familie von Open Source Software</value>
<value xml:lang="en">Part of the Apache OFBiz Family of Open Source Software</value>
<!--value xml:lang="es">Parte de la familia "Open for Bussiness" de Software Libre</value-->
<value xml:lang="es">Parte de la familia de software Apache OFBiz de código abierto</value>
<value xml:lang="fr">Un module de la famille Apache OFBiz, logiciel libre de gestion d'entreprise.</value>
<value xml:lang="it">Un modulo della famiglia di software open source Apache OFBiz</value>
<!--value xml:lang="nl">Onderdeel van de Apache OFBiz'-suite</value-->
<value xml:lang="ja">Part of the Apache OFBiz Family of Open Source Software</value>
<value xml:lang="nl">Deel van de Apache OFBiz-suite van Open Source Software</value>
<value xml:lang="pt-BR">Parte da família OfBiz de software de fonte aberta</value>
<!--value xml:lang="pt-PT">Parte do Software de Fonte Aberta para Grupos Abertos Para o Negócio</value-->
<value xml:lang="pt-PT">Parte da família OfBiz de software de fonte aberta</value>
<!--value xml:lang="ro">Parte accesibila pentru Business Family of Open Source Software</valuevalue xml:lang="ro">Parte din Open for Business Family of Open Source Software</value-->
<value xml:lang="ro">Partea de Deschidere Pentru Afaceri Familiale din Open Source Software</value>
<!--value xml:lang="ru">Часть семейства ПО Apache OFBiz</valuevalue xml:lang="ru">Часть семейства "Apache OFBiz Family" программных продуктов Open Source </value-->
<value xml:lang="ru">Входит в состав семейства Apache OFBiz</value>
<!--value xml:lang="th">เป็นส่วนหนึ่งของธุรกิจแบบครอบครัวที่เป็นซอฟต์แวร์โอเพนซอส</value-->
<value xml:lang="th">ส่วนหนึ่งของธุรกิจแบบครอบครัวที่เป็นซอฟต์แวร์โอเพนซอส</value>
<!--value xml:lang="zh">开源软件OFBiz的组成部分</valuevalue xml:lang="zh">开源软件OFBiz的组成部分</value-->
<value xml:lang="zh">开源软件OFBiz家族的一部分</value>
<value xml:lang="zh-CN">OFBiz的一部分</value>
<value xml:lang="zh-TW">開源軟體OFBiz家族的一部分</value>
</property>
<property key="ExampleChart">
<value xml:lang="en">Chart examples</value>
<value xml:lang="fr">Graphes</value>
<value xml:lang="zh">绘图样例</value>
</property>
<property key="ExampleCompoundWidgets">
<value xml:lang="en">Compound Screen Widget</value>
<value xml:lang="fr">Screen Widget composé</value>
......@@ -626,6 +608,10 @@
<property key="ExampleGeneralErrorRenderingScreen">
<value xml:lang="en">General error rendering screen [${screenLocation}]: ${errorString}</value>
</property>
<property key="ExampleGeneratePDF">
<value xml:lang="en">Generate PDF</value>
<value xml:lang="zh">生成PDF</value>
</property>
<property key="ExampleGroupField">
<value xml:lang="en">Group</value>
<value xml:lang="it">Gruppo</value>
......@@ -796,6 +782,24 @@
<property key="ExampleParserConfigurationErrorRenderingScreen">
<value xml:lang="en">Parser configuration error rendering screen [${screenLocation}]: ${errorString}</value>
</property>
<property key="ExamplePdfBarcode">
<value xml:lang="de">Barcode</value>
<value xml:lang="en">Barcode</value>
<value xml:lang="es">Código de barra</value>
<value xml:lang="fr">Code barre</value>
<value xml:lang="it">Codice a barre</value>
<value xml:lang="ja">バーコード</value>
<value xml:lang="ro">Cod bara</value>
<value xml:lang="ru">Баркод</value>
<value xml:lang="th">บาร์โคด</value>
<value xml:lang="vi">Mã vạch (Barcode)</value>
<value xml:lang="zh">条形码</value>
<value xml:lang="zh-TW">條形碼</value>
</property>
<property key="ExamplePdfPassword">
<value xml:lang="en">PDF With Password</value>
<value xml:lang="zh">有密码的PDF</value>
</property>
<property key="ExamplePermissionError">
<value xml:lang="en">Security Error: to run ${resourceDescription} you must have the EXAMPLE_${mainAction} or EXAMPLE_ADMIN permission</value>
<value xml:lang="fr">Erreur de sécurité : pour exécuter ${resourceDescription} vous devez avoir l'autorisation EXAMPLE_${mainAction} ou EXAMPLE_ADMIN</value>
......@@ -934,6 +938,16 @@
<value xml:lang="zh">源代码</value>
<value xml:lang="zh-TW">原始程式碼</value>
</property>
<property key="ExampleSpecifyOtherDropdown">
<value xml:lang="en">Specify-other Dropdown</value>
<value xml:lang="zh">指定其它输入的下拉框</value>
<value xml:lang="zh-TW">指定其它輸入的下拉清單</value>
</property>
<property key="ExampleSpecifyOtherTooltip">
<value xml:lang="en">Select "specify other" option, an input box will be shown next to dropdown. See tootip of other-field-size attribute of drop-down form element</value>
<value xml:lang="zh">如果选择"specify other",下拉框旁边会出现本文框。参考form的drop-down元素的other-field-size属性说明</value>
<value xml:lang="zh-TW">如果選擇"specify other",下拉清單旁邊會出現本文框.參考form的drop-down元素的other-field-size屬性說明</value>
</property>
<property key="ExampleTextDescription">
<value xml:lang="en">This example text means we are in the extended form.</value>
<value xml:lang="it">Questo testo di esempio significa che noi siamo nella form estesa di esempio.</value>
......@@ -990,7 +1004,6 @@
<value xml:lang="ja">別のテキスト</value>
<value xml:lang="th">ตัวหนังสืออื่น ๆ</value>
<value xml:lang="zh">另一个文本</value>
<!--value xml:lang="zh_TW">另一個文本</value-->
<value xml:lang="zh-TW">另一個本文</value>
</property>
<property key="FormFieldTitle_displayAnotherText">
......@@ -998,7 +1011,6 @@
<value xml:lang="it">Testo alternativo</value>
<value xml:lang="ja">別のテキスト</value>
<value xml:lang="zh">另一个文本</value>
<!--value xml:lang="zh_TW">另一個文本</value-->
<value xml:lang="zh-TW">另一個本文</value>
</property>
<property key="FormFieldTitle_exampleDate">
......@@ -1040,9 +1052,56 @@
<value xml:lang="it">Testo esempio</value>
<value xml:lang="ja">サンプルテキスト</value>
<value xml:lang="zh">样例文本</value>
<!--value xml:lang="zh_TW">範例文本</value-->
<value xml:lang="zh-TW">範例本文</value>
</property>
<property key="PDFAllowAccessContent">
<value xml:lang="en">Allow Access Content</value>
<value xml:lang="zh">允许访问内容</value>
</property>
<property key="PDFAllowAssembleDocument">
<value xml:lang="en">Allow Assemble Document</value>
<value xml:lang="zh">允许组装文档</value>
</property>
<property key="PDFAllowCopyContent">
<value xml:lang="en">Allow Copy Content</value>
<value xml:lang="zh">允许复制内容</value>
</property>
<property key="PDFAllowEditAnnotations">
<value xml:lang="en">Allow Edit Annotations</value>
<value xml:lang="zh">允许编辑注释</value>
</property>
<property key="PDFAllowEditContent">
<value xml:lang="en">Allow Edit Content</value>
<value xml:lang="zh">允许编辑内容</value>
</property>
<property key="PDFAllowFillInForms">
<value xml:lang="en">Allow Fill-in Forms</value>
<value xml:lang="zh">允许填写表格</value>
</property>
<property key="PDFAllowPrint">
<value xml:lang="en">Allow Print</value>
<value xml:lang="zh">允许打印</value>
</property>
<property key="PDFAllowPrintHq">
<value xml:lang="en">Allow Print HQ</value>
<value xml:lang="zh">允许高质量打印</value>
</property>
<property key="PDFEncryptMetadata">
<value xml:lang="en">Encrypt Metadata</value>
<value xml:lang="zh">加密元数据</value>
</property>
<property key="PDFEncryptionLength">
<value xml:lang="en">Encryption Length</value>
<value xml:lang="zh">密钥长度</value>
</property>
<property key="PDFOwnerPassword">
<value xml:lang="en">Owner Password</value>
<value xml:lang="zh">拥有者密码</value>
</property>
<property key="PDFUserPassword">
<value xml:lang="en">User Password</value>
<value xml:lang="zh">使用者密码</value>
</property>
<property key="PageTitleEditExample">
<value xml:lang="en">Edit Example</value>
<value xml:lang="fr">Modifier l'exemple</value>
......@@ -1141,89 +1200,27 @@
<value xml:lang="zh">查找样例特征</value>
<value xml:lang="zh-TW">尋找範例特色</value>
</property>
<property key="YouChangedTheSelectBoxValue">
<value xml:lang="de">Sie haben den Wert in der Select Box geändert.</value>
<value xml:lang="en">You have changed the value in the select box</value>
<value xml:lang="ja">選択ボックスで値を変更されています</value>
<value xml:lang="zh">你修改了选择框中的值</value>
<value xml:lang="zh-TW">你修改了選擇框中的值</value>
</property>
<property key="ExamplePdfPassword">
<value xml:lang="en">PDF With Password</value>
<value xml:lang="zh">有密码的PDF</value>
</property>
<property key="ExamplePdfBarcode">
<value xml:lang="de">Barcode</value>
<value xml:lang="en">Barcode</value>
<value xml:lang="es">Código de barra</value>
<value xml:lang="fr">Code barre</value>
<value xml:lang="it">Codice a barre</value>
<value xml:lang="ja">バーコード</value>
<value xml:lang="ro">Cod bara</value>
<value xml:lang="ru">Баркод</value>
<value xml:lang="th">บาร์โคด</value>
<value xml:lang="vi">Mã vạch (Barcode)</value>
<value xml:lang="zh">条形码</value>
<value xml:lang="zh-TW">條形碼</value>
</property>
<property key="PageTitleSetExamplePdfPassword">
<value xml:lang="en">Set PDF Protected By Password</value>
<value xml:lang="zh">设置有密码保护的PDF</value>
</property>
<property key="ExampleGeneratePDF">
<value xml:lang="en">Generate PDF</value>
<value xml:lang="zh">生成PDF</value>
</property>
<property key="password_not_equal_confirm_password">
<value xml:lang="en">Password did not match confirm password.</value>
<value xml:lang="zh">密码与验证密码不一致。</value>
</property>
<property key="PDFOwnerPassword">
<value xml:lang="en">Owner Password</value>
<value xml:lang="zh">拥有者密码</value>
</property>
<property key="PDFUserPassword">
<value xml:lang="en">User Password</value>
<value xml:lang="zh">使用者密码</value>
</property>
<property key="PDFAllowPrint">
<value xml:lang="en">Allow Print</value>
<value xml:lang="zh">允许打印</value>
</property>
<property key="PDFAllowCopyContent">
<value xml:lang="en">Allow Copy Content</value>
<value xml:lang="zh">允许复制内容</value>
<property key="SignedInAuthToAnotherDomain">
<value xml:lang="en">Navigate to another domain with automated signed in authentication</value>
<value xml:lang="fr">Naviguer vers un autre domaine avec authentification automatique</value>
</property>
<property key="PDFAllowEditContent">
<value xml:lang="en">Allow Edit Content</value>
<value xml:lang="zh">允许编辑内容</value>
<property key="TargetURL">
<value xml:lang="en">Target URL</value>
<value xml:lang="fr">URL cible</value>
</property>
<property key="PDFAllowEditAnnotations">
<value xml:lang="en">Allow Edit Annotations</value>
<value xml:lang="zh">允许编辑注释</value>
</property>
<property key="PDFAllowFillInForms">
<value xml:lang="en">Allow Fill-in Forms</value>
<value xml:lang="zh">允许填写表格</value>
</property>
<property key="PDFAllowAccessContent">
<value xml:lang="en">Allow Access Content</value>
<value xml:lang="zh">允许访问内容</value>
</property>
<property key="PDFAllowAssembleDocument">
<value xml:lang="en">Allow Assemble Document</value>
<value xml:lang="zh">允许组装文档</value>
</property>
<property key="PDFAllowPrintHq">
<value xml:lang="en">Allow Print HQ</value>
<value xml:lang="zh">允许高质量打印</value>
</property>
<property key="PDFEncryptMetadata">
<value xml:lang="en">Encrypt Metadata</value>
<value xml:lang="zh">加密元数据</value>
</property>
<property key="PDFEncryptionLength">
<value xml:lang="en">Encryption Length</value>
<value xml:lang="zh">密钥长度</value>
<property key="YouChangedTheSelectBoxValue">
<value xml:lang="de">Sie haben den Wert in der Select Box geändert.</value>
<value xml:lang="en">You have changed the value in the select box</value>
<value xml:lang="ja">選択ボックスで値を変更されています</value>
<value xml:lang="zh">你修改了选择框中的值</value>
<value xml:lang="zh-TW">你修改了選擇框中的值</value>
</property>
</resource>
</resource>
\ No newline at end of file
......@@ -424,6 +424,9 @@ under the License.
<!-- ************************ -->
<!-- *** Layered-modal *** -->
<!-- ************************ -->
<actions>
<set field="targetUrl" value="javascript:sendJWT('${webappName}', 'https://demo-trunk.ofbiz.apache.org/content/control/main')"/>
</actions>
<field name="emptyField0" title=" "><display/></field>
<field name="newExample" title=" " widget-area-style="smallSubmit" position="1">
<hyperlink description="${uiLabelMap.ExampleNewExample} (Layered-modal)" target="EditExampleLayer" also-hidden="false" link-type="layered-modal"/>
......@@ -431,8 +434,11 @@ under the License.
<field name="deleteLink" title="${uiLabelMap.FormFieldTitle_confirmButton} ${uiLabelMap.ExampleExample}" widget-style="buttontext">
<hyperlink description="${uiLabelMap.CommonDelete}" target="FormWidgetExamples" also-hidden="false" confirmation-message="Are you sure you want to perform this action?"/>
</field>
</form>
<field name="targetUrlButton" title="${uiLabelMap.SignedInAuthToAnotherDomain}" widget-style="buttontext">
<hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.TargetURL}" target="${targetUrl}"/>
</field>
</form>
<form name="MaskFieldExampleForm" type="single">
<field name="maskField" title="${uiLabelMap.ExampleField}"><text mask='a*-999-a999'/></field>
</form>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment