You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2014/02/13 10:35:22 UTC
[1/2] git commit: [flex-sdk] [refs/heads/develop] - nl_NL translation
Updated Branches:
refs/heads/develop 195b7a78c -> cc4324c5c
nl_NL translation
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/cc4324c5
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/cc4324c5
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/cc4324c5
Branch: refs/heads/develop
Commit: cc4324c5cf5267f7e2b0103cf1df2a38ad77d592
Parents: 8371673
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Thu Feb 13 10:33:44 2014 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Thu Feb 13 10:34:49 2014 +0100
----------------------------------------------------------------------
installer.properties/nl_NL.properties | 92 +++++++++++++++---------------
1 file changed, 47 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cc4324c5/installer.properties/nl_NL.properties
----------------------------------------------------------------------
diff --git a/installer.properties/nl_NL.properties b/installer.properties/nl_NL.properties
index 4ff7384..18342fc 100644
--- a/installer.properties/nl_NL.properties
+++ b/installer.properties/nl_NL.properties
@@ -23,48 +23,50 @@ yes=j
no=n
flash.prompt.text=\
-Apache FlexJS uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
+Apache FlexJS gebruikt Adobe Flash Player's playerglobal.swc om Adobe Flash applicaties te maken.\n\
\n\
-De Adobe SDK licentie overeenkomst geldt voor de Adobe Flash Player playerglobal.swc.\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\
-you agree to the terms and conditions of the applicable end user license agreement.\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\
+Door het downloaden, aanpassen, distribueren, gebruiken en/of openen van playerglobal.swc\n\
+gaat u akkoord met de voorwaarden van de toepasselijke gebruikersovereenkomst.\n\
\n\
-In addition to the Adobe license terms, you also agree to be bound by the third-party terms specified here:\n\
-http://www.adobe.com/products/eula/third_party/.\n\
-Adobe recommends that you review these third-party terms.\n\
+Naast de Adobe gebruikersovereenkomst gaat u tevens akkoord met de volgende 'third-party' voorwaarden:\n\
+ http://www.adobe.com/products/eula/third_party/.\n\
+Adobe raad u aan om deze 'third-party' voorwaarden door te nemen.\n\
\n\
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 uses the Adobe AIR SDK to build Adobe AIR applications.\n\
+Apache FlexJS 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\
+ http://www.adobe.com/products/air/sdk-eula.html.\n\
Deze licentie is niet compatibel met de Apache V2 licentie.\n\
-Wilt u de Adobe AIR SDK installeren??
+Wilt u de Adobe AIR SDK installeren?
osmf.prompt.text=\
Het Open Source Media Framework (OSMF) dat gebruikt wordt door de video\n\
componenten is gelicenseerd onder de Mozilla Public License Versie 1.1.\n\
-Wilt u het Open Source Media Framework (OSMF) installeren?\n\
+\n\
Mozilla Public License Version 1.1:\n\
\n\
-The contents of the file(s) are subject to the Mozilla Public License Version 1.1.\n\
-You may not use the file(s) except in compliance with the License. \n\
-You may obtain a copy of the License here:\n\
-http://www.mozilla.org/MPL/. \n\
-By downloading, modifying, distributing, using and/or accessing the file(s), \n\
-you agree to the terms and conditions of the applicable license agreement.\n\
+De bestanden en hun inhoud vallen onder de Mozilla Public License Version 1.1.\n\
+U kunt deze bestanden enkel gebruiken onder de voorwaarden van de licentieovereenkomst.\n\
+U kunt de licentieovereenkomst hier vinden:\n\
+ http://www.mozilla.org/MPL/. \n\
+Door het downloaden, aanpassen, distribueren, gebruiken en/of openen van de bestanden\n\
+gaat u akkoord met de voorwaarden van de toepasselijke gebruikersovereenkomst.\n\
\n\
-I have read the MPL1.1 license information above?"
+Wilt u het OSMF installeren?
swfobject.prompt.text=\
-Apache FlexJS uses the SWFObject when building Adobe Flash applications.\n\
+Apache FlexJS gebruikt de SWFObject utility om Adobe Flash applicaties te maken.\n\
De MIT License (MIT) geldt voor de SWFObject utility.\n\
-MIT License Agreement specified here:\n\
-http://opensource.org/licenses/mit-license.php.\n\
+\n\
+U kunt de MIT licentieovereenkomst hier vinden:\n\
+ http://opensource.org/licenses/mit-license.php.\n\
Deze licentie is compatibel met de Apache V2 licentie.\n\
+\n\
Wilt u de SWFObject utility installeren?
blazeds.prompt.text=\
@@ -72,19 +74,19 @@ Apache Flex kan optioneel integreren met remoting providers zoals BlazeDS,\n\
GraniteDS, WebORB, Red5, AMFPHP, RubyAMF, PyAMF en andere. Deze feature vereist\n\
flex-messaging-common.jar uit de Adobe Flex SDK. De Adobe SDK licentie\n\
overeenkomst voor Adobe Flex 4.6 geldt voor deze jar.\n\
+\n\
Deze licentie is niet compatibel met de Apache V2 licentie.\n\
\n\
-Adobe Flex SDK License Agreement:\n\
+Adobe Flex SDK Licentieovereenkomst:\n\
\n\
-All files contained in this Adobe Flex SDK download are 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 in this Adobe Flex SDK, \n\
-you agree to the terms and conditions of the applicable end user license agreement.\n\
+De Adobe Flex SDK licentie overeenkomst geldt voor de Adobe Flex SDK:\n\
+ http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf,\n\
+Door het downloaden, aanpassen, distribueren, gebruiken en/of openen van bestanden in de Adobe Flex SDK\n\
+gaat u akkoord met de voorwaarden van de toepasselijke gebruikersovereenkomst.\n\
\n\
-In addition to the Adobe license terms, you also agree to be bound by the third-party terms specified here: \n\
- http://www.adobe.com/products/eula/third_party/. \n\
-Adobe recommends that you review these third-party terms.\n\
+Naast de Adobe gebruikersovereenkomst gaat u tevens akkoord met de volgende 'third-party' voorwaarden:\n\
+ http://www.adobe.com/products/eula/third_party/.\n\
+Adobe raad u aan om deze 'third-party' voorwaarden door te nemen.\n\
\n\
Wilt u deze jar uit de Adobe Flex SDK installeren?
@@ -94,25 +96,26 @@ Deze feature vereist een aantal font jars uit de Adobe Flex SDK.\n\
De Adobe SDK licentie overeenkomst voor Adobe Flex 4.6 geldt voor deze jars.\n\
Deze licentie is niet compatibel met de Apache V2 licentie.\n\
\n\
-Adobe Flex SDK License Agreement:\n\
+Deze licentie is niet compatibel met de Apache V2 licentie.\n\
+\n\
+Adobe Flex SDK Licentieovereenkomst:\n\
\n\
-All files contained in this Adobe Flex SDK download are 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 in this Adobe Flex SDK, \n\
-you agree to the terms and conditions of the applicable end user license agreement.\n\
+De Adobe Flex SDK licentie overeenkomst geldt voor de Adobe Flex SDK:\n\
+ http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf,\n\
+Door het downloaden, aanpassen, distribueren, gebruiken en/of openen van bestanden in de Adobe Flex SDK\n\
+gaat u akkoord met de voorwaarden van de toepasselijke gebruikersovereenkomst.\n\
\n\
-In addition to the Adobe license terms, you also agree to be bound by the third-party terms specified here: \n\
- http://www.adobe.com/products/eula/third_party/. \n\
-Adobe recommends that you review these third-party terms.\n\
+Naast de Adobe gebruikersovereenkomst gaat u tevens akkoord met de volgende 'third-party' voorwaarden:\n\
+ http://www.adobe.com/products/eula/third_party/.\n\
+Adobe raad u aan om deze 'third-party' voorwaarden door te nemen.\n\
\n\
Wilt u deze jars uit de Adobe Flex SDK installeren?
-unable.to.find.java=Unable to find Java executable. Please set JAVA_HOME environment variable
+unable.to.find.java=Java executable niet gevonden. Configureer de JAVA_HOME omgevingsvariabele.
-install.complete.echo=${basedir} is now an IDE compatible folder
+install.complete.echo=${basedir} is nu een IDE compatibele folder
find.java.echo.pattern=Java is $${java.executable}
-mac.copy.echo.pattern=Copying files from $${download.dir}/airsdk/$${srcdir} to $${destdir}
+mac.copy.echo.pattern=Kopieer bestanden van $${download.dir}/airsdk/$${srcdir} naar $${destdir}
INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC=Adobe AIR Runtime Kit voor Mac wordt gedownload van:
INFO_DOWNLOADING_AIR_RUNTIME_KIT_WINDOWS=Adobe AIR Runtime Kit voor Windows wordt gedownload van:
@@ -121,5 +124,4 @@ INFO_DOWNLOADED=Gedownload
INFO_FINISHED_UNTARING=Klaar met tar uitpakken:
INFO_FINISHED_UNZIPPING=Klaar met zip uitpakken:
INFO_INSTALLING_CONFIG_FILES=Framework configuratie bestanden voor gebruik met IDE worden geinstalleerd
-INFO_INSTALLING_PLAYERGLOBAL_SWC=Adobe Flash Player playerglobal.swc wordt geinstalleerd van:
-
+INFO_INSTALLING_PLAYERGLOBAL_SWC=Adobe Flash Player playerglobal.swc wordt geinstalleerd van:
\ No newline at end of file
[2/2] git commit: [flex-sdk] [refs/heads/develop] - - update
sequencing of property file removal/creation - only write 'used' versions to
file when run was successful
Posted by er...@apache.org.
- update sequencing of property file removal/creation
- only write 'used' versions to file when run was successful
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/8371673a
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/8371673a
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/8371673a
Branch: refs/heads/develop
Commit: 8371673ab18b3010aa25436c8f2b230d376f3ef3
Parents: 195b7a7
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Tue Feb 11 13:58:03 2014 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Thu Feb 13 10:34:49 2014 +0100
----------------------------------------------------------------------
mustella/jenkins.sh | 62 ++++++++++++++++++++++++++----------------------
1 file changed, 34 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8371673a/mustella/jenkins.sh
----------------------------------------------------------------------
diff --git a/mustella/jenkins.sh b/mustella/jenkins.sh
index 3023763..de5e722 100755
--- a/mustella/jenkins.sh
+++ b/mustella/jenkins.sh
@@ -37,13 +37,6 @@ fi
-# CLEAN
-rm -f ../local.properties
-rm -f local.properties
-LOG=$LOG"- Cleaned up 'local.properties' files from previous runs"$'\n'
-
-
-
# VERSIONS
VERSIONS_FILE="versions.txt"
@@ -82,12 +75,6 @@ else
AIR_SDK_DIR=3.7
fi
-# write toggled values to 'versions' file
-cat > $VERSIONS_FILE <<END
-FLASH_VERSION=$FLASH_VERSION
-AIR_VERSION=$AIR_VERSION
-END
-
LOG=$LOG"- Set FLASH_VERSION to '$FLASH_VERSION' and AIR_VERSION to '$AIR_VERSION'"$'\n'
@@ -120,14 +107,6 @@ LOG=$LOG"- Set FLASHPLAYER_DEBUGGER to '$FLASHPLAYER_DEBUGGER'"$'\n'
-# To build the SDK using the versions specified above, write '../local.properties'
-cat > ../local.properties <<END
-playerglobal.version = $FLASH_VERSION
-air.version = $AIR_VERSION
-END
-
-
-
# RUN SETTINGS
RUN_TYPE="main"
@@ -153,13 +132,6 @@ then
TEST_SET=tests/apollo
elif [ "$RUN_TYPE" == "mobile" ]
then
- cat > local.properties <<END
-target_os_name=android
-android_sdk=C:/ApacheFlex/dependencies/AndroidSDK/adt-bundle-windows-x86_64-20130522/sdk
-runtimeApk=${AIR_HOME}/runtimes/air/android/emulator/Runtime.apk
-device_name=win
-END
-
TEST_COMMAND=-mobile
TEST_SET=tests/mobile
fi
@@ -197,10 +169,38 @@ END
+# Remove old 'local.properties' files
+rm -f ../local.properties
+rm -f local.properties
+
+LOG=$LOG"- Cleaned up 'local.properties' files from previous runs"$'\n'
+
+
+
+# To build the SDK using the values specified above, write both 'local.properties' files
+cat > ../local.properties <<END
+playerglobal.version = $FLASH_VERSION
+air.version = $AIR_VERSION
+END
+
+if [ "$RUN_TYPE" == "mobile" ]
+then
+ cat > local.properties <<END
+target_os_name=android
+android_sdk=C:/ApacheFlex/dependencies/AndroidSDK/adt-bundle-windows-x86_64-20130522/sdk
+runtimeApk=${AIR_HOME}/runtimes/air/android/emulator/Runtime.apk
+device_name=win
+END
+
+LOG=$LOG"- Created fresh 'local.properties' files with containing run specific values"$'\n'
+
+
+
# ANT
ant -f ../build.xml clean -Dbuild.noprompt=true
ant -f ../build.xml main -Dbuild.noprompt=true
ant -f ../build.xml other.locales -Dbuild.noprompt=true
+
LOG=$LOG"- Ran 'clean', 'main' and 'other.locales' ant targets to prepare the SDK for testing"$'\n'
@@ -279,4 +279,10 @@ END
if ! $SUCCESS
then
exit 1
+else
+ # write 'used' values to 'versions' file upon success
+ cat > $VERSIONS_FILE <<END
+ FLASH_VERSION=$FLASH_VERSION
+ AIR_VERSION=$AIR_VERSION
+END
fi