Fixing up things for the blends data/presentation seperation for pot file

CVS version numbers

english/blends/index.wml: 1.19 -> 1.20 
english/blends/released.data: 1.1 -> 1.2 
english/blends/unreleased.data: 1.1 -> 1.2 
english/po/blends.pot: 1.1 -> 1.2 
english/po/templates.pot: 1.77 -> 1.78

3 files changed, 29 insertions, 72 deletions

diff --git a/english/blends/index.wml b/english/blends/index.wml
index b604d689e08..0a12c900e75 100644
--- a/english/blends/index.wml
+++ b/english/blends/index.wml
@@ -39,7 +39,7 @@ information on that particular blend.</p>
   <th>Description</th>
   <th>Quick Links</th>
  </tr>
-#include "released.data"
+#include "../../english/blends/released.data"
 </tbody>
 </table>
 </div>
@@ -60,7 +60,7 @@ href="https://www.debian.org/releases/unstable">unstable</a> distribution.</p>
   <th>Description</th>
   <th>Quick Links</th>
  </tr>
-#include "unreleased.data"
+#include "../../english/blends/unreleased.data"
 </tbody>
 </table>
   </div>
diff --git a/english/blends/released.data b/english/blends/released.data
index db0129e1937..883f56e2d02 100644
--- a/english/blends/released.data
+++ b/english/blends/released.data
@@ -12,32 +12,31 @@
 
 <tr>
 <blend "DebiChem" "https://wiki.debian.org/Debichem">
-<description><gettext domain="blends">
-The goal of DebiChem is to make Debian a good platform
-for chemists in their day-to-day work.</gettext>
-</gettext></description>
+<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 "https://blends.debian.org/debichem/tasks">
+<metapackages "http://blends.debian.org/debichem/tasks">
 </links>
 </tr>
 
 <tr>
 <blend "Debian Games" "https://wiki.debian.org/Games">
-<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>
+<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 "https://blends.debian.org/games/tasks">
+<metapackages "http://blends.debian.org/games/tasks">
+</links>
+</tr>
+
+<tr>
+<blend "Debian Edu" "https://wiki.debian.org/DebianEdu/">
+<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">
 </links>
 </tr>
 
 <tr>
 <blend "Debian GIS" "gis/">
-<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>
+<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">
 <downloads "gis/get/live">
@@ -47,47 +46,33 @@ distribution for Geographical Information System applications and users.
 
 <tr>
 <blend "Debian Junior">
-<description><gettext domain="blends">
-The goal of Debian Junior is to make Debian an OS that children
-will enjoy using.
-</gettext></description>
+<description><gettext domain="blends">The goal of Debian Junior is to make Debian an OS that children will enjoy using.</gettext></description>
 <links>
-<metapackages "https://blends.debian.org/junior/tasks">
+<metapackages "http://blends.debian.org/junior/tasks">
 </links>
 </tr>
 
 <tr>
 <blend "Debian Med">
-<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>
+<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 "https://blends.debian.org/med/tasks">
+<metapackages "http://blends.debian.org/med/tasks">
 </links>
 </tr>
 
 <tr>
 <blend "Debian Multimedia">
-<description><gettext domain="blends">
-The goal of Debian Multimedia is to make Debian a good platform
-for audio and multimedia work.
-</gettext></description>
+<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 "https://blends.debian.org/multimedia/tasks">
+<metapackages "http://blends.debian.org/multimedia/tasks">
 </links>
 </tr>
 
 <tr>
 <blend "Debian Science">
-<description><gettext domain="blends">
-The goal of Debian Science is to provide a better experience when
-using Debian to researchers and scientists.
-</gettext></description>
+<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 "https://blends.debian.org/science/tasks">
+<metapackages "http://blends.debian.org/science/tasks">
 </links>
 </tr>
 
diff --git a/english/blends/unreleased.data b/english/blends/unreleased.data
index 5ad257cc5bd..ef37f9ad363 100644
--- a/english/blends/unreleased.data
+++ b/english/blends/unreleased.data
@@ -12,11 +12,7 @@
 
 <tr>
 <blend "Debian Accessibility" "http://blends.debian.org/accessibility">
-<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>
+<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">
 </links>
@@ -24,24 +20,14 @@ people with disabilities.
 
 <tr>
 <blend "Debian Design" "https://wiki.debian.org/Design">
-<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>
+<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">
-<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>
+<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">
 </links>
@@ -49,13 +35,7 @@ Debian.
 
 <tr>
 <blend "FreedomBox" "https://wiki.debian.org/FreedomBox">
-<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>
+<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">
 </links>
@@ -63,11 +43,7 @@ stays with the users.
 
 <tr>
 <blend "Debian Hamradio" "hamradio/">
-<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>
+<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">
 <downloads "hamradio/get/live">
@@ -76,11 +52,7 @@ applications and more.
 
 <tr>
 <blend "DebianParl" "https://wiki.debian.org/DebianParl">
-<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>
+<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>
 </tr>