Merge lp:~otto/valo-cd/devel into lp:~tuukkah/valo-cd/devel

[Otto Kekäläinen]

Better internationalization support

[Otto Kekäläinen (otto)]

review: Approve

[lp:~otto/valo-cd/devel]

69. By Otto Kekäläinen <email address hidden> on 2011-09-05

Preparation for merge with production branch.

70. By Otto Kekäläinen <email address hidden> on 2011-09-05

fix xulrunner package location

71. By Otto Kekäläinen <email address hidden> on 2011-09-05

correct folder structure for merge and join

Unmerged revisions

71. By Otto Kekäläinen <email address hidden> on 2011-09-05

correct folder structure for merge and join

70. By Otto Kekäläinen <email address hidden> on 2011-09-05

fix xulrunner package location

69. By Otto Kekäläinen <email address hidden> on 2011-09-05

Preparation for merge with production branch.

68. By Otto Kekäläinen <email address hidden> on 2011-09-02

lang-file in html-ui directory always contains language code

67. By Otto Kekäläinen <email address hidden> on 2011-09-02

Logo and start up screen changed automatically if wiki is from .fi domain

66. By Otto Kekäläinen <email address hidden> on 2011-09-02

Fixed default english start logo.

65. By Otto Kekäläinen <email address hidden> on 2011-08-31

Refined the build process, filenames, documentation and paths.

64. By Otto Kekäläinen <email address hidden> on 2011-08-31

Replaced all valo-cd.fi with valo-cd.org, made build base internationalized.

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2011-09-05 09:08:37 +0000
@@ -0,0 +1,7 @@
+.sass-cache
+resources.txt
+valo-cd.css
+css/categories.scss
+css/logo.scss
+categories.scss
+logo.scss
 
=== removed file '.bzrignore'
--- .bzrignore	2010-12-09 01:54:41 +0000
+++ .bzrignore	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-.DS_Store
-.sass-cache
-korpela.css
-mixins.css
-reset.css
-html-ui/build-en
-html-ui/build-en.log
-html-ui/resources.txt
-html-ui/build-fi
-html-ui/build-fi.log
-html-ui/css/categories.scss
-html-ui/css/logo.scss
-html-ui/valo-cd.css
-./build-en
-./build-en.log
-./build-en.zip
-./build-fi
-./build-fi.log
-./build-fi.zip
-./xulrunner-1.9.2.12.en-US.win32.zip
 
=== modified file 'README.txt'
--- README.txt	2010-12-09 00:21:28 +0000
+++ README.txt	2011-09-05 09:08:37 +0000
@@ -13,7 +13,7 @@
 start.bmp   -- Splash screen image
 start.exe   -- Legacy splash screen starter app from Open-CD-project 
 start.ini   -- Configuration for the legacy splash screen starter app
-build.sh    -- Script to build the disc
+build-cd.sh    -- Script to build the disc
 
 /VALO-CD
 
 
=== modified file 'VALO-CD/VALO-CD.ini'
--- VALO-CD/VALO-CD.ini	2009-12-21 08:39:40 +0000
+++ VALO-CD/VALO-CD.ini	2011-09-05 09:08:37 +0000
@@ -8,20 +8,20 @@
 Name=VALO-CD
 ;
 ; This field specifies your application's version.  This field is optional.
-Version=1.0
+Version=1.1
 ;
 ; This field specifies your application's build ID (timestamp).  This field is
 ; required.
-BuildID=20091118
+BuildID=20110831
 ;
 ; This field specifies a compact copyright notice for your application.  This
 ; field is optional.
-Copyright=Copyright (c) 2009 VALO-CD <[e-mail]>
+Copyright=Copyright (c) 2009-2011 VALO-CD <[e-mail]>
 ;
 ; This ID is just an example.  Every XUL app ought to have it's own unique ID.
 ; You can use the microsoft "guidgen" or "uuidgen" tools, or go on
 ; irc.mozilla.org and /msg botbot uuid.  This field is optional.
-ID=[e-mail]
+ID=[e-mail]
 
 [Gecko]
 ;
@@ -46,4 +46,4 @@
 ; Specifies whether, when the application is launched for the first time and
 ; there are no profiles, to enable profile migration code through
 ; the nsIProfileMigrator interface. Legal values are 1 and 0
-EnableProfileMigrator=0
 \ No newline at end of file
+EnableProfileMigrator=0
 
=== modified file 'VALO-CD/defaults/preferences/prefs.js'
--- VALO-CD/defaults/preferences/prefs.js	2009-12-21 08:39:40 +0000
+++ VALO-CD/defaults/preferences/prefs.js	2011-09-05 09:08:37 +0000
@@ -1,7 +1,8 @@
 /*globals pref*/
 
 // sets application locale
-pref("general.useragent.locale", "fi-FI") ;
+// (disabled fi-FI to make VALO-CD base international)
+// pref("general.useragent.locale", "fi-FI") ;
 
 // opens VALO-CD browser home page
 pref("toolkit.defaultChromeFeatures", "chrome,resizable=no,dialog=no,centerscreen") ;
 
=== renamed file 'build.sh' => 'build-cd.sh'
--- build.sh	2011-08-03 14:00:43 +0000
+++ build-cd.sh	2011-09-05 09:08:37 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Examples:
-# ./build.sh build-en html-ui/build-en
-# ./build.sh build-fi html-ui/build-fi
+# ./build-cd.sh valo-cd-v7-en-beta2 html-ui/valo-cd-v7-en-beta2
+# ./build-cd.sh <target dir> <ui source dir>
 
 # abort on errors
 set -e
@@ -9,37 +9,46 @@
 # print commands before execution
 set -x
 
-root=$1
-html_ui_build=$2
+cd_target_dir=$1
+html_ui_build_dir=$2
 
 # check that the arguments are in correct order
-if [ -e "$html_ui_build/start.exe" -o ! -e "$html_ui_build/VALO-CD/content/index.html" ]; then
-    echo >&2 "\"$html_ui_build\": doesn't look like a html-ui build result"
+if [ -e "$html_ui_build_dir/start.exe" -o ! -e "$html_ui_build_dir/VALO-CD/index.html" ]; then
+    echo >&2 "\"$html_ui_build_dir\": doesn't look like a html-ui build result"
     exit 10
 fi
 
-
 #start build from a clean state
-mkdir "$root"
-
-cp -a autorun* start* VALO-CD "$root/"
-
-cp -a cd-template/* "$root/"
-
-cp -a "$html_ui_build"/* "$root/"
+mkdir -p "$cd_target_dir"
+
+cp -a autorun* start* VALO-CD "$cd_target_dir/"
+
+# other files could be included too?
+# cp -a cd-template/* "$cd_target_dir/"
+
+cp -a "$html_ui_build_dir"/* "$cd_target_dir/"
+
+# get startup image with correct language (.org and english by default)
+if [ `cat $html_ui_build_dir/lang` == "fi" ]; then
+  wget -nc -nv http://www.valo-cd.fi/wiki/images/f/f4/start.png
+  mv start.png $cd_target_dir/
+  mogrify -format bmp $cd_target_dir/start.png
+  rm $cd_target_dir/start.png
+fi
 
 # XXX this link breaks when new versions are released:
-wget -nv -nc http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.2.19/runtimes/xulrunner-1.9.2.19.en-US.win32.zip
+#wget -nv -nc http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.2.19/runtimes/xulrunner-1.9.2.19.en-US.win32.zip
+wget -nv -nc https://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.2.19/runtimes/xulrunner-1.9.2.19.en-US.win32.zip
 
-unzip -q xulrunner-1.9.2.19.en-US.win32.zip -d "$root/VALO-CD/"
+unzip -q xulrunner-1.9.2.19.en-US.win32.zip -d "$cd_target_dir/VALO-CD/"
 
 # checksums
-(cd "$root" && find . -type f -print0 | xargs -0 md5sum) >md5sums
-(cd "$root" && find . -type f -print0 | xargs -0 sha1sum) >sha1sums
+(cd "$cd_target_dir" && find . -type f -print0 | xargs -0 md5sum) >md5sums
+(cd "$cd_target_dir" && find . -type f -print0 | xargs -0 sha1sum) >sha1sums
 
-mv md5sums sha1sums "$root/"
+mv md5sums sha1sums "$cd_target_dir/"
 
 # package the results
-(cd "$root" && zip -q -r ../`basename "$root"`.zip .)
+(cd "$cd_target_dir" && zip -q -r ../`basename "$cd_target_dir"`.zip .)
 
-genisoimage -J -R -l -o `basename "$root"`.iso -V "VALO-CD" -v -iso-level 4 "$root"
+genisoimage -J -R -l -o `basename "$cd_target_dir"`.iso -V "VALO-CD" -v -iso-level 4 "$cd_target_dir"
 
=== added file 'html-ui/README.txt'
--- html-ui/README.txt	1970-01-01 00:00:00 +0000
+++ html-ui/README.txt	2011-09-05 09:08:37 +0000
@@ -0,0 +1,5 @@
+VALO-CD UI BUILDER
+
+This folder combined with data from the wiki makes the VALO-CD html user interface and contents (e.g. .exe's). The result of build-ui.sh can be browsed with any browser.
+
+To build the CD bundled with its own browser, run build-cd.sh.
 
=== renamed file 'html-ui/build.sh' => 'html-ui/build-ui.sh'
--- html-ui/build.sh	2011-04-04 00:26:45 +0000
+++ html-ui/build-ui.sh	2011-09-05 09:08:37 +0000
@@ -1,7 +1,8 @@
 #!/bin/sh
 # Examples:
-# ./build.sh http://www.valo-cd.org/wiki/Version_7 build-en/VALO-CD/content ../../programs ../../guides
-# ./build.sh http://www.valo-cd.fi/wiki/Versio_7 build-fi/VALO-CD/content ../../ohjelmat ../../oppaat
+# ./build-ui.sh http://www.valo-cd.org/wiki/Version_7 valo-cd-v7-en-beta/VALO-CD ../programs ../guides
+# ./build-ui.sh http://www.valo-cd.fi/wiki/Versio_7 valo-cd-v7-fi-beta/VALO-CD ../ohjelmat ../oppaat
+# ./build-ui.sh <index url> <target directory> <relative paths to programs and guides from target dir>
 
 # abort on errors
 set -e
@@ -32,6 +33,15 @@
 
 cp -a fonts images js "$root/"
 
+# get logo with correct language (.org and english by default)
+if [[ $url =~ valo-cd.fi ]]; then
+  wget -nc -nv http://www.valo-cd.fi/wiki/images/1/1b/logo.png
+  mv logo.png "$root/images/"
+  echo "fi" > "$root/lang"
+else 
+  echo "en" > "$root/lang"
+fi
+
 # valo-cd.xml builds index.html, resources.txt, css/categories.scss, 
 # and css/logo.scss
 xsltproc --load-trace --novalid --stringparam url "$url" --stringparam programs "$programs" --stringparam guides "$guides" valo-cd.xsl valo-cd.html > "$root/index.html"
 
=== modified file 'html-ui/css/valo-cd.scss'
--- html-ui/css/valo-cd.scss	2011-04-05 17:32:42 +0000
+++ html-ui/css/valo-cd.scss	2011-09-05 09:08:37 +0000
@@ -47,7 +47,7 @@
 @import "programs";
 $logo-color: transparent;
 $slogan-color: transparent;
-$logo-url: url("images/logo-fi.png");
+$logo-url: url("images/logo.png");
 $background-color: transparent;
 /* @end */
 
 
=== renamed file 'html-ui/images/logo-fi.png' => 'html-ui/images/logo.png'
 Binary files html-ui/images/logo-fi.png	2011-04-05 15:01:49 +0000 and html-ui/images/logo.png	2011-09-05 09:08:37 +0000 differ
=== modified file 'html-ui/valo-cd.css.sample'
--- html-ui/valo-cd.css.sample	2010-12-01 22:39:26 +0000
+++ html-ui/valo-cd.css.sample	2011-09-05 09:08:37 +0000
@@ -1,7 +1,7 @@
 /*
- valo-cd.css
+ valo-cd.scss
 
- Copyright (C) 2010  Asko Soukka <[e-mail]>
+ Copyright (C) 2011 Asko Soukka <[e-mail]>
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -54,156 +54,74 @@
   border-collapse: collapse;
   border-spacing: 0; }
 
-/* @group DejaVu Sans */
-@font-face {
-  font-family: "DejaVu Sans";
-  src: url("fonts/dejavu-sans/DejaVuSans-Bold.woff");
-  font-weight: bold;
-  font-style: normal; }
-
-@font-face {
-  font-family: "DejaVu Sans";
-  src: url("fonts/dejavu-sans/DejaVuSans-BoldOblique.woff");
-  font-weight: bold;
-  font-style: oblique; }
-
-@font-face {
-  font-family: "DejaVu Sans";
-  src: url("fonts/dejavu-sans/DejaVuSans-BoldOblique.woff");
-  font-weight: bold;
-  font-style: italic; }
-
-@font-face {
-  font-family: "DejaVu Sans";
-  src: url("fonts/dejavu-sans/DejaVuSans-ExtraLight.woff");
-  font-weight: 100;
-  font-style: normal; }
-
-@font-face {
-  font-family: "DejaVu Sans";
-  src: url("fonts/dejavu-sans/DejaVuSans-Oblique.woff");
-  font-weight: normal;
-  font-style: oblique; }
-
-@font-face {
-  font-family: "DejaVu Sans";
-  src: url("fonts/dejavu-sans/DejaVuSans-Oblique.woff");
-  font-weight: normal;
-  font-style: italic; }
-
-@font-face {
-  font-family: "DejaVu Sans";
-  src: url("fonts/dejavu-sans/DejaVuSans.woff");
-  font-weight: normal;
-  font-style: normal; }
-
-/* @end */
-/* @group Gentium Basic */
-@font-face {
-  font-family: "Gentium Basic";
-  src: url("fonts/gentium-basic/GenBasB.woff");
-  font-weight: bold;
-  font-style: normal; }
-
-@font-face {
-  font-family: "Gentium Basic";
-  src: url("fonts/gentium-basic/GenBasBI.woff");
-  font-weight: bold;
-  font-style: oblique; }
-
-@font-face {
-  font-family: "Gentium Basic";
-  src: url("fonts/gentium-basic/GenBasBI.woff");
-  font-weight: bold;
-  font-style: italic; }
-
-@font-face {
-  font-family: "Gentium Basic";
-  src: url("fonts/gentium-basic/GenBasI.woff");
-  font-weight: normal;
-  font-style: oblique; }
-
-@font-face {
-  font-family: "Gentium Basic";
-  src: url("fonts/gentium-basic/GenBasI.woff");
-  font-weight: normal;
-  font-style: italic; }
-
-@font-face {
-  font-family: "Gentium Basic";
-  src: url("fonts/gentium-basic/GenBasR.woff");
-  font-weight: normal;
-  font-style: normal; }
-
-/* @end */
-/* @group Gentium Book Basic */
-@font-face {
-  font-family: "Gentium Book Basic";
-  src: url("fonts/gentium-basic/GenBkBasB.woff");
-  font-weight: bold;
-  font-style: normal; }
-
-@font-face {
-  font-family: "Gentium Book Basic";
-  src: url("fonts/gentium-basic/GenBkBasBI.woff");
-  font-weight: bold;
-  font-style: italic; }
-
-@font-face {
-  font-family: "Gentium Book Basic";
-  src: url("fonts/gentium-basic/GenBkBasI.woff");
-  font-weight: normal;
-  font-style: oblique; }
-
-@font-face {
-  font-family: "Gentium Book Basic";
-  src: url("fonts/gentium-basic/GenBkBasI.woff");
-  font-weight: normal;
-  font-style: italic; }
-
-@font-face {
-  font-family: "Gentium Book Basic";
-  src: url("fonts/gentium-basic/GenBkBasR.woff");
-  font-weight: normal;
-  font-style: normal; }
-
-/* @end */
+/* @group Droid Sans */
+@font-face {
+  font-family: "Droid Sans";
+  src: url("fonts/dejavu-sans/DroidSans-Bold.woff");
+  font-weight: bold;
+  font-style: normal; }
+
+@font-face {
+  font-family: "Droid Sans";
+  src: url("fonts/dejavu-sans/DroidSans.woff");
+  font-weight: normal;
+  font-style: normal; }
+
+/* @end Droid Sans */
 /* @group VALO-CD */
-#Teksti-ja-grafiikka h2 {
+#Writing-and-Drawing h2 {
   top: 14em; }
 
-#Teksti-ja-grafiikka,
-#Teksti-ja-grafiikka h2 {
-  background-color: #36bdea;
-  color: black; }
-
-#Teksti-ja-grafiikka .radio,
-#Teksti-ja-grafiikka blockquote,
-.breadcrumbs li.Teksti-ja-grafiikka {
-  background-color: #36bdea;
-  color: white; }
-
-#Teksti-ja-grafiikka:hover,
-#Teksti-ja-grafiikka:hover h2,
-#Teksti-ja-grafiikka h2:hover {
-  color: white; }
-
-#Teksti-ja-grafiikka div.icon:hover,
-#Teksti-ja-grafiikka .radio:hover,
-#Teksti-ja-grafiikka .radio.selected,
-.breadcrumbs li.Teksti-ja-grafiikka:hover {
-  background-color: #1495bf;
+#Writing-and-Drawing {
+  border-left-color: #36bdea;
+  border-top-color: #36bdea; }
+
+#Writing-and-Drawing h2 {
+  background-color: #36bdea;
+  color: white; }
+
+#Writing-and-Drawing div.label {
+  background: #36bdea;
+  color: white; }
+
+#Writing-and-Drawing .radio {
+  background-color: #7bd4f1; }
+
+#Writing-and-Drawing blockquote,
+.breadcrumbs li.Writing-and-Drawing {
+  background-color: #36bdea;
+  color: white; }
+
+#Writing-and-Drawing:hover,
+#Writing-and-Drawing:hover h2,
+#Writing-and-Drawing h2:hover {
+  color: white; }
+
+#Writing-and-Drawing div.icon:hover,
+#Writing-and-Drawing .radio:hover,
+#Writing-and-Drawing .radio.selected,
+.breadcrumbs li.Writing-and-Drawing:hover {
+  background-color: #7bd4f1;
   color: white; }
 
 #Internet h2 {
-  top: 19em; }
-
-#Internet,
+  top: 19.5em; }
+
+#Internet {
+  border-left-color: #a9c043;
+  border-top-color: #a9c043; }
+
 #Internet h2 {
   background-color: #a9c043;
-  color: black; }
-
-#Internet .radio,
+  color: white; }
+
+#Internet div.label {
+  background: #a9c043;
+  color: white; }
+
+#Internet .radio {
+  background-color: #c3d37c; }
+
 #Internet blockquote,
 .breadcrumbs li.Internet {
   background-color: #a9c043;
@@ -218,44 +136,62 @@
 #Internet .radio:hover,
 #Internet .radio.selected,
 .breadcrumbs li.Internet:hover {
-  background-color: #78892e;
-  color: white; }
-
-#Ajanviete h2 {
-  top: 24em; }
-
-#Ajanviete,
-#Ajanviete h2 {
-  background-color: #cb3889;
-  color: black; }
-
-#Ajanviete .radio,
-#Ajanviete blockquote,
-.breadcrumbs li.Ajanviete {
-  background-color: #cb3889;
-  color: white; }
-
-#Ajanviete:hover,
-#Ajanviete:hover h2,
-#Ajanviete h2:hover {
-  color: white; }
-
-#Ajanviete div.icon:hover,
-#Ajanviete .radio:hover,
-#Ajanviete .radio.selected,
-.breadcrumbs li.Ajanviete:hover {
-  background-color: #912661;
+  background-color: #c3d37c;
+  color: white; }
+
+#Recreation h2 {
+  top: 25em; }
+
+#Recreation {
+  border-left-color: #cb3889;
+  border-top-color: #cb3889; }
+
+#Recreation h2 {
+  background-color: #cb3889;
+  color: white; }
+
+#Recreation div.label {
+  background: #cb3889;
+  color: white; }
+
+#Recreation .radio {
+  background-color: #db75ad; }
+
+#Recreation blockquote,
+.breadcrumbs li.Recreation {
+  background-color: #cb3889;
+  color: white; }
+
+#Recreation:hover,
+#Recreation:hover h2,
+#Recreation h2:hover {
+  color: white; }
+
+#Recreation div.icon:hover,
+#Recreation .radio:hover,
+#Recreation .radio.selected,
+.breadcrumbs li.Recreation:hover {
+  background-color: #db75ad;
   color: white; }
 
 #Multimedia h2 {
-  top: 29em; }
-
-#Multimedia,
+  top: 30.5em; }
+
+#Multimedia {
+  border-left-color: #f2a622;
+  border-top-color: #f2a622; }
+
 #Multimedia h2 {
   background-color: #f2a622;
-  color: black; }
-
-#Multimedia .radio,
+  color: white; }
+
+#Multimedia div.label {
+  background: #f2a622;
+  color: white; }
+
+#Multimedia .radio {
+  background-color: #f6c36a; }
+
 #Multimedia blockquote,
 .breadcrumbs li.Multimedia {
   background-color: #f2a622;
@@ -270,59 +206,112 @@
 #Multimedia .radio:hover,
 #Multimedia .radio.selected,
 .breadcrumbs li.Multimedia:hover {
-  background-color: #bc7c0b;
-  color: white; }
-
-#Työkalut h2 {
-  top: 34em; }
-
-#Työkalut,
-#Työkalut h2 {
-  background-color: #e96028;
-  color: black; }
-
-#Työkalut .radio,
-#Työkalut blockquote,
-.breadcrumbs li.Työkalut {
-  background-color: #e96028;
-  color: white; }
-
-#Työkalut:hover,
-#Työkalut:hover h2,
-#Työkalut h2:hover {
-  color: white; }
-
-#Työkalut div.icon:hover,
-#Työkalut .radio:hover,
-#Työkalut .radio.selected,
-.breadcrumbs li.Työkalut:hover {
-  background-color: #b24112;
-  color: white; }
-
-#Oppaat h2 {
-  top: 39em; }
-
-#Oppaat,
-#Oppaat h2 {
-  background-color: #999999;
-  color: black; }
-
-#Oppaat .radio,
-#Oppaat blockquote,
-.breadcrumbs li.Oppaat {
-  background-color: #999999;
-  color: white; }
-
-#Oppaat:hover,
-#Oppaat:hover h2,
-#Oppaat h2:hover {
-  color: white; }
-
-#Oppaat div.icon:hover,
-#Oppaat .radio:hover,
-#Oppaat .radio.selected,
-.breadcrumbs li.Oppaat:hover {
-  background-color: #737373;
+  background-color: #f6c36a;
+  color: white; }
+
+#Tools h2 {
+  top: 36em; }
+
+#Tools {
+  border-left-color: #e96028;
+  border-top-color: #e96028; }
+
+#Tools h2 {
+  background-color: #e96028;
+  color: white; }
+
+#Tools div.label {
+  background: #e96028;
+  color: white; }
+
+#Tools .radio {
+  background-color: #f0936d; }
+
+#Tools blockquote,
+.breadcrumbs li.Tools {
+  background-color: #e96028;
+  color: white; }
+
+#Tools:hover,
+#Tools:hover h2,
+#Tools h2:hover {
+  color: white; }
+
+#Tools div.icon:hover,
+#Tools .radio:hover,
+#Tools .radio.selected,
+.breadcrumbs li.Tools:hover {
+  background-color: #f0936d;
+  color: white; }
+
+#Guides h2 {
+  top: 41.5em; }
+
+#Guides {
+  border-left-color: #5c76b8;
+  border-top-color: #5c76b8; }
+
+#Guides h2 {
+  background-color: #5c76b8;
+  color: white; }
+
+#Guides div.label {
+  background: #5c76b8;
+  color: white; }
+
+#Guides .radio {
+  background-color: #91a3cf; }
+
+#Guides blockquote,
+.breadcrumbs li.Guides {
+  background-color: #5c76b8;
+  color: white; }
+
+#Guides:hover,
+#Guides:hover h2,
+#Guides h2:hover {
+  color: white; }
+
+#Guides div.icon:hover,
+#Guides .radio:hover,
+#Guides .radio.selected,
+.breadcrumbs li.Guides:hover {
+  background-color: #91a3cf;
+  color: white; }
+
+#Additional-information h2 {
+  top: 47em; }
+
+#Additional-information {
+  border-left-color: #999999;
+  border-top-color: #999999; }
+
+#Additional-information h2 {
+  background-color: #999999;
+  color: white; }
+
+#Additional-information div.label {
+  background: #999999;
+  color: white; }
+
+#Additional-information .radio {
+  background-color: #bfbfbf; }
+
+#Additional-information blockquote,
+.breadcrumbs li.Additional-information {
+  background-color: #999999;
+  color: white; }
+
+#Additional-information:hover,
+#Additional-information:hover h2,
+#Additional-information h2:hover {
+  color: white; }
+
+#Additional-information div.icon:hover,
+#Additional-information .radio:hover,
+#Additional-information .radio.selected,
+.breadcrumbs li.Additional-information:hover {
+  background-color: #bfbfbf;
   color: white; }
 
 /* @group Icons */
@@ -344,30 +333,36 @@
   font-size: 62.5%;
   margin-left: 20em;
   width: 58.4em;
-  background-color: #c3e8f2; }
+  background-color: transparent;
+  background: -webkit-gradient(linear, left top, left bottom, from(transparent), to(white));
+  background: -moz-linear-gradient(center top, transparent, white);
+  background-image: url("images/valo-background.jpg");
+  background-attachment: fixed; }
 
 /* @end */
 /* @group Logo */
 h1 {
-  font-family: "DejaVu Sans", sans-serif;
+  font-family: "Droid Sans", sans-serif;
   font-weight: normal;
   text-align: center;
+  font-size: 2.8em;
+  background-size: 100% auto;
   position: fixed;
   top: 0;
   left: 0;
-  padding-top: 8em;
-  width: 20em;
-  height: 100%;
-  color: #0DC4EF;
-  background-color: #c3e8f2;
-  background-size: 100% 7.4em;
-  -moz-background-size: 100% 7.4em;
-  background-image: url("images/disc.png");
-  background-position: 0 0.5em;
-  background-repeat: no-repeat; }
+  padding-top: 3.071em;
+  height: 2.143em;
+  width: 7.143em;
+  color: transparent;
+  background-color: transparent;
+  background-image: url("images/logo.png");
+  background-position: center 0.286em;
+  background-repeat: no-repeat;
+  cursor: pointer;
+  -webkit-user-select: none;
+  -moz-user-select: none; }
   h1 + p {
-    text-shadow: white 0px 1px 1px;
-    font-family: "DejaVu Sans", sans-serif;
+    font-family: "Droid Sans", sans-serif;
     font-size: 0.9em;
     font-weight: bold;
     text-align: center;
@@ -375,40 +370,44 @@
     top: 13.333em;
     left: 0;
     width: 22.222em;
-    color: #58585A;
-    background: transparent; }
-  h1 a:link, h1 a:visited, h1 a:active, h1 a:link:hover {
-    font-weight: normal;
-    text-decoration: none;
-    color: inherit;
-    font-size: 3.4em; }
-    h1 a:link strong, h1 a:visited strong, h1 a:active strong, h1 a:link:hover strong {
-      color: #58585A; }
-  h1 strong {
-    font-weight: normal;
-    color: #58585A;
-    background: inherit;
+    color: transparent;
+    background: transparent;
+    cursor: pointer;
+    -webkit-user-select: none;
+    -moz-user-select: none; }
+  h1 em {
+    font-style: normal;
+    color: transparent;
     padding-right: 0.088em; }
 
 /* @end */
 /* @group Category */
+.category + .category {
+  margin-top: -1.5em; }
+
+.category:last-child {
+  padding-bottom: 1.5em; }
+
 .category {
   border-top-left-radius: 1.5em;
   -moz-border-radius-topleft: 1.5em;
   -webkit-border-top-left-radius: 1.5em;
+  padding-bottom: 3em;
   display: block;
-  padding-top: 1.5em;
-  width: 58.4em;
+  border-top-width: 1.5em;
+  border-top-style: solid;
+  border-left-width: 1.5em;
+  border-left-style: solid;
+  width: 56.9em;
   counter-reset: guide; }
-  .category:hover h2, .category:hover > .icon h3 {
-    text-shadow: black 0px 1px 1px; }
   .category:hover > .icon.guide h3 + p, .category:hover > .icon.guide h3 + a + p {
     color: black; }
   .category h2 {
     border-top-left-radius: 1.5em;
     -moz-border-radius-topleft: 1.5em;
     -webkit-border-top-left-radius: 1.5em;
-    font-family: "DejaVu Sans", sans-serif;
+    text-shadow: black 0px 1px 1px;
+    font-family: "Droid Sans", sans-serif;
     font-weight: normal;
     position: fixed;
     left: 0;
@@ -421,18 +420,17 @@
     cursor: pointer; }
     .category h2:first-line {
       font-size: 1.9em; }
+  .category:hover h2 {
+    padding-left: 3em;
+    width: 17em; }
   .category:after {
     clear: both;
     display: block;
     content: ""; }
-  .category + .category {
+  .category + .category h2 {
     border-top-left-radius: 0;
     -moz-border-radius-topleft: 0;
     -webkit-border-top-left-radius: 0; }
-    .category + .category h2 {
-      border-top-left-radius: 0;
-      -moz-border-radius-topleft: 0;
-      -webkit-border-top-left-radius: 0; }
   .category:last-child {
     border-bottom-left-radius: 1.5em;
     -moz-border-radius-bottomleft: 1.5em;
@@ -441,35 +439,64 @@
       border-bottom-left-radius: 1.5em;
       -moz-border-radius-bottomleft: 1.5em;
       -webkit-border-bottom-left-radius: 1.5em; }
+  .category .label {
+    text-shadow: black 0px 1px 1px;
+    font-family: "Droid Sans", sans-serif;
+    font-weight: normal;
+    margin: 0;
+    margin-bottom: 0.789em;
+    padding: 0;
+    padding-bottom: 1em;
+    padding-right: 1em;
+    text-align: right;
+    font-size: 1.9em;
+    color: white; }
 
 /* @end */
 /* @group Title Icon */
 .category > .icon {
+  width: 55.4em;
+  height: auto;
+  min-height: 20em;
+  margin-bottom: 0;
   position: relative;
   float: left;
   margin-left: 1.5em;
-  margin-bottom: 1.5em;
-  width: 17.467em;
-  height: 18em;
   overflow: hidden;
   border-radius: 1.5em;
   -moz-border-radius: 1.5em;
   -webkit-border-radius: 1.5em; }
   .category > .icon:hover {
     cursor: pointer; }
+    .category > .icon:hover h3 {
+      text-shadow: black 0px 1px 1px;
+      color: white; }
   .category > .icon > * {
     display: none; }
   .category > .icon h3 {
-    font-family: "DejaVu Sans", sans-serif;
+    text-shadow: black 0px 1px 1px;
+    font-family: "Droid Sans", sans-serif;
     font-weight: normal;
-    text-align: center;
     display: block;
-    position: absolute;
-    right: 0;
-    bottom: 1.2em;
-    left: 0; }
+    position: relative;
+    color: black;
+    margin: 1.6em;
+    margin-left: 18.4em; }
     .category > .icon h3:first-line {
       font-size: 1.6em; }
+    .category > .icon h3 + img + a + p {
+      font-family: Arial, sans-serif;
+      font-size: 1.6em;
+      line-height: 1.3;
+      text-align: justify;
+      font-style: normal;
+      display: block;
+      position: relative;
+      margin: 1em;
+      margin-left: 11.5em;
+      background: inherit;
+      background: transparent;
+      color: black; }
   .category > .icon img.icon {
     display: block;
     position: absolute;
@@ -481,26 +508,23 @@
 /* @end */
 /* @group Guide Icons */
 .category > .icon.guide {
-  width: 55.4em;
-  height: auto;
-  margin-bottom: 0; }
+  min-height: 0; }
   .category > .icon.guide h3 {
-    font-family: "DejaVu Sans", sans-serif;
+    font-family: "Droid Sans", sans-serif;
     text-align: left;
     position: static;
-    margin: 1.6em; }
+    margin: 1.6em;
+    padding-left: 0; }
     .category > .icon.guide h3 + p, .category > .icon.guide h3 + a + p {
       font-family: Arial, sans-serif;
       font-size: 1.6em;
       line-height: 1.3;
       text-align: justify;
-      font-style: italic;
+      font-style: normal;
       display: block;
       margin: 1em;
       background: inherit;
       color: black; }
-  .category > .icon.guide:last-child {
-    margin-bottom: 1.6em; }
 
 /* @end */
 /* @group Title */
@@ -508,12 +532,12 @@
   /* Parts of this style's typography in inspired by
    * Jukka Korpela's http://www.cs.tut.fi/~jkorpela/yleinen.css */
   /* @group Typography */
-  /* @group Headers */
+  /* @group Headings */
   /* @end */
   /* @group Lists */
   /* @end */
   /* @end */
-  font-family: "Gentium Basic", sans-serif;
+  font-family: "Droid Sans", sans-serif;
   font-size: 1.6em;
   line-height: 1.3;
   text-align: justify;
@@ -530,8 +554,8 @@
   background: white;
   color: black; }
   .title h1, .title h2, .title h3, .title h4, .title h5, .title h6 {
-    font-family: "DejaVu Sans", sans-serif;
-    font-weight: normal;
+    font-family: "Droid Sans", sans-serif;
+    font-weight: bold;
     page-break-after: avoid; }
   .title h1 {
     font-size: 2.4em; }
@@ -570,13 +594,13 @@
       font-weight: normal; }
   .title dl dd {
     margin-bottom: 0.7em; }
-  .title ul li:before {
+  .title ul > li:before {
     float: left;
     content: "–";
     margin-left: -1em; }
   .title ol {
     counter-reset: list; }
-  .title ol li:before {
+  .title ol > li:before {
     float: left;
     content: counter(list) ".";
     counter-increment: list;
@@ -600,46 +624,75 @@
     height: 8em; }
   .title h3 {
     float: left;
-    text-align: left; }
+    text-align: left;
+    margin-top: 0; }
+  .title.info h3 {
+    float: none; }
   .title p {
     clear: left; }
     .title p + ul, .title p + ol {
       margin-top: -0.9em; }
+  .title img.logo {
+    clear: left;
+    float: left;
+    margin: 0 0.938em 0.938em 0;
+    max-width: 16em; }
+  .title img.inline {
+    box-shadow: 0 0.2em 0.7em black;
+    -moz-box-shadow: 0 0.2em 0.7em black;
+    -webkit-box-shadow: 0 0.2em 0.7em black;
+    float: left;
+    margin: 0 0.938em 0.938em 0;
+    max-width: 16em; }
+  .title img + p {
+    clear: none; }
+  .title img + img + ul,
+  .title img + img + p {
+    clear: left; }
   .title a {
-    display: inline-block;
-    text-decoration: none;
-    height: 1.1em;
-    border-bottom: 0.063em dashed; }
+    /*    display: inline-block; */
+    text-decoration: underline;
+    /*    text-decoration: none;
+        height: 1.1em;
+        border-bottom: 0.1em * 1/1.6 dashed; */ }
     .title a[href^="http"] {
       display: inline;
       text-decoration: underline;
       height: auto;
-      border-bottom: 0; }
+      border-bottom: 0;
+      background: transparent url(images/external-link-ltr-icon.png) no-repeat scroll right center;
+      padding-right: 13px; }
     .title a.visited:link {
       color: #551A8B; }
-  .title ul li:before {
-    float: left;
-    content: "–";
-    margin-left: -1em; }
+  .title ul {
+    text-align: left; }
+    .title ul > li:before {
+      float: left;
+      content: "–";
+      margin-left: -1em; }
   .title ol {
+    text-align: left;
     counter-reset: list; }
-    .title ol li:before {
+    .title ol > li:before {
       float: left;
       content: counter(list) ".";
       counter-increment: list;
       margin-left: -1em; }
-  .title dl.metadata dt {
-    clear: both;
-    float: left;
+  .title dl.metadata {
     margin-left: 0;
-    width: 7em;
-    font-weight: normal;
-    white-space: nowrap; }
-  .title dl.metadata dd {
-    margin-bottom: 0; }
+    margin-top: 1.5em; }
+    .title dl.metadata dt {
+      clear: both;
+      float: left;
+      margin-left: 0;
+      margin-right: 0.5em;
+      font-weight: normal;
+      white-space: nowrap; }
+    .title dl.metadata dd {
+      margin-bottom: 0; }
   .title blockquote {
     text-shadow: black 0px 1px 1px;
-    font-family: "DejaVu Sans", sans-serif;
+    font-family: "Droid Sans", sans-serif;
     margin-left: 0;
     margin-right: 0;
     padding: 0.938em;
@@ -649,7 +702,7 @@
     -webkit-border-radius: 0.938em; }
     .title blockquote:before {
       content: "”";
-      font-family: "Gentium Basic", sans-serif;
+      font-family: "Droid Sans", sans-serif;
       font-size: 6.25em;
       position: absolute;
       margin-top: -0.219em;
@@ -658,11 +711,13 @@
 /* @end */
 /* @group Breadcrumbs */
 .title ul.breadcrumbs {
-  font-family: "DejaVu Sans", sans-serif;
+  font-family: "Droid Sans", sans-serif;
   line-height: 1/1.3;
   text-align: left;
   margin: 0 0 0 -0.938em;
-  padding: 0.313em 0 0 0; }
+  padding: 0.313em 0 0.938em 0;
+  width: 36.625em;
+  overflow: hidden; }
   .title ul.breadcrumbs li {
     text-shadow: black 0px 1px 1px;
     white-space: nowrap;
@@ -684,8 +739,8 @@
 
 /* @end */
 /* @group Download */
-.title a.download:link, .title a.download:visited, .title a.download:hover {
-  font-family: "DejaVu Sans", sans-serif;
+a.download:link, a.download:visited, a.download:hover {
+  font-family: "Droid Sans", sans-serif;
   text-align: center;
   font-weight: normal;
   text-decoration: none;
@@ -694,6 +749,7 @@
   clear: both;
   width: 7.875em;
   height: 1.375em;
+  background: #ffffff;
   background: -webkit-gradient(linear, left top, left bottom, from(white), to(#dddddd));
   background: -moz-linear-gradient(center top, white, #dddddd);
   border-radius: 0.938em;
@@ -703,11 +759,25 @@
   color: #444444;
   margin: 0.313em 0 1.25em 0.938em;
   padding: 0.187em 0 0.125em 0; }
-.title a.download:active {
+a.download:active {
+  background: #cdcdcd;
   background: -webkit-gradient(linear, left top, left bottom, from(#cdcdcd), to(#ececec));
   background: -moz-linear-gradient(center top, #cdcdcd, #ececec);
   padding: 0.25em 0 0.063em 0; }
 
+.icon a.download:link, .icon a.download:visited, .icon a.download:hover {
+  font-size: 1.6em;
+  line-height: 1.3;
+  float: none;
+  display: block;
+  position: absolute;
+  top: 9.875em;
+  left: 1.469em;
+  margin: 0; }
+
+.icon.guide a.download {
+  display: none; }
+
 /* @end */
 /* @group Screenshots */
 .title ul.screenshots {
@@ -747,8 +817,7 @@
     width: 1em;
     border-right: 0.25ex white solid;
     background: #eeeeee;
-    font-size: 150%;
-    opacity: 0.4; }
+    font-size: 150%; }
     .title .selector .radio:hover, .title .selector .radio.selected {
       background: #aaaaaa;
       opacity: 1.0; }
 
=== modified file 'html-ui/valo-cd.html'
--- html-ui/valo-cd.html	2010-12-08 17:46:34 +0000
+++ html-ui/valo-cd.html	2011-09-05 09:08:37 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fi">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
   <head>
     <meta http-equiv="content-type" content="charset=UTF-8"/>
     <link rel="stylesheet" type="text/css" href="valo-cd.css" media="screen"/>
@@ -10,10 +10,10 @@
     </script>
     <script type="text/javascript" src="js/jquery.js">//</script>
     <script type="text/javascript" src="js/valo-cd.js">//</script>
-    <title>VALO-CD: Parhaat suomenkieliset vapaat ja avoimen lähdekoodin ohjelmat Windowsille</title>
+    <title>VALO-CD: The best of Free and Open Source Software for Windows</title>
   </head>
   <body>
-    <h1><em>VALO-</em>CD.fi</h1>
-    <p>Parhaat vapaat ohjelmat Windowsille</p>
+    <h1><em>VALO-</em>CD.org</h1>
+    <p>The best of Free and Open Source Software for Windows</p>
   </body>
-</html>
 \ No newline at end of file
+</html>
 
=== modified file 'start.bmp'
 Binary files start.bmp	2009-12-21 08:39:40 +0000 and start.bmp	2011-09-05 09:08:37 +0000 differ
=== added file 'xulrunner-1.9.2.19.en-US.win32.zip'
 Binary files xulrunner-1.9.2.19.en-US.win32.zip	1970-01-01 00:00:00 +0000 and xulrunner-1.9.2.19.en-US.win32.zip	2011-09-05 09:08:37 +0000 differ