You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2014/05/05 02:04:06 UTC
git commit: [flex-sdk] [refs/heads/develop] - fixed incorrect
references to FlexJS in license text
Repository: flex-sdk
Updated Branches:
refs/heads/develop 20cd5fb1e -> 8350eb580
fixed incorrect references to FlexJS in license text
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/8350eb58
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/8350eb58
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/8350eb58
Branch: refs/heads/develop
Commit: 8350eb580f5cd3d98ba99704ccf9de8351dfe7c3
Parents: 20cd5fb
Author: Justin Mclean <jm...@apache.org>
Authored: Mon May 5 10:03:43 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon May 5 10:03:43 2014 +1000
----------------------------------------------------------------------
installer.properties/de_DE.properties | 6 +++---
installer.properties/el_GR.properties | 6 +++---
installer.properties/en_US.properties | 6 +++---
installer.properties/es_ES.properties | 6 +++---
installer.properties/fr_FR.properties | 6 +++---
installer.properties/ko_KR.properties | 6 +++---
installer.properties/nl_NL.properties | 6 +++---
installer.properties/pt_BR.properties | 6 +++---
8 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8350eb58/installer.properties/de_DE.properties
----------------------------------------------------------------------
diff --git a/installer.properties/de_DE.properties b/installer.properties/de_DE.properties
index f1f97aa..004ddd9 100644
--- a/installer.properties/de_DE.properties
+++ b/installer.properties/de_DE.properties
@@ -23,7 +23,7 @@ yes=j
no=n
flash.prompt.text=\
-Apache FlexJS uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
+Apache Flex SDK uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
\n\
Die Adobe Flash Player playerglobal.swc verwendet die Adobe SDK Lizenzvereinbarung.\n\
http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf,\n\
@@ -39,7 +39,7 @@ Möchten SIe jetzt die Adobe Flash Player playerglobal.swc installieren?
air.prompt.text=\
-Apache FlexJS uses the Adobe AIR SDK to build Adobe AIR applications.\n\
+Apache Flex SDK uses the Adobe AIR SDK to build Adobe AIR applications.\n\
Das Adobe AIR SDK verwendet die Adobe SDK Lizenzvereinbarung.\n\
http://www.adobe.com/products/air/sdk-eula.html.\n\
Diese Lizenz ist nicht mit der Apache V2 Lizenz vereinbar.\n\
@@ -60,7 +60,7 @@ you agree to the terms and conditions of the applicable license agreement.\n\
I have read the MPL1.1 license information above?"
swfobject.prompt.text=\
-Apache FlexJS uses SWFObject when building Adobe Flash applications.\n\
+Apache Flex SDK uses SWFObject when building Adobe Flash applications.\n\
Das SWFObject utility verwendet die MIT License (MIT).\n\
http://opensource.org/licenses/mit-license.php.\n\
Diese Lizenz ist mit der Apache V2 Lizenz vereinbar.\n\
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8350eb58/installer.properties/el_GR.properties
----------------------------------------------------------------------
diff --git a/installer.properties/el_GR.properties b/installer.properties/el_GR.properties
index 2ec2130..9b72a97 100644
--- a/installer.properties/el_GR.properties
+++ b/installer.properties/el_GR.properties
@@ -23,7 +23,7 @@ yes=y
no=n
flash.prompt.text=\
-Apache FlexJS uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
+Apache Flex SDK uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
\n\
Για το Adobe Flash Player playerglobal.swc ισχύει η\n\
συμφωνία χρήσης του Adobe SDK License.\n\
@@ -39,7 +39,7 @@ Adobe recommends that you review these third-party terms.\n\
Θέλετε να εγκαταστήσετε το Adobe Flash Player playerglobal.swc;
air.prompt.text=\
-Apache FlexJS uses the Adobe AIR SDK to build Adobe AIR applications.\n\
+Apache Flex SDK uses the Adobe AIR SDK to build Adobe AIR applications.\n\
Για το Adobe AIR SDK ισχύει η συμφωνία χρήσης του Adobe SDK License.\n\
http://www.adobe.com/products/air/sdk-eula.html.\n\
Η άδεια αυτή δεν είναι συμβατή με την άδεια χρήσης Apache V2.\n\
@@ -60,7 +60,7 @@ you agree to the terms and conditions of the applicable license agreement.\n\
I have read the MPL1.1 license information above?"
swfobject.prompt.text=\
-Apache FlexJS uses the SWFObject when building Adobe Flash applications.\n\
+Apache Flex SDK uses the SWFObject when building Adobe Flash applications.\n\
Για το SWFObject ισχύει η συμφωνία χρήσης του MIT License (MIT).\n\
http://opensource.org/licenses/mit-license.php.\n\
This license is compatible with the Apache v2 license.\n\
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8350eb58/installer.properties/en_US.properties
----------------------------------------------------------------------
diff --git a/installer.properties/en_US.properties b/installer.properties/en_US.properties
index 0a3bb39..60a6bad 100644
--- a/installer.properties/en_US.properties
+++ b/installer.properties/en_US.properties
@@ -23,7 +23,7 @@ yes=y
no=n
flash.prompt.text=\
-Apache FlexJS uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
+Apache Flex SDK 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\
@@ -39,7 +39,7 @@ This license is not compatible with the Apache v2 license.\n\
Do you want to download and install the playerglobal.swc?
air.prompt.text=\
-Apache FlexJS uses the Adobe AIR SDK to build Adobe AIR applications.\n\
+Apache Flex SDK uses the Adobe AIR SDK to build Adobe AIR applications.\n\
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\
@@ -61,7 +61,7 @@ you agree to the terms and conditions of the applicable license agreement.\n\
I have read the MPL1.1 license information above?"
swfobject.prompt.text=\
-Apache FlexJS uses the SWFObject when building Adobe Flash applications.\n\
+Apache Flex SDK uses the SWFObject when building Adobe Flash applications.\n\
SWFObject is subject to and governed by the\n\
MIT License Agreement specified here:\n\
http://opensource.org/licenses/mit-license.php.\n\
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8350eb58/installer.properties/es_ES.properties
----------------------------------------------------------------------
diff --git a/installer.properties/es_ES.properties b/installer.properties/es_ES.properties
index 0f4ecd1..6505941 100644
--- a/installer.properties/es_ES.properties
+++ b/installer.properties/es_ES.properties
@@ -23,7 +23,7 @@ yes=s
no=n
flash.prompt.text=\
-Apache FlexJS utiliza el reproductor Flash de Adobe playerglobal.swc, para poder construir aplicaciones Flash.\n\
+Apache Flex SDK utiliza el reproductor Flash de Adobe playerglobal.swc, para poder construir aplicaciones Flash.\n\
\n\
Adobe Flash Player playerglobal.swc se ofrece bajo los términos y condiciones\n\
de la licencia de Adobe SDK, que puede encontrar aqui:\n\
@@ -39,7 +39,7 @@ Esta licencia no es compatible con la licencia Apache V2.\n\
¿Quiere instalar Adobe Flash Player playerglobal.swc?
air.prompt.text=\
-Apache FlexJS utiliza el SDK de Adobe AIR, para poder construir aplicaciones AIR.\n\
+Apache Flex SDK utiliza el SDK de Adobe AIR, para poder construir aplicaciones AIR.\n\
El SDK de Adobe AIR, se ofrece bajo los términos de la licencia de Adobe SDK, que puede encontrar aqui:\n\
http://www.adobe.com/products/air/sdk-eula.html.\n\
Esta licencia no es compatible con la licencia Apache V2.\n\
@@ -60,7 +60,7 @@ estará aceptando los términos y condiciones aplicables, de la correspondiente
¿Ha leido la MPL1.1 y está de acuerdo en instalar Open Source Media Framework (OSMF)?
swfobject.prompt.text=\
-Apache FlexJS utiliza SWFObject cuando construye aplicaciones Adobe Flash.\n\
+Apache Flex SDK utiliza SWFObject cuando construye aplicaciones Adobe Flash.\n\
SWFObject se ofrece bajo licencia MIT (MIT).\n\
http://opensource.org/licenses/mit-license.php.\n\
Esta licencia es compatible con la licencia Apache V2.\n\
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8350eb58/installer.properties/fr_FR.properties
----------------------------------------------------------------------
diff --git a/installer.properties/fr_FR.properties b/installer.properties/fr_FR.properties
index df186a1..6ccba15 100644
--- a/installer.properties/fr_FR.properties
+++ b/installer.properties/fr_FR.properties
@@ -23,7 +23,7 @@ yes=o
no=n
flash.prompt.text=\
-Apache FlexJS nécessite Adobe Flash Player (playerglobal.swc) pour générer des applications Adobe Flash.\n\
+Apache Flex SDK nécessite Adobe Flash Player (playerglobal.swc) pour générer des applications Adobe Flash.\n\
\n\
Le fichier playerglobal.swc est soumis à l'accord de licence Adobe Flex SDK suivant :\n\
http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf,\n\
@@ -38,7 +38,7 @@ Cette licence n'est pas compatible avec la licence Apache V2.\n\
Voulez-vous installer le logiciel Adobe Flash Player playerglobal.swc?
air.prompt.text=\
-Apache FlexJS nécessite Adobe AIR SDK pour générer des applications Adobe AIR.\n\
+Apache Flex SDK nécessite Adobe AIR SDK pour générer des applications Adobe AIR.\n\
L'accord de licence SDK Adobe s'applique à Adobe AIR SDK.\n\
http://www.adobe.com/products/air/sdk-eula.html.\n\
Cette licence n'est pas incluse dans la licence Apache V2.\n\
@@ -59,7 +59,7 @@ avant de télécharger, modifier, distribuer, utiliser et/ou accéder à ces fic
J'ai bien lu les informations ci-dessus à propos de la licence MPL1.1 ?"
swfobject.prompt.text=\
-Apache FlexJS nécessite SWFObject pour générer des applications Adobe Flash.\n\
+Apache Flex SDK nécessite SWFObject pour générer des applications Adobe Flash.\n\
La licence MIT (MIT) s'applique à l'utilitaire SWFObject.\n\
http://opensource.org/licenses/mit-license.php.\n\
Cette licence n'est pas incluse dans la licence Apache V2.\n\
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8350eb58/installer.properties/ko_KR.properties
----------------------------------------------------------------------
diff --git a/installer.properties/ko_KR.properties b/installer.properties/ko_KR.properties
index 7c7efdd..d784fcf 100644
--- a/installer.properties/ko_KR.properties
+++ b/installer.properties/ko_KR.properties
@@ -23,7 +23,7 @@ yes=y
no=n
flash.prompt.text=\
-Apache FlexJS는 플래시 어플리케이션을 빌드 하기위해 Adobe Flash Player's playerglobal.swc를 사용합니다.\n\
+Apache Flex SDK는 플래시 어플리케이션을 빌드 하기위해 Adobe Flash Player's playerglobal.swc를 사용합니다.\n\
\n\
playerglobal.swc 파일은 다음에 명시된 Adobe Flex SDK 라이센스 계약에 적용되어 있습니다:\n\
http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf,\n\
@@ -38,7 +38,7 @@ Adobe에서는 당신이 서브파티 약관을 살펴보는 것을 추천합니
playerglobal.swc를 다운로드 하고 설치하시겠습니까?
air.prompt.text=\
-Apache FlexJS는 Adobe AIR 어플리케이션을 빌드 하기위해 Adobe AIR SDK를 사용합니다.\n\
+Apache Flex SDK는 Adobe AIR 어플리케이션을 빌드 하기위해 Adobe AIR SDK를 사용합니다.\n\
Adobe AIR SDK 파일은 다음에 명시된 Adobe AIR SDK 라이센스 계약에 적용되어 있습니다:\n\
http://www.adobe.com/products/air/sdk-eula.html.\n\
이 라이센스는 Apache v2 라이센스와 호환되지 않습니다.\n\
@@ -60,7 +60,7 @@ http://www.mozilla.org/MPL/. \n\
나는 MPL1.1 라이센스 안내를 읽었습니까?"
swfobject.prompt.text=\
-Apache FlexJS에서는 Adobe 플래시 어플리케이션을 빌드할 때 SWFObject를 사용합니다.\n\
+Apache Flex SDK에서는 Adobe 플래시 어플리케이션을 빌드할 때 SWFObject를 사용합니다.\n\
SWFObject 유틸리티에는 다음에 명시된\n\
MIT License 라이센스 계약에 적용되어 있습니다:\n\
http://opensource.org/licenses/mit-license.php.\n\
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8350eb58/installer.properties/nl_NL.properties
----------------------------------------------------------------------
diff --git a/installer.properties/nl_NL.properties b/installer.properties/nl_NL.properties
index 18342fc..f923c80 100644
--- a/installer.properties/nl_NL.properties
+++ b/installer.properties/nl_NL.properties
@@ -23,7 +23,7 @@ yes=j
no=n
flash.prompt.text=\
-Apache FlexJS gebruikt Adobe Flash Player's playerglobal.swc om Adobe Flash applicaties te maken.\n\
+Apache Flex SDK gebruikt Adobe Flash Player's playerglobal.swc om Adobe Flash applicaties te maken.\n\
\n\
De Adobe SDK licentie overeenkomst geldt voor Adobe Flash Player's playerglobal.swc.\n\
http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf,\n\
@@ -38,7 +38,7 @@ Deze licentie is niet compatibel met de Apache V2 licentie.\n\
Wilt u de Adobe Flash Player playerglobal.swc installeren?
air.prompt.text=\
-Apache FlexJS gebruikt de Adobe AIR SDK om Adobe AIR applicaties te maken.\n\
+Apache Flex SDK gebruikt de Adobe AIR SDK om Adobe AIR applicaties te maken.\n\
De Adobe SDK licentie overeenkomst geldt voor de Adobe AIR SDK.\n\
http://www.adobe.com/products/air/sdk-eula.html.\n\
Deze licentie is niet compatibel met de Apache V2 licentie.\n\
@@ -60,7 +60,7 @@ gaat u akkoord met de voorwaarden van de toepasselijke gebruikersovereenkomst.\n
Wilt u het OSMF installeren?
swfobject.prompt.text=\
-Apache FlexJS gebruikt de SWFObject utility om Adobe Flash applicaties te maken.\n\
+Apache Flex SDK gebruikt de SWFObject utility om Adobe Flash applicaties te maken.\n\
De MIT License (MIT) geldt voor de SWFObject utility.\n\
\n\
U kunt de MIT licentieovereenkomst hier vinden:\n\
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8350eb58/installer.properties/pt_BR.properties
----------------------------------------------------------------------
diff --git a/installer.properties/pt_BR.properties b/installer.properties/pt_BR.properties
index 8e983fb..aa4a593 100644
--- a/installer.properties/pt_BR.properties
+++ b/installer.properties/pt_BR.properties
@@ -23,7 +23,7 @@ yes=s
no=n
flash.prompt.text=\
-Apache FlexJS uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
+Apache Flex SDK 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\
@@ -39,7 +39,7 @@ This license is not compatible with the Apache v2 license.\n\
Do you want to download and install the playerglobal.swc?
air.prompt.text=\
-Apache FlexJS uses the Adobe AIR SDK to build Adobe AIR applications.\n\
+Apache Flex SDK uses the Adobe AIR SDK to build Adobe AIR applications.\n\
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\
@@ -61,7 +61,7 @@ you agree to the terms and conditions of the applicable license agreement.\n\
I have read the MPL1.1 license information above?"
swfobject.prompt.text=\
-Apache FlexJS uses the SWFObject when building Adobe Flash applications.\n\
+Apache Flex SDK uses the SWFObject when building Adobe Flash applications.\n\
SWFObject is subject to and governed by the\n\
MIT License Agreement specified here:\n\
http://opensource.org/licenses/mit-license.php.\n\