Merge branch 'master' into master

index.html

@@ -230,7 +230,7 @@ Good luck, and thanks again!
 <script src="js/slideshow/SandboxUI.js"></script>
 <script src="js/slideshow/Modal.js"></script>
 <script src="js/slideshow/Preloader.js"></script>
-<script src="js/slideshow/Translations.js?v=3"></script>
+<script src="js/slideshow/Translations.js?v=4"></script>
 
 <script src="js/sim/Peep.js?v=2"></script>
 <script src="js/sim/Connection.js"></script>

js/chapters/E_Complex_Contagion.js

@@ -233,6 +233,7 @@ SLIDES.push(
 {
 	remove:[
 		{type:"box", id:"complex_cascade"},
+		{type:"box", id:"complex_cascade_feel_free"},
 		{type:"box", id:"end"}
 	],
 	move:[

js/slideshow/Translations.js

@@ -12,12 +12,12 @@ r.onreadystatechange = function () {
 	var response = r.responseText;
 	var lines = response.split("\n");
 	var available = lines.filter(function(line){
-		return (/^\w\w\:?\s+(.+)/).test(line); // ww: wwwwww
+		return (/^[a-z]{2}(?:-[A-Z]{2})?\:?\s+(.+)/).test(line); // ww: wwwwww
 	});
 	for(var i=0; i<available.length; i++){
 		var a = available[i];
-		var code = a.match(/\w\w/)[0];
-		var lang = a.match(/^\w\w\:?\s+(.+)/)[1];
+		var code = a.match(/[a-z]{2}(?:-[A-Z]{2})?/)[0];
+		var lang = a.match(/^[a-z]{2}(?:-[A-Z]{2})?\:?\s+(.+)/)[1];
 		if(code=="en") continue; // English is just an example
 		TRANSLATIONS.push({
 			code: code,

translations.txt

@@ -28,7 +28,7 @@
 /////////////////////////////
 
 en: English
-=======
+pt: Português
 it: Italiano
 fr: Français
 es: Español (Castellano)