From b36ab5acaae54da1146be7e9729169b9ac991041 Mon Sep 17 00:00:00 2001
From: ARNHOE <other@arnop.nl>
Date: Mon, 18 Feb 2013 03:02:45 -0800
Subject: [PATCH 1/2] Create nl_NL.js

---
 javascript/lang/nl_NL.js | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 javascript/lang/nl_NL.js

diff --git a/javascript/lang/nl_NL.js b/javascript/lang/nl_NL.js
new file mode 100644
index 00000000..ae961f06
--- /dev/null
+++ b/javascript/lang/nl_NL.js
@@ -0,0 +1,39 @@
+if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
+  if(typeof(console) != 'undefined') console.error('Class ss.i18n not defined');
+} else {
+  ss.i18n.addDictionary('nl_NL', {
+		'CMSMAIN.WARNINGSAVEPAGESBEFOREADDING' : "U moet de pagina opslaan voordat u kinderen kan toevoegen",
+		'CMSMAIN.CANTADDCHILDREN' : "Je kunt geen kinderen toevoegen aan de geselecteerde knoop",
+		'CMSMAIN.ERRORADDINGPAGE' : 'Fout toevoegen pagina',
+		'CMSMAIN.FILTEREDTREE' : 'Gefilterd om alleen aangepaste paginas te tonen',
+		'CMSMAIN.ERRORFILTERPAGES' : 'Kon niet filteren om alleen paginas <br />%s te tonen.', 
+		'CMSMAIN.ERRORUNFILTER' : 'Ongefilterde structuur',
+		'CMSMAIN.PUBLISHINGPAGES' : 'Paginas aan het publiceren...',
+		'CMSMAIN.SELECTONEPAGE' : "Selecteer minstens 1 pagina.",
+		'CMSMAIN.ERRORPUBLISHING' : 'Verwijder gepubliceerde paginas',
+		'CMSMAIN.REALLYDELETEPAGES' : "Wil je echt de geselecteerde %s pagina's verwijderen?",
+		'CMSMAIN.DELETINGPAGES' : 'Paginas verwijderen...',
+		'CMSMAIN.ERRORDELETINGPAGES': 'Fout bij verwijderen paginas',
+		'CMSMAIN.PUBLISHING' : 'Publiceren...',
+		'CMSMAIN.RESTORING': 'Herstellen...',
+		'CMSMAIN.ERRORREVERTING': 'Error reverting to live content',
+		'CMSMAIN.SAVING' : 'opslaan...',
+		'CMSMAIN.SELECTMOREPAGES' : "Je hebt pagina(s) %s geselecteerd. \n\nWil je deze actie uitvoeren?",
+		'CMSMAIN.ALERTCLASSNAME': 'Het paginatype wordt aangepast na opslaan van de pagina',
+		'CMSMAIN.URLSEGMENTVALIDATION': 'URLs kunnen alleen bestaan uit letters, cijfers en koppeltekens.',
+		'AssetAdmin.BATCHACTIONSDELETECONFIRM': "Wil je deze mappen %s verwijderen?",
+		'AssetTableField.REALLYDELETE': 'Wil je de geselecteerde bestanden verwijderen??',
+		'AssetTableField.MOVING': 'Verplaats %s bestand(en)',
+		'CMSMAIN.AddSearchCriteria': 'Voeg criteria toe',
+		'WidgetAreaEditor.TOOMANY': 'Sorry, je hebt de maximaal aantal widgets bereikt',
+		'AssetAdmin.ConfirmDelete': 'Wil je deze map verwijderen en alle bestanden??',
+		'Folder.Name': 'Mapnaam',
+		'Tree.AddSubPage': 'Voeg nieuwe pagina toe',
+		'Tree.EditPage': 'Aanpassen',
+		'CMSMain.ConfirmRestoreFromLive': "Do you really want to copy the published content to the draft site?",
+		'CMSMain.RollbackToVersion': "Do you really want to roll back to version #%s of this page?",
+		'URLSEGMENT.Edit': 'Aanpassen',
+		'URLSEGMENT.OK': 'OK',
+		'URLSEGMENT.Cancel': 'Annuleren'
+	});
+}

From 1ef155fc188acfad6c08799f1498b860ed0ea8cf Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 18 Feb 2013 14:13:24 +0100
Subject: [PATCH 2/2] Hardcode travis branch on dependencies, otherwise breaks
 pull request builds

Pull requests are always on a branch, and this branch
typically is not present on the installer.

This changes means we need to be careful when merging into 3.1
and master, but that's a necessary evil.
---
 tests/travis/before_script | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/travis/before_script b/tests/travis/before_script
index 94f244f8..c54f6c6b 100755
--- a/tests/travis/before_script
+++ b/tests/travis/before_script
@@ -15,8 +15,8 @@ echo ""
 # Fetch all dependencies
 # TODO Replace with different composer.json variations
 
-echo "Checking out installer@$TRAVIS_BRANCH"
-git clone --depth=100 --quiet -b $TRAVIS_BRANCH git://github.com/silverstripe/silverstripe-installer.git $BUILD_DIR
+echo "Checking out installer@3.0"
+git clone --depth=100 --quiet -b 3.0 git://github.com/silverstripe/silverstripe-installer.git $BUILD_DIR
 
 echo "Checking out sqlite3@master"
 git clone --depth=100 --quiet git://github.com/silverstripe-labs/silverstripe-sqlite3.git $BUILD_DIR/sqlite3
@@ -24,8 +24,8 @@ git clone --depth=100 --quiet git://github.com/silverstripe-labs/silverstripe-sq
 echo "Checking out postgresql@master"
 git clone --depth=100 --quiet git://github.com/silverstripe/silverstripe-postgresql.git $BUILD_DIR/postgresql
 
-echo "Checking out sapphire@$TRAVIS_BRANCH"
-git clone --depth=100 --quiet -b $TRAVIS_BRANCH git://github.com/silverstripe/sapphire.git $BUILD_DIR/framework
+echo "Checking out sapphire@3.0"
+git clone --depth=100 --quiet -b 3.0 git://github.com/silverstripe/sapphire.git $BUILD_DIR/framework
 
 # Copy setup files
 cp $BUILD_DIR/framework/tests/travis/_ss_environment.php $BUILD_DIR