Merge lp:~yoboy-leguesh/ubuntu-fr-tour/maj1404 into lp:ubuntu-fr-tour

[YoBoY]

Mise à jour vers la version 14.04 du Ubuntu Online Tour. Intégration de quelques corrections
de la branche de cm-t ainsi que des liens avec l'outil de statistique piwik.

=== modified file 'ALIRE'
--- ALIRE	2013-01-21 17:46:01 +0000
+++ ALIRE	2014-05-18 21:53:52 +0000
@@ -1,7 +1,15 @@
 Processus de mise en place d'une nouvelle version
+*************************************************
+
+pré-requis :
+    sudo apt-get install python-polib
 
 1- Récupérer le code de la dernière version sur launchpad avec baazar
 https://code.launchpad.net/ubuntu-online-tour
+/!\ prendre la version correspondant à la version d'ubuntu
+
+Récupérer les dernières traductions (si po_html/fr.po plus vieux que la dernière proposition)
+https://translations.launchpad.net/ubuntu-online-tour
 
 2- compiler les traductions avec le script adéquat
     cd translate-html

=== modified file 'README'
--- README	2013-01-18 20:24:03 +0000
+++ README	2014-05-18 21:53:52 +0000
@@ -0,0 +1,54 @@
+# How to create translated HTML pages
+
+You simply need to go to the translate-html/bin folder and run:
+
+./translate-html -t
+
+This will generate a set of folders, one for each available translations,
+ready to publish online
+
+# Translate script help
+
+translate-html/bin$ ./translate-html --help
+Usage: translate-html {--extract|--translate} [options]
+
+    This script can be used to prepare translatable messages in HTML files
+    and expose them to translators and to subsequently use those translations
+    to build localized HTML files based on the original in English.
+
+    It works in one of two modes:
+
+    - Extract mode: extracts translatable strings from the file specified
+      in the 'po/POTFILES.in' file and puts them into a .pot file into the
+      'po' folder, ready to give it to translators.
+    - Translate mode: fetches the translations in the form of .po files in the
+      'po-html' folder and builds localized files based on the original.
+      Untranslated strings in the PO files are left as their English originals
+      in the generated localized files. The localized files are named
+        <ISO-639-2-lang-code>/<original-filename>.<original-fileext>
+      E.g.
+        en/index.html      <- original file
+        zh-CN/index.html   <- Simplified Chinese translation
+
+    Structure of the 'po-html' folder:
+
+      po-html/template.pot <- translation template created in extract mode
+      po-html/POTFILES.in  <- files to extract strings from are specified here
+      po-html/zh_CN.po     <- translation done by translators
+      po-html/ca.po        <- another translation, naming: <ISO 639-2 code>.po
+
+    
+
+Options:
+  --version        show program's version number and exit
+  -h, --help       show this help message and exit
+  -d, --debug      Print the maximum debugging info (implies -vv)
+  -v, --verbose    set error_level output to warning, info, and then debug
+  -x, --extract    Extract mode: extract the strings from the original HTML
+                   file
+  -t, --translate  Translate mode: get the translations from PO files and
+                   write them to a new translated HTML file
+  -s, --test       Test mode: only effective in conjunction with Translate
+                   mode. If set, untranslatable messages are translated as
+                   reversed English, so that they are easy to spot.
+ 

=== modified file 'css/base.css'
--- css/base.css	2013-01-18 20:24:03 +0000
+++ css/base.css	2014-05-18 21:53:52 +0000
@@ -2,8 +2,8 @@
  *  Main CSS
  *   author: Anthony Dillon
  */
-		
-		body { 
+
+		body {
 			background-color: black;
 			background: url(../img/background.jpg) no-repeat center center fixed;
 	        -webkit-background-size: cover;
@@ -21,30 +21,30 @@
 			-moz-user-select: none;
 			-o-user-select: none;
 			user-select: none;
-		} 
-		
+		}
+
 		*{
 			cursor: default;
 			font-family:"Ubuntu","Ubuntu Beta",Ubuntu, UbuntuBeta;
 		}
-		
+
 		a {
 			outline: none;
 			color:#DD4814;
 			text-decoration: none;
 			cursor:pointer;
 		}
-		
+
 		.blurred *{
 			color: transparent !important;
 		    text-shadow: 0 0 5px #999 !important;
 		}
-		
+
 		.blurred{
 			 -ms-filter: "progid:DXImageTransform.Microsoft.Blur(pixelRadius=2)";
 		    filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=2);
 		}
-		
+
 		.window{
 				-moz-border-radius:4px 4px 0px 0px;
 				-webkit-border-radius:4px 4px 0px 0px;
@@ -59,50 +59,50 @@
 			font-size:14px;
 			z-index:1;
 		}
-		
+
 		::-moz-selection { none; }
 		::-webkit-selection{ none; }
 	    ::selection { none; }
-	    
+
 	    input::-moz-selection { background:#f07746;color:#fff; }
 		input::-webkit-selection{ background:#f07746;color:#fff; }
 	    input:selection { background:#f07746;color:#fff; }
-	    
+
 	    textarea::-moz-selection { background:#f07746;color:#fff; }
 		textarea::-webkit-selection{ background:#f07746;color:#fff; }
 	    textarea:selection { background:#f07746;color:#fff; }
-	    
+
 	    textarea{
 			background-color:#fff;
 			border: 1px solid #ada9a5;
 			-webkit-border-radius:2px 2px 2px 2px;
 			-moz-border-radius:2px 2px 2px 2px;
-			border-radius:2px 2px 2px 2px;	
+			border-radius:2px 2px 2px 2px;
 			padding:2px;
 			font-family:"Ubuntu","Ubuntu Beta",UbuntuBeta,Ubuntu;
 	    }
-	    
+
 	    input{
 			background-color:#fff;
 			border: 1px solid #ada9a5;
 			-webkit-border-radius:2px 2px 2px 2px;
 			-moz-border-radius:2px 2px 2px 2px;
-			border-radius:2px 2px 2px 2px;	
+			border-radius:2px 2px 2px 2px;
 			padding:2px;
 			font-family:"Ubuntu","Ubuntu Beta",UbuntuBeta,Ubuntu;
 	    }
-	    
+
 	    #Translation-Strings{
 	    	display:none;
 	    }
-	    
+
 		#menu{
-			background:#500D28;
-			width:70px;
+			background:#782220;
+			width:64px;
 			position:absolute;
-			left: 0px; 
-    		top: 24px;	
-    		border-right: 1px solid #6e3a4d;
+			left: 0px;
+    		top: 24px;
+    		border-right: 1px solid rgba(255,255,255,0.2);
     		z-index: 10;
     		overflow:hidden;
 			-webkit-user-select: none;
@@ -111,28 +111,28 @@
 			-o-user-select: none;
 			user-select: none;
 		}
-		
+
 		#menu.dashOpen{
 			/*background:none;*/
 			border-right: 1px solid #333;
 		}
-		
+
 		#menu .scroll-up{
 			position:absolute;
-			left: 0px; 
-    		top: 0px;	
+			left: 0px;
+    		top: 0px;
 			width:100%;
 			height:20px;
 		}
-		
+
 		#menu .scroll-down{
 			position:absolute;
-			left: 0px; 
+			left: 0px;
     		bottom: 0px;
 			width:100%;
 			height:20px;
 		}
-		
+
 		#tooltip{
 			z-index: 10;
 			height:20px;
@@ -160,7 +160,7 @@
 		        width: 0;
 		        height: 0;
 		        border-top: 10px solid transparent;
-		        border-bottom: 10px solid transparent; 
+		        border-bottom: 10px solid transparent;
 				border-right:10px solid #1f171a;
 		        margin-left:-20px;
 		        /*opacity: .8;
@@ -171,45 +171,45 @@
 		.shadow-arrow{
 			border-right:12px solid #4a3742;
 			border-top: 12px solid transparent;
-		    border-bottom: 12px solid transparent; 
+		    border-bottom: 12px solid transparent;
 			margin-left:-22px;
 			margin-top:-2px;
 		}
-		
+
 		#menu ul{
 			margin-top:6px;
-			padding-left: 12px;
+			padding-left: 5px;
 			position:absolute;
 			top:0px;
 			height:100%;
 		}
-		
+
 		#menu ul li{
 			list-style: none;
-			height:46px;
-			width:52px;
+			height:54px;
+			width:54px;
 			color:transparent;
 			padding-top:6px;
-			margin-bottom:6px;
+			margin-bottom:-1px;
 			background-repeat: no-repeat;
 			 -moz-transition:-moz-box-shadow .3s linear;
 			 -webkit-transition:-webkit-box-shadow .3s linear;
 			 transition:box-shadow .3s linear;
 		}
-		
+
 		#menu ul li.glow{
 		 box-shadow:0px 0px 7px #d0733b;
 		 -moz-box-shadow:0px 0px 7px #d0733b;
-		 -webkit-box-shadow:0px 0px 7px #d0733b;   
+		 -webkit-box-shadow:0px 0px 7px #d0733b;
 		 background-color:rgba(208,115,59,0.5);
 		}
-		
+
 		#menu ul li img.open-arrow{
 			margin-left: -7px;
     	    margin-top: 17px;
     	    display:none;
 		}
-		
+
 		#menu ul li img.selected-window-arrow{
     	    display:none;
     	    float: right;
@@ -223,7 +223,7 @@
 		#systemOverlay .copyDash{
 			position:absolute;
 			top:30px;
-			left:12px;
+			left:5px;
 			background-image:url(../img/menu/icon-dash.png);
 			background-repeat: no-repeat;
 			height:52px;
@@ -256,9 +256,18 @@
 		#menu .uone{
 			background-image:url(../img/menu/icon-ubuntuone.png);
 		}
+		#menu .uonemusic{
+			background-image:url(../img/menu/icon-ubuntuonemusic.png);
+		}
+		#menu .amazon{
+			background-image:url(../img/menu/icon-amazon.png);
+		}
 		#menu .software{
 			background-image:url(../img/menu/icon-software.png);
 		}
+		#menu .settings{
+			background-image:url(../img/menu/icon-systemsettings.png);
+		}
 		#menu .email{
 			background-image:url(../img/menu/icon-thunderbird.png);
 		}
@@ -271,49 +280,108 @@
 		#menu .files{
 			background-image:url(../img/menu/icon-files.png);
 		}
+		#menu .email{
+			background-image:url(../img/menu/icon-thunderbird.png);
+		}
 		#menu .rubbish{
-			background-image:url(../img/menu/icon-emptyrubbish.png);
+			background-image:url(../img/menu/icon-trashempty.png);
+			position:absolute;
+		}
+
+		#menu .dash.active-icon{
+			background-image:url(../img/menu/icon-dash-active.png);
+		}
+		#menu .home.active-icon{
+			background-image:url(../img/menu/icon-folder-active.png);
+		}
+		#menu .firefox.active-icon{
+			background-image:url(../img/menu/icon-firefox-active.png);
+		}
+		#menu .movieplayer.active-icon{
+			background-image:url(../img/menu/icon-movieplayer-active.png);
+		}
+		#menu .shotwell.active-icon{
+			background-image:url(../img/menu/icon-shotwell-active.png);
+		}
+		#menu .writer.active-icon{
+			background-image:url(../img/menu/icon-writer-active.png);
+		}
+		#menu .impress.active-icon{
+			background-image:url(../img/menu/icon-impress-active.png);
+		}
+		#menu .calc.active-icon{
+			background-image:url(../img/menu/icon-calc-active.png);
+		}
+		#menu .uone.active-icon{
+			background-image:url(../img/menu/icon-ubuntuone-active.png);
+		}
+		#menu .uonemusic.active-icon{
+			background-image:url(../img/menu/icon-ubuntuonemusic-active.png);
+		}
+		#menu .amazon.active-icon{
+			background-image:url(../img/menu/icon-amazon-active.png);
+		}
+		#menu .software.active-icon{
+			background-image:url(../img/menu/icon-software-active.png);
+		}
+		#menu .settings.active-icon{
+			background-image:url(../img/menu/icon-systemsettings-active.png);
+		}
+		#menu .email.active-icon{
+			background-image:url(../img/menu/icon-thunderbird-active.png);
+		}
+		#menu .workspace.active-icon{
+			background-image:url(../img/menu/icon-workspace-active.png);
+		}
+		#menu .applications.active-icon{
+			background-image:url(../img/menu/icon-applications-active.png);
+		}
+		#menu .files.active-icon{
+			background-image:url(../img/menu/icon-files-active.png);
+		}
+		#menu .rubbish.active-icon{
+			background-image:url(../img/menu/icon-trashempty-active.png);
 			position:absolute;
 		}
 		
 		#menu .bottom{
-			bottom:10px;
+			bottom:6px;
 		}
-		
+
 		#menu .temp{
 			display:none;
 		}
-		
+
 		#top{
 			background-image: url(../img/top-bg.jpg);
 			background-repeat:repeat-x;
 			position:absolute;
-			left: 0px; 
+			left: 0px;
     		top: 0px;
     		width:100%;
     		height:24px;
     		color: #DFDBD2;
-			z-index:9;
+			z-index:11;
 		}
-		
+
 		#top.dashOpen{
 			background-image: none;
 			background-color: transparent;
 			z-index: 13;
 		}
-		
+
 		#top.dashOpen #top-right #time{
 			color:#ffffff;
 		}
-		
+
 		#top.dashOpen #top-left #title{
 			color:transparent;
 		}
-		
+
 		#top #top-left #dash-control-buttons{
 			float:left;
 		}
-		
+
 		#top.dashOpen #top-left #dash-control-buttons div{
 			width:15px;
 			height:15px;
@@ -321,28 +389,28 @@
 			margin-left: 4px;
     		margin-top: 5px;
 		}
-		
+
 		#top.dashOpen #top-left #dash-control-buttons .close{
 			background:url(../img/dash/dash-close.png) no-repeat;
 			margin-left:10px;
 		}
-		
+
 		#top.dashOpen #top-left #dash-control-buttons .close:active{
 			background:url(../img/dash/dash-close-clicked.png) no-repeat;
 		}
-		
+
 		#top.dashOpen #top-left #dash-control-buttons .min{
 			background:url(../img/dash/dash-min.png) no-repeat;
 		}
-		
+
 		#top.dashOpen #top-left #dash-control-buttons .max{
 			background:url(../img/dash/dash-max.png) no-repeat;
 		}
-		
+
 		#top.dropShadow{
-				-moz-box-shadow: 10px 0px 10px #000;
-		  		-webkit-box-shadow: 10px 0px 10px #000;
-			box-shadow: 10px 0px 10px #000;
+			-moz-box-shadow: 0px 0px 10px #000;
+			-webkit-box-shadow: 0px 0px 10px #000;
+			box-shadow: 0px 0px 10px #000;
 		}
 		#top #top-button-bg #top-button{
 			background: url('../img/topleft-button.png') no-repeat center center;
@@ -369,7 +437,7 @@
 			float:left;
 			padding:0px 8px;
 			overflow:hidden;
-			
+
 		}
 		#top #top-right div .drop-down{
 			list-style-type:none;
@@ -406,6 +474,11 @@
 		#top #top-right div .drop-down li.disabled{
 			color:#666;
 		}
+		#top #top-right div .drop-down li .key-combo{
+			float: right;
+			color: #666;
+			background-color:transparent;
+		}
 		#top #top-right div .drop-down li.disabled:hover{
 			background:#464641;
 			color:#666;
@@ -418,7 +491,7 @@
 			background:#3d3c39;
 		}
 		#top #top-right #power .drop-down{
-			margin-left:-235px;
+			margin-left:-232px;
 			width:247px;
 		}
 		#top #top-right #user .drop-down{
@@ -427,17 +500,26 @@
 		}
 		#top #top-right #time .drop-down{
 			width:300px;
-			margin-left:-241px;
+			margin-left:-233px;
 			margin-top:3px;
 		}
 		#top #top-right #message .drop-down{
 			margin-left: -45px;
-			margin-top: 3px;
-   			width: 240px;
+			margin-top: 0px;
+   			padding: 0;
+
+		}
+		#top #top-right #message .system-message{
+			background:url(../img/top/chat.jpg) no-repeat;
+			width:136px;
+			height:146px;
+			padding:0;
+			margin-left:0;
+			margin-top:0;
 		}
 		#top #top-right #speakers .drop-down{
 			width:255px;
-			margin-left:-167px;
+			margin-left:-152px;
 		}
 		#top #top-right #connection .drop-down{
 			width:219px;
@@ -452,32 +534,32 @@
 		}
 		#top #top-right #time .system-calendar{
 			background:url(../img/top/calendar.jpg) no-repeat;
-			width:254px;
-			height:185px;
-			margin-left:20px;
-			margin-top:10px;
+			width:291px;
+			height:292px;
+			margin-left:0;
+			margin-top:0;
 		}
 		#top #top-right div img.disabled{opacity:0.4;filter:alpha(opacity=40)}
 		#top #top-right div ul{
 			list-style-position:inside;
 		}
-		
+
 		#top #top-right div ul li{
 			height: 18px;
     		padding: 3px 3px 3px 15px;
 		}
-		
+
 		#top #top-right div ul li img{
 			margin-left:-10px;
 			margin-right:5px;
 			vertical-align: middle;
 		}
-		
+
 		#top #top-right div ul li.ticked{
 			list-style-image:url('../img/top/tic7pxk.png');
 			padding-left:0px;
 		}
-		
+
 		#top #top-right div ul li.divider{
 			height:1px;
 			background:#3d3c39;
@@ -485,40 +567,40 @@
 			padding:0px;
 			margin:4px 0px;
 		}
-		
+
 		#top #top-right #message{
 			padding-top:4px;
 		}
 		#top #top-right #connection,#top #top-right #speakers,#top #top-right #bluetooth{
 			padding-top:4px;
 		}
-		
+
 		#top #top-right #user{
 			padding-top:2px;
 		}
 		#top #top-right #power{
 			padding-top:2px;
 		}
-		
+
 		#top #top-right #time,#top #top-right #user{
 			padding-top:3px;
 		}
-		
+
 		#top #top-right #user img{
 			vertical-align: bottom;
 		}
-		
+
 		#top #top-right #speakers div{
 			float:left;
 		}
-		
+
 		#top #top-right #speakers .small-icon{
 			background:url(../img/top/0slider.jpg) no-repeat;
 			height:15px;
 			width: 7px;
 			margin-top: 12px;
 		}
-		
+
 		#top #top-right #speakers .system-volume{
 			height:37px;
 			padding:3px;
@@ -526,16 +608,16 @@
 		#top #top-right #speakers .system-volume:hover, #top #top-right #speakers .banshee:hover{
 			background:none;
 		}
-		
+
 		#top #top-right #speakers .banshee{
 			height:43px;
 			padding-left:50px;
 		}
-		
+
 		#top #top-right #speakers .banshee div:hover{
 			background-color:#4d4c48;
 		}
-		
+
 		#top #top-right #speakers .banshee .banshee-rewind{
 			background:url(../img/top/banshee-rewind.png) no-repeat scroll center center #43423f;
 			height:29px;
@@ -547,7 +629,7 @@
 			border-top:1px solid #64625b;
 			border-bottom:1px solid #393836;
 		}
-		
+
 		#top #top-right #speakers .banshee .banshee-play{
 			background:url(../img/top/banshee-play.png) no-repeat scroll center center #43423f;
 			height:43px;
@@ -558,9 +640,9 @@
 			border-top:1px solid #64625b;
 			border-bottom:1px solid #393836;
 			margin-left:-100px;
-			
+
 		}
-		
+
 		#top #top-right #speakers .banshee .banshee-forward{
 			background:url(../img/top/banshee-forward.png) no-repeat scroll center center #43423f;
 			height:29px;
@@ -573,7 +655,7 @@
 			border-bottom:1px solid #393836;
 			margin-left:30px;
 		}
-		
+
 		#top #top-right #speakers .slider{
 			width: 185px;
 			height:17px;
@@ -583,7 +665,7 @@
 			margin-top: 5px;
    			 padding-top: 10px;
 		}
-		
+
 		#top #top-right #speakers .slider-active{
 			-moz-border-radius:5px 5px 5px 5px;
 			-webkit-border-radius:5px 5px 5px 5px;
@@ -597,11 +679,11 @@
 		   z-index:1;
 		   padding:0px;
 		}
-		
+
 		#top #top-right #speakers .ui-slider-handle{
 			z-index:2;
 		}
-		
+
 		#top #top-right #speakers .large-icon{
 			background:url(../img/top/100slider.jpg) no-repeat;
 			height:15px;
@@ -609,7 +691,7 @@
 			float:right;
 			margin-top: 12px;
 		}
-		
+
 		#top #top-right .selected{
 			background:url(../img/top/selected-bg.jpg) repeat-x;
 			-webkit-border-top-left-radius: 2px;
@@ -619,7 +701,7 @@
 			border-top-left-radius: 2px;
 			border-top-right-radius: 2px;
 		}
-		
+
 		#top-left #title{
 			font-weight:bold;
 			float:left;
@@ -628,16 +710,16 @@
 		    margin-left: 10px;
 		    margin-top: 2px;
 		}
-		
-		
-		
+
+
+
 		#control-buttons{
 			margin-top:2px;
 			margin-left:8px;
 			float:left;
 			display:none;
 		}
-		
+
 		#control-buttons div{
 			width:19px;
 			height:19px;
@@ -645,11 +727,11 @@
 			float:left;
 			margin-right:2px;
 		}
-		
+
 		#control-buttons div:hover{
 			background-position: 0px -19px;
 		}
-		
+
 		#control-buttons #close{
 			background-image:url(../img/close-button.jpg);
 		}
@@ -662,7 +744,7 @@
 		#top.dashOpen #control-buttons{
 			display:none;
 		}
-		
+
 .fullsize{
 	top:0px !important;
 	left:70px !important;
@@ -673,7 +755,7 @@
 
 .fullsize .control{
  }
- 
+
  .fullsize .buttons{
  	margin-top:0px;
  }
@@ -705,7 +787,7 @@
     .selected-window .control .window-title{
     	color: #DFDBD2;
     }
-    
+
     .folder{
 	width:730px;
 	height:500px;
@@ -714,7 +796,7 @@
 	display:none;
 }
 .control{
-	height:19px;
+	height:24px;
 	margin-left:10px;
 	margin-top: 6px;
 	/*margin-bottom:5px;*/

=== modified file 'css/folder.css'
--- css/folder.css	2013-01-18 20:24:03 +0000
+++ css/folder.css	2014-05-18 21:53:52 +0000
@@ -4,56 +4,94 @@
  */
 
 #folder-window .buttons{
-	width:65px;
+	width:85px;
 	height:36px;
-	margin-top: 3px;
-	float:right;
+	margin: 1px;
+	float:left;
 }
 
 #folder-window .bottom-buttons{
-	background:url(../img/folder/buttons-bg.jpg) repeat-x;
-	height:41px;
+	background:url(../img/folder/image-nautilus-background.png) repeat-x;
+	height:37px;
 	width:100%;
+	border-bottom: 1px solid #d7d4d2;
 }
 
 #folder-window .buttons div, #folder-window .bottom-buttons div{
 	float:left; 
 }
 
-#folder-window .folder-contents .bottom-buttons div{
-	color:white;
-	height:23px;
-	margin:2px 0 0 5px;
+.folder.window .bottom-buttons div{
+	color: #807d78;
+	height:21px;
+	border:1px solid #353431;
+	margin:0;
 	padding:5px;
+	overflow: hidden;
 	line-height:24px;
-}
-
-#folder-window .folder-contents .bottom-buttons div.selected{
+	background:url(../img/folder/image-nautilus-breadcrumb.png) repeat-x;
+}
+
+.folder.window.selected-window .bottom-buttons div {
+	color: #DFDBD2;
+}
+
+#folder-window .bottom-buttons div:first-of-type {
+	-webkit-border-top-left-radius: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	border-top-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+}
+
+#folder-window .bottom-buttons div:last-of-type {
+	-webkit-border-top-right-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	-moz-border-radius-bottomright: 4px;
+	border-top-right-radius: 4px;
+	border-bottom-right-radius: 4px;	
+}
+
+#folder-window .bottom-buttons div.selected{
 	font-weight:bold;
-	border:1px solid #2c2c29;
-	background:#353531;
-		-moz-border-radius:4px 4px 4px 4px;
-		-webkit-border-radius:4px 4px 4px 4px;
-	border-radius:4px 4px 4px 4px;
-	background-position: 0 -29px;
+	background:url(../img/folder/image-nautilus-breadcrumb-selected.png);
 }
-#folder-window .folder-contents .bottom-buttons div img{
+
+#folder-window .bottom-buttons div img{
 	margin-top: -4px;
-	vertical-align: middle;
+	vertical-align: top;
+	margin-top: 4px;
 	margin-right: 3px;
 }
 
-#folder-window .folder-contents .bottom-buttons span{
+.folder.window  .bottom-buttons div .home{
+	display: block;
+	float: left;
+	width: 16px;
+	height: 16px;
+	padding: 0;
+	margin: 4px 4px 0 0px;
+	background: url(../img/folder/icon-nautilus-mono-home.png) center 48px;
+}
+
+.folder.window.selected-window .bottom-buttons div .home{
+	background-position: center 32px;
+}
+
+#folder-window .bottom-buttons span{
 	color:white;
 }
 
 .folder .folder-list{
 	float:left;
+	border-right: 1px solid #dad8d5;
 }
 
 .folder .list{
-	height: 468px;
-	width:146px;
+	height: 418px;
+	width:144px;
 }
 
 .folder .list p{
@@ -68,25 +106,52 @@
 }
 
 .folder .list ul li{
-	padding:4px 0 4px 30px;
-	margin-right:5px;
+	padding-left: 45px;
 	vertical-align: middle;
-}
-
+	height: 23px;
+	padding-top: 4px;
+}
+.folder .list ul li.home {
+	background: url(../img/folder/home-icon.png) no-repeat 20px 5px;
+}
+.folder .list ul li.desktop {
+	background: url(../img/folder/desktop-icon.png) no-repeat 20px 5px;
+}
+.folder .list ul li.documents {
+	background: url(../img/folder/documents-icon.png) no-repeat 20px 5px;
+}
+.folder .list ul li.downloads {
+	background: url(../img/folder/downloads-icon.png) no-repeat 20px 5px;
+}
+.folder .list ul li.music {
+	background: url(../img/folder/music-icon.png) no-repeat 20px 5px;
+}
+.folder .list ul li.pictures {
+	background: url(../img/folder/pictures-icon.png) no-repeat 20px 5px;
+}
+.folder .list ul li.videos {
+	background: url(../img/folder/videos-icon.png) no-repeat 20px 5px;
+}
+.folder .list ul li.rubbish {
+	background: url(../img/folder/rubbish-icon.png) no-repeat 20px 5px;
+}
 .folder .list ul li.selected{
 	color:white;
-	background:#ed7543;
+	background-color:#ed7543;
+	background-position: 20px -16px;
 }
 
+
 .folder .folder-contents{
 	float:left;
 }
 
 .folder .contents{
 	background-color:#f1f0ef;
-	height: 434px;
+	height: 432px;
     overflow: auto;
     width: 584px;
+    border-left: 1px solid #f2f1f0;
 }
 
 .folder .selected-details{
@@ -106,71 +171,93 @@
 }
 
 #folder-window .buttons .folder-back{
-	width:30px;
-	height:37px;
+	width:34px;
+	height:34px;
 	overflow:hidden;
-	background: url(../img/folder/back.jpg) no-repeat 0px 0px;
+	background: url(../img/folder/image-nautilus-back.png) no-repeat 0px -33px;
 }
 
 #folder-window .buttons .folder-forward{
-	width:30px;
-	height:37px;
+	width:34px;
+	height:34px;
 	overflow:hidden;
-	background: url(../img/folder/forward.jpg) no-repeat 0px 0px;
+	background: url(../img/folder/image-nautilus-forward.png) no-repeat 0px -33px;
 }
 
-#folder-window .buttons .folder-forward:hover,
-#folder-window .buttons .folder-back:hover {
-	background-position: 0px -39px;
-}
 #folder-window .buttons .disabled{
- 	background-position: 0px -78px !important;
- }
+ 	background-position: 0px 0px !important;
+}
+
 #folder-window .buttons .folder-icon-view{
 	margin:5px 0px 0px 5px;
 }
 
 #folder-window.window{
-	background-color:#e6e4e3;
-}
-
- 
-  .folder .folder-contents .contents .file.display-icon p{
- 	width: 53px;
- 	overflow:hidden;
- 	margin:0 auto;
- 	padding:2px;
- 	-moz-border-radius: 4px 4px 4px 4px;
-  	-webkit-border-radius: 4px 4px 4px 4px;
-  	border-radius: 4px 4px 4px 4px;
-  }
-
-  .folder .buttons .folder-search{
+	background-color:#e7e5e4;
+}
+
+.folder .folder-contents .contents .file.display-icon p{
+	width: 53px;
+	overflow:hidden;
+	margin:0 auto;
+	padding:2px;
+	-moz-border-radius: 4px 4px 4px 4px;
+	-webkit-border-radius: 4px 4px 4px 4px;
+	border-radius: 4px 4px 4px 4px;
+}
+
+.folder .buttons .folder-search{
 	width:36px;
 	height:38px;
 	overflow:hidden;
 	background: url(../img/folder/search.jpg) no-repeat 0px 0px;
 }
+
 .folder .buttons .folder-search:hover{
 	background-position: 0px -38px;
- }
+}
  
 .folder .folder-contents .contents .display-icon{
- 	width:130px;
- 	height:80px;
- 	float:left;
- 	text-align: center;
- 	margin:10px;
- 	line-height: 12px;
- }
+	width:130px;
+	height:80px;
+	float:left;
+	text-align: center;
+	margin:10px;
+	line-height: 12px;
+}
  
 .file-folder.display-icon p{
- 	background:url(../img/folder/folder-icon.png) no-repeat 0px 0px;
- 	height:38px;
- 	width:47px;
- 	overflow:hidden;
- 	margin:0 auto;
- }
+	background:url(../img/folder/icon-nautilus-folder-generic.png) no-repeat 0px 0px;
+	height:38px;
+	width:47px;
+	overflow:hidden;
+	margin:0 auto;
+}
+
+.file-folder.display-icon.icon-documents p{
+	background-image:url(../img/folder/icon-nautilus-folder-document.png);
+}
+
+.file-folder.display-icon.icon-downloads p{
+	background-image:url(../img/folder/icon-nautilus-folder-downloads.png);
+}
+
+.file-folder.display-icon.icon-music p{
+	background-image:url(../img/folder/icon-nautilus-folder-music.png);
+}
+
+.file-folder.display-icon.icon-videos p{
+	background-image:url(../img/folder/icon-nautilus-folder-videos.png);
+}
+
+.file-folder.display-icon.icon-pictures p{
+	background-image:url(../img/folder/icon-nautilus-folder-pictures.png);
+}
+
+.file-folder.display-icon.icon-desktop p{
+	background-image:url(../img/folder/icon-nautilus-folder-desktop.png);
+}
+
  .display-compact{
  	float:none;
  	height: 28px;
@@ -221,11 +308,11 @@
   }
   
   .contents .display-icon.over p{
-  	background-position: 0px -39px;
+  	background-position: 0px -40px;
   }
   
    .display-icon.selected p{
-   		background-position: 0px -78px !important;
+   		background-position: 0px -80px !important;
    }
    
   .contents .display-compact.over p{

=== modified file 'css/fr.css'
--- css/fr.css	2013-02-06 07:47:17 +0000
+++ css/fr.css	2014-05-18 21:53:52 +0000
@@ -1,22 +1,26 @@
 /* base.css */
-#top #top-right #power .drop-down{
-	margin-left:-232px;
-}
-#top #top-right #time .drop-down{
-	margin-left:-233px;
-}
-#top #top-right #speakers .drop-down{
-	margin-left:-152px;
-}
 #top #top-right #connection .drop-down{
-	width: 235px;
-	margin-left: -91px;
+	width: 245px;
+	margin-left: -50px;
 }
 #top #top-right #bluetooth .drop-down{
 	width:315px;
 	margin-left: -152px;
 }
 
+#top #top-right #time .drop-down {
+    width: 290px;
+    margin-left: -225px;
+}
+#top #top-right #time .system-calendar {
+    height: 255px;
+}
+#top #top-right #message .drop-down {
+    margin-left: -63px;
+}
+#top #top-right #message .system-message {
+    width: 210px;
+}
 
 /* email.css */
 
@@ -32,7 +36,7 @@
 
 /*  folder.css */
 .folder {
-    width: 752px;
+    width: 755px;
 }
 .folder .list{
 	width: 168px;
@@ -54,11 +58,6 @@
     width: 149px;
 }
 
-/* systemoverlay.css */
-#systemOverlay .app-container .app-list {
-    height: 120px;
-}
-
 /* ubuntuone.css */
 #ubuntuone-window .content .body .features .files-anywhere .logo {
     margin-top: 0px;
@@ -72,9 +71,43 @@
 
 /* Welcome Screen CSS */
 #welcome-screen {
-    width: 760px;
+    width: 765px;
 }
 #welcome-screen li a {
     width: 195px;
 }
+#welcome-screen .welcome-header {
+    padding-right: 10px;
+}
+
+/* tourguide.css */
+#tour-guide {
+    width: 395px;
+	height:200px;
+}
+
+#tour-guide .tour-buttons div{
+    width:80px;
+}
+
+/* Ajouts par cm-t */
+/* icone lang */
+#top #top-right #lang{
+	padding-top:2px;
+}
+#top #top-right #lang .drop-down{
+	margin-left: -8px;
+	margin-top: -2px;
+	width: 298px;
+}
+/* icone cloud */
+#top #top-right #cloud{
+	padding-top:4px;
+}
+#top #top-right #cloud .drop-down{
+	margin-left: -45px;
+	margin-top: -1px;
+	width: 290px;
+}
+
 

=== modified file 'css/libre.css'
--- css/libre.css	2013-01-18 20:24:03 +0000
+++ css/libre.css	2014-05-18 21:53:52 +0000
@@ -11,13 +11,8 @@
 
 #libreoffice-calc-window .content{
 	background:url(../img/librecalc.jpg) no-repeat;
-	width:805px;
-	height:569px;
-	margin-top:5px;
-}
-
-#libreoffice-calc-window  .control .close{
-	background:url(../img/error/close-button.png) no-repeat;
+	width:795px;
+	height:534px;
 }
 
 #libreoffice-calc-window .control .close:hover {
@@ -32,21 +27,23 @@
 
 #libreoffice-writer-window .content{
 	background:url(../img/librewriter.jpg) no-repeat;
-	width:806px;
-	height:552px;
-	margin-top:5px;
-}
-
-#libreoffice-writer-window  .control .close{
-	background:url(../img/error/close-button.png) no-repeat;
-}
-
-#libreoffice-writer-window .control .close:hover {
-    background-position: 0 -19px;
-}
-
-#libreoffice-writer-window .content span, 
-#libreoffice-calc-window .content span, 
+	width:793px;
+	height:532px;
+}
+
+#libreoffice-writer-window .control .min:hover,
+#libreoffice-calc-window .control .min:hover,
+#libreoffice-impress-window .control .min:hover {
+    background-position: 0 0 !important;
+}
+#libreoffice-writer-window .control .max:hover,
+#libreoffice-calc-window .control .max:hover,
+#libreoffice-impress-window .control .max:hover {
+    background-position: 0 0 !important;
+}
+
+#libreoffice-writer-window .content span,
+#libreoffice-calc-window .content span,
 #libreoffice-impress-window .content span{
 	color: #B3B4A6;
     font-size: 15px;
@@ -64,13 +61,8 @@
 
 #libreoffice-impress-window .content{
 	background:url(../img/libreimpress.jpg) no-repeat;
-	width:802px;
-	height:551px;
-	margin-top:5px;
-}
-
-#libreoffice-impress-window  .control .close{
-	background:url(../img/error/close-button.png) no-repeat;
+	width:793px;
+	height:527px;
 }
 
 #libreoffice-impress-window .control .close:hover {

=== modified file 'css/movieplayer.css'
--- css/movieplayer.css	2013-01-18 20:24:03 +0000
+++ css/movieplayer.css	2014-05-18 21:53:52 +0000
@@ -20,7 +20,6 @@
 	background:url(../img/movieplayer/splash.jpg) no-repeat scroll center center #000;
 	width:100%;
 	height: 494px;
-	margin-top: 5px;
 }
 
 #movieplayer .container .tools{

=== modified file 'css/shotwell.css'
--- css/shotwell.css	2013-01-18 20:24:03 +0000
+++ css/shotwell.css	2014-05-18 21:53:52 +0000
@@ -16,7 +16,6 @@
 	float:left;
 	width:215px;
 	margin-right:10px;
-	margin-top:5px;
 }
 
 #shotwell .nav{
@@ -62,7 +61,6 @@
 }
 
 #shotwell .container {
-	margin-top:5px;
 	float: left;
 	width:572px;
 	border-left:1px solid #bdbab7;

=== modified file 'css/systemoverlay.css'
--- css/systemoverlay.css	2013-01-18 20:24:03 +0000
+++ css/systemoverlay.css	2014-05-18 21:53:52 +0000
@@ -7,8 +7,7 @@
 	width:100%;
 	height:100%;
 	position: absolute;
-	/*background:url(../img/dash-bg-60.png);*/
-	background-color:rgba(60, 25, 59, 0.5);
+	background-color:rgba(96,22,19,0.7);
 	top:0px;
 	left:0px;
 	z-index:12;
@@ -53,6 +52,9 @@
 	vertical-align: text-top;
 	margin-right: 8px;
 }
+#systemOverlay .app-list img {
+	margin-right: 0;
+}
 #systemOverlay #shortcuts img{
 	vertical-align: middle;
 	margin-right:15px;
@@ -79,14 +81,21 @@
 	margin-top:10px;
 }
 
+#systemOverlay #overlayContents .message {
+	min-height: 100%;
+	height: auto;
+	display: table-cell;
+	vertical-align: middle;
+}
+
 #systemOverlay #overlayContents .bottom{
-	margin-bottom:40px;
+	margin-bottom:20px;
 } 
 
 #systemOverlay .app-container .app-list{
 	width:100%;
 	height:110px;
-	margin:20px;
+	margin:10px 20px;
 	overflow:hidden;
 }
 
@@ -110,7 +119,7 @@
 }
 
 #systemOverlay .app-container .app-list div p{
-	font-size:14px;
+	font-size: 13px;
 	margin-top: 0px;
 }
 
@@ -221,6 +230,13 @@
 #systemOverlay #dash-bottom-bar .video-icon{
 	background:url(../img/dash/dash-video.png) no-repeat scroll 0px -44px;
 }
+#systemOverlay #dash-bottom-bar .photos-icon{
+	background:url(../img/dash/dash-photos.png) no-repeat scroll 0px -44px;
+}
+#systemOverlay #dash-bottom-bar .chat-icon{
+	background:url(../img/dash/dash-chat.png) no-repeat scroll 0px -44px;
+}
+
 
 #systemOverlay #dash-bottom-bar .bottom-wrapper div:hover{
 	background-position: 0px -88px;
@@ -230,4 +246,38 @@
 	background-position: 0px 0px;
 }
 
-
+#systemOverlay #preview {
+	width: 800px;
+	position: absolute;
+}
+
+#systemOverlay #preview .image {
+	width: 400px;
+	float: left;
+}
+
+#systemOverlay #preview .info,
+#systemOverlay #preview .buttons {
+	width: 380px;
+	float: left;
+	padding-left: 20px;
+}
+
+#systemOverlay #preview .buttons a {
+	margin: 0 10px 10px 0;
+	display: block;
+	height: 35px;
+	line-height: 35px;
+	text-align: center;
+	width: 175px;
+	float: left;
+	border: 1px solid #999;
+	-moz-border-radius: 8px 8px 8px 8px;
+	-webkit-border-radius: 8px 8px 8px 8px;
+	border-radius: 8px 8px 8px 8px;
+	color: #fff;
+}
+
+#systemOverlay #preview .buttons a:hover {
+	background-color: rgba(255, 255, 255, 0.1);
+}

=== modified file 'css/tourguide.css'
--- css/tourguide.css	2013-01-18 20:24:03 +0000
+++ css/tourguide.css	2014-05-18 21:53:52 +0000
@@ -5,12 +5,18 @@
 
 #tour-guide{
 	position:absolute;
-	bottom:0px;
-	left:0px;
-	width:100%;
-	height:50px;
-	background-color:#111;
+	top:150px;
+	right:20px;
+	width:370px;
+	height:189px;
+	background-color: rgba(0, 0, 0, 0.85);
 	z-index:100;
+	-moz-border-radius:4px 4px 4px 4px;
+	-webkit-border-radius:4px 4px 4px 4px;
+	border-radius:4px 4px 4px 4px;
+	-moz-box-shadow: 0px 0px 5px #000;
+	-webkit-box-shadow: 0px 0px 5px #000;
+	box-shadow: 0px 0px 5px #000; 
 }
 
 #tour-guide .guide-container{ 
@@ -19,64 +25,79 @@
 
 #tour-guide .next-button{
 	position: relative;
-    width: 50px;
+    width: 30px;
     z-index: 2;
-	height:50px;
-	margin-right:150px;
+	height:30px;
+	margin-right:15px;
+	margin-top: 15px;
 	float:right;
 	cursor:pointer;
+	text-align: center;
+	font-size: 30px;
+	border: 1px solid #333;
+	border-left: 0px;
+	color: #AEA79F;
+		-moz-border-radius: 0 4px 4px 0;
+		-webkit-border-radius: 0 4px 4px 0;
+	border-radius: 0 4px 4px 0;
+	line-height: .8;
 }
 
 #tour-guide .prev-button{
 	position: relative;
-    width: 50px;
+    width: 30px;
     z-index: 2;
-	height:50px;
+	height:30px;
+	margin-top: 15px;
+	float:right;
+	cursor:pointer;
+	text-align: center;
+	font-size: 30px;
+	border: 1px solid #333;
+	color: #AEA79F;
+		-moz-border-radius: 4px 0 0 4px;
+		-webkit-border-radius: 4px 0 0 4px;
+	border-radius: 4px 0 0 4px;
+	line-height: .8;
+}
+
+#tour-guide .prev-button:hover,
+#tour-guide .next-button:hover {
+	background-color:#000000;
+	color: #fff;
+}
+
+#tour-guide .tour-buttons{
+	position: absolute;
+	bottom: 0;
+	border-top: 1px solid #333;
+	width: 100%;
+}
+#tour-guide .tour-buttons div{
+	border-left: 1px solid #000;
+	border-right: 1px solid #333;
+	cursor:pointer;
 	float:left;
-	cursor:pointer;
-}
-
-#tour-guide .prev-button img{
-	margin:10px 0 0 25px;
-	cursor:pointer;
-}
-
-#tour-guide .next-button img{
-	margin:10px 0 0 25px;
-	cursor:pointer;
-}
-
-#tour-guide .explore-to-welcome{
-	position:absolute;
-	right:80px;
-	bottom:3px;
-	width:45px;
-	height:45px;
-		-moz-border-radius:10px 10px 10px 10px;
-		-webkit-border-radius:10px 10px 10px 10px;
-	border-radius:10px 10px 10px 10px;
-	background:url(../img/tourguide/back-to-welcome.png) no-repeat;
-	cursor: pointer;
-		-webkit-box-shadow: 0 0 5px #000000;
-		-moz-box-shadow: 0 0 5px #000000;
-	box-shadow: 0 0 5px #000000;
-}
-
-#tour-guide .explore-to-download{
-	position:absolute;
-	right:20px;
-	bottom:3px;
-	width:45px;
-	height:45px;
-		-moz-border-radius:10px 10px 10px 10px;
-		-webkit-border-radius:10px 10px 10px 10px;
-	border-radius:10px 10px 10px 10px;
-	background:url(../img/tourguide/back-to-download.png) no-repeat;
-	cursor: pointer;
-			-webkit-box-shadow: 0 0 5px #000000;
-		-moz-box-shadow: 0 0 5px #000000;
-	box-shadow: 0 0 5px #000000;
-
+	width:72px;
+	height:44px;
+	font-size: 14px;
+	padding-top: 10px;
+	padding-left: 50px;
+	line-height: 16px;
+}
+#tour-guide .tour-buttons div:hover{
+	background-color:#000000;
+}
+#tour-guide .tour-buttons .explore-to-welcome {
+	background: url(../img/tourguide/welcome.png) no-repeat scroll 15px center;
+	border-left: 0;
+}
+#tour-guide .tour-buttons .explore-to-download {
+	background: url(../img/tourguide/download.png) no-repeat scroll 15px center;
+}
+#tour-guide .tour-buttons .explore-to-exit {
+	background: url(../img/tourguide/close.png) no-repeat scroll 15px center;
+	border-right: 0;
 }
 
 #tour-guide .guide-logo{
@@ -84,7 +105,7 @@
 	height:50px;
 	float:left;
 	background-repeat:no-repeat;
-	margin:0px 20px;
+	margin:15px 5px 0 15px;
 }
 
 #tour-guide .guide-logo img{
@@ -92,54 +113,20 @@
 }
 
 #tour-guide h3{
-	font-size:20px;
+	font-size:16px;
 	display:inline;
 	position:relative;
-	top:13px;
+	top:26px;
 	margin-bottom:0px;
 }
 
 #tour-guide p{
 	font-size:16px;
-	display:inline;
 	font-weight: normal;
-	margin-left: 20px;
-	position:relative;
-	top:13px;
-	margin-bottom:0px;
-}
-
-#tour-guide .explore-tooltip-download{
-	height:20px;
-	background:url(../img/black-bg-20.png);
-	background-color:rgba(0,0,0,0.2);
-	display:none;
-	position: absolute;
-	bottom:55px;
-	right:10px;
-	padding:5px;
-	-moz-border-radius: 4px 4px 4px 4px;
-	-webkit-border-radius: 4px 4px 4px 4px;
-	border-radius: 4px 4px 4px 4px;
-	-moz-box-shadow: 0px 0px 5px #000;
-	-webkit-box-shadow: 0px 0px 5px #000;
-	box-shadow: 0px 0px 5px #000;
-}
-
-#tour-guide .explore-tooltip-welcome{
-	height:20px;
-	background:url(../img/black-bg-20.png);
-	background-color:rgba(0,0,0,0.2);
-	display:none;
-	position: absolute;
-	bottom:55px;
-	right:40px;
-	padding:5px;
-	-moz-border-radius: 4px 4px 4px 4px;
-	-webkit-border-radius: 4px 4px 4px 4px;
-	border-radius: 4px 4px 4px 4px;
-	-moz-box-shadow: 0px 0px 5px #000;
-	-webkit-box-shadow: 0px 0px 5px #000;
-	box-shadow: 0px 0px 5px #000;
-}
-
+	position:absolute;
+	top: 70px;
+	padding: 0 15px 15px;
+	border-bottom: 1px solid #000;
+	line-height: 1.5;
+	margin-top: 0;
+}

=== modified file 'css/welcome.css'
--- css/welcome.css	2013-01-18 20:24:03 +0000
+++ css/welcome.css	2014-05-18 21:53:52 +0000
@@ -76,7 +76,7 @@
 	list-style: none;
 }
 #welcome-screen li a {
-	padding: 28px 0 22px 57px;
+	padding: 24px 0 24px 59px;
 	display: block;
 	width: 160px;
 	text-decoration: none;
@@ -102,49 +102,49 @@
     margin-top: -20px;
 }
 #welcome-screen .browse-files {
-	background: url("../img/welcome/browse-files.png") no-repeat 12px 15px;
+	background: url("../img/welcome/browse-files.png") no-repeat 10px center;
 }
 #welcome-screen .surf-the-web {
-	background: url("../img/welcome/surf-the-web.png") no-repeat 12px 15px;
+	background: url("../img/welcome/surf-the-web.png") no-repeat 10px center;
 	border-right:0px;
 	border-top:1px solid #fff;
 }
 #welcome-screen .check-email {
-	background: url("../img/welcome/check-email.png") no-repeat 12px 15px;
+	background: url("../img/welcome/check-email.png") no-repeat 10px center;
 	border-top:1px solid #fff;
 }
 #welcome-screen .watch-video {
-	background: url("../img/welcome/watch-video.png") no-repeat 12px 15px;
+	background: url("../img/welcome/watch-video.png") no-repeat 10px center;
 	border-right:0px;
 	border-bottom:0px;
 }
 #welcome-screen .view-photos {
-	background: url("../img/welcome/view-photos.png") no-repeat 12px 15px;
+	background: url("../img/welcome/view-photos.png") no-repeat 10px center;
 	border-right:0px;
 }
 #welcome-screen .find-apps {
-	background: url("../img/welcome/find-apps.png") no-repeat 12px 15px;
+	background: url("../img/welcome/find-apps.png") no-repeat 10px center;
 }
 #welcome-screen .create-documents {
-	background: url("../img/welcome/create-documents.png") no-repeat 15px 15px;
+	background: url("../img/welcome/create-documents.png") no-repeat 10px center;
 }
 #welcome-screen .create-spreadsheets {
-	background: url("../img/welcome/create-spreadsheets.png") no-repeat 15px 15px;
+	background: url("../img/welcome/create-spreadsheets.png") no-repeat 10px center;
 	border-bottom:0px;
 }
 #welcome-screen .create-presentations {
-	background: url("../img/welcome/create-presentations.png") no-repeat 15px 15px;
+	background: url("../img/welcome/create-presentations.png") no-repeat 10px center;
 	border-bottom: 0px;
 }
 #welcome-screen .listen-music{
-	background: url("../img/welcome/listen-to-music.png") no-repeat 12px 15px;
+	background: url("../img/welcome/listen-to-music.png") no-repeat 10px center;
 }
 #welcome-screen .system-indicators{
-	background: url("../img/welcome/indicators.png") no-repeat 12px 15px;
+	background: url("../img/welcome/indicators.png") no-repeat 10px center;
 	border-bottom:1px solid #d5d5d5;
 }
 #welcome-screen .applications{
-	background: url("../img/welcome/applications.png") no-repeat 12px 15px;
+	background: url("../img/welcome/applications.png") no-repeat 10px center;
 	border-right:0px;
 	border-bottom:1px solid #d5d5d5;
 }

=== modified file 'en/index.html'
--- en/index.html	2013-01-18 20:24:03 +0000
+++ en/index.html	2014-05-18 21:53:52 +0000
@@ -70,33 +70,23 @@
 				<div id="title"></div>
 			</div>
 			<div id="top-right">
-				<div id="message"><img src="../img/top/nomessage.jpg" class="message-logo" alt="" />
+				<div id="connection"><img src="../img/top/connection.png" alt=""/>
 					<ul class="drop-down">
-						<li class="disabled"><img src="../img/top/available.jpg" alt=""/> Available
-						</li>
-						<li class="disabled"><img src="../img/top/away.jpg" alt=""/> Away
-						</li>
-						<li class="disabled"><img src="../img/top/busy.jpg" alt=""/> Busy
-						</li>
-						<li class="disabled"><img src="../img/top/invisible.jpg" alt=""/> Invisible
-						</li>
-						<li class="disabled"><img src="../img/top/offline.jpg" alt=""/> Offline
-						</li>
-						<li class="divider"></li>
-						<li class="disabled"><img src="../img/top/chat.png" alt=""/> Chat
-						</li>
-						<li class="divider"></li>
-						<li class="disabled"><img src="../img/top/broadcast.png" alt=""/> Set Up Broadcast Account…
-						</li>
-						<li class="divider"></li>
-						<li class="disabled"><img src="../img/top/mail.png" alt=""/> Set Up Mail…
-						</li>
-						<li class="divider"></li>
-						<li class="disabled"><img src="../img/top/uone.png" alt=""/> Ubuntu One
-						</li>
-						<li class="divider"></li>
-						<li class="disabled">
-							Clear
+						<li class="disabled">
+							Auto eth0
+						</li>
+						<li class="disabled">
+							Disconnect
+						</li>
+						<li class="divider"></li>
+						<!--<li class="disabled"><img src="../img/top/wireless-icon.png" alt=""/> My Wireless Connection</li>
+						<li class="disabled">Disconnect</li>
+						<li class="divider"></li>-->
+						<li class="disabled">
+							Connection Information
+						</li>
+						<li class="disabled">
+							Edit Connections…
 						</li>
 					</ul>
 				</div>
@@ -129,24 +119,9 @@
 						</li>
 					</ul>
 				</div>
-				<div id="connection"><img src="../img/top/connection.png" alt=""/>
+				<div id="message"><img src="../img/top/nomessage.jpg" class="message-logo" alt="" />
 					<ul class="drop-down">
-						<li class="disabled">
-							Auto eth0
-						</li>
-						<li class="disabled">
-							Disconnect
-						</li>
-						<li class="divider"></li>
-						<!--<li class="disabled"><img src="../img/top/wireless-icon.png" alt=""/> My Wireless Connection</li>
-						<li class="disabled">Disconnect</li>
-						<li class="divider"></li>-->
-						<li class="disabled">
-							Connection Information
-						</li>
-						<li class="disabled">
-							Edit Connections…
-						</li>
+						<li class="system-message"></li>
 					</ul>
 				</div>
 				<div id="speakers"><img src="../img/top/speakers3.png" class="speakers-logo"  alt=""/>
@@ -173,45 +148,37 @@
 					<p></p>
 					<ul class="drop-down">
 						<li class="system-calendar"></li>
-						<li class="divider"></li>
-						<li class="disabled">
-							Time &amp; Date Settings…
-						</li>
 					</ul>
 				</div>
 				<div id="power"><img src="../img/top/power.png"  alt=""/>
 					<ul class="drop-down">
 						<li class="disabled">
-							System Settings…
-						</li>
-						<li class="disabled">
-							Displays…
-						</li>
-						<li class="disabled">
-							Startup Applications…
-						</li>
-						<li class="disabled">
-							Software Up to Date
-						</li>
-						<li class="divider"></li>
-						<li class="disabled">
-							Attached Devices
-						</li>
-						<li class="disabled">
-							Printers
-						</li>
-						<li class="divider"></li>
-						<li class="disabled">
-							Lock Screen
-						</li>
-						<li class="disabled">
-							Log Out…
-						</li>
+							About This Computer
+						</li>
+						<li class="disabled">
+							Ubuntu Help
+						</li>
+						<li class="divider"></li>
+						<li class="disabled">
+							System Settings&hellip;
+						</li>
+						<li class="divider"></li>
+						<li class="disabled">
+							Lock <span class="key-combo">Ctrl+Alt+L</span>
+						</li>
+						<li class="disabled user">
+							Guest Session
+						</li>
+						<li class="divider"></li>
+						<li class="disabled">
+							Logout
+						</li>
+						<li class="divider"></li>
 						<li class="disabled">
 							Suspend
 						</li>
 						<li class="disabled">
-							Hibernate
+							Restart&hellip;
 						</li>
 						<li>
 							Shut Down…
@@ -234,22 +201,26 @@
 				</li>
 				<li class="firefox"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Firefox Web Browser</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
 				</li>
-				<li class="software"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Ubuntu Software Centre</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
 				<li class="writer"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>LibreOffice Writer</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
 				</li>
+				<li class="calc"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>LibreOffice Calc</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
+				</li>
 				<li class="impress"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>LibreOffice Impress</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
 				</li>
-				<li class="calc"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>LibreOffice Calc</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="uone"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Ubuntu One</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="email"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Thunderbird Mail</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
+				<li class="software"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Ubuntu Software Centre</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
+				</li>
+				<li class="amazon"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Amazon</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
+				</li>
+				<li class="settings"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>System Settings</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
+				</li>
+				<li class="email temp"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""><span>Thunderbird Mail</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt="">
 				</li>
 				<li class="shotwell temp"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Shotwell Photo Manager</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
 				</li>
 				<li class="movieplayer temp"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Movie Player</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
 				</li>
+				<li class="email temp"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Thunderbird</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
+				</li>
 				<!--<li class="workspace"><span>Workspace Switcher</span></li>-->
 				<li class="rubbish bottom">
 					<span>Rubbish bin</span>
@@ -259,7 +230,7 @@
 		<div id="systemOverlay">
 			<div class="copyDash"></div>
 			<div id="overlayContents">
-				<input type="text" name="search" value="Search"/>
+				<input type="text" name="search" value="Search your computer and online sources"/>
 				<div id="display-home" class="app-container">
 					<div class="recent-apps bottom"><img src="../img/overlay/recentapps.png" alt=""/> Applications <div class="app-list"></div>
 					</div>
@@ -279,7 +250,7 @@
 					</div>
 					<div class="folders"><img src="../img/overlay/folders.png" alt=""/> Folders<div class="app-list"></div>
 					</div>
-					
+
 				</div>
 				<div id="display-find-music" class="app-container">
 					<div class="songs bottom"><img src="../img/overlay/folders.png" alt=""/> Songs<div class="app-list"></div>
@@ -291,6 +262,15 @@
 					<div class="videos bottom"><img src="../img/overlay/folders.png" alt=""/> Videos<div class="app-list"></div>
 					</div>
 				</div>
+				<div id="display-find-photos" class="app-container">
+					<div class="photos bottom"><img src="../img/overlay/folders.png" alt=""/> My photos<div class="app-list"></div>
+					</div>
+				</div>
+				<div id="display-chat" class="app-container">
+					<div class="message">
+						<p>Sorry, there is nothing that matches your search</p>
+					</div>
+				</div>
 				<div id="display-search" class="app-container">
 					<div class="applications bottom"><img src="../img/overlay/search-apps-logo.jpg" alt=""/> Applications<div class="app-list"></div>
 					</div>
@@ -304,7 +284,18 @@
 					<div class="applications-icon"></div>
 					<div class="files-icon"></div>
 					<div class="music-icon"></div>
-					<div class="video-icon last"></div>
+					<div class="video-icon"></div>
+					<div class="photos-icon"></div>
+					<div class="chat-icon last"></div>
+				</div>
+			</div>
+			<div id="preview">
+				<div class="image"></div>
+				<div class="info"></div>
+				<div class="buttons">
+					<a class="email">E-mail</a>
+					<a class="showInFolder">Show in Folder</a>
+					<a class="open">Open</a>
 				</div>
 			</div>
 		</div>
@@ -376,58 +367,40 @@
 		<div id="libreoffice-calc-window" class="calc window">
 			<div class="control">
 				<div class="close"></div>
+				<div class="min"></div>
+				<div class="max"></div>
 				<div class="window-title">
 					Untitled 1 - LibreOffice Calc
 				</div>
 			</div>
 			<div class="content">
-				<span>File</span>
-				<span>Edit</span>
-				<span>View</span>
-				<span>Insert</span>
-				<span>Format</span>
-				<span>Table</span>
-				<span>Tools</span>
-				<span>Window</span>
-				<span>Help</span>
+
 			</div>
 		</div>
 		<div id="libreoffice-writer-window" class="writer window">
 			<div class="control">
 				<div class="close"></div>
+				<div class="min"></div>
+				<div class="max"></div>
 				<div class="window-title">
 					Untitled 1 - LibreOffice Writer
 				</div>
 			</div>
 			<div class="content">
-				<span>File</span>
-				<span>Edit</span>
-				<span>View</span>
-				<span>Insert</span>
-				<span>Format</span>
-				<span>Table</span>
-				<span>Tools</span>
-				<span>Window</span>
-				<span>Help</span>
+
 			</div>
 		</div>
 		<div id="libreoffice-impress-window" class="impress window">
 			<div class="control">
 				<div class="close"></div>
+				<div class="min"></div>
+				<div class="max"></div>
 				<div class="window-title">
 					Untitled 1 - LibreOffice Impress
 				</div>
 			</div>
 			<div class="content">
-				<span>File</span>
-				<span>Edit</span>
-				<span>View</span>
-				<span>Insert</span>
-				<span>Format</span>
-				<span>Table</span>
-				<span>Tools</span>
-				<span>Window</span>
-				<span>Help</span>
+
 			</div>
 		</div>
 		<div class="error-window window">
@@ -963,89 +936,42 @@
 				<div class="max"></div>
 				<div class="window-title"></div>
 			</div>
-			<div style="clear:both;"></div>
+
+			<div class="buttons">
+					<div class="folder-back"></div>
+					<div class="folder-forward"></div>
+				</div>
+				<div class="bottom-buttons"></div>
+				<div style="clear:both;"></div>
 			<div class="folder-list">
 				<div class="list">
 					<p>
-						Computer
+						Places
 					</p>
 					<ul>
-						<li class="home selected" data-folder="home"><img src="../img/folder/home-icon.png" alt=""/> Home
-						</li>
-						<li class="desktop" data-folder="5"><img src="../img/folder/desktop-icon.png"  alt=""/> Desktop
-						</li>
-						<li class="documents" data-folder="0"><img src="../img/folder/documents-icon.png"  alt=""/> Documents
-						</li>
-						<li class="downloads" data-folder="1"><img src="../img/folder/downloads-icon.png"  alt=""/> Downloads
-						</li>
-						<li class="music" data-folder="2"><img src="../img/folder/music-icon.png"  alt=""/> Music
-						</li>
-						<li class="pictures" data-folder="4"><img src="../img/folder/pictures-icon.png"  alt=""/> Pictures
-						</li>
-						<li class="videos" data-folder="3"><img src="../img/folder/videos-icon.png"  alt=""/> Videos
-						</li>
-						<li class="rubbish" data-folder="bin"><img src="../img/folder/rubbish-icon.png"  alt=""/> Rubbish bin
-						</li>
+						<li class="home selected" data-folder="home">Home</li>
+						<li class="desktop" data-folder="5">Desktop</li>
+						<li class="documents" data-folder="0">Documents</li>
+						<li class="downloads" data-folder="1">Downloads</li>
+						<li class="music" data-folder="2">Music</li>
+						<li class="pictures" data-folder="4">Pictures</li>
+						<li class="videos" data-folder="3">Videos</li>
+						<li class="rubbish" data-folder="bin">Rubbish bin</li>
 					</ul>
 				</div>
 			</div>
 			<div class="folder-contents">
-				<div class="buttons">
-					<div class="folder-back"></div>
-					<div class="folder-forward"></div>
-				</div>
-				<div class="bottom-buttons"></div>
-				<div style="clear:both;"></div>
 				<div class="contents"></div>
 				<div class="selected-details"></div>
 			</div>
 		</div>
-		<!--<div id="welcome">
-			<div id="welcome-screen">
-				<div class="close"></div>
-				<h1>Welcome to the Ubuntu online tour!</h1>
-				<h2>Take Ubuntu for a test drive with our online demo.</h2>
-				<ul>
-					<li>
-						<a class="browse-files" href="#browse-files">Browse files</a>
-					</li>
-					<li>
-						<a class="surf-the-web" href="#surf-the-web">Surf the web</a>
-					</li>
-					<li>
-						<a class="check-email" href="#check-email">Check email</a>
-					</li>
-					<li>
-						<a class="view-photos" href="#view-photos">View photos</a>
-					</li>
-					<li>
-						<a class="find-apps" href="#find-apps">Find apps</a>
-					</li>
-					<li>
-						<a class="create-documents" href="#create-documents">Create documents</a>
-					</li>
-					<li>
-						<a class="create-spreadsheets" href="#create-spreadsheets">Create spreadsheets</a>
-					</li>
-					<li>
-						<a class="create-presentations" href="#create-presentations">Create presentations</a>
-					</li>
-				</ul>
-				<div class="language-mode">
-					<span class="active">English</span>
-					<a href="/tour/zh-CN/">中文</a>
-				</div>
-				<a class="explore-mode primary" href="#">Show yourself around</a>
-				<a class="tour-mode" href="#">Take the guided tour</a>
-			</div>
-		</div>-->
 		<div id="welcome">
 			<div id="welcome-screen" class="selected-window">
 				<div class="control">
 					<div class="window-title">Ubuntu tour</div>
 				</div>
 				<div class="welcome-header">
-					<h1>Welcome to the Ubuntu 12.10 tour!</h1>
+					<h1>Welcome to the Ubuntu 14.04 tour!</h1>
 					<h2>Take Ubuntu for a test drive with our online demo.</h2>
 				</div>
 				<ul>
@@ -1086,13 +1012,11 @@
 			</div>
 		</div>
 		<div id="tour-guide">
-			<div class="next-button"><img src="../img/tourguide/arrow-next.png" alt="" />
-			</div>
-			<div class="prev-button"><img src="../img/tourguide/arrow-prev.png" alt="" />
-			</div>
+			<div class="next-button">&rsaquo;</div>
+			<div class="prev-button">&lsaquo;</div>
 			<div class="guide-container welcome">
-				<div class="guide-logo"></div>
-				<h3></h3>
+				<div class="guide-logo"><img src="../img/tourguide/back-to-welcome.png" /></div>
+				<h3>Ubuntu online tour</h3>
 				<p>
 					We hope you've enjoyed the Ubuntu online tour. <a href="http://www.ubuntu.com/download/ubuntu/download?utm_source=tour&utm_medium=online&utm_campaign=tour" target="_blank">Ready to download?</a> or <a href="/ubuntu/take-the-tour" >back to the site</a>
 				</p>
@@ -1169,14 +1093,11 @@
 					You can watch all your favourite films and videos, DVDs, downloads or movies you've created yourself.
 				</p>
 			</div>
-			<div class="explore-tooltip-download">
-				Download
-			</div>
-			<div class="explore-tooltip-welcome">
-				Welcome Screen
-			</div>
-			<div class="explore-to-welcome"></div>
-			<div class="explore-to-download"></div>
+			<div class=" tour-buttons">
+				<div class="explore-to-welcome">Welcome screen</div>
+				<div class="explore-to-download">Download Ubuntu</div>
+				<div class="explore-to-exit">Exit the Tour</div>
+			</div>
 		</div>
 		<div id="Translation-Strings">
 			<!--
@@ -1395,8 +1316,8 @@
 				<br/>
 				All gameplay is based on time manipulation. Journey into worlds where time behaves strangely; observe, learn from, and then master these worlds.
 			</p>
-			<p class="_banshee_app_">
-				Banshee Media Player
+			<p class="_rhythmbox_app_">
+				Rhythmbox Media Player
 			</p>
 			<p class="_brasero_app_">
 				Brasero Disc Burner
@@ -1431,6 +1352,18 @@
 			<p class="_terminal_app_">
 				Terminal Server Client
 			</p>
+			<p class="_ubuntu_one_app_">
+				Ubuntu One
+			</p>
+			<p class="_ubuntu_software_center_app_">
+				Ubuntu Software Center
+			</p>
+			<p class="_ubuntu_one_music_app_">
+				Ubuntu One Music
+			</p>
+			<p class="_amazon_app_">
+				Amazon
+			</p>
 			<p class="_about_me_app_">
 				About Me
 			</p>
@@ -1449,7 +1382,7 @@
 			<!--
 			* Dash
 			-->
-			<p class="_search_">Search</p>
+			<p class="_search_">Search your computer and online sources</p>
 			<!--
 			* Notifications
 			-->
@@ -1475,13 +1408,13 @@
 				Files Details - Images
 			-->
 			<p class="_photo_size_">
-				15.2KB	
+				15.2KB
 			</p>
 			<p class="_photo_date_">
 				Fri 26 Oct, 2001
 			</p>
 			<p class="_buck_off_title_">
-				Buck Off	
+				Buck Off
 			</p>
 			<p class="_darkening_clockwork_title_">
 				Darkening Clockwork

=== modified file 'fr/index.html'
--- fr/index.html	2013-01-28 07:20:45 +0000
+++ fr/index.html	2014-05-18 21:53:52 +0000
@@ -48,10 +48,10 @@
 			<div id="dot-container">
 				<noscript>
 					<p>
-						This demo uses JavaScript. Either your browser doesn't support JavaScript, or it's currently switched off.
-						<br/>
-						<br/>
-						Don't panic. We've got <a href="/ubuntu/take-the-tour-gallery">a non-JavaScript version</a> of the online tour you can view instead. :)
+						Cette démonstration utilise JavaScript. Soit votre navigateur web ne supporte pas JavaScript, soit il est actuellement désactivé.
+						<br/>
+						<br/>
+						<!--Don't panic. We've got <a href="/ubuntu/take-the-tour-gallery">a non-JavaScript version</a> of the online tour you can view instead. :) -->
 					</p>
 				</noscript>
 			</div>
@@ -71,67 +71,6 @@
 				<div id="title"></div>
 			</div>
 			<div id="top-right">
-				<div id="message"><img src="../img/top/nomessage.jpg" class="message-logo" alt="" />
-					<ul class="drop-down">
-						<li class="disabled"><img src="../img/top/available.jpg" alt=""/> Disponible
-						</li>
-						<li class="disabled"><img src="../img/top/away.jpg" alt=""/> Absent(e)
-						</li>
-						<li class="disabled"><img src="../img/top/busy.jpg" alt=""/> Occupé(e)
-						</li>
-						<li class="disabled"><img src="../img/top/invisible.jpg" alt=""/> Invisible
-						</li>
-						<li class="disabled"><img src="../img/top/offline.jpg" alt=""/> Hors ligne
-						</li>
-						<li class="divider"></li>
-						<li class="disabled"><img src="../img/top/chat.png" alt=""/> Messagerie instantanée
-						</li>
-						<li class="divider"></li>
-						<li class="disabled"><img src="../img/top/broadcast.png" alt=""/> Configurer le microblogage…
-						</li>
-						<li class="divider"></li>
-						<li class="disabled"><img src="../img/top/mail.png" alt=""/> Configurer le courriel…
-						</li>
-						<li class="divider"></li>
-						<li class="disabled"><img src="../img/top/uone.png" alt=""/> Ubuntu One
-						</li>
-						<li class="divider"></li>
-						<li class="disabled">
-							Effacer
-						</li>
-					</ul>
-				</div>
-				<div id="bluetooth"><img src="../img/top/bluetooth.png" alt=""/>
-					<ul class="drop-down">
-						<li class="disabled bluetooth">
-							Bluetooth : actif
-						</li>
-						<li>
-							Désactiver le Bluetooth
-						</li>
-						<li class="disabled BtOn">
-							Visible
-						</li>
-						<li class="divider"></li>
-						<li class="disabled BtOn">
-						    Périphériques
-						</li>
-						<li class="disabled BtOn">
-						    Ubuntu Phone
-						</li>
-						<li class="divider"></li>
-						<li class="disabled BtOn">
-							Envoyer des fichiers à un périphérique...
-						</li>
-						<li class="disabled BtOn">
-							Configurer un nouveau périphérique...
-						</li>
-						<li class="divider BtOn"></li>
-						<li class="disabled">
-							Réglages du Bluetooth…
-						</li>
-					</ul>
-				</div>
 				<div id="connection"><img src="../img/top/connection.png" alt=""/>
 					<ul class="drop-down">
 						<li class="disabled">
@@ -148,8 +87,42 @@
 							Informations sur la connexion
 						</li>
 						<li class="disabled">
-							Modification des connexions...
-						</li>
+							Modification des connexions…
+						</li>
+					</ul>
+				</div>
+				<div id="bluetooth"><img src="../img/top/bluetooth.png" alt=""/>
+					<ul class="drop-down">
+						<li class="disabled bluetooth">
+							Bluetooth : actif
+						</li>
+						<li>
+							Désactiver le Bluetooth
+						</li>
+						<li class="divider"></li>
+						<li class="disabled BtOn">
+							Visible
+						</li>
+						<li class="divider BtOn"></li>
+						<li class="disabled BtOn">
+							Envoyer des fichiers à un périphérique…
+						</li>
+						<li class="disabled BtOn">
+							Parcourir les fichiers sur le périphérique…
+						</li>
+						<li class="divider"></li>
+						<li class="disabled BtOn">
+							Configurer un nouveau périphérique…
+						</li>
+						<li class="divider BtOn"></li>
+						<li class="disabled">
+							Paramètres bluetooth…
+						</li>
+					</ul>
+				</div>
+				<div id="message"><img src="../img/top/nomessage.jpg" class="message-logo" alt="" />
+					<ul class="drop-down">
+						<li class="system-message"></li>
 					</ul>
 				</div>
 				<div id="speakers"><img src="../img/top/speakers3.png" class="speakers-logo"  alt=""/>
@@ -168,7 +141,7 @@
 						</li>
 						<li class="divider"></li>
 						<li class="disabled">
-							Réglages du son...
+							Paramètres sonores…
 						</li>
 					</ul>
 				</div>
@@ -176,10 +149,6 @@
 					<p></p>
 					<ul class="drop-down">
 						<li class="system-calendar"></li>
-						<li class="divider"></li>
-						<li class="disabled">
-							Réglages de la date et de l'heure…
-						</li>
 					</ul>
 				</div>
 				<div id="power"><img src="../img/top/power.png"  alt=""/>
@@ -196,18 +165,16 @@
 						</li>
 						<li class="divider"></li>
 						<li class="disabled">
-							Verrouiller
+							Verrouiller <span class="key-combo">Ctrl+Alt+L</span>
 						</li>
-						<li class="disabled">
+						<li class="disabled user">
 							Session d'invité
 						</li>
-						<li class="disabled">
-							Vous
-						</li>
 						<li class="divider"></li>
 						<li class="disabled">
 							Fermer la session…
 						</li>
+						<li class="divider"></li>
 						<li class="disabled">
 							Mettre en veille
 						</li>
@@ -235,17 +202,19 @@
 				</li>
 				<li class="firefox"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Navigateur Web Firefox</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
 				</li>
-				<li class="software"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Logithèque Ubuntu</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
 				<li class="writer"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>LibreOffice Writer</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
 				</li>
+				<li class="calc"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>LibreOffice Calc</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
+				</li>
 				<li class="impress"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>LibreOffice Impress</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
 				</li>
-				<li class="calc"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>LibreOffice Calc</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="uone"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Ubuntu One</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="email"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Messagerie Thunderbird</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
+				<li class="software"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Logithèque Ubuntu</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
+				</li>
+				<li class="amazon"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Amazon</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
+				</li>
+				<li class="settings"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Paramètres système</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
+				</li>
+				<li class="email temp"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""><span>Messagerie Thunderbird</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt="">
 				</li>
 				<li class="shotwell temp"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Gestionnaire de photos Shotwell</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
 				</li>
@@ -260,7 +229,7 @@
 		<div id="systemOverlay">
 			<div class="copyDash"></div>
 			<div id="overlayContents">
-				<input type="text" name="search" value="Search"/>
+				<input type="text" name="search" value="Rechercher sur votre ordinateur et à partir de sources en ligne"/>
 				<div id="display-home" class="app-container">
 					<div class="recent-apps bottom"><img src="../img/overlay/recentapps.png" alt=""/> Applications <div class="app-list"></div>
 					</div>
@@ -280,7 +249,7 @@
 					</div>
 					<div class="folders"><img src="../img/overlay/folders.png" alt=""/> Dossiers<div class="app-list"></div>
 					</div>
-					
+
 				</div>
 				<div id="display-find-music" class="app-container">
 					<div class="songs bottom"><img src="../img/overlay/folders.png" alt=""/> Morceaux<div class="app-list"></div>
@@ -292,6 +261,15 @@
 					<div class="videos bottom"><img src="../img/overlay/folders.png" alt=""/> Vidéos<div class="app-list"></div>
 					</div>
 				</div>
+				<div id="display-find-photos" class="app-container">
+					<div class="photos bottom"><img src="../img/overlay/folders.png" alt=""/> Mes photos<div class="app-list"></div>
+					</div>
+				</div>
+				<div id="display-chat" class="app-container">
+					<div class="message">
+						<p>Désolé, aucun résultat ne correspond à votre recherche.</p>
+					</div>
+				</div>
 				<div id="display-search" class="app-container">
 					<div class="applications bottom"><img src="../img/overlay/search-apps-logo.jpg" alt=""/> Applications<div class="app-list"></div>
 					</div>
@@ -305,7 +283,18 @@
 					<div class="applications-icon"></div>
 					<div class="files-icon"></div>
 					<div class="music-icon"></div>
-					<div class="video-icon last"></div>
+					<div class="video-icon"></div>
+					<div class="photos-icon"></div>
+					<div class="chat-icon last"></div>
+				</div>
+			</div>
+			<div id="preview">
+				<div class="image"></div>
+				<div class="info"></div>
+				<div class="buttons">
+					<a class="email">Courriel</a>
+					<a class="showInFolder">Afficher dans le dossier</a>
+					<a class="open">Voir</a>
 				</div>
 			</div>
 		</div>
@@ -326,7 +315,7 @@
 							<div>
 								<h3>Vos fichiers disponibles partout</h3>
 								<p>
-									Sauvegardez et accédez à vos fichiers depuis Ubuntu, Windows, le web ou un téléphone portable.
+									Sauvegardez et accédez à vos fichiers depuis Ubuntu, Windows, le web ou un téléphone portable
 								</p>
 							</div>
 						</div>
@@ -377,58 +366,40 @@
 		<div id="libreoffice-calc-window" class="calc window">
 			<div class="control">
 				<div class="close"></div>
+				<div class="min"></div>
+				<div class="max"></div>
 				<div class="window-title">
 					Sans nom 1 - LibreOffice Calc
 				</div>
 			</div>
 			<div class="content">
-				<span>Fichier</span>
-				<span>Édition</span>
-				<span>Affichage</span>
-				<span>Insertion</span>
-				<span>Format</span>
-				<span>Outils</span>
-				<span>Données</span>
-				<span>Fenêtre</span>
-				<span>Aide</span>
+
 			</div>
 		</div>
 		<div id="libreoffice-writer-window" class="writer window">
 			<div class="control">
 				<div class="close"></div>
+				<div class="min"></div>
+				<div class="max"></div>
 				<div class="window-title">
 					Sans nom 1 – LibreOffice Writer
 				</div>
 			</div>
 			<div class="content">
-				<span>Fichier</span>
-				<span>Édition</span>
-				<span>Affichage</span>
-				<span>Insertion</span>
-				<span>Format</span>
-				<span>Tableau</span>
-				<span>Outils</span>
-				<span>Fenêtre</span>
-				<span>Aide</span>
+
 			</div>
 		</div>
 		<div id="libreoffice-impress-window" class="impress window">
 			<div class="control">
 				<div class="close"></div>
+				<div class="min"></div>
+				<div class="max"></div>
 				<div class="window-title">
 					Sans nom 1 – LibreOffice Impress
 				</div>
 			</div>
 			<div class="content">
-				<span>Fichier</span>
-				<span>Édition</span>
-				<span>Affichage</span>
-				<span>Insertion</span>
-				<span>Format</span>
-				<span>Outils</span>
-				<span>Diaporama</span>
-				<span>Fenêtre</span>
-				<span>Aide</span>
+
 			</div>
 		</div>
 		<div class="error-window window">
@@ -438,7 +409,7 @@
 			</div>
 			<div class="error-container">
 				<h1>Merci d'explorer Ubuntu&nbsp;!</h1>
-				<a class="download"  href="http://www.ubuntu-fr.org/telechargement" target="_blank">Télécharger Ubuntu</a>
+				<a class="download"  href="http://ubuntu-fr.org/telechargement?pk_campaign=tour&pk_kwd=popup" target="_blank">Télécharger Ubuntu</a>
 				<h2>Pour rappel, ceci n'est qu'une démonstration. Vous devez télécharger Ubuntu pour profiter de toutes ses possibilités !</h2>
 			</div>
 		</div>
@@ -665,7 +636,7 @@
 				<div class="description-container">
 					<div class="description-image"><img src="../img/software-centre/screenshot-blender.jpg" alt="" />
 					</div>
-					<div class="description"><img src="../img/software-centre/screenshot-blender.jpg" alt="" />Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse quam augue, convallis id commodo id, tristique ac mi. Ut dapibus, neque eget elementum pretium, nunc turpis congue eros, et interdum nisi nisi at diam. Duis dictum, justo eget imperdiet pulvinar, dolor est fermentum nisl, luctus imperdiet metus elit a purus. Quisque nisl enim, lacinia ut venenatis in, porttitor eget orci. Quisque non nibh nec risus tincidunt sollicitudin vitae et nisl. Proin odio lacus, vulputate non auctor sit amet, dapibus quis tortor. Donec elit libero, pellentesque quis dictum sed, hendrerit non libero. Aliquam eu diam id leo auctor tincidunt. Phasellus cursus felis at nulla facilisis semper. Cras mauris urna, adipiscing sed scelerisque ut, gravida id neque. Mauris ut vestibulum justo. Curabitur convallis elementum pellentesque. Duis sit amet arcu ac eros pretium scelerisque. Nunc nec nisi nulla.
+					<div class="description"><img src="../img/software-centre/screenshot-blender.jpg" alt="" />Blender est une suite logicielle intégrée pour la modélisation, l'animation, le rendu, la post-production, la création et le rendu interactif (jeux). Blender a sa propre interface utilisateur implémentée entièrement avec OpenGL et conçue pour la vitesse. Une interface Python est disponible pour les scripts (les fonctions d'import/export pour les formats de fichiers 3D populaires comme 3D Studio et Wavefront Obj sont implémentés par des scripts par la communauté). Les images fixes, les animations, les modèles pour des jeux ou autre moteurs tiers et le contenu interactif sous forme de binaire portable sont fréquents dans l'utilisation de Blender.
 					</div>
 					<div style="clear:both;"></div>
 				</div>
@@ -869,7 +840,7 @@
 							Titre : <span class="title"></span>
 						</div>
 						<div>
-							Date : <span class="date"></span>
+							Date&nbsp;: <span class="date"></span>
 						</div>
 						<div>
 							Taille : <span class="size"></span>
@@ -915,7 +886,7 @@
 				<div class="firefox-back"></div>
 				<div class="firefox-forward"></div>
 				<div class="firefox-url">
-					<input type="text" name="submitURL" id="submitURL" value="http://www.ubuntu.com"/>
+					<input type="text" name="submitURL" id="submitURL" value="http://www.ubuntu-fr.org"/>
 				</div>
 				<div class="firefox-search">
 					<input type="text" name="submitSearch" id="submitSearch" value="Wikipedia" class="fade-text"/>
@@ -925,7 +896,7 @@
 			<div class="firefox-internet">
 				<div class="web-overlay-tran"></div>
 				<div class="theIframe">
-					<iframe src="../http://www.ubuntu.com" id="firefoxInternet" >
+					<iframe src="http://www.ubuntu-fr.org" id="firefoxInternet" >
 						<p>
 							Votre navigateur ne prend pas en charge iframes.
 						</p>
@@ -944,7 +915,7 @@
 				<img src="../img/powerwarning.jpg" alt=""/>
 				<div class="message">
 					<p>
-						Voulez-vous vraiment quitter tous les programmes et éteindre l'ordinateur ?
+						Voulez-vous vraiment quitter tous les programmes et éteindre l'ordinateur&nbsp;?
 					</p>
 				</div>
 				<div class="shutdown-buttons">
@@ -964,89 +935,42 @@
 				<div class="max"></div>
 				<div class="window-title"></div>
 			</div>
-			<div style="clear:both;"></div>
+
+			<div class="buttons">
+					<div class="folder-back"></div>
+					<div class="folder-forward"></div>
+				</div>
+				<div class="bottom-buttons"></div>
+				<div style="clear:both;"></div>
 			<div class="folder-list">
 				<div class="list">
 					<p>
-						Poste de travail
+						Raccourcis
 					</p>
 					<ul>
-						<li class="home selected" data-folder="home"><img src="../img/folder/home-icon.png" alt=""/> Dossier personnel
-						</li>
-						<li class="desktop" data-folder="5"><img src="../img/folder/desktop-icon.png"  alt=""/> Bureau
-						</li>
-						<li class="documents" data-folder="0"><img src="../img/folder/documents-icon.png"  alt=""/> Documents
-						</li>
-						<li class="pictures" data-folder="4"><img src="../img/folder/pictures-icon.png"  alt=""/> Images
-						</li>
-						<li class="music" data-folder="2"><img src="../img/folder/music-icon.png"  alt=""/> Musique
-						</li>
-						<li class="downloads" data-folder="1"><img src="../img/folder/downloads-icon.png"  alt=""/> Téléchargements
-						</li>
-						<li class="videos" data-folder="3"><img src="../img/folder/videos-icon.png"  alt=""/> Vidéos
-						</li>
-						<li class="rubbish" data-folder="bin"><img src="../img/folder/rubbish-icon.png"  alt=""/> Corbeille
-						</li>
+						<li class="home selected" data-folder="home">Dossier personnel</li>
+						<li class="desktop" data-folder="5">Bureau</li>
+						<li class="documents" data-folder="0">Documents</li>
+						<li class="pictures" data-folder="4">Images</li>
+						<li class="music" data-folder="2">Musique</li>
+						<li class="downloads" data-folder="1">Téléchargements</li>
+						<li class="videos" data-folder="3">Vidéos</li>
+						<li class="rubbish" data-folder="bin">Corbeille</li>
 					</ul>
 				</div>
 			</div>
 			<div class="folder-contents">
-				<div class="buttons">
-					<div class="folder-back"></div>
-					<div class="folder-forward"></div>
-				</div>
-				<div class="bottom-buttons"></div>
-				<div style="clear:both;"></div>
 				<div class="contents"></div>
 				<div class="selected-details"></div>
 			</div>
 		</div>
-		<!--<div id="welcome">
-			<div id="welcome-screen">
-				<div class="close"></div>
-				<h1>Welcome to the Ubuntu online tour!</h1>
-				<h2>Essayez Ubuntu avec notre démonstration en ligne.</h2>
-				<ul>
-					<li>
-						<a class="browse-files" href="#browse-files">Parcourir les fichiers</a>
-					</li>
-					<li>
-						<a class="surf-the-web" href="#surf-the-web">Naviguer sur le web</a>
-					</li>
-					<li>
-						<a class="check-email" href="#check-email">Relever le courriel</a>
-					</li>
-					<li>
-						<a class="view-photos" href="#view-photos">Voir vos photos</a>
-					</li>
-					<li>
-						<a class="find-apps" href="#find-apps">Trouver des applications</a>
-					</li>
-					<li>
-						<a class="create-documents" href="#create-documents">Créer des documents</a>
-					</li>
-					<li>
-						<a class="create-spreadsheets" href="#create-spreadsheets">Créer des feuilles de calcul</a>
-					</li>
-					<li>
-						<a class="create-presentations" href="#create-presentations">Cr&eacute;er des pr&eacute;sentations</a>
-					</li>
-				</ul>
-				<div class="language-mode">
-					<span class="active">Français</span>
-					<a href="http://ubuntu.com/tour/en/">English</a>
-				</div>
-				<a class="explore-mode primary" href="#">Découvrez par vous-même</a>
-				<a class="tour-mode" href="#">Suivez le guide</a>
-			</div>
-		</div>-->
 		<div id="welcome">
 			<div id="welcome-screen" class="selected-window">
 				<div class="control">
 					<div class="window-title">Visite guidée Ubuntu</div>
 				</div>
 				<div class="welcome-header">
-					<h1>Bienvenue dans la visite guidée d'Ubuntu 12.10&nbsp;!</h1>
+					<h1>Bienvenue dans la visite guidée d'Ubuntu 14.04 LTS&nbsp;!</h1>
 					<h2>Essayez Ubuntu avec notre démonstration en ligne.</h2>
 				</div>
 				<ul>
@@ -1080,22 +1004,20 @@
 				</ul>
 				<div class="language-mode">
 					<span class="active">Français</span>
-					<a href="http://ubuntu.com/tour/en/">English</a>
+					<a href="http://www.ubuntu.com/tour/en/">Anglais</a>
 				</div>
 				<a class="explore-mode primary" href="#">Découvrez par vous-même</a>
 				<a class="tour-mode" href="#">Suivez le guide</a>
 			</div>
 		</div>
 		<div id="tour-guide">
-			<div class="next-button"><img src="../img/tourguide/arrow-next.png" alt="" />
-			</div>
-			<div class="prev-button"><img src="../img/tourguide/arrow-prev.png" alt="" />
-			</div>
+			<div class="next-button">&rsaquo;</div>
+			<div class="prev-button">&lsaquo;</div>
 			<div class="guide-container welcome">
-				<div class="guide-logo"></div>
-				<h3></h3>
+				<div class="guide-logo"><img src="../img/tourguide/back-to-welcome.png" /></div>
+				<h3>Découverte en ligne d'Ubuntu</h3>
 				<p>
-					Nous esp&eacute;rons que vous avez appr&eacute;ci&eacute; la visite d'Ubuntu en ligne. <a href="http://www.ubuntu-fr.org/telechargement" target="_blank">Télécharger Ubuntu</a> ou <a href="http://ubuntu-fr.org/" >revenir sur le site</a>.
+					Nous esp&eacute;rons que vous avez appr&eacute;ci&eacute; la visite d'Ubuntu en ligne. <a href="http://ubuntu-fr.org/telechargement?pk_campaign=tour&pk_kwd=popup" target="_blank">Prêt à télécharger&nbsp;?</a> ou <a href="/ubuntu/take-the-tour" >retourner sur le site</a>
 				</p>
 			</div>
 			<div class="guide-container home">
@@ -1109,7 +1031,7 @@
 			<div class="guide-container firefox">
 				<div class="guide-logo"><img src="../img/tourguide/firefox-small.png" />
 				</div>
-				<h3>Naviguer sur le web</h3>
+				<h3>Naviguer sur le Web</h3>
 				<p>
 					Naviguer sur le Web est rapide et sécurisé avec Ubuntu et Firefox.
 				</p>
@@ -1170,14 +1092,11 @@
 					Regardez tous vos films, DVD et vidéos préférés et vos propres réalisations.
 				</p>
 			</div>
-			<div class="explore-tooltip-download">
-				Télécharger
-			</div>
-			<div class="explore-tooltip-welcome">
-				Écran d'accueil
-			</div>
-			<div class="explore-to-welcome"></div>
-			<div class="explore-to-download"></div>
+			<div class=" tour-buttons">
+				<div class="explore-to-welcome">Écran d'accueil</div>
+				<div class="explore-to-download">Télécharger Ubuntu</div>
+				<div class="explore-to-exit">Quitter le guide</div>
+			</div>
 		</div>
 		<div id="Translation-Strings">
 			<!--
@@ -1208,7 +1127,7 @@
 				Ubuntu fonctionne à merveille avec une large gamme de périphériques. Il vous suffit de brancher votre lecteur mp3, appareil photo ou une imprimante et vous serez opérationnel tout de suite. Aucun CD d'installation. Pas de chichi. Et il est compatible avec Windows aussi! Ainsi, vous pouvez ouvrir, modifier et partager des documents Microsoft Office sans stress.
 			</p>
 			<p class="_email_4_body_">
-				Vous pouvez surfer en toute sécurité avec Ubuntu - sûr que vos fichiers et vos données resteront protégés. Un pare-feu intégré et une protection contre les virus sont livrés en standard. Et si une menace potentielle apparaît, nous fournissons des mises à jour automatiques que vous pouvez installer en un seul clic. Vous obtenez une sécurité supplémentaire avec AppArmor, qui protège vos applications importantes afin que les attaquants ne puissent pas accéder à votre système. Et grâce à Firefox et gnome-keyring, Ubuntu vous permet de garder vos informations privées... privées. Ainsi, qu'il s'agisse d' accéder à votre compte bancaire ou de  partager des données sensibles avec des amis ou des collègues, vous aurez l'esprit en paix quand vous en avez le plus besoin.
+				Vous pouvez surfer en toute sécurité avec Ubuntu - sûr que vos fichiers et vos données resteront protégés. Un pare-feu intégré et une protection contre les virus sont livrés en standard. Et si une menace potentielle apparaît, nous fournissons des mises à jour automatiques que vous pouvez installer en un seul clic. Vous obtenez une sécurité supplémentaire avec AppArmor, qui protège vos applications importantes afin que les attaquants ne puissent pas accéder à votre système. Et grâce à Firefox et gnome-keyring, Ubuntu vous permet de garder vos informations privées… privées. Ainsi, qu'il s'agisse d' accéder à votre compte bancaire ou de  partager des données sensibles avec des amis ou des collègues, vous aurez l'esprit en paix quand vous en avez le plus besoin.
 			</p>
 			<p class="_email_5_body_">
 				Profitez de la simplicité de l'interface élégante et intuitive d'Ubuntu. Rapide, sûr et avec des milliers d'applications à choisir, Ubuntu vous donne une expérience cohérente, intégrée et simplifiée que vous pouvez vraiment personnaliser selon vos goûts.
@@ -1217,7 +1136,7 @@
 				Merci d'explorer Ubuntu ! Pour rappel, ceci n'est qu'une démonstration. Vous devez télécharger Ubuntu pour profiter de toutes ses possibilités !
 				<br/>
 				<br/>
-				<a href="http://www.ubuntu-fr.org/telechargement" target="_blank">Télécharger Ubuntu</a>
+				<a href="http://ubuntu-fr.org/telechargement?pk_campaign=tour&pk_kwd=popup" target="_blank">Télécharger Ubuntu</a>
 			</p>
 			<p class="_write_">
 				Écrire
@@ -1319,7 +1238,7 @@
 				Chromium sert de base pour Google Chrome, qui est Chromium rebaptisé (nom et logo) avec quelques ajouts tels que le suivi d'utilisation et un système de mise à jour automatique.
 				<br/>
 				<br/>
-				Ce paquet contient le navigateur web Chromium.
+				Ce paquet contient le navigateur Web Chromium.
 			</p>
 			<p class="_beep_app_">
 				BEEP
@@ -1343,7 +1262,7 @@
 				Créer et éditer des images vectorielles au format SVG
 			</p>
 			<p class="_inkscape_desc_">
-				Inkscape charge et sauvegarde un sous-ensemble du format SVG ( pour « Scalable Vector Graphics » signifiant Graphismes vectoriels redimensionnables), un standard maintenu par le consortium WWW.
+				Inkscape charge et sauvegarde un sous-ensemble du format SVG (pour « Scalable Vector Graphics » signifiant Graphismes vectoriels redimensionnables), un standard maintenu par le consortium WWW.
 				<br/>
 				<br/>
 				L'interface utilisateur d'Inkscape devrait est similaire à celle de CorelDraw et d'autres programmes de dessin similaires. Elle offre des outils pour tracer rectangles, ellipses, objets de texte, images matricielles et courbes à main levée. De plus, les images vectorielles et matricielles bénéficient toutes les deux de la transparence alpha et peuvent être transformées arbitrairement.
@@ -1367,7 +1286,7 @@
 				Jeu de construction / d'énigme basé sur la physique
 			</p>
 			<p class="_world_of_goo_desc_">
-				Glissez et déposez des petites boules de pâte visqueuse pleines de vie, se tortillant, et parlant pour bâtir des structures, des ponts, des boulets de canon,des zeppelins et des langues géantes. Les millions de boules de Goo innocentes qui vivent dans le monde merveilleux des Goo sont curieux de partir à l'aventure.
+				Glissez et déposez des petites boules de pâte visqueuse pleines de vie, se tortillant, et parlant pour bâtir des structures, des ponts, des boulets de canon, des zeppelins et des langues géantes. Les millions de boules de Goo innocentes qui vivent dans le monde merveilleux des Goo sont curieux de partir à l'aventure.
 				<br/>
 				<br/>
 				Mais ils ne savent pas qu'ils sont dans un jeu, ou qu'ils sont délicieux. Ce jeu de réflexion, le plus addictif et grandiose vous emportera dans une aventure que vous n'oublierez jamais !
@@ -1394,10 +1313,10 @@
 				Braid considère votre temps et attention comme précieux, et fait tout son possible pour vous donner une expérience propre à élargir votre psyché.
 				<br/>
 				<br/>
-				Tout la mécanique de jeu est basée sur la manipulation du temps. Voyagez dans des mondes où le temps se comporte étrangement, observez, apprenez puis maîtrisez ces mondes.
+				Toute la mécanique de jeu est basée sur la manipulation du temps. Voyagez dans des mondes où le temps se comporte étrangement, observez, apprenez puis maîtrisez ces mondes.
 			</p>
-			<p class="_banshee_app_">
-				Lecteur multimédia Banshee
+			<p class="_rhythmbox_app_">
+				Lecteur de musique Rhythmbox
 			</p>
 			<p class="_brasero_app_">
 				Gravure de disque Brasero
@@ -1432,6 +1351,18 @@
 			<p class="_terminal_app_">
 				Client terminal serveur
 			</p>
+			<p class="_ubuntu_one_app_">
+				Ubuntu One
+			</p>
+			<p class="_ubuntu_software_center_app_">
+				Logithèque Ubuntu
+			</p>
+			<p class="_ubuntu_one_music_app_">
+				Ubuntu One Music
+			</p>
+			<p class="_amazon_app_">
+				Amazon
+			</p>
 			<p class="_about_me_app_">
 				À propos de moi
 			</p>
@@ -1450,7 +1381,7 @@
 			<!--
 			* Dash
 			-->
-			<p class="_search_">Rechercher</p>
+			<p class="_search_">Rechercher sur votre ordinateur et à partir de sources en ligne</p>
 			<!--
 			* Notifications
 			-->
@@ -1476,13 +1407,13 @@
 				Files Details - Images
 			-->
 			<p class="_photo_size_">
-				15,2 ko	
+				15,2 ko
 			</p>
 			<p class="_photo_date_">
 				ven. 26 oct. 2001
 			</p>
 			<p class="_buck_off_title_">
-				Buck Off	
+				Buck Off
 			</p>
 			<p class="_darkening_clockwork_title_">
 				Darkening Clockwork
@@ -1551,7 +1482,7 @@
 				3,3 Mo
 			</p>
 			<p class="_music_date_">
-				Weds 14 October, 2010
+				jeu. 14 Oct. 2010
 			</p>
 		</div>
 		<script type="text/javascript" src="../js/jquery.min.js"></script>

=== added file 'img/applications/amazon.png'
Binary files img/applications/amazon.png	1970-01-01 00:00:00 +0000 and img/applications/amazon.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/blur/amazon.png'
Binary files img/applications/blur/amazon.png	1970-01-01 00:00:00 +0000 and img/applications/blur/amazon.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/blur/calc.png'
Binary files img/applications/blur/calc.png	2013-01-18 20:24:03 +0000 and img/applications/blur/calc.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/blur/draw.png'
Binary files img/applications/blur/draw.png	2013-01-18 20:24:03 +0000 and img/applications/blur/draw.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/blur/firefox.png'
Binary files img/applications/blur/firefox.png	2013-01-18 20:24:03 +0000 and img/applications/blur/firefox.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/blur/folder-desktop.png'
Binary files img/applications/blur/folder-desktop.png	1970-01-01 00:00:00 +0000 and img/applications/blur/folder-desktop.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/blur/folder-documents.png'
Binary files img/applications/blur/folder-documents.png	1970-01-01 00:00:00 +0000 and img/applications/blur/folder-documents.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/blur/folder-downloads.png'
Binary files img/applications/blur/folder-downloads.png	1970-01-01 00:00:00 +0000 and img/applications/blur/folder-downloads.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/blur/folder-generic.png'
Binary files img/applications/blur/folder-generic.png	1970-01-01 00:00:00 +0000 and img/applications/blur/folder-generic.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/blur/folder-music.png'
Binary files img/applications/blur/folder-music.png	1970-01-01 00:00:00 +0000 and img/applications/blur/folder-music.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/blur/folder-pictures.png'
Binary files img/applications/blur/folder-pictures.png	1970-01-01 00:00:00 +0000 and img/applications/blur/folder-pictures.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/blur/folder-videos.png'
Binary files img/applications/blur/folder-videos.png	1970-01-01 00:00:00 +0000 and img/applications/blur/folder-videos.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/blur/impress.png'
Binary files img/applications/blur/impress.png	2013-01-18 20:24:03 +0000 and img/applications/blur/impress.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/blur/math.png'
Binary files img/applications/blur/math.png	2013-01-18 20:24:03 +0000 and img/applications/blur/math.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/blur/rhythmbox.png'
Binary files img/applications/blur/rhythmbox.png	1970-01-01 00:00:00 +0000 and img/applications/blur/rhythmbox.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/blur/screenshot.png'
Binary files img/applications/blur/screenshot.png	2013-01-18 20:24:03 +0000 and img/applications/blur/screenshot.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/blur/solitaire.png'
Binary files img/applications/blur/solitaire.png	2013-01-18 20:24:03 +0000 and img/applications/blur/solitaire.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/blur/systemsettings.png'
Binary files img/applications/blur/systemsettings.png	2013-01-18 20:24:03 +0000 and img/applications/blur/systemsettings.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/blur/thunderbird.png'
Binary files img/applications/blur/thunderbird.png	2013-01-18 20:24:03 +0000 and img/applications/blur/thunderbird.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/blur/ubuntuone.png'
Binary files img/applications/blur/ubuntuone.png	1970-01-01 00:00:00 +0000 and img/applications/blur/ubuntuone.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/blur/ubuntuonemusic.png'
Binary files img/applications/blur/ubuntuonemusic.png	1970-01-01 00:00:00 +0000 and img/applications/blur/ubuntuonemusic.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/blur/unknown.png'
Binary files img/applications/blur/unknown.png	2013-01-18 20:24:03 +0000 and img/applications/blur/unknown.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/blur/writer.png'
Binary files img/applications/blur/writer.png	2013-01-18 20:24:03 +0000 and img/applications/blur/writer.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/brasero.png'
Binary files img/applications/brasero.png	2013-01-18 20:24:03 +0000 and img/applications/brasero.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/calc.png'
Binary files img/applications/calc.png	2013-01-18 20:24:03 +0000 and img/applications/calc.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/draw.png'
Binary files img/applications/draw.png	2013-01-18 20:24:03 +0000 and img/applications/draw.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/empathy.png'
Binary files img/applications/empathy.png	2013-01-18 20:24:03 +0000 and img/applications/empathy.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/firefox.png'
Binary files img/applications/firefox.png	2013-01-18 20:24:03 +0000 and img/applications/firefox.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/folder-desktop.png'
Binary files img/applications/folder-desktop.png	1970-01-01 00:00:00 +0000 and img/applications/folder-desktop.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/folder-documents.png'
Binary files img/applications/folder-documents.png	1970-01-01 00:00:00 +0000 and img/applications/folder-documents.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/folder-downloads.png'
Binary files img/applications/folder-downloads.png	1970-01-01 00:00:00 +0000 and img/applications/folder-downloads.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/folder-generic.png'
Binary files img/applications/folder-generic.png	1970-01-01 00:00:00 +0000 and img/applications/folder-generic.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/folder-music.png'
Binary files img/applications/folder-music.png	1970-01-01 00:00:00 +0000 and img/applications/folder-music.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/folder-pictures.png'
Binary files img/applications/folder-pictures.png	1970-01-01 00:00:00 +0000 and img/applications/folder-pictures.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/folder-videos.png'
Binary files img/applications/folder-videos.png	1970-01-01 00:00:00 +0000 and img/applications/folder-videos.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/impress.png'
Binary files img/applications/impress.png	2013-01-18 20:24:03 +0000 and img/applications/impress.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/math.png'
Binary files img/applications/math.png	2013-01-18 20:24:03 +0000 and img/applications/math.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/rhythmbox.png'
Binary files img/applications/rhythmbox.png	1970-01-01 00:00:00 +0000 and img/applications/rhythmbox.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/systemsettings.png'
Binary files img/applications/systemsettings.png	2013-01-18 20:24:03 +0000 and img/applications/systemsettings.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/thunderbird.png'
Binary files img/applications/thunderbird.png	2013-01-18 20:24:03 +0000 and img/applications/thunderbird.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/ubuntuone.png'
Binary files img/applications/ubuntuone.png	1970-01-01 00:00:00 +0000 and img/applications/ubuntuone.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/ubuntuonemusic.png'
Binary files img/applications/ubuntuonemusic.png	1970-01-01 00:00:00 +0000 and img/applications/ubuntuonemusic.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/applications/ubuntusoftwarecenter.png'
Binary files img/applications/ubuntusoftwarecenter.png	1970-01-01 00:00:00 +0000 and img/applications/ubuntusoftwarecenter.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/unknown.png'
Binary files img/applications/unknown.png	2013-01-18 20:24:03 +0000 and img/applications/unknown.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/applications/writer.png'
Binary files img/applications/writer.png	2013-01-18 20:24:03 +0000 and img/applications/writer.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/background.jpg'
Binary files img/background.jpg	2013-01-18 20:24:03 +0000 and img/background.jpg	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/blur/librecalc.jpg'
Binary files img/blur/librecalc.jpg	2013-01-18 20:24:03 +0000 and img/blur/librecalc.jpg	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/blur/libreimpress.jpg'
Binary files img/blur/libreimpress.jpg	2013-01-18 20:24:03 +0000 and img/blur/libreimpress.jpg	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/blur/librewriter.jpg'
Binary files img/blur/librewriter.jpg	2013-01-18 20:24:03 +0000 and img/blur/librewriter.jpg	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/dash/dash-applications.png'
Binary files img/dash/dash-applications.png	2013-01-18 20:24:03 +0000 and img/dash/dash-applications.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/dash/dash-chat.png'
Binary files img/dash/dash-chat.png	1970-01-01 00:00:00 +0000 and img/dash/dash-chat.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/dash/dash-files.png'
Binary files img/dash/dash-files.png	2013-01-18 20:24:03 +0000 and img/dash/dash-files.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/dash/dash-home.png'
Binary files img/dash/dash-home.png	2013-01-18 20:24:03 +0000 and img/dash/dash-home.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/dash/dash-max.png'
Binary files img/dash/dash-max.png	2013-01-18 20:24:03 +0000 and img/dash/dash-max.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/dash/dash-min.png'
Binary files img/dash/dash-min.png	2013-01-18 20:24:03 +0000 and img/dash/dash-min.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/dash/dash-music.png'
Binary files img/dash/dash-music.png	2013-01-18 20:24:03 +0000 and img/dash/dash-music.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/dash/dash-photos.png'
Binary files img/dash/dash-photos.png	1970-01-01 00:00:00 +0000 and img/dash/dash-photos.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/dash/dash-video.png'
Binary files img/dash/dash-video.png	2013-01-18 20:24:03 +0000 and img/dash/dash-video.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/back.jpg'
Binary files img/folder/back.jpg	2013-01-18 20:24:03 +0000 and img/folder/back.jpg	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/blur/back.jpg'
Binary files img/folder/blur/back.jpg	2013-01-18 20:24:03 +0000 and img/folder/blur/back.jpg	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/back.png'
Binary files img/folder/blur/back.png	1970-01-01 00:00:00 +0000 and img/folder/blur/back.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/breadcrumb-selected.png'
Binary files img/folder/blur/breadcrumb-selected.png	1970-01-01 00:00:00 +0000 and img/folder/blur/breadcrumb-selected.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/blur/desktop-icon.png'
Binary files img/folder/blur/desktop-icon.png	2013-01-18 20:24:03 +0000 and img/folder/blur/desktop-icon.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/blur/documents-icon.png'
Binary files img/folder/blur/documents-icon.png	2013-01-18 20:24:03 +0000 and img/folder/blur/documents-icon.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/blur/downloads-icon.png'
Binary files img/folder/blur/downloads-icon.png	2013-01-18 20:24:03 +0000 and img/folder/blur/downloads-icon.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/blur/forward.jpg'
Binary files img/folder/blur/forward.jpg	2013-01-18 20:24:03 +0000 and img/folder/blur/forward.jpg	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/forward.png'
Binary files img/folder/blur/forward.png	1970-01-01 00:00:00 +0000 and img/folder/blur/forward.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/blur/home-icon.png'
Binary files img/folder/blur/home-icon.png	2013-01-18 20:24:03 +0000 and img/folder/blur/home-icon.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/icon-nautilus-folder-desktop.png'
Binary files img/folder/blur/icon-nautilus-folder-desktop.png	1970-01-01 00:00:00 +0000 and img/folder/blur/icon-nautilus-folder-desktop.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/icon-nautilus-folder-documents.png'
Binary files img/folder/blur/icon-nautilus-folder-documents.png	1970-01-01 00:00:00 +0000 and img/folder/blur/icon-nautilus-folder-documents.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/icon-nautilus-folder-downloads.png'
Binary files img/folder/blur/icon-nautilus-folder-downloads.png	1970-01-01 00:00:00 +0000 and img/folder/blur/icon-nautilus-folder-downloads.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/icon-nautilus-folder-generic.png'
Binary files img/folder/blur/icon-nautilus-folder-generic.png	1970-01-01 00:00:00 +0000 and img/folder/blur/icon-nautilus-folder-generic.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/icon-nautilus-folder-music.png'
Binary files img/folder/blur/icon-nautilus-folder-music.png	1970-01-01 00:00:00 +0000 and img/folder/blur/icon-nautilus-folder-music.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/icon-nautilus-folder-pictures.png'
Binary files img/folder/blur/icon-nautilus-folder-pictures.png	1970-01-01 00:00:00 +0000 and img/folder/blur/icon-nautilus-folder-pictures.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/icon-nautilus-folder-videos.png'
Binary files img/folder/blur/icon-nautilus-folder-videos.png	1970-01-01 00:00:00 +0000 and img/folder/blur/icon-nautilus-folder-videos.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/icon-nautilus-mono-desktop.png'
Binary files img/folder/blur/icon-nautilus-mono-desktop.png	1970-01-01 00:00:00 +0000 and img/folder/blur/icon-nautilus-mono-desktop.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/icon-nautilus-mono-documents.png'
Binary files img/folder/blur/icon-nautilus-mono-documents.png	1970-01-01 00:00:00 +0000 and img/folder/blur/icon-nautilus-mono-documents.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/icon-nautilus-mono-downloads.png'
Binary files img/folder/blur/icon-nautilus-mono-downloads.png	1970-01-01 00:00:00 +0000 and img/folder/blur/icon-nautilus-mono-downloads.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/icon-nautilus-mono-home.png'
Binary files img/folder/blur/icon-nautilus-mono-home.png	1970-01-01 00:00:00 +0000 and img/folder/blur/icon-nautilus-mono-home.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/icon-nautilus-mono-music.png'
Binary files img/folder/blur/icon-nautilus-mono-music.png	1970-01-01 00:00:00 +0000 and img/folder/blur/icon-nautilus-mono-music.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/icon-nautilus-mono-pictures.png'
Binary files img/folder/blur/icon-nautilus-mono-pictures.png	1970-01-01 00:00:00 +0000 and img/folder/blur/icon-nautilus-mono-pictures.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/icon-nautilus-mono-trash.png'
Binary files img/folder/blur/icon-nautilus-mono-trash.png	1970-01-01 00:00:00 +0000 and img/folder/blur/icon-nautilus-mono-trash.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/icon-nautilus-mono-videos.png'
Binary files img/folder/blur/icon-nautilus-mono-videos.png	1970-01-01 00:00:00 +0000 and img/folder/blur/icon-nautilus-mono-videos.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/image-nautilus-back.png'
Binary files img/folder/blur/image-nautilus-back.png	1970-01-01 00:00:00 +0000 and img/folder/blur/image-nautilus-back.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/image-nautilus-background.png'
Binary files img/folder/blur/image-nautilus-background.png	1970-01-01 00:00:00 +0000 and img/folder/blur/image-nautilus-background.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/image-nautilus-breadcrumb-selected.png'
Binary files img/folder/blur/image-nautilus-breadcrumb-selected.png	1970-01-01 00:00:00 +0000 and img/folder/blur/image-nautilus-breadcrumb-selected.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/image-nautilus-breadcrumb.png'
Binary files img/folder/blur/image-nautilus-breadcrumb.png	1970-01-01 00:00:00 +0000 and img/folder/blur/image-nautilus-breadcrumb.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/image-nautilus-forward.png'
Binary files img/folder/blur/image-nautilus-forward.png	1970-01-01 00:00:00 +0000 and img/folder/blur/image-nautilus-forward.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/blur/image-nautilus-options.png'
Binary files img/folder/blur/image-nautilus-options.png	1970-01-01 00:00:00 +0000 and img/folder/blur/image-nautilus-options.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/blur/music-icon.png'
Binary files img/folder/blur/music-icon.png	2013-01-18 20:24:03 +0000 and img/folder/blur/music-icon.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/blur/pictures-icon.png'
Binary files img/folder/blur/pictures-icon.png	2013-01-18 20:24:03 +0000 and img/folder/blur/pictures-icon.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/blur/rubbish-icon.png'
Binary files img/folder/blur/rubbish-icon.png	2013-01-18 20:24:03 +0000 and img/folder/blur/rubbish-icon.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/blur/videos-icon.png'
Binary files img/folder/blur/videos-icon.png	2013-01-18 20:24:03 +0000 and img/folder/blur/videos-icon.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/breadcrumb-selected.png'
Binary files img/folder/breadcrumb-selected.png	1970-01-01 00:00:00 +0000 and img/folder/breadcrumb-selected.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/desktop-icon.png'
Binary files img/folder/desktop-icon.png	2013-01-18 20:24:03 +0000 and img/folder/desktop-icon.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/documents-icon.png'
Binary files img/folder/documents-icon.png	2013-01-18 20:24:03 +0000 and img/folder/documents-icon.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/downloads-icon.png'
Binary files img/folder/downloads-icon.png	2013-01-18 20:24:03 +0000 and img/folder/downloads-icon.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/forward.jpg'
Binary files img/folder/forward.jpg	2013-01-18 20:24:03 +0000 and img/folder/forward.jpg	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/home-icon.png'
Binary files img/folder/home-icon.png	2013-01-18 20:24:03 +0000 and img/folder/home-icon.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/icon-nautilus-folder-desktop.png'
Binary files img/folder/icon-nautilus-folder-desktop.png	1970-01-01 00:00:00 +0000 and img/folder/icon-nautilus-folder-desktop.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/icon-nautilus-folder-document.png'
Binary files img/folder/icon-nautilus-folder-document.png	1970-01-01 00:00:00 +0000 and img/folder/icon-nautilus-folder-document.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/icon-nautilus-folder-documents.png'
Binary files img/folder/icon-nautilus-folder-documents.png	1970-01-01 00:00:00 +0000 and img/folder/icon-nautilus-folder-documents.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/icon-nautilus-folder-downloads.png'
Binary files img/folder/icon-nautilus-folder-downloads.png	1970-01-01 00:00:00 +0000 and img/folder/icon-nautilus-folder-downloads.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/icon-nautilus-folder-generic.png'
Binary files img/folder/icon-nautilus-folder-generic.png	1970-01-01 00:00:00 +0000 and img/folder/icon-nautilus-folder-generic.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/icon-nautilus-folder-music.png'
Binary files img/folder/icon-nautilus-folder-music.png	1970-01-01 00:00:00 +0000 and img/folder/icon-nautilus-folder-music.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/icon-nautilus-folder-pictures.png'
Binary files img/folder/icon-nautilus-folder-pictures.png	1970-01-01 00:00:00 +0000 and img/folder/icon-nautilus-folder-pictures.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/icon-nautilus-folder-videos.png'
Binary files img/folder/icon-nautilus-folder-videos.png	1970-01-01 00:00:00 +0000 and img/folder/icon-nautilus-folder-videos.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/icon-nautilus-folders.png'
Binary files img/folder/icon-nautilus-folders.png	1970-01-01 00:00:00 +0000 and img/folder/icon-nautilus-folders.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/icon-nautilus-mono-desktop.png'
Binary files img/folder/icon-nautilus-mono-desktop.png	1970-01-01 00:00:00 +0000 and img/folder/icon-nautilus-mono-desktop.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/icon-nautilus-mono-documents.png'
Binary files img/folder/icon-nautilus-mono-documents.png	1970-01-01 00:00:00 +0000 and img/folder/icon-nautilus-mono-documents.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/icon-nautilus-mono-downloads.png'
Binary files img/folder/icon-nautilus-mono-downloads.png	1970-01-01 00:00:00 +0000 and img/folder/icon-nautilus-mono-downloads.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/icon-nautilus-mono-home.png'
Binary files img/folder/icon-nautilus-mono-home.png	1970-01-01 00:00:00 +0000 and img/folder/icon-nautilus-mono-home.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/icon-nautilus-mono-music.png'
Binary files img/folder/icon-nautilus-mono-music.png	1970-01-01 00:00:00 +0000 and img/folder/icon-nautilus-mono-music.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/icon-nautilus-mono-pictures.png'
Binary files img/folder/icon-nautilus-mono-pictures.png	1970-01-01 00:00:00 +0000 and img/folder/icon-nautilus-mono-pictures.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/icon-nautilus-mono-trash.png'
Binary files img/folder/icon-nautilus-mono-trash.png	1970-01-01 00:00:00 +0000 and img/folder/icon-nautilus-mono-trash.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/icon-nautilus-mono-videos.png'
Binary files img/folder/icon-nautilus-mono-videos.png	1970-01-01 00:00:00 +0000 and img/folder/icon-nautilus-mono-videos.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/image-nautilus-back.png'
Binary files img/folder/image-nautilus-back.png	1970-01-01 00:00:00 +0000 and img/folder/image-nautilus-back.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/image-nautilus-background.png'
Binary files img/folder/image-nautilus-background.png	1970-01-01 00:00:00 +0000 and img/folder/image-nautilus-background.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/image-nautilus-breadcrumb-selected.png'
Binary files img/folder/image-nautilus-breadcrumb-selected.png	1970-01-01 00:00:00 +0000 and img/folder/image-nautilus-breadcrumb-selected.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/image-nautilus-breadcrumb.png'
Binary files img/folder/image-nautilus-breadcrumb.png	1970-01-01 00:00:00 +0000 and img/folder/image-nautilus-breadcrumb.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/image-nautilus-forward.png'
Binary files img/folder/image-nautilus-forward.png	1970-01-01 00:00:00 +0000 and img/folder/image-nautilus-forward.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/folder/image-nautilus-options.png'
Binary files img/folder/image-nautilus-options.png	1970-01-01 00:00:00 +0000 and img/folder/image-nautilus-options.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/music-icon.png'
Binary files img/folder/music-icon.png	2013-01-18 20:24:03 +0000 and img/folder/music-icon.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/pictures-icon.png'
Binary files img/folder/pictures-icon.png	2013-01-18 20:24:03 +0000 and img/folder/pictures-icon.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/rubbish-icon.png'
Binary files img/folder/rubbish-icon.png	2013-01-18 20:24:03 +0000 and img/folder/rubbish-icon.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/folder/videos-icon.png'
Binary files img/folder/videos-icon.png	2013-01-18 20:24:03 +0000 and img/folder/videos-icon.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/librecalc.jpg'
Binary files img/librecalc.jpg	2013-01-18 20:24:03 +0000 and img/librecalc.jpg	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/libreimpress.jpg'
Binary files img/libreimpress.jpg	2013-01-18 20:24:03 +0000 and img/libreimpress.jpg	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/librewriter.jpg'
Binary files img/librewriter.jpg	2013-01-18 20:24:03 +0000 and img/librewriter.jpg	2014-05-18 21:53:52 +0000 differ
=== added file 'img/menu/icon-amazon-active.png'
Binary files img/menu/icon-amazon-active.png	1970-01-01 00:00:00 +0000 and img/menu/icon-amazon-active.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/menu/icon-amazon.png'
Binary files img/menu/icon-amazon.png	1970-01-01 00:00:00 +0000 and img/menu/icon-amazon.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-calc-active.png'
Binary files img/menu/icon-calc-active.png	2013-01-18 20:24:03 +0000 and img/menu/icon-calc-active.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-calc.png'
Binary files img/menu/icon-calc.png	2013-01-18 20:24:03 +0000 and img/menu/icon-calc.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-dash.png'
Binary files img/menu/icon-dash.png	2013-01-18 20:24:03 +0000 and img/menu/icon-dash.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-firefox-active.png'
Binary files img/menu/icon-firefox-active.png	2013-01-18 20:24:03 +0000 and img/menu/icon-firefox-active.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-firefox.png'
Binary files img/menu/icon-firefox.png	2013-01-18 20:24:03 +0000 and img/menu/icon-firefox.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-folder-active.png'
Binary files img/menu/icon-folder-active.png	2013-01-18 20:24:03 +0000 and img/menu/icon-folder-active.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-folder.png'
Binary files img/menu/icon-folder.png	2013-01-18 20:24:03 +0000 and img/menu/icon-folder.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-impress-active.png'
Binary files img/menu/icon-impress-active.png	2013-01-18 20:24:03 +0000 and img/menu/icon-impress-active.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-impress.png'
Binary files img/menu/icon-impress.png	2013-01-18 20:24:03 +0000 and img/menu/icon-impress.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-movieplayer-active.png'
Binary files img/menu/icon-movieplayer-active.png	2013-01-18 20:24:03 +0000 and img/menu/icon-movieplayer-active.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-movieplayer.png'
Binary files img/menu/icon-movieplayer.png	2013-01-18 20:24:03 +0000 and img/menu/icon-movieplayer.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/menu/icon-nautilus-active.png'
Binary files img/menu/icon-nautilus-active.png	1970-01-01 00:00:00 +0000 and img/menu/icon-nautilus-active.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/menu/icon-nautilus.png'
Binary files img/menu/icon-nautilus.png	1970-01-01 00:00:00 +0000 and img/menu/icon-nautilus.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-shotwell-active.png'
Binary files img/menu/icon-shotwell-active.png	2013-01-18 20:24:03 +0000 and img/menu/icon-shotwell-active.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-shotwell.png'
Binary files img/menu/icon-shotwell.png	2013-01-18 20:24:03 +0000 and img/menu/icon-shotwell.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-software-active.png'
Binary files img/menu/icon-software-active.png	2013-01-18 20:24:03 +0000 and img/menu/icon-software-active.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-software.png'
Binary files img/menu/icon-software.png	2013-01-18 20:24:03 +0000 and img/menu/icon-software.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/menu/icon-systemsettings-active.png'
Binary files img/menu/icon-systemsettings-active.png	1970-01-01 00:00:00 +0000 and img/menu/icon-systemsettings-active.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/menu/icon-systemsettings.png'
Binary files img/menu/icon-systemsettings.png	1970-01-01 00:00:00 +0000 and img/menu/icon-systemsettings.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-thunderbird-active.png'
Binary files img/menu/icon-thunderbird-active.png	2013-01-18 20:24:03 +0000 and img/menu/icon-thunderbird-active.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-thunderbird.png'
Binary files img/menu/icon-thunderbird.png	2013-01-18 20:24:03 +0000 and img/menu/icon-thunderbird.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/menu/icon-trashempty-active.png'
Binary files img/menu/icon-trashempty-active.png	1970-01-01 00:00:00 +0000 and img/menu/icon-trashempty-active.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/menu/icon-trashempty.png'
Binary files img/menu/icon-trashempty.png	1970-01-01 00:00:00 +0000 and img/menu/icon-trashempty.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/menu/icon-trashfull-active.png'
Binary files img/menu/icon-trashfull-active.png	1970-01-01 00:00:00 +0000 and img/menu/icon-trashfull-active.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/menu/icon-trashfull.png'
Binary files img/menu/icon-trashfull.png	1970-01-01 00:00:00 +0000 and img/menu/icon-trashfull.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-ubuntuone-active.png'
Binary files img/menu/icon-ubuntuone-active.png	2013-01-18 20:24:03 +0000 and img/menu/icon-ubuntuone-active.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-ubuntuone.png'
Binary files img/menu/icon-ubuntuone.png	2013-01-18 20:24:03 +0000 and img/menu/icon-ubuntuone.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/menu/icon-ubuntuonemusic-active.png'
Binary files img/menu/icon-ubuntuonemusic-active.png	1970-01-01 00:00:00 +0000 and img/menu/icon-ubuntuonemusic-active.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/menu/icon-ubuntuonemusic.png'
Binary files img/menu/icon-ubuntuonemusic.png	1970-01-01 00:00:00 +0000 and img/menu/icon-ubuntuonemusic.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-writer-active.png'
Binary files img/menu/icon-writer-active.png	2013-01-18 20:24:03 +0000 and img/menu/icon-writer-active.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/menu/icon-writer.png'
Binary files img/menu/icon-writer.png	2013-01-18 20:24:03 +0000 and img/menu/icon-writer.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/overlay/recentfiles.png'
Binary files img/overlay/recentfiles.png	2013-01-18 20:24:03 +0000 and img/overlay/recentfiles.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/top/blur/calendar.jpg'
Binary files img/top/blur/calendar.jpg	2013-01-18 20:24:03 +0000 and img/top/blur/calendar.jpg	2014-05-18 21:53:52 +0000 differ
=== added file 'img/top/blur/chat.jpg'
Binary files img/top/blur/chat.jpg	1970-01-01 00:00:00 +0000 and img/top/blur/chat.jpg	2014-05-18 21:53:52 +0000 differ
=== added file 'img/top/blur/gotmessage-old.jpg'
Binary files img/top/blur/gotmessage-old.jpg	1970-01-01 00:00:00 +0000 and img/top/blur/gotmessage-old.jpg	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/top/blur/gotmessage.jpg'
Binary files img/top/blur/gotmessage.jpg	2013-01-18 20:24:03 +0000 and img/top/blur/gotmessage.jpg	2014-05-18 21:53:52 +0000 differ
=== added file 'img/top/blur/gotmessage.png'
Binary files img/top/blur/gotmessage.png	1970-01-01 00:00:00 +0000 and img/top/blur/gotmessage.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/top/calendar.jpg'
Binary files img/top/calendar.jpg	2013-01-21 17:46:01 +0000 and img/top/calendar.jpg	2014-05-18 21:53:52 +0000 differ
=== added file 'img/top/chat.jpg'
Binary files img/top/chat.jpg	1970-01-01 00:00:00 +0000 and img/top/chat.jpg	2014-05-18 21:53:52 +0000 differ
=== added file 'img/top/cloud.png'
Binary files img/top/cloud.png	1970-01-01 00:00:00 +0000 and img/top/cloud.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/top/en.png'
Binary files img/top/en.png	1970-01-01 00:00:00 +0000 and img/top/en.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/top/fr-selected.png'
Binary files img/top/fr-selected.png	1970-01-01 00:00:00 +0000 and img/top/fr-selected.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/top/lang.png'
Binary files img/top/lang.png	1970-01-01 00:00:00 +0000 and img/top/lang.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/top/mail.png'
Binary files img/top/mail.png	2013-01-18 20:24:03 +0000 and img/top/mail.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/tourguide/apps-small.png'
Binary files img/tourguide/apps-small.png	2013-01-18 20:24:03 +0000 and img/tourguide/apps-small.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/tourguide/calc-small.png'
Binary files img/tourguide/calc-small.png	2013-01-18 20:24:03 +0000 and img/tourguide/calc-small.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/tourguide/close.png'
Binary files img/tourguide/close.png	1970-01-01 00:00:00 +0000 and img/tourguide/close.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/tourguide/document-small.png'
Binary files img/tourguide/document-small.png	2013-01-18 20:24:03 +0000 and img/tourguide/document-small.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/tourguide/download.png'
Binary files img/tourguide/download.png	1970-01-01 00:00:00 +0000 and img/tourguide/download.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/tourguide/file-small.png'
Binary files img/tourguide/file-small.png	2013-01-18 20:24:03 +0000 and img/tourguide/file-small.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/tourguide/impress-small.png'
Binary files img/tourguide/impress-small.png	2013-01-18 20:24:03 +0000 and img/tourguide/impress-small.png	2014-05-18 21:53:52 +0000 differ
=== added file 'img/tourguide/welcome.png'
Binary files img/tourguide/welcome.png	1970-01-01 00:00:00 +0000 and img/tourguide/welcome.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/welcome/browse-files.png'
Binary files img/welcome/browse-files.png	2013-01-18 20:24:03 +0000 and img/welcome/browse-files.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/welcome/check-email.png'
Binary files img/welcome/check-email.png	2013-01-18 20:24:03 +0000 and img/welcome/check-email.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/welcome/create-documents.png'
Binary files img/welcome/create-documents.png	2013-01-18 20:24:03 +0000 and img/welcome/create-documents.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/welcome/create-presentations.png'
Binary files img/welcome/create-presentations.png	2013-01-18 20:24:03 +0000 and img/welcome/create-presentations.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/welcome/create-spreadsheets.png'
Binary files img/welcome/create-spreadsheets.png	2013-01-18 20:24:03 +0000 and img/welcome/create-spreadsheets.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/welcome/find-apps.png'
Binary files img/welcome/find-apps.png	2013-01-18 20:24:03 +0000 and img/welcome/find-apps.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/welcome/surf-the-web.png'
Binary files img/welcome/surf-the-web.png	2013-01-18 20:24:03 +0000 and img/welcome/surf-the-web.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/welcome/view-photos.png'
Binary files img/welcome/view-photos.png	2013-01-18 20:24:03 +0000 and img/welcome/view-photos.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'img/welcome/watch-video.png'
Binary files img/welcome/watch-video.png	2013-01-18 20:24:03 +0000 and img/welcome/watch-video.png	2014-05-18 21:53:52 +0000 differ
=== modified file 'index.html'
--- index.html	2013-01-21 19:43:00 +0000
+++ index.html	2014-05-18 21:53:52 +0000
@@ -2,13 +2,20 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr-FR" lang="fr-FR">
 <head>
 <meta charset="UTF-8" />
-<meta http-equiv="Refresh" content="0; url=/fr/index.html" />
+<meta http-equiv="Refresh" content="0; url=./fr/index.html" />
 <title>Redirection</title>
 <meta name="robots" content="noindex" />
+<style>
+body{
+    background:#210819;
+}
+a{
+    color:#FFFFFF;
+}
+</style>
 </head>
-
 <body>
-<p><center><a href="/fr/index.html">Découvrir Ubuntu</a>.</center></p>
+<p><center><a title="Cliquer ici pour commencer la démonstration" href="./fr/index.html">Découvrir Ubuntu</a></center></p>
 </body>
 </html>
 

=== modified file 'js/analytics.js'
--- js/analytics.js	2013-01-18 20:24:03 +0000
+++ js/analytics.js	2014-05-18 21:53:52 +0000
@@ -1,10 +1,15 @@
-var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-1018242-4"]);_gaq.push(["_trackPageview"]);if(window.location.pathname.indexOf('search/google-appliance') != -1) {
-    var qs = window.location.pathname.substring(25);
-    pageTracker._trackPageview('/site_search?query='+qs);
-}(function() {var ga = document.createElement("script");ga.type = "text/javascript";ga.async = true;ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";var s = document.getElementsByTagName("script")[0];s.parentNode.insertBefore(ga, s);})();
-
-/*
-var axel = Math.random() + "";
-var a = axel * 10000000000000;
-document.write('<iframe src="http://fls.doubleclick.net/activityi;src=3450579;type=tourm853;cat=ubunt767;ord=' + a + '?" width="1" height="1" frameborder="0" style="display:none"></iframe>');
-*/
\ No newline at end of file
+    /*<!-- Piwik -->
+    Ci-dessous mettre l'ID du site.enregisté dans piwik */
+    var piwik_site_id = '5';
+    var _paq = _paq || [];
+    _paq.push(["trackPageView"]);
+    _paq.push(["enableLinkTracking"]);
+     
+    (function() {
+    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.infra.ubuntu-fr.org/";
+    _paq.push(["setTrackerUrl", u+"piwik.php"]);
+    _paq.push(["setSiteId", piwik_site_id]);
+    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+    })();
+    /*<!-- End Piwik Code -->*/

=== modified file 'js/emailsystem.js'
--- js/emailsystem.js	2013-01-18 20:24:03 +0000
+++ js/emailsystem.js	2014-05-18 21:53:52 +0000
@@ -21,30 +21,30 @@
 	var randomEmail = null;
 	var theWriteEmail = null;
 	var writeType = '';
-	
+
 	this.init = function(){
 		emails.push(new Email(0,'inbox', $.trim(_email_1_title_), $.trim(_email_1_body_), 'Inayaili de Leon', $.trim(_you_)));
 		emails.push(new Email(1,'inbox',$.trim(_email_2_title_),$.trim(_email_2_body_),'John Oxton', $.trim(_you_)));
 		emails.push(new Email(2,'inbox',$.trim(_email_3_title_),$.trim(_email_3_body_),'Ellen Arnold', $.trim(_you_)));
 		emails.push(new Email(3,'inbox',$.trim(_email_4_title_),$.trim(_email_4_body_),'Steve Edwards', $.trim(_you_)));
 		emails.push(new Email(4,'inbox',$.trim(_email_5_title_),$.trim(_email_5_body_),'Anthony Dillon', $.trim(_you_)));
-		
+
 		randomReplies.push(_random_reply_);
-		
+
 		randomEmails.push(new Email(emails.length,'inbox','Hiya there again','Just checking how you are? Been along time...\n\nRegards,\nJoe','Joe Bloggs <[e-mail]>'));
 		randomEmails.push(new Email(emails.length,'inbox','Hiya there again','Great ... Sounds good! Lets meet for lunch tomorrow to talk it over! What you think?\n\nThanks,\nSue','Sue  White <[e-mail]>'));
 		randomEmails.push(new Email(emails.length,'inbox','Hiya there again','Did you catch the game last night! What a goal... fancy coming over next time?','Jack Smith <[e-mail]>'));
 		randomEmails.push(new Email(emails.length,'inbox','Hiya there again','Ok, ill do my best but no promises. It will take some time so let you know when its done./\n/\nThanks,/\nPaul','Paul Swan <[e-mail]>'));
-		
+
 		this.setupControl();
 	}
-	
+
 	this.setupControl = function(){
 		this.resetMessage();
-		
+
 		$('#email-write #write-send').bind('click',function(){
 			_this.sendEmail();
-		}); 
+		});
 
 		$('#email-write #write-subject input[name=subject]').keyup(function(){
 			var subjectText = $(this).val();
@@ -54,26 +54,26 @@
 				$('#email-write  .window-title').text(_write_+': ('+_no_subject_+')');
 			}
 		});
-		
+
 		$('#email-write input').focus(function(){
 			$(this).css('border-color','#dd4814');
 		});
-		
+
 		$('#email-write input').blur(function(){
 			$(this).css('border-color','#ADA9A5');
 		});
-		
+
 		$('#email-write .control .close').click(function(){
 			_this.closeWrite();
 		});
-		
+
 		$('#email-write .control .min').click(function(){
 			$('#email-write').hide();
 			if(writeMaximised){ _parent.systemSettings.decreaseFullscreen(); }
 			_parent.systemMenu.wiggle('email');
 			writeMinified = true;
 		});
-		
+
 		$('#email-write .control .max').click(function(){
 			if(writeMaximised){
 				writeMaximised = false;
@@ -84,24 +84,24 @@
 			}else{
 				writeMaximised = true;
 				$('#email-write').css('width',$(document).width() - 70 + 'px');
-				$('#email-write').css('height',$(document).height() - 50 + 'px');
+				$('#email-write').css('height',$(document).height() + 'px');
 				$('#email-write').addClass('fullsize');
 				_parent.systemSettings.increaseFullscreen();
 			}
 			_this.resizeMessage();
 		});
-		
+
 		$('.email-window .control .close').click(function(){
 			_this.close();
 		});
-		
+
 		$('.email-window .control .min').click(function(){
 			$('.email-window').hide();
 			if(maximised){ _parent.systemSettings.decreaseFullscreen(); }
 			_parent.systemMenu.wiggle('email');
 			minified = true;
 		});
-		
+
 		$('.email-window .control .max').click(function(){
 			if(maximised){
 				maximised = false;
@@ -112,27 +112,27 @@
 			}else{
 				maximised = true;
 				$('.email-window').css('width',$(document).width() - 70 + 'px');
-				$('.email-window').css('height',$(document).height() - 50 + 'px');
+				$('.email-window').css('height',$(document).height() + 'px');
 				$('.email-window').addClass('fullsize');
 				_parent.systemSettings.increaseFullscreen();
 			}
 			_this.resize();
 		});
-		
+
 		$('.email-content .folder-list .list div').click(function(){
 			$('.email-window .folder-list .list div').removeClass('selected');
 			$(this).addClass('selected');
 			_this.setFolder($(this).attr('id').split('-')[1]);
 		});
-		
+
 		$('.email-window .buttons .email-write').bind('click',function(event){
 			_this.showWrite();
 		});
-		
+
 		$('.email-window .buttons .email-get-mail').bind('click',function(event){
 			_this.updateDisplay();
 		});
-		
+
 		$('.message-header .email-buttons span.message-delete').bind('click',function(event){
 			if(selectedID != -1){
 				if(emails[selectedID].folder() != 'trash'){
@@ -145,7 +145,7 @@
 				_this.updateMessage();
 			}
 		});
-		
+
 		$('.message-header .email-buttons span.message-archive').bind('click',function(event){
 			if(selectedID != -1){
 					emails[selectedID].setFolder('archive');
@@ -154,7 +154,7 @@
 					_this.updateMessage();
 			}
 		});
-		
+
 		$('.message-header .email-buttons span.message-junk').bind('click',function(event){
 			if(selectedID != -1){
 				if(emails[selectedID].fire()){
@@ -166,11 +166,11 @@
 				_this.updateMessage();
 			}
 		});
-		
+
 		$('.message-header .email-buttons span.message-forward').bind('click',function(event){
 			_this.showWrite('forward');
 		});
-		
+
 		$('.message-header .email-buttons span.message-reply').bind('click',function(event){
 			if(currentFolder == 'sent'){
 				_this.showWrite('sentreply');
@@ -178,7 +178,7 @@
 				_this.showWrite('reply');
 			}
 		});
-		
+
 		$('.not-junk').bind('click',function(event){
 			if(selectedID != -1){
 				emails[selectedID].setFire(false);
@@ -186,19 +186,19 @@
 				_this.updateMessage();
 			}
 		});
-		
+
 		this.updateDisplay();
 		this.updateMessage();
-		
+
 	}
-	
+
 	this.setupRandomEmail = function(){
 		var randomIndex = Math.floor(Math.random() * randomEmails.length);
 		randomEmail = randomEmails[randomIndex];
 		var randomTime = (Math.random()*10000) + 2000;
 		setTimeout ( "recieveMessage()", randomTime );
 	}
-	
+
 	this.showWrite = function($type){
 		if(selectedID != -1){
 			 theWriteEmail = emails[selectedID];
@@ -232,30 +232,31 @@
         	$('#email-write').prev().css('left', $('#email-write').css('left'));
         }
 	}
-	
+
 	this.closeWrite = function(){
 		_parent.openWindows['email-write'] = false;
 		this.resetMessage();
 		$('#email-write').hide();
 	}
-	
+
 	 this.isMaximised = function(){
 	    	return maximised;
 	 }
-	
+
 	this.isWriteMaximised = function(){
 		return writeMaximised;
-	} 
+	}
 	this.isWriteMinified = function(){
 		return writeMinified;
-	}   
-	
+	}
+
 	this.open = function(){
 		_isOpen = true;
 		this.center();
 		$('.email-window').show();
+		_parent.systemMenu.openWindow('email');
 	}
-	
+
 	this.close = function(){
 		if(_isOpen){
 			_isOpen = false;
@@ -271,7 +272,7 @@
 			this.center();
 		}
 	}
-	
+
 	this.updateDisplay = function( ){
 		emailCount = unreadCount = 0;
 		emailLIstContents = '';
@@ -291,7 +292,7 @@
 		if(selectedID != -1){
 			$('.email-window .email-list #email-'+selectedID).addClass('selected');
 		}
-		
+
 		$('.email-list div').bind('click',function(){
 			selectedID = $(this).attr('id').split('-')[1];
 			emails[selectedID].setRead(true);
@@ -302,7 +303,7 @@
 			_this.updateMessage();
 			_this.updateDetails();
 		});
-		
+
 		$('.email-list div li.message-star').bind('click',function(event){
 			event.stopPropagation();
 			selectedID = $(this).parent().parent().attr('id').split('-')[1];
@@ -314,7 +315,7 @@
 				$(this).parent().parent().addClass('starred');
 			}
 		});
-		
+
 		$('.email-list div li.message-fire').bind('click',function(event){
 			event.stopPropagation();
 			var tempID = $(this).parent().parent().attr('id').split('-')[1];
@@ -327,7 +328,7 @@
 			}
 			_this.updateMessage();
 		});
-		
+
 		$('.email-list div li.message-glasses').bind('click',function(event){
 			event.stopPropagation();
 			selectedID = $(this).parent().parent().attr('id').split('-')[1];
@@ -342,10 +343,10 @@
 			}
 			_this.updateDetails();
 		});
-		
-		
+
+
 	}
-	
+
 	this.checkMessageNotification = function(){
 		if(unreadCount > 0){
 			_parent.systemSettings.gotMail(true);
@@ -353,7 +354,7 @@
 			_parent.systemSettings.gotMail(false);
 		}
 	}
-	
+
 	this.updateMessage = function(){
 		if(selectedID != -1){
 			var $body = emails[selectedID].body();
@@ -385,7 +386,7 @@
 		}
 		this.updateDetails();
 	}
-	
+
 	this.setFolder = function($folder){
 		currentFolder = $folder;
 		selectedID = -1;
@@ -397,7 +398,7 @@
 		this.updateDisplay();
 		this.updateMessage();
 	}
-	
+
 	this.resize = function(){
 		var emailContentWidth = $('.email-window').width() - 188;
 		var folderListHeight =  ($('.email-window').height()) - 130;
@@ -407,19 +408,19 @@
 		$('.email-window .email-content .email-contents .email-body').css('height',(folderListHeight / 2)-3);
 		this.updateMessage();
 	}
-	
+
 	this.resizeMessage = function(){
 		var bodyWidth = $('#email-write').width() - 6;
 		var bodyHeight =  ($('#email-write').height() - 250);
 		$('#email-write #write-body textarea').css('width',bodyWidth);
 		$('#email-write #write-body textarea').css('height',bodyHeight);
 	}
-	
+
 	this.updateDetails = function(){
 		$('.email-window .email-content .emails-info #details-unread').text(unreadCount);
 		$('.email-window .email-content .emails-info #details-total').text(emailCount);
 	}
-	
+
 	this.resetMessage = function(){
 		$('#email-write').hide();
 		$('#email-write  .window-title').text(_write_+': ('+_no_subject_+')');
@@ -428,7 +429,7 @@
 		$('#email-write #write-body textarea[name=body]').val('');
 		$('#email-write .loading-bar .progress').css('width','0');
 	}
-	
+
 	this.sendEmail = function(){
 		var subject = $('#email-write #write-subject input[name=subject]').val();
 		var body = $('#email-write #write-body textarea[name=body]').val();
@@ -447,13 +448,13 @@
 		currentTime = date+'/'+month+'/'+year+' '+currentTime.getHours() + ":" + minutes + " ";
 		var newEmail = new Email(emails.length,'sent',subject,body,from,to,currentTime);
 		emails.push(newEmail);
-		
+
 		if(writeType == 'reply'){
 			theWriteEmail.setReplied(true);
 		}else if(writeType == 'forward'){
 			theWriteEmail.setForwarded(true);
 		}
-		
+
 		$('#email-write .loading-bar .progress').animate({
 		    	width: 96
 		  }, 500, function() {
@@ -462,7 +463,7 @@
 		    	_this.setupRandomReply(newEmail);
 		  });
 	}
-	
+
 	this.setupRandomReply = function($email){
 		var randomIndex = Math.floor(Math.random() * randomReplies.length);
 		var body = randomReplies[randomIndex]+'\n\n'+$.trim(_on_)+' '+$.trim($email.date())+', '+$.trim($email.from())+' '+$.trim(_fwd_)+' '+$.trim(_wrote_)+': \n\n'+$email.body();
@@ -472,7 +473,7 @@
 		var randomTime = (Math.random()*2000) + 2000;
 		setTimeout ( "recieveMessage()", randomTime );
 	}
-	
+
 	 this.center = function(){
     	var left = ($(document).width() / 2) - ($('.email-window').width() / 2);
 		var top = Math.max(24,($(document).height() / 2) - ($('.email-window').height() / 2));

=== modified file 'js/filesystem.js'
--- js/filesystem.js	2013-01-21 17:46:01 +0000
+++ js/filesystem.js	2014-05-18 21:53:52 +0000
@@ -4,7 +4,7 @@
 */
 
 function FileSystem($parent, $startingDir){
-	
+
 	var _parent = $parent;
 	var home = '/'+_home_folder_;
 	if($startingDir == undefined){ $startingDir = home; }
@@ -23,32 +23,32 @@
 	var _isOpen = false;
 	var list_type = 'display-icon';
 	var openedID = -1;
-	
+
 	var folderContentsHeight = 0;
 	var folderContentsWidth = 0;
-	
+
 	this.init = function(){
-		
-		list_of_files.push(new Folder(_documents_folder_, '/'+_home_folder_));
-		list_of_files.push(new Folder(_downloads_folder_, '/'+_home_folder_));
-		list_of_files.push(new Folder(_music_folder_, '/'+_home_folder_));
-		list_of_files.push(new Folder(_videos_folder_, '/'+_home_folder_));
-		list_of_files.push(new Folder(_pictures_folder_, '/'+_home_folder_));
-		list_of_files.push(new Folder(_desktop_folder_, '/'+_home_folder_));
-		
-		
+
+		list_of_files.push(new Folder(_documents_folder_, '/'+_home_folder_, 'icon-documents'));
+		list_of_files.push(new Folder(_downloads_folder_, '/'+_home_folder_, 'icon-downloads'));
+		list_of_files.push(new Folder(_music_folder_, '/'+_home_folder_, 'icon-music'));
+		list_of_files.push(new Folder(_videos_folder_, '/'+_home_folder_, 'icon-videos'));
+		list_of_files.push(new Folder(_pictures_folder_, '/'+_home_folder_, 'icon-pictures'));
+		list_of_files.push(new Folder(_desktop_folder_, '/'+_home_folder_, 'icon-desktop'));
+
+
 		list_of_files.push(new Folder(_canonical_folder_, '/'+_home_folder_+'/'+_documents_folder_));
 		list_of_files.push(new Folder(_backup_folder_, '/'+_home_folder_+'/'+_documents_folder_));
 		list_of_files.push(new Folder(_local_folder_, '/'+_home_folder_+'/'+_documents_folder_));
-		
+
 		list_of_files.push(new Folder(_work_folder_, '/'+_home_folder_+'/'+_documents_folder_+'/'+_canonical_folder_));
 		list_of_files.push(new Folder(_branches_folder_, '/'+_home_folder_+'/'+_documents_folder_+'/'+_canonical_folder_));
-		
+
 		list_of_files = list_of_files.concat(_parent.fileLibrary);
-		
+
 		this.setupControl();
 	}
-	
+
 	this.setupControl = function(){
 		$('.folder .control .close').click(function(){
 			_this.close();
@@ -59,7 +59,7 @@
 			_parent.systemMenu.wiggle('home');
 			minified = true;
 		});
-		
+
 		$('.folder .control .max').click(function(){
 			if(maximised){
 				maximised = false;
@@ -69,7 +69,7 @@
 				_parent.systemSettings.decreaseFullscreen();
 			}else{
 				maximised = true;
-				$('.folder').css('height',$(document).height() - 50 + 'px');
+				$('.folder').css('height',$(document).height() + 'px');
 				$('.folder').css('width',$(document).width() - 70 + 'px');
 				$('.folder').addClass('fullsize');
 				_parent.systemSettings.increaseFullscreen();
@@ -77,7 +77,7 @@
 			_this.resize();
 			_this.center();
 		});
-		
+
 		$('#folder-window .folder-list .list ul li').click(function(){
 			$('#folder-window .folder-list .list ul li').removeClass('selected');
 			$(this).addClass('selected');
@@ -95,11 +95,11 @@
 	  		_this.clickedNewFolder(newDir);
 		 	_this.updateDir(newDir,fresh);
 		});
-		
+
 		this.updateDir(current_dir);
 		this.center();
 	}
-	
+
 	this.reset = function($full){
 		if($full){
 			current_dir = '/'+_home_folder_;
@@ -112,7 +112,7 @@
 		}
 		this.updateDir(current_dir);
 	}
-	
+
 	this.open = function(){
 		$('.folder').show();
 		_isOpen = true;
@@ -121,11 +121,11 @@
         	$('.folder').prev().css('left', $('.folder').css('left'));
         }
 	}
-	
+
 	this.isMinified = function(){ return minified; }
 	this.isMaximised = function(){ return maximised; }
 	this.in_bin = function (){ return _in_bin; };
-	
+
 	this.close = function(){
 		if(_isOpen){
 			_parent.openWindows['folder-window'] = false;
@@ -140,44 +140,44 @@
 			maximised = false;
 		}
 	}
-	
+
 	this.isOpen = function(){
 		return _isOpen;
 	}
-	
+
 	this.setupFolderControl = function(){
 		$('.folder-contents .contents div').mouseover(function() {
 		  	$(this).addClass("over");
 		});
-		
-		/*$('.folder-contents .contents div').draggable({ 
-			revert: true, 
-			opacity: 0.35, 
-			zIndex: 2700, 
-			start: function(event, ui) { 
+
+		/*$('.folder-contents .contents div').draggable({
+			revert: true,
+			opacity: 0.35,
+			zIndex: 2700,
+			start: function(event, ui) {
 				//_parent.lockOpenMenu();
 		 	},
-		 	end: function(event, ui) { 
+		 	end: function(event, ui) {
 				//_parent.lockCloseMenu();
 		 	}
 		 });*/
-		
+
 		$('.folder-contents .contents div').mouseout(function() {
 			$(this).removeClass("over");
 		});
-		
+
 		$('.folder-contents .contents').mousedown(function(){
 			$('.folder-contents .contents div').removeClass("selected");
 			$('.selected-details').hide();
 		 });
-			 
+
 		$('.folder-contents .contents div').mousedown(function(event) {
 			event.stopPropagation();
 			$('.folder-contents .contents div').removeClass("selected");
 		  	$(this).addClass("selected");
 		  	_this.showSelectedDetails(parseInt($(this).attr('data-id')));
 		});
-		
+
 		$('.folder-contents .contents div').dblclick(function() {
 			  openedID = $(this).attr('data-id');
 			  switch($(this).attr('data-type')){
@@ -202,10 +202,10 @@
 					_parent.errorMessage.open();
 			  	break;
 			  }
-		 
+
 	 	 });
 	}
-	
+
 	this.showSelectedDetails = function($index){
 		var detailsName = list_of_files[$index].name();
 		var detailsCount = 0;
@@ -220,19 +220,19 @@
 		}else{
 			$('.selected-details').text('« '+detailsName+' » sélectionné ('+list_of_files[$index].size()+')');
 		}
-		
+
 		$('.selected-details').show();
 	}
-	
+
 	this.setupBreadcrumbControl = function(){
-		$('.folder-contents .bottom-buttons div').bind('click',function() {
+		$('#folder-window .bottom-buttons div').bind('click',function() {
 		  	$(this).addClass("selected");
 		  	var index = $(this).attr('data-id');
 		  	_this.history_index = index;
 			_this.updateDir(dir_history[index]);
 		});
 	}
-	
+
 	this.clickedNewFolder = function(){
 		var dirExists = $.inArray(current_dir, dir_history);
 		if(dirExists > -1){
@@ -241,7 +241,7 @@
 		}
 		$('.selected-details').hide();
 	}
-	
+
 	this.refresh = function (){
 		itemCount = 0;
 		$('.folder-contents .contents').html('');
@@ -253,14 +253,14 @@
 				itemCount++;
 			}
 		}
-		
+
 		$('.folder-contents .contents').html(folderContents);
-		$('.folder-contents .bottom-buttons div').unbind('click');
+		$('#folder-window .bottom-buttons div').unbind('click');
 		var breadcrumb = '';
 		for(i = 0; i < dir_history.length; i++ ){
 			var dir_name = dir_history[i].split('/');
 			dir_name = dir_name[dir_name.length-1];
-			if(i == 0){dir_name = '<img src="../img/folder/home-icon.png"/>' + dir_name}
+			if(dir_name == 'Home'){dir_name = '<span class="home"></span>' + dir_name}
 			if($.trim(dir_name) == 'Desktop'){dir_name = '<img src="../img/folder/desktop-icon.png"/>' + dir_name}
 			if(i == history_index){
 				breadcrumb += '<div data-id="'+i+'" class="selected">'+dir_name+'</div>';
@@ -270,26 +270,26 @@
 		}
 		dir_name = dir_history[history_index].split('/');
 		dir_name = dir_name[dir_name.length-1];
-		$('.folder-contents .bottom-buttons').html(breadcrumb);
+		$('#folder-window .bottom-buttons').html(breadcrumb);
 		$('.folder .window-title').text(dir_name);
 		this.setupBreadcrumbControl();
 		this.setupFolderControl();
 	}
-	
+
 	this.getFiles = function(){
 		return list_of_files;
 	}
-	
+
 	this.backDir = function(){
 		history_index--;
 		this.updateDir(dir_history[history_index]);
 	}
-	
+
 	this.forwardDir = function(){
 		history_index++;
 		this.updateDir(dir_history[history_index]);
 	}
-	
+
 	this.updateDir = function($newDIr, $sidebar){
 		var tempArray = $newDIr.split('/');
 		var sidebarName = tempArray[tempArray.length - 1].toLowerCase();
@@ -298,12 +298,12 @@
 			$('#folder-window .folder-list .list ul li').removeClass('selected');
 			$('#folder-window .folder-list .list ul li[data-folder="'+openedID+'"]').addClass('selected');
 		}
-		
-		
+
+
 		current_dir = $newDIr;
 		if($sidebar == undefined){ $sidebar = false; }
 		var dirExists = $.inArray($newDIr, dir_history);
-		
+
 		if(dirExists > -1){
 			history_index = dirExists;
 		} else{
@@ -333,7 +333,7 @@
 		}
 		this.refresh();
 	}
-		
+
 	this.backButton = function($enable){
 		if($enable){
 			if($('.buttons .folder-back').hasClass('disabled')){
@@ -360,19 +360,19 @@
 			}
 		}
 	}
-	
+
 	this.center = function(){
 	    	var left = ($(document).width() / 2) - ($('.folder').width() / 2);
 			var top = Math.max(24,($(document).height() / 2) - ($('.folder').height() / 2));
 			$('.folder').css('left',left);
 			$('.folder').css('top',top);
 	    }
-	
+
 	this.resize = function(){
-		folderContentsWidth = $('.folder').width() - 168;
+		folderContentsWidth = $('.folder').width() - 170;
 		folderListHeight = $('.folder').height() - 51;
-		$('.folder .folder-list .list').css('height',folderListHeight);
-		$('.folder .folder-contents .contents').css('height',folderListHeight - 15);
+		$('.folder .folder-list .list').css('height',folderListHeight-30);
+		$('.folder .folder-contents .contents').css('height',folderListHeight - 17);
 		$('.folder .folder-contents .contents').css('width',folderContentsWidth);
 	}
 }

=== modified file 'js/folders.js'
--- js/folders.js	2013-01-18 20:24:03 +0000
+++ js/folders.js	2014-05-18 21:53:52 +0000
@@ -3,18 +3,21 @@
 *  author: Anthony Dillon
 */
 
-function Folder($name, $location){ 
+function Folder($name, $location, $icon){
 	if ($name==undefined) { $name='Untitled Folder';}
 	if ($location==undefined) { $location='/Home';}
+	if ($icon==undefined) { $icon=''; }
 	var _name = $name;
 	var _size = '6.2 GB';
 	var _location = $location;
 	var _in_bin = false;
+	var _icon = $icon;
 
 	this.name = function (){ return _name; };
 	this.size = function (){ return _size; };
 	this.location = function (){ return _location; };
 	this.in_bin = function (){ return _in_bin; };
+	this.icon = function (){ return _icon; };
 	
 	this.rename = function($name){
 		_name = $name;
@@ -29,7 +32,7 @@
 	}
 	
 	this.drawIcon = function($id, $type){
-		return  "<div class='file-folder "+$type+"' data-type='folder' data-id='"+$id+"'><p></p><span>"+_name+"</span></div>";
+		return  "<div class='file-folder "+this.icon()+" "+$type+"' data-type='folder' data-id='"+$id+"'><p></p><span>"+_name+"</span></div>";
 	}
 	
 	this.type = function(){ 

=== modified file 'js/guidedtoursystem.js'
--- js/guidedtoursystem.js	2013-01-18 20:24:03 +0000
+++ js/guidedtoursystem.js	2014-05-18 21:53:52 +0000
@@ -119,8 +119,8 @@
 		$('#tour-guide .guide-container').hide();
 		
 		if(currentIndex == -1){
-			$('#tour-guide .prev-button').hide();
-			$('#tour-guide .next-button').hide();
+			//$('#tour-guide .prev-button').hide();
+			//$('#tour-guide .next-button').hide();
 			$('#tour-guide .welcome').show();
 		}else{
 			$('#tour-guide .'+guides[currentIndex].system).show();

=== modified file 'js/internetsystem.js'
--- js/internetsystem.js	2013-01-21 17:46:01 +0000
+++ js/internetsystem.js	2014-05-18 21:53:52 +0000
@@ -11,13 +11,13 @@
 	var firefoxHeight = 0;
 	var urlWidth = 0;
 	var maximised = false;
-	var homePage = 'http://start.ubuntu.com';
+	var homePage = 'http://start.ubuntu-fr.org';
 	var internalClick = true;
 	var name = 'Browse the internet';
 	var _isOpen = false;
-	
+
 	this.init = function(){
-		
+
 		$('.firefox-window .control .close').click(function(){
 			_this.close();
 		});
@@ -38,16 +38,16 @@
 			}else{
 				maximised = true;
 				$('.firefox-window').addClass('fullsize');
-				$('.firefox-window').css('height',$(document).height() - 50 + 'px');
+				$('.firefox-window').css('height',$(document).height() + 'px');
 				$('.firefox-window').css('width',$(document).width() - 70 + 'px');
 				$('.firefox-window .web-overlay-tran').css('width','100px');
 				$('.firefox-window .web-overlay-tran').show();
 				_parent.systemSettings.increaseFullscreen();
 			}
-			
+
 			resize();
 		});
-		
+
 	    $('#submitURL').keypress(function(e){
 	    	if(e.keyCode == 13){
 	    		var inputURL = $('#submitURL ').val();
@@ -64,7 +64,7 @@
 	    		changeURL(inputURL);
 	    	}
 	    });
-	    
+
 	    $('#submitSearch ').keypress(function(e){
 	    	if(e.keyCode == 13){
 	    		var inputURL = 'http://fr.wikipedia.org/w/index.php?title=Special%3ASearch&search='+$('#submitSearch ').val().replace(' ','+');
@@ -74,7 +74,7 @@
 	    		changeURL(inputURL);
 	    	}
 	    });
-	    
+
 	    this.close = function(){
 	    	if(_isOpen){}
 	    	_parent.openWindows['firefox-window'] = false;
@@ -89,7 +89,7 @@
 			_this.center();
 			_parent.systemMenu.closeWindow('firefox');
 	    }
-	    
+
 	    this.open = function(){
 	    	center();
 	    	$('.firefox-window ').show();
@@ -99,19 +99,19 @@
 	        	$('.firefox-window').prev().css('left', $('.firefox-window').css('left'));
 	        }
 	    }
-	    
+
 	    this.isMaximised = function(){
 	    	return maximised;
 	    }
-	    
+
 	    this.resize = function(){
 	    	resize();
 	    }
-	    
+
 	    this.center = function(){
 	    	center();
 	    }
-	    
+
 	     $('#submitSearch').focus(function() {
 				if ($(this).val() == 'Wikipedia') {
 					$(this).val('');
@@ -124,7 +124,7 @@
 					$(this).addClass('fade-text');
 				}
 			});
-			
+
 			$('#submitURL').focus(function() {
 				if($(this).val().substr($(this).val().length - 3,3) == '...'){
 					$(this).removeClass('fade-text');
@@ -139,17 +139,17 @@
 	    backHistory.push(homePage);
 	    changeURL(homePage);
 	}
-	
+
 	function changeURL($url){
 	    	$('#submitURL ').attr('value', $url);
 	    	$('#firefoxInternet').attr('src', $url);
 	    	updateButtons();
 	    }
-	    
+
 	    function updateButtons(){
 	    	$('.buttons .firefox-back').unbind('click');
 	    	$('.buttons .firefox-forward').unbind('click');
-	    	
+
 	    	if(backHistory.length <= 1){
 	    		$('.buttons .firefox-back').addClass('inactive');
 	    	}else{
@@ -167,7 +167,7 @@
 	    		});
 	    	}
 	    }
-	    
+
 	    function backPressed(){
 	    	forwardHistory.push(backHistory[backHistory.length - 1]);
 	    	backHistory.pop();firefoxHeight = $('.firefox-window').height() - ($('.firefox-window .control').height() + $('.firefox-window .buttons').height() + 12);
@@ -177,7 +177,7 @@
 			internalClick = true;
 	    	changeURL(backHistory[backHistory.length - 1]);
 	    }
-	    
+
 	    function forwardPressed(){
 	    	var forwardURL = forwardHistory[forwardHistory.length - 1];
 	    	backHistory.push(forwardURL);
@@ -185,7 +185,7 @@
 	    	internalClick = true;
 	    	changeURL(forwardURL);
 	    }
-	    
+
 	    function resize(){
 	    	firefoxHeight = $('.firefox-window').height() - ($('.firefox-window .control').height() + $('.firefox-window .buttons').height() + 12);
 	    	if(maximised){ firefoxHeight -= 27; }
@@ -194,14 +194,14 @@
 			urlWidth = $('.firefox-window').width() - 310;
 			$('.firefox-window .buttons .firefox-url input').css('width',urlWidth);
 	    }
-	    
+
 	    function center(){
 	    	var left = ($(document).width() / 2) - ($('.firefox-window').width() / 2);
 			var top = Math.max(24,($(document).height() / 2) - ($('.firefox-window').height() / 2));
 			$('.firefox-window').css('left',left);
 			$('.firefox-window').css('top',top);
 	    }
-	    
+
 	     function iframeChange(){
 	     	if(!internalClick){
 		     	$('#submitURL').addClass('fade-text');

=== modified file 'js/lang.js'
--- js/lang.js	2013-01-18 20:24:03 +0000
+++ js/lang.js	2014-05-18 21:53:52 +0000
@@ -74,7 +74,7 @@
 var _braid_app_ = $.trim(hiddenTranslation.find('._braid_app_').text());
 var _braid_sub_ = $.trim(hiddenTranslation.find('._braid_sub_').text());
 var _braid_desc_ = $.trim(hiddenTranslation.find('._braid_desc_').text());
-var _banshee_app_ = $.trim(hiddenTranslation.find('._banshee_app_').text());
+var _rhythmbox_app_ = $.trim(hiddenTranslation.find('._rhythmbox_app_').text());
 var _brasero_app_ = $.trim(hiddenTranslation.find('._brasero_app_').text());
 var _movie_player_app_ = $.trim(hiddenTranslation.find('._movie_player_app_').text());
 var _shotwell_app_ = $.trim(hiddenTranslation.find('._shotwell_app_').text());
@@ -82,6 +82,7 @@
 var _sound_recorder_app_ = $.trim(hiddenTranslation.find('._sound_recorder_app_').text());
 var _empathy_app_ = $.trim(hiddenTranslation.find('._empathy_app_').text());
 var _thunderbird_app_ = $.trim(hiddenTranslation.find('._thunderbird_app_').text());
+var _ubuntu_one_app_ = $.trim(hiddenTranslation.find('._ubuntu_one_app_').text());
 var _firefox_app_ = $.trim(hiddenTranslation.find('._firefox_app_').text());
 var _gwibber_app_ = $.trim(hiddenTranslation.find('._gwibber_app_').text());
 var _remote_desktop_app_ = $.trim(hiddenTranslation.find('._remote_desktop_app_').text());
@@ -91,6 +92,9 @@
 var _aisleroit_app_ = $.trim(hiddenTranslation.find('._aisleroit_app_').text());
 var _appearance_app_ = $.trim(hiddenTranslation.find('._appearance_app_').text());
 var _bluetooth_app_ = $.trim(hiddenTranslation.find('._bluetooth_app_').text());
+var _ubuntu_software_center_app_ = $.trim(hiddenTranslation.find('._ubuntu_software_center_app_').text());
+var _ubuntu_one_music_app_ = $.trim(hiddenTranslation.find('._ubuntu_one_music_app_').text());
+var _amazon_app_ = $.trim(hiddenTranslation.find('._amazon_app_').text());
 
 /*
  * Dash

=== modified file 'js/movieplayersystem.js'
--- js/movieplayersystem.js	2013-01-18 20:24:03 +0000
+++ js/movieplayersystem.js	2014-05-18 21:53:52 +0000
@@ -4,18 +4,18 @@
  */
 
 function MoviePlayerSystem($parent){
-	
+
 	var _parent = $parent;
 	var _this = this;
 	var _isOpen = false;
 	var maximised = false;
 	var minified = false;
 	var movieURL = 'videos/iStock.flv';
-	
+
 	this.init = function(){
 		this.setupControl();
 	}
-	
+
 	this.setupControl = function(){
 		$('#movieplayer  .control .close').click(function(){
 			_this.close();
@@ -23,7 +23,7 @@
 		$('#movieplayer  .control .min').click(function(){
 			_this.min();
 		});
-		
+
 		$('#movieplayer  .control .max').click(function(){
 			if(maximised){
 				maximised = false;
@@ -34,7 +34,7 @@
 			}else{
 				maximised = true;
 				$('#movieplayer').css('width',$(document).width() - 70 + 'px');
-				$('#movieplayer').css('height',$(document).height() - 50 + 'px');
+				$('#movieplayer').css('height',$(document).height() + 'px');
 				$('#movieplayer').addClass('fullsize');
 				_parent.systemSettings.increaseFullscreen();
 			}
@@ -44,16 +44,16 @@
 			playClicked();
 		});
 	}
-	
+
 	this.addVideo = function(){
-		var videoObject = '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"  width="'+$('#movieplayer .container .video').width()+'" height="'+$('#movieplayer .container .video').height()+'"  id="videoPlayer"><param name="movie"  value="../videoplayer.swf" />		<param name="wmode" value="transparent" />  <param name="quality" value="high" />		<param name="bgcolor" value="#000000" />		<embed wmode="transparent" src="../videoplayer.swf" quality="high" bgcolor="#000000" width="'+$('#movieplayer .container .video').width()+'" height="'+$('#movieplayer .container .video').height()+'"  name="videoPlayer" align="" type="application/x-shockwave-flash"  pluginspage="http://www.macromedia.com/go/getflashplayer"> </embed></object>'; 
+		var videoObject = '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"  width="'+$('#movieplayer .container .video').width()+'" height="'+$('#movieplayer .container .video').height()+'"  id="videoPlayer"><param name="movie"  value="../videoplayer.swf" />		<param name="wmode" value="transparent" />  <param name="quality" value="high" />		<param name="bgcolor" value="#000000" />		<embed wmode="transparent" src="../videoplayer.swf" quality="high" bgcolor="#000000" width="'+$('#movieplayer .container .video').width()+'" height="'+$('#movieplayer .container .video').height()+'"  name="videoPlayer" align="" type="application/x-shockwave-flash"  pluginspage="http://www.macromedia.com/go/getflashplayer"> </embed></object>';
 		$('#movieplayer .container .video').html(videoObject);
 	}
-	
+
 	this.removeVideo = function(){
 		$('#movieplayer .container .video').html('');
 	}
-	
+
 	this.open = function($playvideo){
 		if(!_isOpen){
 			this.resize();
@@ -68,7 +68,7 @@
         	$('#movieplayer').prev().css('left', $('#movieplayer').css('left'));
         }
 	}
-	
+
 	this.close = function(){
 		_parent.openWindows['movieplayer'] = false;
 		if(maximised){ _parent.systemSettings.decreaseFullscreen(); }
@@ -80,7 +80,7 @@
 		this.removeVideo();
 		_this.center();
 	}
-	
+
 	this.min = function(){
 		if(maximised){ _parent.systemSettings.decreaseFullscreen(); }
 		$('#movieplayer ').hide();
@@ -88,11 +88,11 @@
 		minified = true;
 		_isOpen = false;
 	}
-	
+
 	this.isMaximised = function(){
 		return maximised;
 	}
-	
+
 	this.resize = function(){
 		var videoWidth = $('#movieplayer').width();
 		var videoHeight = $('#movieplayer').height();
@@ -101,7 +101,7 @@
 		$('#videoPlayer').attr('height',videoHeight);
 		$('#videoPlayer embed').attr('height',videoHeight - 27);
 	}
-	
+
 	this.center = function(){
     	var left = ($(document).width() / 2) - ($('#movieplayer').width() / 2);
 		var top = Math.max(24,($(document).height() / 2) - ($('#movieplayer').height() / 2));

=== modified file 'js/scripts.js'
--- js/scripts.js	2013-01-18 20:24:03 +0000
+++ js/scripts.js	2014-05-18 21:53:52 +0000
@@ -32,7 +32,8 @@
 $(document).ready(function(){
 	if($.browser.msie){
 		if($.browser.version != '8.0' && $.browser.version != '9.0'){
-			window.location.href = '/ubuntu/take-the-tour-gallery';
+			alert('Désolé, mais cette démonstration ne semble pas être compatible avec votre navigateur.');
+			window.location.href = 'http://www.ubuntu-fr.org';
 		}else{
 			setup();
 		}
@@ -76,23 +77,29 @@
 		}
 		systemMenu.resize();
 	});
-	
+
 	$(document).mousemove(function(e){
       		if(movingFolder != null){
       			movingFolder.css('left', e.pageX - folderXOffset);
       			movingFolder.css('top',Math.max(24, e.pageY - folderYOffset));
       		}
-     }); 
-     
+     });
+
      $('.control').mousedown(function(e) {
 			movingFolder = $(this).parent();
 			folderXOffset = e.pageX - movingFolder.position().left;
 			folderYOffset = e.pageY - movingFolder.position().top;
 	 });
+
+	 $('#tour-guide').mousedown(function(e) {
+			movingFolder = $(this);
+			folderXOffset = e.pageX - movingFolder.position().left;
+			folderYOffset = e.pageY - movingFolder.position().top;
+	 });
 	 $(document).mouseup(function() {
 			movingFolder = null;
 	 });
-	 
+
 	 $('.window').mousedown(function(){
 		if($(this).attr('class').indexOf("firefox-window") != -1){
 			if($(this).attr('class').indexOf("fullsize") == -1){
@@ -100,7 +107,7 @@
 				$('.firefox-window .web-overlay-tran').hide();
 			}else{
 				$('.firefox-window .web-ubuntuOneSystemoverlay-tran').css('width','100px');
-				$('.firefox-window .web-overlay-tran').show();	
+				$('.firefox-window .web-overlay-tran').show();
 			}
 		}else{
 			$('.firefox-window .web-overlay-tran').css('width','100%');
@@ -111,16 +118,16 @@
 		$('#top #top-left #title').text($('.window-title', this).text());
 		$('.'+currentSystemSelected).css('z-index',3);
 		$(this).css('z-index',4);
-		
+
 		if($('css3-container').length > 0){
 	     	$('css3-container').css('z-index',2);
 	     	$('.'+currentSystemSelected).prev().css('z-index',3);
 	        $(this).prev().css('z-index',4);
 		}
-		
+
 		$(this).addClass('selected-window');
 		openWindows[$(this).attr('id')] = true;
-		
+
 		if(currentSystemSelected != $(this).attr('class').replace(' window', '').replace(' fullsize', '').replace(' selected-window','').replace(' window', '')){
 			currentSystemSelected = $(this).attr('class').replace(' fullsize', '');
 			currentSystemSelected = currentSystemSelected.replace(' selected-window','');
@@ -130,9 +137,9 @@
 			if(set == 'folder'){ set = 'home'; }
 			if(set == 'firefox-window'){ set = 'firefox'; }
 			if(set == 'email-window'){ set = 'email'; }
-			
+
 			$('#menu ul li.'+set+' .selected-window-arrow').show();
-			
+
 			guidedTourSystem.setSystem(set);
 		}
 	 });
@@ -165,7 +172,7 @@
 			//systemMenu.setLocked(false);
 		}
 	});
-	
+
 	$('#top #top-right div ul li').bind('click',function(){
 		switch($.trim($(this).text())){
 			case _turn_off_bluetooth_:
@@ -203,7 +210,7 @@
 			break;
 		}
 	});
-	
+
 	$('#top #top-right #speakers .slider').slider({
 			min: 0,
 			max: 100,
@@ -219,21 +226,21 @@
 				_this.systemSettings.setVolume(currentPercent);
 			}
 		});
-		
-	
+
+
 	$('#top #top-left #control-buttons div').bind('click', function(){
 		var buttonClicked = $(this).attr('id');
 		$('.'+currentSystemSelected+ ' .control .'+buttonClicked).trigger('click');
 	});
-	
+
 	$('#top #top-right #speakers .banshee').mouseover(function(){
 		$('#top #top-right #speakers .banshee .banshee-play').css('background-image','url(../img/top/banshee-play-highlight.png)');
 	});
-	
+
 	$('#top #top-right #speakers .banshee').mouseout(function(){
 		$('#top #top-right #speakers .banshee .banshee-play').css('background-image','url(../img/top/banshee-play.png)');
 	});
-	
+
 }
 
 function sliderUpdate($percent, $muted){
@@ -371,6 +378,7 @@
 	libreSystem.close('calc');
 	libreSystem.close('impress');
 	softwareSystem.close();
+	moviePlayerSystem.close();
 	guidedTourSystem.setIndex(_tourIndex);
 }
 
@@ -391,11 +399,11 @@
 	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/StalkingOcelot.jpg','photo', _stalking_ocelot_title_, _photo_size_, _photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
 	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/TheGrassAintGreener.jpg','photo', _the_grass_aint_greener_title_, _photo_size_, _photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
 	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/WildWheat.jpg','photo', _wildWheat_title_, _photo_size_,_photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
-	
+
 	fileLibrary.push(new File(fileLibrary.length,'../videos/IAmWeAre.flv','video', _introduction_ubuntu_title_, _video_size_, _video_date_, '/'+_home_folder_+'/'+_videos_folder_));
-	
+
 	fileLibrary.push(new File(fileLibrary.length,'../audio/preview.mp3','audio', _happyness_title_, _music_size_, _music_date_, '/'+_home_folder_+'/'+_music_folder_));
-	
+
 	shotwellSystem = new ShotwellSystem(this);
 	shotwellSystem.init();
 }
@@ -445,7 +453,7 @@
 				});
 			}
 		}
-		
+
 		/*$.each($('#menu *'), function(){
 			if($(this).is('img')){
 				$currentBackground = $(this).attr('src');
@@ -476,7 +484,7 @@
 				}
 			}
 		});
-		
+
 }
 
 function unblurWindows(){
@@ -500,7 +508,7 @@
 				});
 			}
 		}
-		
+
 		$.each($('#menu *'), function(){
 			if($(this).is('img')){
 				$currentBackground = $(this).attr('src');

=== modified file 'js/shotwellsystem.js'
--- js/shotwellsystem.js	2013-01-18 20:24:03 +0000
+++ js/shotwellsystem.js	2014-05-18 21:53:52 +0000
@@ -4,7 +4,7 @@
  */
 
 function ShotwellSystem($parent){
-	
+
 	var _parent = $parent;
 	var _this = this;
 	var _isOpen = false;
@@ -16,13 +16,13 @@
 	var columns = 0;
 	var currentPercent = 0.3;
 	var currentIndex = 0;
-	
+
 	this.init = function(){
 		columns = Math.floor($('#shotwell .container .images').width() / 158);
 		imageCount = _parent.fileLibrary.length - 2;
 		this.setupControl();
 	}
-	
+
 	this.setupControl = function(){
 		$('#shotwell  .control .close').click(function(){
 			_this.close();
@@ -30,7 +30,7 @@
 		$('#shotwell  .control .min').click(function(){
 			_this.min();
 		});
-		
+
 		$('#shotwell  .control .max').click(function(){
 			if(maximised){
 				maximised = false;
@@ -41,13 +41,13 @@
 			}else{
 				maximised = true;
 				$('#shotwell').css('width',$(document).width() - 70 + 'px');
-				$('#shotwell').css('height',$(document).height() - 50 + 'px');
+				$('#shotwell').css('height',$(document).height() + 'px');
 				$('#shotwell ').addClass('fullsize');
 				_parent.systemSettings.increaseFullscreen();
 			}
 			_this.resize();
 		});
-		
+
 		$('#shotwell .nav ul').click(function(){
 			$(this).addClass('selected');
 			$('#shotwell .container .images').removeClass('singleImage');
@@ -58,7 +58,7 @@
 			_this.display();
 			_this.sliderUpdate(currentPercent);
 		});
-		
+
 		$('#shotwell .container .tools .jump-image .next').bind('click',function(){
 			if(!$(this).hasClass('disabled')){
 				currentIndex++;
@@ -67,7 +67,7 @@
 				_this.checkNextPrev();
 			}
 		});
-		
+
 		$('#shotwell .container .tools .jump-image .prev').bind('click',function(){
 			if(!$(this).hasClass('disabled')){
 				currentIndex--;
@@ -76,7 +76,7 @@
 				_this.checkNextPrev();
 			}
 		});
-		
+
 		$('#shotwell .container .tools .slider-container .slider').slider({
 			min: 0,
 			max: 100,
@@ -89,26 +89,26 @@
 				_this.getSliderValueAndUpdate($(this));
 			}
 		});
-		
+
 		$('#shotwell .container .images').click(function(){
 			$('#shotwell .nav ul').removeClass('selected');
 			$('#shotwell .container .images img').removeClass('selected');
 			$('#shotwell .sidebar .details .overall').show();
 			$('#shotwell .sidebar .details .single').hide();
 		});
-		
+
 		$('#shotwell .sidebar .details .single').hide();
 		$('#shotwell .container .tools .jump-image').hide();
 		this.display();
 		this.sliderUpdate(currentPercent,1);
 		this.center();
 	}
-	
+
 	this.getSliderValueAndUpdate = function(slider) {
 		var currentPercent = slider.slider('option', 'value') / 100;
 		_this.sliderUpdate(currentPercent);
 	}
-	
+
 	this.checkNextPrev = function(){
 		$('#shotwell .container .tools .jump-image div').removeClass('disabled');
 		if(currentIndex <= 0){
@@ -118,23 +118,23 @@
 			$('#shotwell .container .tools .jump-image .next').addClass('disabled');
 		}
 	}
-	
+
 	this.sliderUpdate = function($percent, $firsttime){
 		var containerWidth = $('#shotwell .container .images').width() - 15;
 		var active = $('#shotwell .container .tools .slider-container .slider .ui-slider-handle').position();
 		if($firsttime != undefined){ active = '60.45px; '}
 		$('#shotwell .container .tools .slider-container .slider-active').css('width', active.left);
-		
+
 		var imageWidth = Math.floor(((imageMax - imageMin) * $percent) + imageMin) - 5;
 		$('#shotwell .container .images img').css('width',imageWidth);
-		
+
 		columns = Math.min(imageCount, Math.floor(containerWidth/ imageWidth));
 		var imageDivsWidth = Math.floor(containerWidth / columns)
 		$('#shotwell .container .images div').css('width',imageDivsWidth+'px');
 	}
-	
+
 	this.display = function($imageIndex){
-		
+
 		var imagesHTML = '';
 		if($imageIndex == undefined){
 			for(var i = 0; i < imageCount; i++){
@@ -146,7 +146,7 @@
 			imagesHTML += '<div class="large"><img src="'+_parent.fileLibrary[$imageIndex].url()+'" alt="'+_parent.fileLibrary[$imageIndex].name()+'"  id="-1"  /></div>';
 		}
 		$('#shotwell .container .images').html(imagesHTML);
-		
+
 		//$('#shotwell .container .images div').css('height',$('#shotwell .container .images img').height());
 		//$('#shotwell .sidebar .details .items').text(imageCount+' Photos');
 		$('#shotwell .container .images img').click(function( event ){
@@ -169,19 +169,19 @@
 		});
 		this.resize();
 	}
-	
+
 	this.showImageDetails = function( $index ){
 		this.updateImageDetails($index);
 		$('#shotwell .sidebar .details .overall').hide();
 		$('#shotwell .sidebar .details .single').show();
 	}
-	
+
 	this.updateImageDetails = function( $index ){
 		$('#shotwell .sidebar .details .title').text(_parent.fileLibrary[$index].name());
 		$('#shotwell .sidebar .details .date').text(_parent.fileLibrary[$index].date());
 		$('#shotwell .sidebar .details .size').text(_parent.fileLibrary[$index].size());
 	}
-	
+
 	this.selectImage = function($index){
 		$('#shotwell .container .images').addClass('singleImage');
 		$('#shotwell .container .tools .jump-image').show();
@@ -209,7 +209,7 @@
         	$('#shotwell').prev().css('left', $('#shotwell').css('left'));
         }
 	}
-	
+
 	this.close = function(){
 		if(_isOpen){
 			_parent.openWindows['shotwell'] = false;
@@ -220,7 +220,7 @@
 			$('#shotwell .sidebar .details .single').hide();
 			_this.display();
 			_this.sliderUpdate(currentPercent);
-			
+
 			if(maximised){ _parent.systemSettings.decreaseFullscreen(); }
 			$('#shotwell ').hide();
 			_parent.systemMenu.closeWindow('shotwell');
@@ -230,23 +230,23 @@
 			_this.center();
 		}
 	}
-	
+
 	this.min = function(){
 		if(maximised){ _parent.systemSettings.decreaseFullscreen(); }
 		$('#shotwell ').hide();
 		_parent.systemMenu.wiggle('shotwell');
 		minified = true;
 	}
-	
+
 	this.isMaximised = function(){
 		return maximised;
 	}
-	
+
 	/* this.open = function(){
 	    	this.center();
 	    	$('.shotwell').show();
 	  }*/
-	
+
 	this.resize = function(){
 		/*var topPadding = ($('#shotwell .container .images').height() - $('#shotwell .container .images .large img').height()) /2;
 		 $('#shotwell .container .images .large img').css('margin-top',topPadding+'px');*/
@@ -257,7 +257,7 @@
 		 $('#shotwell .sidebar .nav').css('height',imageContainerHeight - 138);
 		 $('#shotwell .container .images').css('height',imageContainerHeight-40);
 	}
-	
+
 	this.center = function(){
     	var left = ($(document).width() / 2) - ($('#shotwell').width() / 2);
 		var top = Math.max(24,($(document).height() / 2) - ($('#shotwell').height() / 2));

=== modified file 'js/softwaresystem.js'
--- js/softwaresystem.js	2013-01-18 20:24:03 +0000
+++ js/softwaresystem.js	2014-05-18 21:53:52 +0000
@@ -17,19 +17,19 @@
 	var theImage = '';
 	var theDescription = '';
 	var theDesctiptionImage = '';
-	
+
 	this.init = function(){
-		
+
 		$('#software-centre .loading-bar').hide();
 		$('#software-centre .detailed .price .progress').css('width','0');
-		
+
 		$('#software-centre .control .close').click(function(){
 			_this.close();
 		});
 		$('#software-centre  .control .min').click(function(){
 			_this.min();
 		});
-		
+
 		$('#software-centre  .control .max').click(function(){
 			if(maximised){
 				maximised = false;
@@ -40,13 +40,13 @@
 			}else{
 				maximised = true;
 				$('#software-centre').css('width',$(document).width() - 70 + 'px');
-				$('#software-centre').css('height',$(document).height() - 50 + 'px');
+				$('#software-centre').css('height',$(document).height() + 'px');
 				$('#software-centre').addClass('fullsize');
 				_parent.systemSettings.increaseFullscreen();
 			}
 			_this.resize();
 		});
-		
+
 		$('#software-centre .top-panel .back').bind('click',function(){
 			if(!$(this).hasClass('disabled')){
 				$('#software-centre .home').show();
@@ -61,7 +61,7 @@
 				$(this).addClass('disabled');
 			}
 		});
-		
+
 		$('#software-centre .whats-new .app-container div').click(function(){
 			currentApp = $(this).attr('class');
 			$('#software-centre .top-panel .forward').addClass('disabled');
@@ -71,7 +71,7 @@
 		this.setupTopButtons();
 		this.center();
 	}
-	
+
 	this.loadApp = function(){
 		var error = false;
 		$('#software-centre .top-panel .back').removeClass('disabled');
@@ -130,9 +130,9 @@
 				default:
 					_parent.errorMessage.open();
 					error = true;
-					break;	
+					break;
 				}
-			
+
 			$('#software-centre .detailed .title h1').text(theName);
 			$('#software-centre .detailed .title p.subheading').text(theSub);
 			$('#software-centre .detailed .title img.app-image').attr('src', theImage);
@@ -148,7 +148,7 @@
 				$('#software-centre .detailed').show();
 			}
 	}
-	
+
 	this.setupInstall = function(){
 		$('#software-centre .detailed .price .button').bind('click',function(){
 			if(installedApps[currentApp] == true){
@@ -167,7 +167,7 @@
 				 }
 		});
 	}
-	
+
 	this.removeApp = function(){
 		$('#software-centre .detailed .price .theprice').text(thePrice);
 		$('#software-centre .detailed .price .theprice').removeClass('installed');
@@ -176,7 +176,7 @@
 		_parent.systemOverlay.removeApps(theName);
 		installedApps[currentApp] = false;
 	}
-	
+
 	this.installedApp = function(){
 		$('#software-centre .detailed .price .theprice').text(_installed_);
 		$('#software-centre .detailed .price .theprice').addClass('installed');
@@ -185,7 +185,7 @@
 		_parent.systemOverlay.totalApps.push({name:theName,image:theImage});
 		installedApps[currentApp] = true;
 	}
-	
+
 	this.setupTopButtons = function(){
 		$('#software-centre .all-software').bind('click', function(){
 			$('#software-centre .home').show();
@@ -193,7 +193,7 @@
 			$('#software-centre .top-panel .back').addClass('disabled');
 		});
 	}
-	
+
 	this.close = function(){
 		if(_isOpen){
 			$('#software-centre .home').show();
@@ -211,14 +211,14 @@
 	        }
        }
 	}
-	
+
 	this.min = function(){
 		if(maximised){ _parent.systemSettings.decreaseFullscreen(); }
 		$('#software-centre ').hide();
 		_parent.systemMenu.wiggle('software');
 		minified = true;
 	}
-	
+
 	this.resize = function(){
 		var containerHeight = $('#software-centre').height() - ($('#software-centre .top-panel').height() + $('#software-centre .control').height() + 6);
 		var appBoxWidth = $('#software-centre').width() - ($('#software-centre .navigation').width() + 50);
@@ -226,18 +226,18 @@
 		$('#software-centre .container').css('height',containerHeight);
 		$('#software-centre .container .whats-new').css('width',appBoxWidth);
 	}
-	
+
 	this.center = function(){
     	var left = ($(document).width() / 2) - ($('#software-centre ').width() / 2);
 		var top = Math.max(24,($(document).height() / 2) - ($('#software-centre ').height() / 2));
 		$('#software-centre ').css('left',left);
 		$('#software-centre ').css('top',top);