update galleries, announce contest

diff --git a/www/ds/images/desktopsummit-marble_thumb.png b/www/ds/images/desktopsummit-marble_thumb.png
new file mode 100644 (file)
index 0000000..07d247e
Binary files /dev/null and b/www/ds/images/desktopsummit-marble_thumb.png differ

diff --git a/www/ds/images/screenshot107_thumb.png b/www/ds/images/screenshot107_thumb.png
new file mode 100644 (file)
index 0000000..2ed0d15
Binary files /dev/null and b/www/ds/images/screenshot107_thumb.png differ

diff --git a/www/ds/images/screenshot108_thumb.png b/www/ds/images/screenshot108_thumb.png
new file mode 100644 (file)
index 0000000..223a899
Binary files /dev/null and b/www/ds/images/screenshot108_thumb.png differ

diff --git a/www/ds/images/screenshot110_thumb.png b/www/ds/images/screenshot110_thumb.png
new file mode 100644 (file)
index 0000000..73db2a2
Binary files /dev/null and b/www/ds/images/screenshot110_thumb.png differ

diff --git a/www/ds/images/screenshot111_thumb.png b/www/ds/images/screenshot111_thumb.png
new file mode 100644 (file)
index 0000000..1fb3eb7
Binary files /dev/null and b/www/ds/images/screenshot111_thumb.png differ

diff --git a/www/ds/images/screenshot112_thumb.png b/www/ds/images/screenshot112_thumb.png
new file mode 100644 (file)
index 0000000..7c5553a
Binary files /dev/null and b/www/ds/images/screenshot112_thumb.png differ

diff --git a/www/ds/images/screenshot113_thumb.png b/www/ds/images/screenshot113_thumb.png
new file mode 100644 (file)
index 0000000..1846a9e
Binary files /dev/null and b/www/ds/images/screenshot113_thumb.png differ

diff --git a/www/ds/images/screenshot114_thumb.png b/www/ds/images/screenshot114_thumb.png
new file mode 100644 (file)
index 0000000..522f2e0
Binary files /dev/null and b/www/ds/images/screenshot114_thumb.png differ

diff --git a/www/ds/images/screenshot115_thumb.png b/www/ds/images/screenshot115_thumb.png
new file mode 100644 (file)
index 0000000..e4b1052
Binary files /dev/null and b/www/ds/images/screenshot115_thumb.png differ

diff --git a/www/ds/index.html b/www/ds/index.html
index 328a31f..9d5d82f 100644 (file)
--- a/www/ds/index.html
+++ b/www/ds/index.html
@@ -57,7 +57,7 @@ Please be patient. We'll add installation instructions here in time for the conf
 <p>View the map of Berlin to orient yourself.</p>
 <a href="images/screenshot108.png" title="open image" class="open"></a>
 <img src="images/screenshot108.png" class="full" />
-<img src="images/screenshot108.png" class="thumbnail" />
+<img src="images/screenshot108_thumb.png" class="thumbnail" />
 </div>
 
 <div class="imageElement">
@@ -65,7 +65,7 @@ Please be patient. We'll add installation instructions here in time for the conf
 <p>A couple of important places are included as bookmarks.</p>
 <a href="images/screenshot115.png" title="open image" class="open"></a>
 <img src="images/screenshot115.png" class="full" />
-<img src="images/screenshot115.png" class="thumbnail" />
+<img src="images/screenshot115_thumb.png" class="thumbnail" />
 </div>
 
 <div class="imageElement">
@@ -73,7 +73,7 @@ Please be patient. We'll add installation instructions here in time for the conf
 <p>Rent a car at the airport and have Marble calculate the route to your hotel. You can use the bookmarks to select start and destination quickly.</p>
 <a href="images/screenshot107.png" title="open image" class="open"></a>
 <img src="images/screenshot107.png" class="full" />
-<img src="images/screenshot107.png" class="thumbnail" />
+<img src="images/screenshot107_thumb.png" class="thumbnail" />
 </div>
 
 <div class="imageElement">
@@ -81,7 +81,7 @@ Please be patient. We'll add installation instructions here in time for the conf
 <p>Turn instructions describe each turn point of the route.</p>
 <a href="images/screenshot114.png" title="open image" class="open"></a>
 <img src="images/screenshot114.png" class="full" />
-<img src="images/screenshot114.png" class="thumbnail" />
+<img src="images/screenshot114_thumb.png" class="thumbnail" />
 </div>
 
 <div class="imageElement">
@@ -89,7 +89,7 @@ Please be patient. We'll add installation instructions here in time for the conf
 <p>Want to go to the hotel from the conference venue? Marble guides your walk to the next subway station.</p>
 <a href="images/screenshot110.png" title="open image" class="open"></a>
 <img src="images/screenshot110.png" class="full" />
-<img src="images/screenshot110.png" class="thumbnail" />
+<img src="images/screenshot110_thumb.png" class="thumbnail" />
 </div>
 
 <div class="imageElement">
@@ -97,7 +97,7 @@ Please be patient. We'll add installation instructions here in time for the conf
 <p>Search for any address in Berlin.</p>
 <a href="images/screenshot112.png" title="open image" class="open"></a>
 <img src="images/screenshot112.png" class="full" />
-<img src="images/screenshot112.png" class="thumbnail" />
+<img src="images/screenshot112_thumb.png" class="thumbnail" />
 </div>
 
 <div class="imageElement">
@@ -105,7 +105,7 @@ Please be patient. We'll add installation instructions here in time for the conf
 <p>List all points of interest for a certain category. Turn on the GPS to have the nearby ones appear on top.</p>
 <a href="images/screenshot113.png" title="open image" class="open"></a>
 <img src="images/screenshot113.png" class="full" />
-<img src="images/screenshot113.png" class="thumbnail" />
+<img src="images/screenshot113_thumb.png" class="thumbnail" />
 </div>
 
 <div class="imageElement">
@@ -113,7 +113,7 @@ Please be patient. We'll add installation instructions here in time for the conf
 <p>Not sure about the exact name? Use fuzzy searches (case insensitive, '*' as wildcard).</p>
 <a href="images/screenshot111.png" title="open image" class="open"></a>
 <img src="images/screenshot111.png" class="full" />
-<img src="images/screenshot111.png" class="thumbnail" />
+<img src="images/screenshot111_thumb.png" class="thumbnail" />
 </div>
 
 </div>

diff --git a/www/images/Marble-Maemo-Offline-Routing_thumb.png b/www/images/Marble-Maemo-Offline-Routing_thumb.png
new file mode 100644 (file)
index 0000000..4e16f61
Binary files /dev/null and b/www/images/Marble-Maemo-Offline-Routing_thumb.png differ

diff --git a/www/images/Screenshot-20110619-201850.png b/www/images/Screenshot-20110619-201850.png
new file mode 100644 (file)
index 0000000..f2b069d
Binary files /dev/null and b/www/images/Screenshot-20110619-201850.png differ

diff --git a/www/images/Screenshot-20110619-201850_thumb.png b/www/images/Screenshot-20110619-201850_thumb.png
new file mode 100644 (file)
index 0000000..4bf086e
Binary files /dev/null and b/www/images/Screenshot-20110619-201850_thumb.png differ

diff --git a/www/images/screenshot116_thumb.png b/www/images/screenshot116_thumb.png
new file mode 100644 (file)
index 0000000..c8f3062
Binary files /dev/null and b/www/images/screenshot116_thumb.png differ

diff --git a/www/images/screenshot117_thumb.png b/www/images/screenshot117_thumb.png
new file mode 100644 (file)
index 0000000..dcde078
Binary files /dev/null and b/www/images/screenshot117_thumb.png differ

diff --git a/www/images/screenshot118_thumb.png b/www/images/screenshot118_thumb.png
new file mode 100644 (file)
index 0000000..4506e9b
Binary files /dev/null and b/www/images/screenshot118_thumb.png differ

diff --git a/www/images/screenshot119_thumb.png b/www/images/screenshot119_thumb.png
new file mode 100644 (file)
index 0000000..8343bf8
Binary files /dev/null and b/www/images/screenshot119_thumb.png differ

diff --git a/www/images/screenshot120_thumb.png b/www/images/screenshot120_thumb.png
new file mode 100644 (file)
index 0000000..8e9038c
Binary files /dev/null and b/www/images/screenshot120_thumb.png differ

diff --git a/www/index.html b/www/index.html
index 84b9124..a658aeb 100644 (file)
--- a/www/index.html
+++ b/www/index.html
@@ -44,46 +44,64 @@ div.spacer {
 Marble is a Virtual Globe and World Atlas. It is part of the KDE Software Compilation and distributed under the terms of the LGPL, Version 2. Please visit the <a href="http://edu.kde.org/marble/">official Marble website</a> for further information.
 </p>
 
-<div id="myGallery">
+<h3>Marble on Maemo</h3>
 
-<div class="imageElement">
-<h3>Find your Way</h3>
-<p>Several backends for online and offline routing are available.</p>
-<a href="ds/images/screenshot107.png" title="open image" class="open"></a>
-<img src="ds/images/screenshot107.png" class="full" />
-<img src="ds/images/screenshot107.png" class="thumbnail" />
-</div>
+<p>
+Find your way and explore the world with Marble.
+</p>
+
+<p>
+Marble is a Virtual Globe with advanced routing capabilities. Use it as your personal navigation device to guide you to any destination in the world. Download maps from a variety of themes and explore the surroundings. Record your trip and share it with your friends.
+</p>
+
+<div id="myGallery">
 
 <div class="imageElement">
 <h3>Explore the World</h3>
-<p>Customize your view of the world with different map themes and projections.</p>
+<p>Around the world in... seconds. Virtually.</p>
 <a href="images/screenshot118.png" title="open image" class="open"></a>
 <img src="images/screenshot118.png" class="full" />
-<img src="images/screenshot118.png" class="thumbnail" />
+<img src="images/screenshot118_thumb.png" class="thumbnail" />
+</div>
+
+<div class="imageElement">
+<h3>Map Themes</h3>
+<p>Customize your view of the world using different map themes and projections.</p>
+<a href="images/screenshot117.png" title="open image" class="open"></a>
+<img src="images/screenshot117.png" class="full" />
+<img src="images/screenshot117_thumb.png" class="thumbnail" />
+</div>
+
+<div class="imageElement">
+<h3>Find your Way</h3>
+<p>Want to get from A to B? Over C? D, E, F? As you like.</p>
+<a href="ds/images/screenshot107.png" title="open image" class="open"></a>
+<img src="ds/images/screenshot107.png" class="full" />
+<img src="ds/images/screenshot107_thumb.png" class="thumbnail" />
 </div>
 
 <div class="imageElement">
 <h3>Turn Instructions</h3>
-<p>Turn instructions describe each turn point of the route.</p>
+<p>Get turn-by-turn directions describing important steps of your route.</p>
 <a href="ds/images/screenshot114.png" title="open image" class="open"></a>
 <img src="ds/images/screenshot114.png" class="full" />
-<img src="ds/images/screenshot114.png" class="thumbnail" />
+<img src="ds/images/screenshot114_thumb.png" class="thumbnail" />
 </div>
 
 <div class="imageElement">
 <h3>Guidance Mode</h3>
 <p>Have Marble announce turn points during your journey -- on the screen and by voice guidance.</p>
-<a href="images/Marble-Maemo-Offline-Routing.png" title="open image" class="open"></a>
-<img src="images/Marble-Maemo-Offline-Routing.png" class="full" />
-<img src="images/Marble-Maemo-Offline-Routing.png" class="thumbnail" />
+<a href="images/Screenshot-20110619-201850.png" title="open image" class="open"></a>
+<img src="images/Screenshot-20110619-201850.png" class="full" />
+<img src="images/Screenshot-20110619-201850_thumb.png" class="thumbnail" />
 </div>
 
 <div class="imageElement">
 <h3>Bookmarks</h3>
-<p>Access your favorite places quickly using bookmarks.</p>
+<p>Quick access to important places.</p>
 <a href="ds/images/screenshot115.png" title="open image" class="open"></a>
 <img src="ds/images/screenshot115.png" class="full" />
-<img src="ds/images/screenshot115.png" class="thumbnail" />
+<img src="ds/images/screenshot115_thumb.png" class="thumbnail" />
 </div>
 
 <div class="imageElement">
@@ -91,51 +109,43 @@ Marble is a Virtual Globe and World Atlas. It is part of the KDE Software Compil
 <p>Search for any address, online (Marble 1.1) or offline (Marble 1.2).</p>
 <a href="ds/images/screenshot112.png" title="open image" class="open"></a>
 <img src="ds/images/screenshot112.png" class="full" />
-<img src="ds/images/screenshot112.png" class="thumbnail" />
+<img src="ds/images/screenshot112_thumb.png" class="thumbnail" />
 </div>
 
 <div class="imageElement">
 <h3>Offline POI Search</h3>
-<p>(Marble 1.2) List all points of interest for a certain category. Turn on the GPS to have the nearby ones appear on top.</p>
+<p>List all points of interest for a certain category (Marble 1.2). Turn on GPS to have the nearby ones appear on top.</p>
 <a href="images/screenshot120.png" title="open image" class="open"></a>
 <img src="images/screenshot120.png" class="full" />
-<img src="images/screenshot120.png" class="thumbnail" />
+<img src="images/screenshot120_thumb.png" class="thumbnail" />
 </div>
 
 <div class="imageElement">
 <h3>Offline Fuzzy Search</h3>
-<p>(Marble 1.2) Not sure about the exact name? Use fuzzy searches (case insensitive, '*' as wildcard).</p>
+<p>Not sure about the exact name? Use fuzzy searches (Marble 1.2; case insensitive, '*' as wildcard).</p>
 <a href="ds/images/screenshot111.png" title="open image" class="open"></a>
 <img src="ds/images/screenshot111.png" class="full" />
-<img src="ds/images/screenshot111.png" class="thumbnail" />
+<img src="ds/images/screenshot111_thumb.png" class="thumbnail" />
 </div>
 
 <div class="imageElement">
 <h3>Download Map Themes</h3>
-<p>Parts of the map can be downloaded for offline viewing.</p>
+<p>Downloaded interesting parts of the world for offline viewing.</p>
 <a href="images/screenshot119.png" title="open image" class="open"></a>
 <img src="images/screenshot119.png" class="full" />
-<img src="images/screenshot119.png" class="thumbnail" />
+<img src="images/screenshot119_thumb.png" class="thumbnail" />
 </div>
 
 </div>
 
-<h3>Marble on Maemo</h3>
-
-<p>
-Find your way and explore the world with Marble.
-</p>
-
-<p>
-Marble is a Virtual Globe with advanced routing capabilities. Use it as your personal navigation device to guide you to any destination in the world. Download maps from a variety of themes and explore the surroundings. Record your trip and share it with your friends.
-</p>
+<div class="spacer"></div>
 
 <p>
 <a href="http://maemo.org/downloads/product/Maemo5/marble/">
 <img src="Download.png" width="113" height="144" align="left" class="bordered" />
 </a>
 
-Main features:
+<h3>Main features</h3>
 <ul>
 <li>Online and offline routing</li>
 <li>GPS tracking and recording (KML format)</li>
@@ -144,6 +154,8 @@ Main features:
 <li>Download of maps and route data for offline usage</li>
 </ul>
 
+<div class="spacer"></div>
+
 <h3>External Links</h3>
 
 <ul>
@@ -158,6 +170,10 @@ Main features:
 <p>
 <table border="1">
 <tr>
+  <td>2011-06-15</td>
+  <td>We have started the <a href="community.kde.org/Marble/VoiceOfMarble">Voice of Marble</a> contest. Your voice counts!</td>
+</tr>
+<tr>
   <td>2011-05-25</td>
   <td>The stable version Marble 1.1.1 is available in the extras repository. It fixes some minor bugs.</td>
 </tr>