You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/06/20 19:06:30 UTC

[1/5] git commit: [flex-asjs] [refs/heads/develop] - remove goog step now that it is bundled

Repository: flex-asjs
Updated Branches:
  refs/heads/develop 25b81124c -> c7fb92e19


remove goog step now that it is bundled


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c7fb92e1
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c7fb92e1
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c7fb92e1

Branch: refs/heads/develop
Commit: c7fb92e194fb882eda1cd8bbb909edd918dff263
Parents: c73638c
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jun 20 09:50:51 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 20 10:06:15 2014 -0700

----------------------------------------------------------------------
 apache-flex-flexjs-installer-config.xml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c7fb92e1/apache-flex-flexjs-installer-config.xml
----------------------------------------------------------------------
diff --git a/apache-flex-flexjs-installer-config.xml b/apache-flex-flexjs-installer-config.xml
index 99aebb0..688aedb 100755
--- a/apache-flex-flexjs-installer-config.xml
+++ b/apache-flex-flexjs-installer-config.xml
@@ -20,20 +20,20 @@
 
 <config>
 	<!--
-	<progressLabels>
+	<progressLabels>
 
-		<en_US>
+		<en_US>
 
-			<Copy>Copying %1 of %2</Copy>
+			<Copy>Copying %1 of %2</Copy>
 
-			<Get>Downloading bytes %1 of %2</Get>
+			<Get>Downloading bytes %1 of %2</Get>
 
 			<Checksum>Computing checksum: bytes %1 of %2</Checksum>
 		</en_US>
-	</progressLabels>
+	</progressLabels>
 
 	-->
-	<properties>
+	<properties>
 
 	</properties>
 	<strings description="override default installer strings here">
@@ -152,12 +152,6 @@
 			<zh_CN>拷贝 FalconJX SDK 文件</zh_CN>
 			<zh_TW>拷貝 FalconJX SDK 檔案</zh_TW>
 		</step>
-		<step id="goog-download" property="do.goog.install">
-			<el_GR>Λήψη Google Closure Library</el_GR>
-			<en_US>Google Closure Library jar (Required)</en_US>
-			<zh_CN>Google Closure Library jar (必须的)</zh_CN>
-			<zh_TW>Google Closure Library jar (必須的)</zh_TW>
-		</step>
 		<step id="air-download" property="do.air.install">
 			<el_GR>Αποσυμπίεση του Adobe AIR Runtime Kit</el_GR>
 			<en_US>Adobe AIR SDK (Required)</en_US>


[3/5] git commit: [flex-asjs] [refs/heads/develop] - try the github version of closure library

Posted by ah...@apache.org.
try the github version of closure library


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ea0f1f32
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ea0f1f32
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ea0f1f32

Branch: refs/heads/develop
Commit: ea0f1f32303de41f530f7551727605fd94f5109d
Parents: 25b8112
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 19 14:23:46 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 20 10:06:15 2014 -0700

----------------------------------------------------------------------
 installer.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ea0f1f32/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 2f0d2cb..e6b1ea1 100644
--- a/installer.xml
+++ b/installer.xml
@@ -61,11 +61,11 @@
     <property name="flexjs.version" value="0.0.2"/>
     <property name="falcon.version" value="0.0.2"/>
     
-    <property name="goog.lib.url.server" value="https://closure-library.googlecode.com" />
-    <property name="goog.lib.url.folder" value="files" />
-    <property name="goog.lib.url.file" value="closure-library-20130212-95c19e7f0f5f.zip" />
-    <property name="goog.lib.md5" value="7891ce8200dedf50c811017a0d76bcdc" />
-    
+    <property name="goog.lib.url.server" value="https://github.com" />
+    <property name="goog.lib.url.folder" value="google/closure-library/archive" />
+    <property name="goog.lib.url.file" value="master.zip" />
+    <property name="goog.lib.md5" value="9711bb32b35550f8cc49d7aac6b2c41c" />
+
     <property name="swfobject.url.server" value="https://github.com" />
     <property name="swfobject.url.folder" value="swfobject/swfobject/archive" />
     <property name="swfobject.url.file" value="2.2.zip" />


[5/5] git commit: [flex-asjs] [refs/heads/develop] - chinese translations from Darkstone

Posted by ah...@apache.org.
chinese translations from Darkstone


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b97f3335
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b97f3335
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b97f3335

Branch: refs/heads/develop
Commit: b97f3335f4590585cc7af26ea3e411e6336be77a
Parents: ea0f1f3
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jun 19 14:24:03 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 20 10:06:15 2014 -0700

----------------------------------------------------------------------
 installer.properties/zh_CN.properties | 83 ++++++++++++++++++++++++++++++
 installer.properties/zh_TW.properties | 83 ++++++++++++++++++++++++++++++
 2 files changed, 166 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b97f3335/installer.properties/zh_CN.properties
----------------------------------------------------------------------
diff --git a/installer.properties/zh_CN.properties b/installer.properties/zh_CN.properties
new file mode 100755
index 0000000..59796e2
--- /dev/null
+++ b/installer.properties/zh_CN.properties
@@ -0,0 +1,83 @@
+################################################################################
+##
+##  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 regarding copyright ownership.
+##  The ASF licenses this file to You under the Apache License, Version 2.0
+##  (the "License"); you may not use this file except in compliance with
+##  the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+##  Unless required by applicable law or agreed to in writing, software
+##  distributed under the License is distributed on an "AS IS" BASIS,
+##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##  See the License for the specific language governing permissions and
+##  limitations under the License.
+##
+################################################################################
+
+
+yes.no.prompts=y,n
+yes=y
+no=n
+
+flash.prompt.text=\
+Apache FlexJS 使用 Adobe Flash Player 的 playerglobal.swc 文件来构建 Adobe Flash 应用程序.\n\
+\n\
+playerglobal.swc 文件受到 Adobe Flex SDK 许可协议的管理, \n\
+此许可协议的地址:\n\
+http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf,\n\
+一旦您下载, 修改, 分发, 使用 和/或 访问 playerglobal.swc 文件, \n\
+您便同意可适用最终用户许可协议的条款和条件.\n\
+\n\
+除了 Adobe 的许可条款外, 您也同意此处第三方条款的约束:\n\
+http://www.adobe.com/products/eula/third_party/.\n\
+Adobe 建议您查看这些第三方的条款.\n\
+\n\
+此许可与 Apache v2 许可并不兼容.\n\
+您想要下载并安装 playerglobal.swc 文件吗?
+
+air.prompt.text=\
+Apache FlexJS 使用 Adobe AIR SDK 来构建 Adobe AIR 应用程序.\n\
+Adobe AIR SDK 受到 Adobe AIR SDK 许可协议的管理, \n\
+此许可协议的地址:\n\
+http://www.adobe.com/products/air/sdk-eula.html.\n\
+此许可与 Apache v2 许可并不兼容.\n\
+您想要下载并安装 Adobe AIR SDK 吗?
+
+goog.prompt.text=\
+Apache FlexJS 使用 Google Closure 库来构建 FlexJS 应用程序.\n\
+Google Closure 受到 Apache v2 许可协议的管理, \n\
+此许可协议的地址:\n\
+http://www.apache.org/licenses/LICENSE-2.0.\n\
+您想要下载并安装 Google Closure 库吗?
+
+swfobject.prompt.text=\
+Apache FlexJS 使用 SWFObject 来构建 Adobe Flash 应用程序.\n\
+SWFObject 受到 MIT 许可协议的管理, \n\
+此许可协议的地址:\n\
+http://opensource.org/licenses/mit-license.php.\n\
+此许可与 Apache v2 许可并不兼容.\n\
+您想要下载并安装 SWFObject 吗?
+
+unable.to.find.java=无法找到可执行的 Java, 请设置 JAVA_HOME 环境变量
+
+install.complete.echo=${basedir} 现在是一个与 IDE 兼容的目录
+find.java.echo.pattern=可执行的 Java 是 $${java.executable}
+mac.copy.echo.pattern=从 $${download.dir}/airsdk/$${srcdir} 拷贝文件到 $${destdir}
+
+INFO_INSTALLING_FALCON=正在从这个地址安装 Apache Flex Falcon 编译器: 
+INFO_INSTALLING_FLEX=正在从这个地址安装 Apache Flex SDK: 
+INFO_INSTALLING_GOOG=正在从这个地址安装 Google Closure 库: 
+INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC=正在从这个地址下载 Mac 版 Adobe AIR 运行时工具包: 
+INFO_DOWNLOADING_AIR_RUNTIME_KIT_WINDOWS=正在从这个地址下载 Windows 版 Adobe AIR 运行时工具包: 
+INFO_FINISHED_UNTARING=已完成 tar 文件的解压: 
+INFO_FINISHED_UNZIPPING=已完成解压: 
+INFO_UNZIPPING=正在解压: 
+INFO_INSTALLING_PLAYERGLOBAL_SWC=正在从这个地址安装 Adobe Flash Player 的 playerglobal.swc 文件: 
+INFO_INSTALLING_CONFIG_FILES=正在安装框架配置文件, 以便为某个 IDE 所使用
+INFO_INSTALLING_LAUNCH_CONFIG_FILES=正在安装 Adobe Flash Builder 启动配置文件
+INFO_DOWNLOADING_FILE_FROM=正在下载 {0} 从这个地址: {1}
+INFO_DOWNLOADED=下载完成
+INFO_VALIDATING_FILE=正在验证已下载的文件: 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b97f3335/installer.properties/zh_TW.properties
----------------------------------------------------------------------
diff --git a/installer.properties/zh_TW.properties b/installer.properties/zh_TW.properties
new file mode 100755
index 0000000..c42fbc3
--- /dev/null
+++ b/installer.properties/zh_TW.properties
@@ -0,0 +1,83 @@
+################################################################################
+##
+##  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 regarding copyright ownership.
+##  The ASF licenses this file to You under the Apache License, Version 2.0
+##  (the "License"); you may not use this file except in compliance with
+##  the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+##  Unless required by applicable law or agreed to in writing, software
+##  distributed under the License is distributed on an "AS IS" BASIS,
+##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##  See the License for the specific language governing permissions and
+##  limitations under the License.
+##
+################################################################################
+
+
+yes.no.prompts=y,n
+yes=y
+no=n
+
+flash.prompt.text=\
+Apache FlexJS 使用 Adobe Flash Player 的 playerglobal.swc 檔案來構建 Adobe Flash 應用程式.\n\
+\n\
+playerglobal.swc 檔案受到 Adobe Flex SDK 授權合約的管理, \n\
+此授權合約的位址:\n\
+http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf,\n\
+一旦您下載, 修改, 分發, 使用 和/或 訪問 playerglobal.swc 檔案, \n\
+您便同意可適用使用者授權合約的條款和條件.\n\
+\n\
+除了 Adobe 的許可條款外, 您也同意此處協力廠商條款的約束:\n\
+http://www.adobe.com/products/eula/third_party/.\n\
+Adobe 建議您查看這些協力廠商的條款.\n\
+\n\
+此許可與 Apache v2 許可並不相容.\n\
+您想要下載並安裝 playerglobal.swc 檔案嗎?
+
+air.prompt.text=\
+Apache FlexJS 使用 Adobe AIR SDK 來構建 Adobe AIR 應用程式.\n\
+Adobe AIR SDK 受到 Adobe AIR SDK 授權合約的管理, \n\
+此授權合約的位址:\n\
+http://www.adobe.com/products/air/sdk-eula.html.\n\
+此許可與 Apache v2 許可並不相容.\n\
+您想要下載並安裝 Adobe AIR SDK 嗎?
+
+goog.prompt.text=\
+Apache FlexJS 使用 Google Closure 庫來構建 FlexJS 應用程式.\n\
+Google Closure 受到 Apache v2 授權合約的管理, \n\
+此授權合約的位址:\n\
+http://www.apache.org/licenses/LICENSE-2.0.\n\
+您想要下載並安裝 Google Closure 庫嗎?
+
+swfobject.prompt.text=\
+Apache FlexJS 使用 SWFObject 來構建 Adobe Flash 應用程式.\n\
+SWFObject 受到 MIT 授權合約的管理, \n\
+此授權合約的位址:\n\
+http://opensource.org/licenses/mit-license.php.\n\
+此許可與 Apache v2 許可並不相容.\n\
+您想要下載並安裝 SWFObject 嗎?
+
+unable.to.find.java=無法找到可執行的 Java, 請設置 JAVA_HOME 環境變數
+
+install.complete.echo=${basedir} 現在是一個與 IDE 相容的目錄
+find.java.echo.pattern=可執行的 Java 是 $${java.executable}
+mac.copy.echo.pattern=從 $${download.dir}/airsdk/$${srcdir} 拷貝檔案到 $${destdir}
+
+INFO_INSTALLING_FALCON=正在從這個位址安裝 Apache Flex Falcon 編譯器: 
+INFO_INSTALLING_FLEX=正在從這個位址安裝 Apache Flex SDK: 
+INFO_INSTALLING_GOOG=正在從這個位址安裝 Google Closure 庫: 
+INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC=正在從這個位址下載 Mac 版 Adobe AIR 運行時工具包: 
+INFO_DOWNLOADING_AIR_RUNTIME_KIT_WINDOWS=正在從這個位址下載 Windows 版 Adobe AIR 運行時工具包: 
+INFO_FINISHED_UNTARING=已完成 tar 檔案的解壓: 
+INFO_FINISHED_UNZIPPING=已完成解壓: 
+INFO_UNZIPPING=正在解壓: 
+INFO_INSTALLING_PLAYERGLOBAL_SWC=正在從這個位址安裝 Adobe Flash Player 的 playerglobal.swc 檔案: 
+INFO_INSTALLING_CONFIG_FILES=正在安裝框架設定檔案, 以便為某個 IDE 所使用
+INFO_INSTALLING_LAUNCH_CONFIG_FILES=正在安裝 Adobe Flash Builder 啟動設定檔案
+INFO_DOWNLOADING_FILE_FROM=正在下載 {0} 從這個位址: {1}
+INFO_DOWNLOADED=下載完成
+INFO_VALIDATING_FILE=正在驗證已下載的檔案: 
\ No newline at end of file


[2/5] git commit: [flex-asjs] [refs/heads/develop] - bundle Google Closure Library

Posted by ah...@apache.org.
bundle Google Closure Library


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4f3efbcc
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4f3efbcc
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4f3efbcc

Branch: refs/heads/develop
Commit: 4f3efbcc5592ef9eb208efcea39f337727561f8e
Parents: b97f333
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jun 20 08:13:46 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 20 10:06:15 2014 -0700

----------------------------------------------------------------------
 build.xml     | 15 ++++++++++++--
 installer.xml | 58 +++---------------------------------------------------
 2 files changed, 16 insertions(+), 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4f3efbcc/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 740a9ee..e300e2a 100644
--- a/build.xml
+++ b/build.xml
@@ -754,6 +754,15 @@
     <target name="stage-nightly" if="nightly" description="add nightly.properties if nightly build">
         <copy todir="${basedir}/temp" file="${basedir}/nightly.properties" />
     </target>
+    
+    <target name="stage-goog" description="add google closure library to binary package">
+        <mkdir dir="${basedir}/temp/js/lib/google/closure-library" />
+        <copy todir="${basedir}/temp/js/lib/google/closure-library" >
+            <fileset dir="${GOOG_HOME}" >
+                <include name="**/*"/>
+            </fileset>
+        </copy>
+    </target>
 
     <target name="binary-package"
         description="Package binary files in zip and tar-gzip file.">
@@ -823,8 +832,10 @@
             </fileset>
         </copy>
          -->
-                 
-        <antcall target="binary-package-zip"/>        
+        
+        <antcall target="stage-goog" />
+        
+        <antcall target="binary-package-zip"/>
         <antcall target="binary-package-tgz"/>
         <copy todir="${basedir}/out" file="${basedir}/apache-flex-flexjs-installer-config.xml" />
     </target>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4f3efbcc/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index e6b1ea1..1bd20b7 100644
--- a/installer.xml
+++ b/installer.xml
@@ -61,11 +61,6 @@
     <property name="flexjs.version" value="0.0.2"/>
     <property name="falcon.version" value="0.0.2"/>
     
-    <property name="goog.lib.url.server" value="https://github.com" />
-    <property name="goog.lib.url.folder" value="google/closure-library/archive" />
-    <property name="goog.lib.url.file" value="master.zip" />
-    <property name="goog.lib.md5" value="9711bb32b35550f8cc49d7aac6b2c41c" />
-
     <property name="swfobject.url.server" value="https://github.com" />
     <property name="swfobject.url.folder" value="swfobject/swfobject/archive" />
     <property name="swfobject.url.file" value="2.2.zip" />
@@ -94,9 +89,6 @@
     </condition>
     <property name="AIRDownloadEcho" value="${INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC}" />
 
-    <condition property="goog.donot.ask" value="true">
-        <isset property="installer" />
-    </condition>
     <condition property="air.donot.ask" value="true">
         <isset property="installer" />
     </condition>
@@ -288,24 +280,9 @@
         </fail>
     </target>
     
-    <target name="ask-licenses" depends="ask-goog,ask-air,ask-flash,ask-swfobject" description="Ask about the various licenses">
+    <target name="ask-licenses" depends="ask-air,ask-flash,ask-swfobject" description="Ask about the various licenses">
 	</target>
     
-    <target name="ask-goog" unless="goog.donot.ask"
-        description="Prompt the user before downloading Google Closure Library">
-        
-        <input
-        message="${goog.prompt.text}"
-        validargs="${yes.no.prompts}"
-        defaultvalue="${no}"
-        addproperty="input.goog.download"/>
-        <condition property="do.goog.install">
-            <equals arg1="${yes}" arg2="${input.goog.download}"/>
-        </condition>
-        <!-- Only ask once per ant run.  -->
-        <property name="goog.donot.ask" value="set"/>
-    </target>
-    
     <target name="ask-air" unless="air.donot.ask"
         description="Prompt the user before downloading AIR">
         
@@ -486,36 +463,7 @@
         </antcall>
     </target>
 
-    <target name="get-third-party-files" depends="goog-download,air-download,flash-download,swfobject-download" />
-    
-    <!-- Because this requires a network connection it downloads artifacts only if it doesn't already exist. -->
-    <target name="goog-check" description="Checks if Google Closure Library has been downloaded.">
-        <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" property="goog.lib.present"/>
-    </target>
-    
-    <target name="goog-download" depends="goog-check" unless="goog.lib.present"
-        description="Downloads Google Closure Library and copies to correct locations">
-        
-        <mkdir dir="${download.dir}"/>
-        <antcall target="goog-get" />
-        <unzip src="${download.dir}/${goog.lib.url.file}" dest="${FLEXJS_HOME}/js/lib/google/closure-library" />
-    </target>
-    
-    <target name="goog-get-check" >
-        <available file="${download.dir}/${goog.lib.url.file}" property="goog.downloaded" />
-    </target>
-            
-    <target name="goog-get" depends="goog-get-check" unless="goog.downloaded" >
-        <echo>${INFO_INSTALLING_GOOG} ${goog.lib.url.server}/${goog.lib.url.folder}/${goog.lib.url.file}</echo>
-        <antcall target="download_using_get" >
-            <param name="srcDomain" value="${goog.lib.url.server}" />
-            <param name="srcFolder" value="${goog.lib.url.folder}" />
-            <param name="srcFile" value="${goog.lib.url.file}" />
-            <param name="dest" value="${download.dir}/${goog.lib.url.file}" />
-			<param name="failmessage" value="Google Closure Library download failed" />
-			<param name="md5" value="${goog.lib.md5}" />
-        </antcall>
-    </target>
+    <target name="get-third-party-files" depends="air-download,flash-download,swfobject-download" />
     
     <target name="air-check" description="Checks if AIR SDK has been downloaded.">
         <available file="${FLEXJS_HOME}/lib/adt.jar" property="air.jar.present"/>
@@ -768,7 +716,7 @@
     </target>
     
     <target name="swfobject-download" depends="swfobject-check" unless="swfobject.js.present"
-        description="Copies SWFObject from code.google.com">
+        description="Copies SWFObject from github.com">
         
         <echo file="${basedir}/swfobject.properties">swfobject.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
         <replace file="${basedir}/swfobject.properties" token="{0}" value="${swfobject.url.file}" />


[4/5] git commit: [flex-asjs] [refs/heads/develop] - additional chinese translations from Darkstone

Posted by ah...@apache.org.
additional chinese translations from Darkstone


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c73638cb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c73638cb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c73638cb

Branch: refs/heads/develop
Commit: c73638cbc9bf1a1ec2b34a9e731056c17ea0c8e4
Parents: 4f3efbc
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jun 20 08:26:56 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 20 10:06:15 2014 -0700

----------------------------------------------------------------------
 apache-flex-flexjs-installer-config.xml | 491 ++++++++++++++++-----------
 installer.properties/zh_CN.properties   |  24 +-
 installer.properties/zh_TW.properties   |  24 +-
 3 files changed, 322 insertions(+), 217 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c73638cb/apache-flex-flexjs-installer-config.xml
----------------------------------------------------------------------
diff --git a/apache-flex-flexjs-installer-config.xml b/apache-flex-flexjs-installer-config.xml
old mode 100644
new mode 100755
index e818264..99aebb0
--- a/apache-flex-flexjs-installer-config.xml
+++ b/apache-flex-flexjs-installer-config.xml
@@ -1,193 +1,298 @@
-<?xml version="1.0"?>
-<!--
-
-  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 regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
--->
-
-<config>
-    <!--<progressLabels>
-        <en_US>
-            <Copy>Copying %1 of %2</Copy>
-            <Get>Downloading bytes %1 of %2</Get>
-            <Checksum>Computing checksum: bytes %1 of %2</Checksum>
-        </en_US>
-    </progressLabels>
-     -->
-    <properties>
-    </properties>
-    <strings description="override default installer strings here">
-        <string id="INFO_CREATING_FLEX_HOME">
-            <el_GR>Δημιουργία αρχικού καταλόγου για το Apache FlexJS</el_GR>
-            <en_US>Creating Apache FlexJS home</en_US>
-        </string>
-        <string id="INFO_DOWNLOADING_FLEX_SDK">
-            <el_GR>Γίνεται λήψη του Apache FlexJS από:</el_GR>
-            <en_US>Downloading Apache FlexJS from: </en_US>
-        </string>
-        <string id="INFO_ENTER_VALID_FLEX_SDK_PATH">
-            <el_GR>Παρακαλώ εισάγετε μια έγκυρη διαδρομή καταλόγου για το FlexJS</el_GR>
-            <en_US>Please enter valid directory path for the FlexJS SDK</en_US>
-        </string>
-        <string id="INFO_SELECT_DIRECTORY">
-            <el_GR>Επιλέξτε τον κατάλογο στον οποίο θέλετε να εγκαταστήσετε το FlexJS</el_GR>
-            <en_US>Select the directory where you want to install the FlexJS files</en_US>
-        </string>
-        <string id="INFO_VERIFY_FLEX_SDK_DONE">
-            <el_GR>Η επαλήθευση των ληφθέντων αρχείων είναι επιτυχής.</el_GR>
-            <en_US>The Apache FlexJS MD5 Signature of the downloaded files matches the reference. The file is valid.</en_US>
-        </string>
-        <string id="SELECT_PATH_PROMPT">
-            <el_GR>Πληκτρολογήστε η επιλέξτε μια έγκυρη διαδρομή για το FlexJS SDK</el_GR>
-            <en_US>Where do you want to install the Apache FlexJS SDK?</en_US>
-        </string>
-        <string id="ERROR_VERIFY_FLEX_SDK">
-            <el_GR>Η επαλήθευση των ληφθέντων αρχείων απέτυχε. Η εγκατάσταση σταμάτησε.</el_GR>
-            <en_US>The Apache FlexJS MD5 Signature of the downloaded files does not match the reference value. The file is invalid, installation is aborted.</en_US>
-        </string>
-        <string id="BTN_LABEL_OPEN_APACHE_FLEX_FOLDER">
-            <el_GR>ΑΝΟΙΓΜΑ ΦΑΚΕΛΟΥ APACHE FLEXJS</el_GR>
-            <en_US>OPEN APACHE FLEXJS FOLDER</en_US>
-        </string>
-        <string id="STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK">
-            <el_GR>Λήψη Apache FlexJS SDK</el_GR>
-            <en_US>Apache FlexJS SDK (Required)</en_US>
-        </string>
-        <string id="STEP_VERIFY_FLEX_SDK">
-            <el_GR>Γίνεται επαλήθευση του Apache Flex SDK MD5 Signature</el_GR>
-            <en_US>Verifying Apache Flex JS MD5 Signature</en_US>
-        </string>
-        <string id="STEP_UNZIP_FLEX_SDK">
-            <el_GR>Αποσυμπίεση του Apache Flex SDK</el_GR>
-            <en_US>Uncompress Apache FlexJS SDK</en_US>
-        </string>
-    </strings>
-    <steps description="targets that should have a 'step' in the GUI progress indicator, in order of appearance.">
-        <step id="flex-get">
-            <el_GR>Λήψη Apache Flex SDK</el_GR>
-            <en_US>Apache Flex SDK (Required)</en_US>
-        </step>
-        <step id="get-flex">
-            <el_GR>Αποσυμπίεση του Apache Flex SDK</el_GR>
-            <en_US>Uncompress Apache Flex SDK</en_US>
-        </step>
-        <step id="falcon-get">
-            <el_GR>Λήψη Apache Flex Falcon SDK</el_GR>
-            <en_US>Apache Flex Falcon SDK (Required)</en_US>
-        </step>
-        <step id="get-falcon">
-            <el_GR>Αποσυμπίεση του Apache Flex Falcon SDK</el_GR>
-            <en_US>Uncompress Apache Flex Falcon SDK</en_US>
-        </step>
-        <step id="download">
-            <el_GR></el_GR>
-            <en_US>Download Falcon dependencies</en_US>
-        </step>
-        <step id="copyfiles">
-            <el_GR></el_GR>
-            <en_US>Copy Falcon SDK files</en_US>
-        </step>
-        <step id="download.jx">
-            <en_US>Download FalconJX Dependencies</en_US>
-        </step>
-        <step id="copyfiles.jx">
-            <el_GR></el_GR>
-            <en_US>Copy FalconJX SDK files</en_US>
-        </step>
-        <step id="goog-download" property="do.goog.install">
-            <el_GR>Λήψη Google Closure Library</el_GR>
-            <en_US>Google Closure Library jar (Required)</en_US>
-        </step>
-        <step id="air-download" property="do.air.install">
-            <el_GR>Αποσυμπίεση του Adobe AIR Runtime Kit</el_GR>
-            <en_US>Adobe AIR SDK (Required)</en_US>
-        </step>
-        <step id="flash-download" property="do.flash.install">
-            <el_GR>Λήψη Flash Player swc</el_GR>
-            <en_US>Adobe Flash Player playerglobal.swc (Required)</en_US>
-        </step>
-        <step id="swfobject-download" property="do.swfobject.install">
-            <el_GR>SWFObject (Απαιτούμενο)</el_GR>
-            <en_US>SWFObject (Required)</en_US>
-        </step>
-        <step id="fixup-config-files">
-            <el_GR>Εγκατάσταση των αρχείων ρυθμίσεων του Framework</el_GR>
-            <en_US>Install Framework Configuration Files</en_US>
-        </step>
-    </steps>
-    <component id="STEP_REQUIRED_INSTALL_APACHE_FLEXJS" required="true" property="do.flexjs.install">
-        <el_GR>
-            <label>Apache FlexJS (Απαιτούμενο)</label>
-            <message>Για το Apache FlexJS ισχύει η συμφωνία χρήσης του Apache License V2. Θέλετε να εγκαταστήσετε το Apache FlexJS;</message>
-        </el_GR>
-        <en_US>
-            <label>Apache FlexJS (Required)</label>
-            <message>The Apache License V2 applies to the Apache FlexJS.  Do you want to install the Apache FlexJS?</message>
-            <license>Apache V2 License</license>
-            <licenseURL>http://www.apache.org/licenses/LICENSE-2.0.html</licenseURL>
-        </en_US>
-    </component>
-    <component id="STEP_REQUIRED_INSTALL_GOOGLE_CLOSURE_LIBRARY" required="true" property="do.goog.install">
-        <el_GR>
-            <label>Google Closure Library (Απαιτούμενο)</label>
-            <message>Για το Google Closure Library ισχύει η συμφωνία χρήσης του Apache License V2. Θέλετε να εγκαταστήσετε το Google Closure Library;</message>
-        </el_GR>
-        <en_US>
-            <label>Google Closure Library (Required)</label>
-            <message>The Apache License V2 applies to the Google Closure Library.  Do you want to install the Google Closure Library?</message>
-            <license>Apache V2 License</license>
-            <licenseURL>http://www.apache.org/licenses/LICENSE-2.0.html</licenseURL>
-        </en_US>
-    </component>
-    <component id="STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK" required="true" property="do.air.install">
-        <el_GR>
-            <label>Adobe AIR SDK (Απαιτούμενο)</label>
-            <message>Για το Adobe AIR SDK ισχύει η συμφωνία χρήσης του Adobe SDK License. Θέλετε να εγκαταστήσετε το Adobe AIR SDK;</message>
-            <license>'Αδεια χρήσης Adobe AIR SDK</license>
-        </el_GR>
-        <en_US>
-            <label>Adobe AIR SDK (Required)</label>
-            <message>The Adobe SDK license agreement applies to the Adobe AIR SDK.  Do you want to install the Adobe AIR SDK?</message>
-            <license>Adobe AIR SDK License</license>
-            <licenseURL>http://www.adobe.com/products/air/sdk-eula.html</licenseURL>
-        </en_US>
-    </component>
-    <component id="STEP_REQUIRED_INSTALL_FLASH_PLAYER_GLOBAL_SWC" required="true" property="do.flash.install">
-        <el_GR>
-            <label>Adobe Flash Player playerglobal.swc (Απαιτούμενο)</label>
-            <message>Για το Adobe Flash Player playerglobal.swc ισχύει η συμφωνία χρήσης του Adobe SDK License. Θέλετε να εγκαταστήσετε το Adobe Flash Player playerglobal.swc;</message>
-            <license>'Αδεια χρήσης Adobe Flex SDK</license>
-        </el_GR>
-        <en_US>
-            <label>Adobe Flash Player playerglobal.swc (Required)</label>
-            <message>The Adobe SDK license agreement applies to the Adobe Flash Player playerglobal.swc.  Do you want to install the Adobe Flash Player playerglobal.swc?</message>
-            <license>Adobe Flex SDK License</license>
-            <licenseURL>http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf</licenseURL>
-        </en_US>
-    </component>
-    <component id="SWFObject (Required)" required="true" property="do.swfobject.install">
-        <el_GR>
-            <label>SWFObject (Απαιτούμενο)</label>
-            <message>Για το SWFObject ισχύει η συμφωνία χρήσης του MIT License (MIT). Θέλετε να εγκαταστήσετε το SWFObject;</message>
-\        </el_GR>
-        <en_US>
-            <label>SWFObject (Required)</label>
-            <message>The MIT License (MIT) applies to the SWFObject utility.  Do you want to install the SWFObject utility?</message>
-            <license>MIT License</license>
-            <licenseURL>http://opensource.org/licenses/mit-license.php</licenseURL>
-        </en_US>
-    </component>
-</config>
+<?xml version="1.0"?>
+<!--
+
+  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 regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+-->
+
+<config>
+	<!--
+	<progressLabels>
+
+		<en_US>
+
+			<Copy>Copying %1 of %2</Copy>
+
+			<Get>Downloading bytes %1 of %2</Get>
+
+			<Checksum>Computing checksum: bytes %1 of %2</Checksum>
+		</en_US>
+	</progressLabels>
+
+	-->
+	<properties>
+
+	</properties>
+	<strings description="override default installer strings here">
+		<string id="INFO_CREATING_FLEX_HOME">
+			<el_GR>Δημιουργία αρχικού καταλόγου για το Apache FlexJS</el_GR>
+			<en_US>Creating Apache FlexJS home</en_US>
+			<zh_CN>正在创建 Apache FlexJS 主目录</zh_CN>
+			<zh_TW>正在創建 Apache FlexJS 主目錄</zh_TW>
+		</string>
+		<string id="INFO_DOWNLOADING_FLEX_SDK">
+			<el_GR>Γίνεται λήψη του Apache FlexJS από:</el_GR>
+			<en_US>Downloading Apache FlexJS from: </en_US>
+			<zh_CN>正在下载 Apache FlexJS: </zh_CN>
+			<zh_TW>正在下載 Apache FlexJS: </zh_TW>
+		</string>
+		<string id="INFO_ENTER_VALID_FLEX_SDK_PATH">
+			<el_GR>Παρακαλώ εισάγετε μια έγκυρη διαδρομή καταλόγου για το FlexJS</el_GR>
+			<en_US>Please enter valid directory path for the FlexJS SDK</en_US>
+			<zh_CN>请为 FlexJS SDK 输入有效的目录路径</zh_CN>
+			<zh_TW>請為 FlexJS SDK 輸入有效的目錄路徑</zh_TW>
+		</string>
+		<string id="INFO_SELECT_DIRECTORY">
+			<el_GR>Επιλέξτε τον κατάλογο στον οποίο θέλετε να εγκαταστήσετε το FlexJS</el_GR>
+			<en_US>Select the directory where you want to install the FlexJS files</en_US>
+			<zh_CN>请选择您想要安装 FlexJS 文件的目录</zh_CN>
+			<zh_TW>請選擇您想要安裝 FlexJS 檔案的目錄</zh_TW>
+		</string>
+		<string id="INFO_VERIFY_FLEX_SDK_DONE">
+			<el_GR>Η επαλήθευση των ληφθέντων αρχείων είναι επιτυχής.</el_GR>
+			<en_US>The Apache FlexJS MD5 Signature of the downloaded files matches the reference. The file is valid.</en_US>
+			<zh_CN>所下载文件的 MD5 签名和 Apache FlexJS 的官方签名一致, 此文件有效.</zh_CN>
+			<zh_TW>所下載檔案的 MD5 簽名和 Apache FlexJS 的官方簽名一致, 此檔案有效.</zh_TW>
+		</string>
+		<string id="SELECT_PATH_PROMPT">
+			<el_GR>Πληκτρολογήστε η επιλέξτε μια έγκυρη διαδρομή για το FlexJS SDK</el_GR>
+			<en_US>Where do you want to install the Apache FlexJS SDK?</en_US>
+			<zh_CN>您想在哪里安装 Apache FlexJS SDK?</zh_CN>
+			<zh_TW>您想在哪裡安裝 Apache FlexJS SDK?</zh_TW>
+		</string>
+		<string id="ERROR_VERIFY_FLEX_SDK">
+			<el_GR>Η επαλήθευση των ληφθέντων αρχείων απέτυχε. Η εγκατάσταση σταμάτησε.</el_GR>
+			<en_US>The Apache FlexJS MD5 Signature of the downloaded files does not match the reference value. The file is invalid, installation is aborted.</en_US>
+			<zh_CN>所下载文件的 MD5 签名和 Apache FlexJS 的官方签名不一致, 此文件无效, 安装中止.</zh_CN>
+			<zh_TW>所下載檔案的 MD5 簽名和 Apache FlexJS 的官方簽名不一致, 此檔案無效, 安裝中止.</zh_TW>
+		</string>
+		<string id="BTN_LABEL_OPEN_APACHE_FLEX_FOLDER">
+			<el_GR>ΑΝΟΙΓΜΑ ΦΑΚΕΛΟΥ APACHE FLEXJS</el_GR>
+			<en_US>OPEN APACHE FLEXJS FOLDER</en_US>
+			<zh_CN>打开 Apache FlexJS 目录</zh_CN>
+			<zh_TW>打開 Apache FlexJS 目錄</zh_TW>
+		</string>
+		<string id="STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK">
+			<el_GR>Λήψη Apache FlexJS SDK</el_GR>
+			<en_US>Apache FlexJS SDK (Required)</en_US>
+			<zh_CN>Apache FlexJS SDK (必须的)</zh_CN>
+			<zh_TW>Apache FlexJS SDK (必須的)</zh_TW>
+		</string>
+		<string id="STEP_VERIFY_FLEX_SDK">
+			<el_GR>Γίνεται επαλήθευση του Apache Flex SDK MD5 Signature</el_GR>
+			<en_US>Verifying Apache FlexJS MD5 Signature</en_US>
+			<zh_CN>正在检查 Apache FlexJS 的 MD5 签名</zh_CN>
+			<zh_TW>正在檢查 Apache FlexJS 的 MD5 簽名</zh_TW>
+		</string>
+		<string id="STEP_UNZIP_FLEX_SDK">
+			<el_GR>Αποσυμπίεση του Apache Flex SDK</el_GR>
+			<en_US>Uncompress Apache FlexJS SDK</en_US>
+			<zh_CN>解压 Apache FlexJS SDK</zh_CN>
+			<zh_TW>解壓 Apache FlexJS SDK</zh_TW>
+		</string>
+	</strings>
+	<steps description="targets that should have a 'step' in the GUI progress indicator, in order of appearance.">
+		<step id="flex-get">
+			<el_GR>Λήψη Apache Flex SDK</el_GR>
+			<en_US>Apache Flex SDK (Required)</en_US>
+			<zh_CN>Apache Flex SDK (必须的)</zh_CN>
+			<zh_TW>Apache Flex SDK (必須的)</zh_TW>
+		</step>
+		<step id="get-flex">
+			<el_GR>Αποσυμπίεση του Apache Flex SDK</el_GR>
+			<en_US>Uncompress Apache Flex SDK</en_US>
+			<zh_CN>解压 Apache Flex SDK</zh_CN>
+			<zh_TW>解壓 Apache Flex SDK</zh_TW>
+		</step>
+		<step id="falcon-get">
+			<el_GR>Λήψη Apache Flex Falcon SDK</el_GR>
+			<en_US>Apache Flex Falcon SDK (Required)</en_US>
+			<zh_CN>Apache Flex Falcon SDK (必须的)</zh_CN>
+			<zh_TW>Apache Flex Falcon SDK (必須的)</zh_TW>
+		</step>
+		<step id="get-falcon">
+			<el_GR>Αποσυμπίεση του Apache Flex Falcon SDK</el_GR>
+			<en_US>Uncompress Apache Flex Falcon SDK</en_US>
+			<zh_CN>解压 Apache Flex Falcon SDK</zh_CN>
+			<zh_TW>解壓 Apache Flex Falcon SDK</zh_TW>
+		</step>
+		<step id="download">
+			<el_GR></el_GR>
+			<en_US>Download Falcon dependencies</en_US>
+			<zh_CN>下载 Falcon 所需组件</zh_CN>
+			<zh_TW>下載 Falcon 所需組件</zh_TW>
+		</step>
+		<step id="copyfiles">
+			<el_GR></el_GR>
+			<en_US>Copy Falcon SDK files</en_US>
+			<zh_CN>拷贝 Falcon SDK 文件</zh_CN>
+			<zh_TW>拷貝 Falcon SDK 檔案</zh_TW>
+		</step>
+		<step id="download.jx">
+			<en_US>Download FalconJX Dependencies</en_US>
+			<zh_CN>下载 FalconJX 所需组件</zh_CN>
+			<zh_TW>下載 FalconJX 所需組件</zh_TW>
+		</step>
+		<step id="copyfiles.jx">
+			<el_GR></el_GR>
+			<en_US>Copy FalconJX SDK files</en_US>
+			<zh_CN>拷贝 FalconJX SDK 文件</zh_CN>
+			<zh_TW>拷貝 FalconJX SDK 檔案</zh_TW>
+		</step>
+		<step id="goog-download" property="do.goog.install">
+			<el_GR>Λήψη Google Closure Library</el_GR>
+			<en_US>Google Closure Library jar (Required)</en_US>
+			<zh_CN>Google Closure Library jar (必须的)</zh_CN>
+			<zh_TW>Google Closure Library jar (必須的)</zh_TW>
+		</step>
+		<step id="air-download" property="do.air.install">
+			<el_GR>Αποσυμπίεση του Adobe AIR Runtime Kit</el_GR>
+			<en_US>Adobe AIR SDK (Required)</en_US>
+			<zh_CN>Adobe AIR SDK (必须的)</zh_CN>
+			<zh_TW>Adobe AIR SDK (必須的)</zh_TW>
+		</step>
+		<step id="flash-download" property="do.flash.install">
+			<el_GR>Λήψη Flash Player swc</el_GR>
+			<en_US>Adobe Flash Player playerglobal.swc (Required)</en_US>
+			<zh_CN>Adobe Flash Player playerglobal.swc (必须的)</zh_CN>
+			<zh_TW>Adobe Flash Player playerglobal.swc (必須的)</zh_TW>
+		</step>
+		<step id="swfobject-download" property="do.swfobject.install">
+			<el_GR>SWFObject (Απαιτούμενο)</el_GR>
+			<en_US>SWFObject (Required)</en_US>
+			<zh_CN>SWFObject (必须的)</zh_CN>
+			<zh_TW>SWFObject (必須的)</zh_TW>
+		</step>
+		<step id="fixup-config-files">
+			<el_GR>Εγκατάσταση των αρχείων ρυθμίσεων του Framework</el_GR>
+			<en_US>Install Framework Configuration Files</en_US>
+			<zh_CN>安装框架配置文件</zh_CN>
+			<zh_TW>安裝框架設定檔案</zh_TW>
+		</step>
+	</steps>
+	<component id="STEP_REQUIRED_INSTALL_APACHE_FLEXJS" required="true" property="do.flexjs.install">
+		<el_GR>
+			<label>Apache FlexJS (Απαιτούμενο)</label>
+			<message>Για το Apache FlexJS ισχύει η συμφωνία χρήσης του Apache License V2. Θέλετε να εγκαταστήσετε το Apache FlexJS;</message>
+		</el_GR>
+		<en_US>
+			<label>Apache FlexJS (Required)</label>
+			<message>The Apache License V2 applies to the Apache FlexJS.  Do you want to install the Apache FlexJS?</message>
+			<license>Apache V2 License</license>
+			<licenseURL>http://www.apache.org/licenses/LICENSE-2.0.html</licenseURL>
+		</en_US>
+		<zh_CN>
+			<label>Apache FlexJS (必须的)</label>
+			<message>Apache V2 许可协议适用于 Apache FlexJS. 您想要安装 Apache FlexJS 吗?</message>
+			<license>Apache V2 许可协议</license>
+		</zh_CN>
+		<zh_TW>
+			<label>Apache FlexJS (必須的)</label>
+			<message>Apache V2 授權合約適用於 Apache FlexJS. 您想要安裝 Apache FlexJS 嗎?</message>
+			<license>Apache V2 授權合約</license>
+		</zh_TW>
+	</component>
+	<component id="STEP_REQUIRED_INSTALL_GOOGLE_CLOSURE_LIBRARY" required="true" property="do.goog.install">
+		<el_GR>
+			<label>Google Closure Library (Απαιτούμενο)</label>
+			<message>Για το Google Closure Library ισχύει η συμφωνία χρήσης του Apache License V2. Θέλετε να εγκαταστήσετε το Google Closure Library;</message>
+		</el_GR>
+		<en_US>
+			<label>Google Closure Library (Required)</label>
+			<message>The Apache License V2 applies to the Google Closure Library.  Do you want to install the Google Closure Library?</message>
+			<license>Apache V2 License</license>
+			<licenseURL>http://www.apache.org/licenses/LICENSE-2.0.html</licenseURL>
+		</en_US>
+		<zh_CN>
+			<label>Google Closure Library (必须的)</label>
+			<message>Apache V2 许可协议适用于 Google Closure Library. 您想要安装 Google Closure Library 吗?</message>
+			<license>Apache V2 许可协议</license>
+		</zh_CN>
+		<zh_TW>
+			<label>Google Closure Library (必須的)</label>
+			<message>Apache V2 授權合約適用於 Google Closure Library. 您想要安裝 Google Closure Library 嗎?</message>
+			<license>Apache V2 授權合約</license>
+		</zh_TW>
+	</component>
+	<component id="STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK" required="true" property="do.air.install">
+		<el_GR>
+			<label>Adobe AIR SDK (Απαιτούμενο)</label>
+			<message>Για το Adobe AIR SDK ισχύει η συμφωνία χρήσης του Adobe SDK License. Θέλετε να εγκαταστήσετε το Adobe AIR SDK;</message>
+			<license>'Αδεια χρήσης Adobe AIR SDK</license>
+		</el_GR>
+		<en_US>
+			<label>Adobe AIR SDK (Required)</label>
+			<message>The Adobe SDK license agreement applies to the Adobe AIR SDK.  Do you want to install the Adobe AIR SDK?</message>
+			<license>Adobe AIR SDK License</license>
+			<licenseURL>http://www.adobe.com/products/air/sdk-eula.html</licenseURL>
+		</en_US>
+		<zh_CN>
+			<label>Adobe AIR SDK (必须的)</label>
+			<message>Adobe SDK 许可协议适用于 Adobe AIR SDK. 您想要安装 Adobe AIR SDK 吗?</message>
+			<license>Adobe AIR SDK 许可协议</license>
+		</zh_CN>
+		<zh_TW>
+			<label>Adobe AIR SDK (必須的)</label>
+			<message>Adobe SDK 授權合約適用於 Adobe AIR SDK. 您想要安裝 Adobe AIR SDK 嗎?</message>
+			<license>Adobe AIR SDK 授權合約</license>
+		</zh_TW>
+	</component>
+	<component id="STEP_REQUIRED_INSTALL_FLASH_PLAYER_GLOBAL_SWC" required="true" property="do.flash.install">
+		<el_GR>
+			<label>Adobe Flash Player playerglobal.swc (Απαιτούμενο)</label>
+			<message>Για το Adobe Flash Player playerglobal.swc ισχύει η συμφωνία χρήσης του Adobe SDK License. Θέλετε να εγκαταστήσετε το Adobe Flash Player playerglobal.swc;</message>
+			<license>'Αδεια χρήσης Adobe Flex SDK</license>
+		</el_GR>
+		<en_US>
+			<label>Adobe Flash Player playerglobal.swc (Required)</label>
+			<message>The Adobe SDK license agreement applies to the Adobe Flash Player playerglobal.swc.  Do you want to install the Adobe Flash Player playerglobal.swc?</message>
+			<license>Adobe Flex SDK License</license>
+			<licenseURL>http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf</licenseURL>
+		</en_US>
+		<zh_CN>
+			<label>Adobe Flash Player playerglobal.swc (必须的)</label>
+			<message>Adobe SDK 许可协议适用于 Adobe Flash Player 的 playerglobal.swc 文件. 您想要安装 Adobe Flash Player 的 playerglobal.swc 文件吗?</message>
+			<license>Adobe Flex SDK 许可协议</license>
+		</zh_CN>
+		<zh_TW>
+			<label>Adobe Flash Player playerglobal.swc (必須的)</label>
+			<message>Adobe SDK 授權合約適用於 Adobe Flash Player 的 playerglobal.swc 檔案. 您想要安裝 Adobe Flash Player 的 playerglobal.swc 檔案嗎?</message>
+			<license>Adobe Flex SDK 授權合約</license>
+		</zh_TW>
+	</component>
+	<component id="SWFObject (Required)" required="true" property="do.swfobject.install">
+		<el_GR>
+			<label>SWFObject (Απαιτούμενο)</label>
+			<message>Για το SWFObject ισχύει η συμφωνία χρήσης του MIT License (MIT). Θέλετε να εγκαταστήσετε το SWFObject;</message>
+		</el_GR>
+		<en_US>
+			<label>SWFObject (Required)</label>
+			<message>The MIT License (MIT) applies to the SWFObject utility.  Do you want to install the SWFObject utility?</message>
+			<license>MIT License</license>
+			<licenseURL>http://opensource.org/licenses/mit-license.php</licenseURL>
+		</en_US>
+		<zh_CN>
+			<label>SWFObject (必须的)</label>
+			<message>MIT 许可协议适用于 SWFObject 实用程序. 您想要安装 SWFObject 实用程序吗?</message>
+			<license>MIT 许可协议</license>
+		</zh_CN>
+		<zh_TW>
+			<label>SWFObject (必須的)</label>
+			<message>MIT 授權合約適用於 SWFObject 實用程式. 您想要安裝 SWFObject 實用程式嗎?</message>
+			<license>MIT 授權合約</license>
+		</zh_TW>
+	</component>
+</config>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c73638cb/installer.properties/zh_CN.properties
----------------------------------------------------------------------
diff --git a/installer.properties/zh_CN.properties b/installer.properties/zh_CN.properties
index 59796e2..58977a6 100755
--- a/installer.properties/zh_CN.properties
+++ b/installer.properties/zh_CN.properties
@@ -35,7 +35,7 @@ http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-com
 http://www.adobe.com/products/eula/third_party/.\n\
 Adobe 建议您查看这些第三方的条款.\n\
 \n\
-此许可与 Apache v2 许可并不兼容.\n\
+此许可与 Apache V2 许可并不兼容.\n\
 您想要下载并安装 playerglobal.swc 文件吗?
 
 air.prompt.text=\
@@ -43,22 +43,22 @@ Apache FlexJS 使用 Adobe AIR SDK 来构建 Adobe AIR 应用程序.\n\
 Adobe AIR SDK 受到 Adobe AIR SDK 许可协议的管理, \n\
 此许可协议的地址:\n\
 http://www.adobe.com/products/air/sdk-eula.html.\n\
-此许可与 Apache v2 许可并不兼容.\n\
+此许可与 Apache V2 许可并不兼容.\n\
 您想要下载并安装 Adobe AIR SDK 吗?
 
 goog.prompt.text=\
-Apache FlexJS 使用 Google Closure 库来构建 FlexJS 应用程序.\n\
-Google Closure 受到 Apache v2 许可协议的管理, \n\
+Apache FlexJS 使用 Google Closure Library 来构建 FlexJS 应用程序.\n\
+Google Closure Library 受到 Apache V2 许可协议的管理, \n\
 此许可协议的地址:\n\
 http://www.apache.org/licenses/LICENSE-2.0.\n\
-您想要下载并安装 Google Closure 库吗?
+您想要下载并安装 Google Closure Library 吗?
 
 swfobject.prompt.text=\
 Apache FlexJS 使用 SWFObject 来构建 Adobe Flash 应用程序.\n\
 SWFObject 受到 MIT 许可协议的管理, \n\
 此许可协议的地址:\n\
 http://opensource.org/licenses/mit-license.php.\n\
-此许可与 Apache v2 许可并不兼容.\n\
+此许可与 Apache V2 许可并不兼容.\n\
 您想要下载并安装 SWFObject 吗?
 
 unable.to.find.java=无法找到可执行的 Java, 请设置 JAVA_HOME 环境变量
@@ -67,15 +67,15 @@ install.complete.echo=${basedir} 现在是一个与 IDE 兼容的目录
 find.java.echo.pattern=可执行的 Java 是 $${java.executable}
 mac.copy.echo.pattern=从 $${download.dir}/airsdk/$${srcdir} 拷贝文件到 $${destdir}
 
-INFO_INSTALLING_FALCON=正在从这个地址安装 Apache Flex Falcon 编译器: 
-INFO_INSTALLING_FLEX=正在从这个地址安装 Apache Flex SDK: 
-INFO_INSTALLING_GOOG=正在从这个地址安装 Google Closure 库: 
-INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC=正在从这个地址下载 Mac 版 Adobe AIR 运行时工具包: 
-INFO_DOWNLOADING_AIR_RUNTIME_KIT_WINDOWS=正在从这个地址下载 Windows 版 Adobe AIR 运行时工具包: 
+INFO_INSTALLING_FALCON=正在安装 Apache Flex Falcon 编译器: 
+INFO_INSTALLING_FLEX=正在安装 Apache Flex SDK: 
+INFO_INSTALLING_GOOG=正在安装 Google Closure Library: 
+INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC=正在下载 Mac 版 Adobe AIR 运行时工具包: 
+INFO_DOWNLOADING_AIR_RUNTIME_KIT_WINDOWS=正在下载 Windows 版 Adobe AIR 运行时工具包: 
 INFO_FINISHED_UNTARING=已完成 tar 文件的解压: 
 INFO_FINISHED_UNZIPPING=已完成解压: 
 INFO_UNZIPPING=正在解压: 
-INFO_INSTALLING_PLAYERGLOBAL_SWC=正在从这个地址安装 Adobe Flash Player 的 playerglobal.swc 文件: 
+INFO_INSTALLING_PLAYERGLOBAL_SWC=正在安装 Adobe Flash Player 的 playerglobal.swc 文件: 
 INFO_INSTALLING_CONFIG_FILES=正在安装框架配置文件, 以便为某个 IDE 所使用
 INFO_INSTALLING_LAUNCH_CONFIG_FILES=正在安装 Adobe Flash Builder 启动配置文件
 INFO_DOWNLOADING_FILE_FROM=正在下载 {0} 从这个地址: {1}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c73638cb/installer.properties/zh_TW.properties
----------------------------------------------------------------------
diff --git a/installer.properties/zh_TW.properties b/installer.properties/zh_TW.properties
index c42fbc3..e891fa6 100755
--- a/installer.properties/zh_TW.properties
+++ b/installer.properties/zh_TW.properties
@@ -35,7 +35,7 @@ http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-com
 http://www.adobe.com/products/eula/third_party/.\n\
 Adobe 建議您查看這些協力廠商的條款.\n\
 \n\
-此許可與 Apache v2 許可並不相容.\n\
+此許可與 Apache V2 許可並不相容.\n\
 您想要下載並安裝 playerglobal.swc 檔案嗎?
 
 air.prompt.text=\
@@ -43,22 +43,22 @@ Apache FlexJS 使用 Adobe AIR SDK 來構建 Adobe AIR 應用程式.\n\
 Adobe AIR SDK 受到 Adobe AIR SDK 授權合約的管理, \n\
 此授權合約的位址:\n\
 http://www.adobe.com/products/air/sdk-eula.html.\n\
-此許可與 Apache v2 許可並不相容.\n\
+此許可與 Apache V2 許可並不相容.\n\
 您想要下載並安裝 Adobe AIR SDK 嗎?
 
 goog.prompt.text=\
-Apache FlexJS 使用 Google Closure 庫來構建 FlexJS 應用程式.\n\
-Google Closure 受到 Apache v2 授權合約的管理, \n\
+Apache FlexJS 使用 Google Closure Library 來構建 FlexJS 應用程式.\n\
+Google Closure Library 受到 Apache V2 授權合約的管理, \n\
 此授權合約的位址:\n\
 http://www.apache.org/licenses/LICENSE-2.0.\n\
-您想要下載並安裝 Google Closure 庫嗎?
+您想要下載並安裝 Google Closure Library 嗎?
 
 swfobject.prompt.text=\
 Apache FlexJS 使用 SWFObject 來構建 Adobe Flash 應用程式.\n\
 SWFObject 受到 MIT 授權合約的管理, \n\
 此授權合約的位址:\n\
 http://opensource.org/licenses/mit-license.php.\n\
-此許可與 Apache v2 許可並不相容.\n\
+此許可與 Apache V2 許可並不相容.\n\
 您想要下載並安裝 SWFObject 嗎?
 
 unable.to.find.java=無法找到可執行的 Java, 請設置 JAVA_HOME 環境變數
@@ -67,15 +67,15 @@ install.complete.echo=${basedir} 現在是一個與 IDE 相容的目錄
 find.java.echo.pattern=可執行的 Java 是 $${java.executable}
 mac.copy.echo.pattern=從 $${download.dir}/airsdk/$${srcdir} 拷貝檔案到 $${destdir}
 
-INFO_INSTALLING_FALCON=正在從這個位址安裝 Apache Flex Falcon 編譯器: 
-INFO_INSTALLING_FLEX=正在從這個位址安裝 Apache Flex SDK: 
-INFO_INSTALLING_GOOG=正在從這個位址安裝 Google Closure 庫: 
-INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC=正在從這個位址下載 Mac 版 Adobe AIR 運行時工具包: 
-INFO_DOWNLOADING_AIR_RUNTIME_KIT_WINDOWS=正在從這個位址下載 Windows 版 Adobe AIR 運行時工具包: 
+INFO_INSTALLING_FALCON=正在安裝 Apache Flex Falcon 編譯器: 
+INFO_INSTALLING_FLEX=正在安裝 Apache Flex SDK: 
+INFO_INSTALLING_GOOG=正在安裝 Google Closure Library: 
+INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC=正在下載 Mac 版 Adobe AIR 運行時工具包: 
+INFO_DOWNLOADING_AIR_RUNTIME_KIT_WINDOWS=正在下載 Windows 版 Adobe AIR 運行時工具包: 
 INFO_FINISHED_UNTARING=已完成 tar 檔案的解壓: 
 INFO_FINISHED_UNZIPPING=已完成解壓: 
 INFO_UNZIPPING=正在解壓: 
-INFO_INSTALLING_PLAYERGLOBAL_SWC=正在從這個位址安裝 Adobe Flash Player 的 playerglobal.swc 檔案: 
+INFO_INSTALLING_PLAYERGLOBAL_SWC=正在安裝 Adobe Flash Player 的 playerglobal.swc 檔案: 
 INFO_INSTALLING_CONFIG_FILES=正在安裝框架設定檔案, 以便為某個 IDE 所使用
 INFO_INSTALLING_LAUNCH_CONFIG_FILES=正在安裝 Adobe Flash Builder 啟動設定檔案
 INFO_DOWNLOADING_FILE_FROM=正在下載 {0} 從這個位址: {1}