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 2013/05/27 03:43:42 UTC
[1/2] git commit: [flex-utilities] [refs/heads/develop] - fix
resources - translation is still required
Updated Branches:
refs/heads/develop f0fac4fe6 -> a745aeab9
fix resources - translation is still required
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/db4d52e9
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/db4d52e9
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/db4d52e9
Branch: refs/heads/develop
Commit: db4d52e9c35b86a6d2681dc8236c3e5664fab6d9
Parents: f0fac4f
Author: Justin Mclean <jm...@apache.org>
Authored: Mon May 27 11:42:20 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon May 27 11:42:20 2013 +1000
----------------------------------------------------------------------
.../flex/packageflexsdk/resource/RuntimeLocale.as | 19 +++++++--------
1 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/db4d52e9/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
----------------------------------------------------------------------
diff --git a/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as b/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
index 9c99d60..a2ce193 100644
--- a/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
+++ b/installer/src/org/apache/flex/packageflexsdk/resource/RuntimeLocale.as
@@ -166,7 +166,7 @@ public class RuntimeLocale
content["INFO_SELECT_DIRECTORY_INSTALL"] = "Επιλέξτε τον κατάλογο εγκατάστασης";
content["INFO_UNZIPPING"] = "Αποσυμπίεση: ";
content["SELECT_PATH_PROMPT"] = "Πληκτρολογήστε η επιλέξτε μια έγκυρη διαδρομή για το Flex SDK";
- content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select AIR and Flash Player versions.";
content["STEP_CREATE_DIRECTORIES"] = "Δημιουργία Καταλόγων";
content["STEP_DOWNLOAD_AIR_RUNTIME_KIT"] = "Λήψη Adobe AIR Runtime Kit";
content["STEP_DOWNLOAD_FLASHPLAYER_SWC"] = "Λήψη Flash Player swc";
@@ -288,8 +288,7 @@ public class RuntimeLocale
content["INFO_SELECT_DIRECTORY"]="Select a directory";
content["INFO_UNZIPPING"]="Unzipping: ";
content["SELECT_PATH_PROMPT"]="Enter Flex SDK path or browse to select a path";
- content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
- content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select AIR and Flash Player versions.";
content["STEP_CREATE_DIRECTORIES"]="Create Directories";
content["STEP_DOWNLOAD_AIR_RUNTIME_KIT"]="Download Adobe AIR Runtime Kit";
content["STEP_DOWNLOAD_FLASHPLAYER_SWC"]="Download Flash Player swc";
@@ -346,7 +345,6 @@ public class RuntimeLocale
content["INFO_INSTALLING_CONFIG_FILES"]="Installing frameworks configuration files configured for use with an IDE";
content["INFO_INSTALLING_PLAYERGLOBAL_SWC"]="Installing Adobe Flash Player playerglobal.swc from: ";
content["INFO_INVOKED_GUI_MODE"]="invoked in GUI mode";
- content["INFO_SELECT_AIR_FLASH_PLAYER"] = "Select AIR and Flash Player versions."
content["INFO_SELECT_DIRECTORY"]="Select a directory";
content["INFO_UNZIPPING"]="Unzipping: ";
content["SELECT_PATH_PROMPT"]="Enter Flex SDK path or browse to select a path";
@@ -441,6 +439,7 @@ public class RuntimeLocale
content["INFO_INVOKED_GUI_MODE"]="invoked in GUI mode";
content["INFO_LICENSE_AGREEMENTS"]="License Agreements";
content["INFO_NEED_TO_READ_AND_AGREE_TO_LICENSE"]="This installer will download software from multiple sites with various license agreements. Please click on each item on the left, read the license and confirm that you agree to the terms of each license by checking the checkbox next to it.";
+ content["INFO_SELECT_AIR_FLASH_PLAYER"] = "Select AIR and Flash Player versions.";
content["INFO_SELECT_DIRECTORY"]="Select the directory where you want to install the Flex SDK";
content["INFO_SELECT_DIRECTORY_INSTALL"]="Select installation directory";
content["INFO_UNZIPPING"]="Uncompressing: ";
@@ -450,7 +449,7 @@ public class RuntimeLocale
content["INSTALL_AGREE_ALL"] = "I agree to all options and licenses, Install";
content["INSTALL_DISAGREE"] = "I Disagree, Don't Install";
content["SELECT_PATH_PROMPT"]="Where do you want to install the Apache Flex SDK?";
- content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select AIR and Flash Player versions.";
content["STEP_CREATE_DIRECTORIES"]="Create Directories";
content["STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK"]="Apache Flex SDK (Required)";
content["STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK"]="Adobe AIR SDK (Required)";
@@ -575,7 +574,7 @@ public class RuntimeLocale
content["INSTALL_AGREE_ALL"] = "Acepto todas las opciones y licencias, Instalar";
content["INSTALL_DISAGREE"] = "No estoy de acuerdo, Cancelar";
content["SELECT_PATH_PROMPT"]="¿Dónde quieres instalar el SDK de Apache Flex?";
- content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select AIR and Flash Player versions.";
content["STEP_CREATE_DIRECTORIES"]="Crear directorios";
content["STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK"]="Apache Flex SDK (Necesario)";
content["STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK"]="Adobe AIR SDK (Necesario)";
@@ -691,7 +690,7 @@ public class RuntimeLocale
content["INSTALL_AGREE_ALL"] = "Ik ga akkoord met alle opties en licenties, installeer";
content["INSTALL_DISAGREE"] = "Ik ga niet akkoord, installeer niet";
content["SELECT_PATH_PROMPT"]="Geef Flex SDK pad in of blader naar het pad";
- content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select AIR and Flash Player versions.";
content["STEP_CREATE_DIRECTORIES"]="Mappen aanmaken";
content["STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK"]="Apache Flex SDK (Verplicht)";
content["STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK"]="Adobe AIR SDK (Verplicht)";
@@ -810,7 +809,7 @@ public class RuntimeLocale
content["INSTALL_AGREE"] = "Eu concordo, instalar";
content["INSTALL_DISAGREE"] = "Não concordo, não instale";
content["SELECT_PATH_PROMPT"]="Aonde você deseja instalar o Apache Flex SDK?";
- content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select AIR and Flash Player versions.";
content["STEP_CREATE_DIRECTORIES"]="Criar diretórios";
content["STEP_DOWNLOAD_AIR_RUNTIME_KIT"]="Download Adobe AIR Runtime Kit";
content["STEP_DOWNLOAD_FLASHPLAYER_SWC"]="Download Flash Player swc";
@@ -917,7 +916,7 @@ public class RuntimeLocale
content["INSTALL_DISAGREE"] = "Je suis en désaccord, Ne pas installer";
content["SELECT_PATH_PROMPT"]="Où voulez-vous installer le SDK Flex Apache?";
content["STEP_CREATE_DIRECTORIES"]="Créer les répertoires";
- content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select AIR and Flash Player versions.";
content["STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK"]="Apache Flex SDK (Requis)";
content["STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK"]="Adobe AIR SDK (Requis)";
content["STEP_REQUIRED_INSTALL_FLASH_PLAYER_GLOBAL_SWC"]="Adobe Flash Player playerglobal.swc (Requis)";
@@ -1043,7 +1042,7 @@ public class RuntimeLocale
content["INSTALL_DISAGREE"] = "Ich Stimme nicht zu, nicht installieren";
content["SELECT_PATH_PROMPT"]="In welches Verzeichnis soll das Apache Flex SDK installiert werden?";
content["STEP_CREATE_DIRECTORIES"]="Erstelle Verzeichnisse";
- content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select the AIR and Flash Player versions.";
+ content["STEP_SELECT_AIR_AND_FLASH_VERSION"]="Select AIR and Flash Player versions.";
content["STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK"]="Apache Flex SDK (Benötigt)";
content["STEP_REQUIRED_INSTALL_ADOBE_AIR_SDK"]="Adobe AIR SDK (Benötigt)";
content["STEP_REQUIRED_INSTALL_FLASH_PLAYER_GLOBAL_SWC"]="Adobe Flash Player playerglobal.swc (Benötigt)";
[2/2] git commit: [flex-utilities] [refs/heads/develop] - Set default
AIR version to 3.1 and fixed Flash Player selection logic.
Posted by jm...@apache.org.
Set default AIR version to 3.1 and fixed Flash Player selection logic.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/a745aeab
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/a745aeab
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/a745aeab
Branch: refs/heads/develop
Commit: a745aeab9e60ef4bf5a5c175d610746fc855c92d
Parents: db4d52e
Author: Justin Mclean <jm...@apache.org>
Authored: Mon May 27 11:43:32 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon May 27 11:43:32 2013 +1000
----------------------------------------------------------------------
installer/src/InstallApacheFlex.mxml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a745aeab/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 3bd9abd..ceb9e07 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -111,7 +111,7 @@ variables are not required because the locations of these pieces are known.
*
*/
[Bindable] private var AIR_VERSIONS:ArrayCollection = new ArrayCollection();
- private var AIR_VERSION:String;
+ private var AIR_VERSION:String = "3.1";
private var ADOBE_AIR_SDK_WIN_FILE:String;
private var ADOBE_AIR_SDK_WIN_URL:String;
private var ADOBE_AIR_SDK_MAC_FILE:String;
@@ -707,7 +707,7 @@ variables are not required because the locations of these pieces are known.
FLASH_PLAYER_VERSION = flashPlayerVersion.selectedItem.verson;
// AIR requires a minimum Flash Player version
- if (airVersion.selectedIndex > flashPlayerVersion.selectedIndex) {
+ if (airVersion.selectedIndex < flashPlayerVersion.selectedIndex) {
airVersion.selectedIndex = flashPlayerVersion.selectedIndex;
AIR_VERSION = AIR_VERSIONS[flashPlayerVersion.selectedIndex].version;
}