Updates to the blends sub-site

 * Rewording of blends/index following discussion on debian-blends list
 * Allow for blend names to be translatable
 * Set Debian Games and Accessiblity translatable

CVS version numbers

english/blends/blend.defs: 1.1 -> 1.2 
english/blends/index.wml: 1.21 -> 1.22 
english/blends/released.data: 1.3 -> 1.4 
english/blends/unreleased.data: 1.3 -> 1.4

4 files changed, 28 insertions, 31 deletions

diff --git a/english/blends/blend.defs b/english/blends/blend.defs
index 5f741fee146..3d2429de286 100644
--- a/english/blends/blend.defs
+++ b/english/blends/blend.defs
@@ -2,8 +2,8 @@
 
 <bind-gettext-domain domain="blends" />
 
-<define-tag blend whitespace=delete>
-  <td><a href="%1">%0</a></td>
+<define-tag blend whitespace=delete endtag=required>
+  <td><a href="%0">%body</a></td>
 </define-tag>
 <define-tag description whitespace=delete endtag=required>
   <td>%body</td>
diff --git a/english/blends/index.wml b/english/blends/index.wml
index f1191c518f5..f847fb57357 100644
--- a/english/blends/index.wml
+++ b/english/blends/index.wml
@@ -10,26 +10,22 @@ pure Debian and just provide a specific flavour. So if you obtain the complete
 Debian GNU/Linux distribution, you have all available Debian Pure Blends
 available for installation.</p>
 
-<p>Debian Pure Blends are also just called Blends when used clearly in the
-Debian internal context which makes "Pure" and "Debian" obvious, like on this
-page.</p>
-
-   <p>You can read more about Debian Pure Blends in the <a
+<p>You can read more about Debian Pure Blends in the <a
 href="http://blends.debian.org/blends/">Pure Blends Manual</a>.</p>
 
 <ul class="toc">
-<li><a href="#released">Released Blends</a></li>
-<li><a href="#unreleased">Unreleased Blends</a></li>
+<li><a href="#released">Released Pure Blends</a></li>
+<li><a href="#unreleased">Upcoming Pure Blends</a></li>
 <li><a href="#development">Development</a></li>
 </ul>
 
 <div class="card" id="released">
-<h2>Released Blends</h2>
+<h2>Released Pure Blends</h2>
 <div>
-<p>"Released" may have different meanings for different blends. At a minimum,
-it means that the blend has metapackages that were released in a stable release
-of Debian, although blends may also provide installation media or form the
-basis of a derivative distribution. See the individual blend pages for more
+<p>"Released" may have different meanings for different blends. In most cases
+it means that the blend has metapackages or an installer that was released in a
+stable release of Debian. Blends may also provide installation media or form
+the basis of a derivative distribution. See the individual blend pages for more
 information on that particular blend.</p>
 
 <table class="tabular" summary="">
@@ -46,12 +42,13 @@ information on that particular blend.</p>
 </div>
 
 <div class="card" id="unreleased">
-  <h2>Unreleased Blends</h2>
+  <h2>Upcoming Pure Blends</h2>
   <div>
    <p>These blends are works-in-progress and have not yet made a stable release
    although they may be available in the <a
 href="https://www.debian.org/releases/testing/">testing</a> or <a
-href="https://www.debian.org/releases/unstable">unstable</a> distribution.</p>
+href="https://www.debian.org/releases/unstable">unstable</a> distribution. Some
+upcoming pure blends may still rely on non-free components.</p>
   
 <table class="tabular" summary="">
 <tbody>
diff --git a/english/blends/released.data b/english/blends/released.data
index d5f41d76cf5..0878fbe9efa 100644
--- a/english/blends/released.data
+++ b/english/blends/released.data
@@ -11,7 +11,7 @@
 # the links tag may be empty if there are no relevant links.
 
 <tr>
-<blend "DebiChem" "https://wiki.debian.org/Debichem">
+<blend "https://wiki.debian.org/Debichem">DebiChem</blend>
 <description><gettext domain="blends">The goal of DebiChem is to make Debian a good platform for chemists in their day-to-day work.</gettext></description>
 <links>
 <metapackages "http://blends.debian.org/debichem/tasks">
@@ -19,7 +19,7 @@
 </tr>
 
 <tr>
-<blend "Debian Games" "https://wiki.debian.org/Games">
+<blend "https://wiki.debian.org/Games"><gettext domain="blends">Debian Games</gettext></blend>
 <description><gettext domain="blends">The goal of Debian Games is to provide games in Debian from arcade and aventure to simulation and strategy.</gettext></description>
 <links>
 <metapackages "http://blends.debian.org/games/tasks">
@@ -27,7 +27,7 @@
 </tr>
 
 <tr>
-<blend "Debian Edu" "https://wiki.debian.org/DebianEdu/">
+<blend "https://wiki.debian.org/DebianEdu/">Debian Edu</blend>
 <description><gettext domain="blends">The goal of Debian Edu is to provide a Debian OS system suitable for educational use and in schools.</gettext></description>
 <links>
 <metapackages "http://blends.debian.org/edu/tasks">
@@ -35,7 +35,7 @@
 </tr>
 
 <tr>
-<blend "Debian GIS" "gis/">
+<blend "gis/">Debian GIS</blend>
 <description><gettext domain="blends">The goal of Debian GIS is to develop Debian into the best distribution for Geographical Information System applications and users.</gettext></description>
 <links>
 <metapackages "gis/get/metapackages">
@@ -45,7 +45,7 @@
 </tr>
 
 <tr>
-<blend "Debian Junior" "https://www.debian.org/devel/debian-jr/">
+<blend "https://www.debian.org/devel/debian-jr/">Debian Junior</blend>
 <description><gettext domain="blends">The goal of Debian Junior is to make Debian an OS that children will enjoy using.</gettext></description>
 <links>
 <metapackages "http://blends.debian.org/junior/tasks">
@@ -53,7 +53,7 @@
 </tr>
 
 <tr>
-<blend "Debian Med" "https://www.debian.org/devel/debian-med/">
+<blend "https://www.debian.org/devel/debian-med/">Debian Med</blend>
 <description><gettext domain="blends">The goal of Debian Med is a complete free and open system for all tasks in medical care and research. To achieve this goal Debian Med integrates related free and open source software for medical imaging, bioinformatics, clinic IT infrastructure, and others within the Debian OS.</gettext></description>
 <links>
 <metapackages "http://blends.debian.org/med/tasks">
@@ -61,7 +61,7 @@
 </tr>
 
 <tr>
-<blend "Debian Multimedia" "https://wiki.debian.org/DebianMultimedia">
+<blend "https://wiki.debian.org/DebianMultimedia">Debian Multimedia</blend>
 <description><gettext domain="blends">The goal of Debian Multimedia is to make Debian a good platform for audio and multimedia work.</gettext></description>
 <links>
 <metapackages "http://blends.debian.org/multimedia/tasks">
@@ -69,7 +69,7 @@
 </tr>
 
 <tr>
-<blend "Debian Science" "https://wiki.debian.org/DebianScience">
+<blend "https://wiki.debian.org/DebianScience">Debian Science</blend>
 <description><gettext domain="blends">The goal of Debian Science is to provide a better experience when using Debian to researchers and scientists.</gettext></description>
 <links>
 <metapackages "http://blends.debian.org/science/tasks">
diff --git a/english/blends/unreleased.data b/english/blends/unreleased.data
index 8176150c2cb..69dba090c3b 100644
--- a/english/blends/unreleased.data
+++ b/english/blends/unreleased.data
@@ -11,7 +11,7 @@
 # the links tag may be empty if there are no relevant links.
 
 <tr>
-<blend "Debian Accessibility" "http://blends.debian.org/accessibility">
+<blend "http://blends.debian.org/accessibility"><gettext domain="blends">Debian Accessibility</gettext></blend>
 <description><gettext domain="blends">The goal of Debian Accessibility is to develop Debian into an operating system that is particularly well suited for the requirements of people with disabilities.</gettext></description>
 <links>
 <metapackages "http://blends.debian.org/accessibility/tasks">
@@ -19,7 +19,7 @@
 </tr>
 
 <tr>
-<blend "Debian Astro" "http://blends.debian.org/astro">
+<blend "http://blends.debian.org/astro">Debian Astro</blend>
 <description><gettext domain="blends">The goal of Debian Astro is to develop a Debian based operating system that fits the requirements of both professional and hobby astronomers. It integrates a large number of software packages covering telescope control, data reduction, presentation and other fields.</gettext></description>
 <links>
 <metapackages "http://blends.debian.org/astro/tasks">
@@ -27,14 +27,14 @@
 </tr>
 
 <tr>
-<blend "Debian Design" "https://wiki.debian.org/Design">
+<blend "https://wiki.debian.org/Design">Debian Design</blend>
 <description><gettext domain="blends">The goal of Debian Design is to provide applications for designers. This includes graphic design, web design and multimedia design.</gettext></description>
 <links>
 </links>
 </tr>
 
 <tr>
-<blend "Debian EzGo" "http://blends.debian.org/ezgo/tasks">
+<blend "http://blends.debian.org/ezgo/tasks">Debian EzGo</blend>
 <description><gettext domain="blends">The goal of Debian EzGo is to provide culture-based open and free technology with native language support and appropriate user friendly, lightweight and fast desktop environment for low powerful/cost hardwares to empower human capacity building and technology development  in many areas and regions, like Africa, Afghanistan, Indonesia, Vietnam  using Debian.</gettext></description>
 <links>
 <metapackages "http://blends.debian.org/ezgo/tasks">
@@ -42,7 +42,7 @@
 </tr>
 
 <tr>
-<blend "FreedomBox" "https://wiki.debian.org/FreedomBox">
+<blend "https://wiki.debian.org/FreedomBox">FreedomBox</blend>
 <description><gettext domain="blends">The goal of FreedomBox is to develop, design and promote personal servers running free software for private, personal communications. Applications include blogs, wikis, websites, social networks, email, web proxy and a Tor relay on a device that can replace a wireless router so that data stays with the users.</gettext></description>
 <links>
 <downloads "https://wiki.debian.org/FreedomBox/Download">
@@ -50,7 +50,7 @@
 </tr>
 
 <tr>
-<blend "Debian Hamradio" "hamradio/">
+<blend "hamradio/">Hamradio</blend>
 <description><gettext domain="blends">The goal of Debian Hamradio is to support the needs of radio amateurs in Debian by providing logging, data mode and packet mode applications and more.</gettext></description>
 <links>
 <metapackages "hamradio/get/metapackages">
@@ -59,7 +59,7 @@
 </tr>
 
 <tr>
-<blend "DebianParl" "https://wiki.debian.org/DebianParl">
+<blend "https://wiki.debian.org/DebianParl">DebianParl</blend>
 <description><gettext domain="blends">The goal of DebianParl is to provide applications to support the needs of parliamentarians, politicians and their staffers all around the world.</gettext></description>
 <links>
 </links>