update license acceptance per Adobe legal
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/cba0d671 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/cba0d671 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/cba0d671 Branch: refs/heads/develop Commit: cba0d67176bcb269c18182aa296bc712a1785477 Parents: 9609b7d Author: Alex Harui <aha...@apache.org> Authored: Thu Jun 30 11:10:37 2016 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Thu Jul 7 10:11:20 2016 -0700 ---------------------------------------------------------------------- apache-flex-flexjs-installer-config.xml | 20 ++++++++++---------- installer.properties/en_US.properties | 11 ++++++++--- 2 files changed, 18 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cba0d671/apache-flex-flexjs-installer-config.xml ---------------------------------------------------------------------- diff --git a/apache-flex-flexjs-installer-config.xml b/apache-flex-flexjs-installer-config.xml index 42813bf..524069c 100755 --- a/apache-flex-flexjs-installer-config.xml +++ b/apache-flex-flexjs-installer-config.xml @@ -201,7 +201,7 @@ </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> + <message>Terms and Conditions: By clicking the âInstallâ button, you acknowledge that you have read and agree to the Adobe AIR SDK License Agreement.</message> <license>Adobe AIR SDK License</license> <licenseURL>http://www.adobe.com/products/air/sdk-eula.html</licenseURL> </en_US> @@ -219,24 +219,24 @@ <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> + <message>Îια Ïο Adobe Flash Player playerglobal.swc ιÏÏÏει η ÏÏ Î¼ÏÏνία ÏÏήÏÎ·Ï ÏÎ¿Ï Adobe Flash Player License. ÎÎλεÏε να εγκαÏαÏÏήÏεÏε Ïο Adobe Flash Player playerglobal.swc;</message> + <license>'Îδεια ÏÏήÏÎ·Ï Adobe Flash Player</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> + <message>Terms and Conditions: By clicking the âInstallâ button, you acknowledge that you have read and agree to the Adobe Flash Player Agreement.</message> + <license>Adobe Flash Player License</license> + <licenseURL>http://wwwimages.adobe.com/content/dam/acom/en/legal/licenses-terms/pdf/Flash_Player_21_0.pdf#page=87</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> + <message>Adobe Flash Player 许å¯åè®®éç¨äº Adobe Flash Player ç playerglobal.swc æ件. æ¨æ³è¦å®è£ Adobe Flash Player ç playerglobal.swc æ件å?</message> + <license>Adobe Flash Player 许å¯åè®®</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> + <message>Adobe Flash Player ææ¬åç´é©ç¨æ¼ Adobe Flash Player ç playerglobal.swc æªæ¡. æ¨æ³è¦å®è£ Adobe Flash Player ç playerglobal.swc æªæ¡å?</message> + <license>Adobe Flash Player ææ¬åç´</license> </zh_TW> </component> <component id="STEP_REQUIRED_INSTALL_FLAT_FONTS" required="false" property="do.flat.install"> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cba0d671/installer.properties/en_US.properties ---------------------------------------------------------------------- diff --git a/installer.properties/en_US.properties b/installer.properties/en_US.properties index bb84b36..68381ea 100644 --- a/installer.properties/en_US.properties +++ b/installer.properties/en_US.properties @@ -39,9 +39,9 @@ flash.prompt.text=\ Apache FlexJS uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\ \n\ The playerglobal.swc file is subject to and governed by the\n\ -Adobe Flex SDK License Agreement specified here:\n\ -http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf,\n\ -By downloading, modifying, distributing, using and/or accessing any files the playerglobal.swc file\n\ +Adobe Flash Player License Agreement specified here:\n\ +http://wwwimages.adobe.com/content/dam/acom/en/legal/licenses-terms/pdf/Flash_Player_21_0.pdf.\n\ +By downloading, modifying, distributing, using and/or accessing the playerglobal.swc file\n\ you agree to the terms and conditions of the applicable end user license agreement.\n\ \n\ In addition to the Adobe license terms, you also agree to be bound by the third-party terms specified here:\n\ @@ -49,6 +49,9 @@ http://www.adobe.com/products/eula/third_party/.\n\ Adobe recommends that you review these third-party terms.\n\ \n\ This license is not compatible with the Apache v2 license.\n\ +Terms and Conditions: By entering the 'y' key, you acknowledge\n\ +that you have read and agree to the Adobe Flash Player Agreement\n\ +which governs the playerglobal.swc.\n\ Do you want to download and install the playerglobal.swc? air.prompt.text=\ @@ -57,6 +60,8 @@ The Adobe AIR SDK is subject to and governed by the\n\ Adobe AIR SDK License Agreement specified here:\n\ http://www.adobe.com/products/air/sdk-eula.html.\n\ This license is not compatible with the Apache v2 license.\n\ +Terms and Conditions: By entering the 'y' key, you acknowledge\n\ +that you have read and agree to the Adobe AIR SDK License Agreement.\n\ Do you want to download and install the Adobe AIR SDK? goog.prompt.text=\
