[Cdd-commits] r1185 - in cdd/trunk/webtools: . po templates

CDD Subversion Commit noreply at alioth.debian.org
Sat Nov 1 13:21:48 UTC 2008


Author: tille
Date: Sat Nov  1 13:21:47 2008
New Revision: 1185

Modified:
   cdd/trunk/webtools/bugs.py
   cdd/trunk/webtools/ddpo_register.py
   cdd/trunk/webtools/distasktools.py
   cdd/trunk/webtools/mkpot.sh
   cdd/trunk/webtools/po/cs.po
   cdd/trunk/webtools/po/da.po
   cdd/trunk/webtools/po/de.po
   cdd/trunk/webtools/po/dis-webtools.pot
   cdd/trunk/webtools/po/es.po
   cdd/trunk/webtools/po/fi.po
   cdd/trunk/webtools/po/fr.po
   cdd/trunk/webtools/po/it.po
   cdd/trunk/webtools/po/ja.po
   cdd/trunk/webtools/po/ko.po
   cdd/trunk/webtools/po/nl.po
   cdd/trunk/webtools/po/php-message-strings.pot
   cdd/trunk/webtools/po/pl.po
   cdd/trunk/webtools/po/pt.po
   cdd/trunk/webtools/po/ru.po
   cdd/trunk/webtools/po/zh.po
   cdd/trunk/webtools/tasks.py
   cdd/trunk/webtools/templates/bugs.xhtml
Log:
Completely reworked logic for registering bugs of metapackage dependencies.  Needs more polishing / removal or debugging code - but finally the result is somehow useful as the ofl code was before.  Also some renaming stuff in po files I forgot to check in formerly.


Modified: cdd/trunk/webtools/bugs.py
==============================================================================
--- cdd/trunk/webtools/bugs.py	(original)
+++ cdd/trunk/webtools/bugs.py	Sat Nov  1 13:21:47 2008
@@ -12,7 +12,7 @@
 from genshi.template import TemplateLoader
 from genshi import Markup
 
-from distasktools import DisDependencies, ReadConfig
+from distasktools import DisDependencies, ReadConfig, DEPENDENT, SUGGESTED, DONE, BUGLISTCAT
 
 if len(argv) <= 1:
 	print >>stderr, "Usage: %s <Blend name>\n       The <Blend name> needs a matching config file webconf/<Blend name>.conf"\
@@ -21,22 +21,69 @@
 
 bts = debbugs()
 
+SEVERITIES = ('critical', 'grave', 'serious', 'important', 'normal', 'minor', 'wishlist')
+
+# Sense of weight: We want to find a measure how much care a metapackage needs.
+# So we build the weighted sums of bugs and define limits for the status
+# The weights below are used for suggested packages.  In case a package has
+# a stronger dependency (Depends, Recommends) the weight is multiplied by 3
+weight = { 'critical'  : 10,
+	   'grave'     : 10,
+           'serious'   : 10,
+           'important' :  5,
+	   'normal'    :  3,
+           'minor'     :  1,
+           'wishlist'  :  0
+         }
+BAD          = 100 # if weighted bug sum >= BAD, the meta package is in a bad shape
+                   # Dependent packages might have 3 or more 5 RC bugs
+PASS         =  70 # this deserves a look - potentially two RC bugs in dependent packages
+SATISFACTORY =  50 # consider looking at this
+GOOD         =  30 # at least no RC bug in a dependent package
+VERYGOOD     =  10 # nothing burning
+EXCELLENT    =   5 # There is no real need to look at this meta package
+
 class PackageBugs:
+    # Store list of bugs (either open or done) of a package
+
+    def __init__(self, pkgname, source=None):
+        self.pkgname    = None
+        self.source     = None
+	self.bugs       = []      # open bugs
+	self.nbugs      = 0
+	self.severities = {}
+	for s in SEVERITIES:
+		self.severities[s] = 0
+
+    # sort these objects according to the package name
+    def __cmp__(self, other):
+        # Comparing with None object has to return something reasonable
+        if other == None:
+            return -2
+        # Sort according to package name
+        return cmp(self.pkgname, other.pkgname)
+
+    def __str__(self): 
+        return "---\npkgname: %s\nsource: %s\nbugs: %s\nnbugs = %i\nseverities = %s\n---" % \
+	    (self.pkgname, self.source, self.bugs, self.nbugs, self.severities)
+
+class PackageBugsOpenAndDone:
     # Store list of bugs of a package
 
     def __init__(self, pkgname, source=None):
-        self.pkgname = None
-	self.bugs    = []      # open bugs
-	self.nbugs   = 0
-	self.done    = []      # closed bugs
-	self.ndone   = 0
-	
+	self.open       = PackageBugs(pkgname, source)  # open bugs
+	self.done       = PackageBugs(pkgname, source)  # closed bugs
+
+	bugs = None
 	try:
 	    bugs = bts.query('src:' + pkgname)
 	except AttributeError, err:
 	    print >>stderr, "We seem to face an effect of bug #503716 of python-btsutils when querying package %s for bugs.\n   Error message was: %s" \
 		% (pkgname, err)
-	    bugs = None
+	except TypeError, err:
+	    print >>stderr, "There seems to be another problem with python-btsutils when querying package %s for bugs.\n   Error message was: %s" \
+		% (pkgname, err)
+
 	if bugs:
 		for bug in bugs:
 			# append a complete dictionary instead of a bug object
@@ -45,20 +92,61 @@
 			#            circumvent encoding problems
 			bugdict = {'bug':      bug.getBug(),
                                    'summary':  bug.getSummary(),
-				   'severity': bug.getSeverity()
+				   'severity': bug.getSeverity(),
+				   'tags':     bug.getTags()
                                   }
 			if bug.getStatus() == 'done':
-				self.done.append(bugdict)
-				self.ndone += 1
+				if self.done.pkgname == None:
+					self.done.pkgname = pkgname
+				self.done.bugs.append(bugdict)
+				self.done.nbugs += 1
 			else:
-				self.bugs.append(bugdict)
-				self.nbugs += 1
-		self.pkgname = pkgname
+				if self.open.pkgname == None:
+					self.open.pkgname = pkgname
+				self.open.bugs.append(bugdict)
+				self.open.nbugs += 1
+				self.open.severities[bugdict['severity']] += 1
 		if source == None:
-			self.source = pkgname
+			self.open.source = pkgname
+			self.done.source = pkgname
 		else:
-			self.source = source
+			self.open.source = source
+			self.done.source = source
 
+class BugList:
+    # We have three category of bugs:
+    #  1. open bugs in dependent and recommended packages
+    #  2. open bugs in suggested packages
+    #  3. closed bugs (closed bugs are fine - there is no need to classify
+    #     these according to dependency status)
+    # For each metapackage contains a buglist for each category is created
+    def __init__(self, category, source=None):
+	    if category not in BUGLISTCAT:
+		    print >>stderr, "The category value of a BugList object can only be (%s), %s is invalid." % \
+			( str(BUGLISTCAT), str(category) )
+		    return None
+
+	    self.pkgbugs  = [] # list of PackageBugs elements
+	    self.category = category
+
+	    self.severities = {}
+	    for s in SEVERITIES:
+		    self.severities[s] = 0
+
+    def append(self, pkgbug):
+	    # Append PackageBug opject to the list and update bug statistics
+	    self.pkgbugs.append(pkgbug)
+	    for s in SEVERITIES:
+		    self.severities[s] += pkgbug.severities[s]
+
+    def __str__(self): 
+	    ret = ''
+	    if self.pkgbugs != []:
+		    for pkgbug in self.pkgbugs:
+			    ret += str(pkgbug) + "\n"
+	    else:
+		    ret = 'empty list of bugs'
+	    return "pkgbugs: %s\nseverities: %s" % (ret, str(self.severities))
 
 # Define directories used
 current_dir  = os.path.dirname(__file__)
@@ -105,33 +193,65 @@
 allbugs = {}
 nbugs   = {}
 ndone   = {}
+buglist = {}
 for task in packages.keys():
-	pkgbugs     = []
-	nbugs[task] = 0
-	ndone[task] = 0
+	pkgbugs       = []
+	nbugs[task]   = 0
+	ndone[task]   = 0
+	buglist[task] = {}
+	for cat in BUGLISTCAT:
+		buglist[task][cat] = BugList(cat)
+
 	# query bugs of meta package name
-	pkgbug = PackageBugs(data['tasks'][task].metapkg.pkg)
+	pkgbug_oad = PackageBugsOpenAndDone(data['tasks'][task].metapkg.pkg)
+	# the metapackage itself belongs to the list do dependent packages
+	if pkgbug_oad.open.pkgname:
+		buglist[task][DEPENDENT].append(pkgbug_oad.open)
+		nbugs[task] += pkgbug_oad.open.nbugs
+	if pkgbug_oad.done.pkgname:
+		buglist[task][DONE].append(pkgbug_oad.done)
+		ndone[task] += pkgbug_oad.done.nbugs
 
-	if pkgbug.pkgname:
-		pkgbugs.append(pkgbug)
 	for pkg in packages[task]:
-		pkgbug = PackageBugs(pkg[0], pkg[1])
-		if pkgbug.pkgname:
-			pkgbugs.append(pkgbug)
-		nbugs[task] += pkgbug.nbugs
-		ndone[task] += pkgbug.ndone
-
-	if pkgbugs:
-		allbugs[task] = pkgbugs
-	else:
-		allbugs[task] = None
+		pkgbug_oad = PackageBugsOpenAndDone(pkg[0], pkg[1])
+		if pkgbug_oad.open.pkgname:
+			buglist[task][pkg[2]].append(pkgbug_oad.open)
+		if pkgbug_oad.done.pkgname:
+			buglist[task][DONE].append(pkgbug_oad.done)
+		nbugs[task] += pkgbug_oad.open.nbugs
+		ndone[task] += pkgbug_oad.done.nbugs
+
+	print "task = %s: nbugs = %i, ndone = %i" % (task, nbugs[task], ndone[task])
+
+	allbugs[task] = []
+	for cat in BUGLISTCAT:
+		if len(buglist[task][cat].pkgbugs) > 0:
+			# sort lists of PkgBug objects inside the three categories
+			buglist[task][cat].pkgbugs.sort()
+			print "type(buglist[%s][%s]) = %s" % \
+			    (task, cat, type(buglist[task][cat]))
+			print "isinstance(buglist[%s][%s]) = %s" % \
+			    (task, cat, isinstance(buglist[task][cat], BugList))
+			allbugs[task].append(buglist[task][cat])
+			print "type(allbugs[%s]) = %s" % \
+			    (task, type(allbugs[task]))
 
 for task in packages.keys():
-	data['task']    = task
-	data['pkgbugs'] = allbugs[task]
-	data['nbugs']   = nbugs
-	data['ndone']   = ndone
+	data['task']       = task
+	data['allbugs']    = allbugs[task]
+	data['nbugs']      = nbugs
+	data['ndone']      = ndone
+	data['buglist']    = buglist[task]
+	data['buglistcat'] = BUGLISTCAT
+
+	print "Ende: task = %s: nbugs = %i, ndone = %i" % (task, nbugs[task], ndone[task])
+
 	template = loader.load('bugs.xhtml')
+#	for pkgbugs in data['allbugs':
+#		print str(pkgbugs)
+	for cat in BUGLISTCAT:
+		for pkgbug in buglist[task][cat].pkgbugs:
+			print str(pkgbug)
 	f = open(outputdir + '/' + task + '.html', 'w')
 	print >> f, template.generate(**data).render('xhtml')
 

Modified: cdd/trunk/webtools/ddpo_register.py
==============================================================================
--- cdd/trunk/webtools/ddpo_register.py	(original)
+++ cdd/trunk/webtools/ddpo_register.py	Sat Nov  1 13:21:47 2008
@@ -8,7 +8,7 @@
 from distasktools import DisDependencies, ReadConfig
 
 if len(argv) <= 1:
-	print >>stderr, "Usage: %s <DIS name>\n       The <DIS name> needs a matching config file webconf/<DIS name>.conf"\
+	print >>stderr, "Usage: %s <Blend name>\n       The <Blend name> needs a matching config file webconf/<Blend name>.conf"\
                         % argv[0]
 	exit(-1)
 

Modified: cdd/trunk/webtools/distasktools.py
==============================================================================
--- cdd/trunk/webtools/distasktools.py	(original)
+++ cdd/trunk/webtools/distasktools.py	Sat Nov  1 13:21:47 2008
@@ -47,6 +47,11 @@
 
 DEFAULTCACHEDIR='/var/lib/gforge/chroot/home/groups/cdd/cache'
 
+DEPENDENT  = 0
+SUGGESTED  = 1
+DONE       = 2
+BUGLISTCAT = (DEPENDENT, SUGGESTED, DONE )
+
 def ReadConfig(disname=''):
     # Try to read config file CONFDIR/<disname>.conf
     conffile = CONFDIR + '/' + disname + '.conf'
@@ -170,7 +175,6 @@
 
 class DependantPackage:
     # Hold information about a program that is in dependency list
-    # The 
 
     def __init__(self, disname=None, taskname=None):
         self.disname        = disname  # DIS that includes the package in dependency list
@@ -310,18 +314,25 @@
     def GetNamesAndSourceDict(self, dependencytypes=()):
         # For the bugs pages we need not only the binary package names but the
         # source package as well to be able to link to the QA page
-        # The lists are tuples with first value package name and the second source name
+        # The lists are tripels with first value package name and the second source name
+        # The last value characterises the strength of dependency: Possible values
+        # are 'suggested' for Suggested packages, and 
         ret = {}
         if dependencytypes == ():
-            # see above in GetNamesOnlyDict()
+            # see above in GetNamesOnlyDict() ... but when we are looking for bugs a
+            # reasonable default is to use only official dependencytypes
+            dependencytypes=('depends', 'recommends', 'suggests')
 
-            dependencytypes=('depends', 'recommends', 'suggests', 'unofficial', 'prospective', 'unknown')
         for task in self.metapackagekeys:
             tdeps = self.tasks[task]
             list = []
             for dep in dependencytypes:
+                if dep == 'suggests':
+                    bugrelevantdependency = SUGGESTED
+                else:
+                    bugrelevantdependency = DEPENDENT
                 for tdep in tdeps.dependencies[dep]:
-                    list.append([tdep.pkg, tdep.source])
+                    list.append([tdep.pkg, tdep.source, bugrelevantdependency])
             ret[task] = list
         return ret
 

Modified: cdd/trunk/webtools/mkpot.sh
==============================================================================
--- cdd/trunk/webtools/mkpot.sh	(original)
+++ cdd/trunk/webtools/mkpot.sh	Sat Nov  1 13:21:47 2008
@@ -6,7 +6,7 @@
 	--package-name="$NAME" \
 	--package-version="0.1.1" \
 	--msgid-bugs-address="debian-custom at lists.debian.org" \
-	--copyright-holder="Debian Integrated Solutions Team <debian-custom at lists.debian.org>" \
+	--copyright-holder="Debian Pure Blends Team <debian-custom at lists.debian.org>" \
 	--keyword="_" \
 	--output-dir="po" \
 	--escape \

Modified: cdd/trunk/webtools/po/cs.po
==============================================================================
--- cdd/trunk/webtools/po/cs.po	(original)
+++ cdd/trunk/webtools/po/cs.po	Sat Nov  1 13:21:47 2008
@@ -1,61 +1,61 @@
-#: tasks.py:86
+#: tasks.py:79
 msgid   "Maintainer"
 msgstr  ""
 
-#: tasks.py:87
+#: tasks.py:80
 msgid   "Responsible"
 msgstr  ""
 
-#: tasks.py:88
+#: tasks.py:81
 msgid   "License"
 msgstr  ""
 
-#: tasks.py:89
+#: tasks.py:82
 msgid   "Version"
 msgstr  ""
 
-#: tasks.py:90
+#: tasks.py:83
 msgid   "Summary"
 msgstr  ""
 
-#: tasks.py:91
+#: tasks.py:84
 msgid   "Last update:"
 msgstr  ""
 
-#: tasks.py:93 tasks.py:101
+#: tasks.py:86 tasks.py:94
 msgid   "Official Debian package"
 msgstr  ""
 
-#: tasks.py:94
+#: tasks.py:87
 msgid   "Official Debian package (recommended)"
 msgstr  ""
 
-#: tasks.py:95
+#: tasks.py:88
 msgid   "Official Debian package (suggested)"
 msgstr  ""
 
-#: tasks.py:96
+#: tasks.py:89
 msgid   "Debian package in non-free"
 msgstr  ""
 
-#: tasks.py:97
+#: tasks.py:90
 msgid   "Debian package in contrib"
 msgstr  ""
 
-#: tasks.py:98
+#: tasks.py:91
 msgid   "Unofficial Debian package"
 msgstr  ""
 
-#: tasks.py:99
+#: tasks.py:92
 msgid   "Debian package not available"
 msgstr  ""
 
-#: tasks.py:102
+#: tasks.py:95
 msgid   "For a better overview of the project's availability as a Debian package, each head row "
         "has a color code according to this scheme:"
 msgstr  ""
 
-#: tasks.py:103
+#: tasks.py:96
 #, python-format
 msgid   "If you discover a project which looks like a good candidate for %s\n"
         "                              to you, or if you have prepared an unofficial Debian "
@@ -64,120 +64,120 @@
         "s\">%s mailing list</a>"
 msgstr  ""
 
-#: tasks.py:107
+#: tasks.py:100
 #, python-format
 msgid   "The list to the right includes various software projects which are of some interest to "
         "the %s Project. Currently, only a few of them are available as Debian packages. It is our "
         "goal, however, to include all software in %s which can sensibly add to a high quality "
-        "Debian Integrated Solution."
+        "Debian Pure Blend."
 msgstr  ""
 
-#: tasks.py:108
+#: tasks.py:101
 msgid   "Tasks page"
 msgstr  ""
 
-#: tasks.py:109
+#: tasks.py:102
 msgid   "Project"
 msgstr  ""
 
-#: tasks.py:110
+#: tasks.py:103
 #, python-format
 msgid   "This is a list of the Tasks %s is made of:"
 msgstr  ""
 
-#: tasks.py:111
+#: tasks.py:104
 msgid   "This page is also available in the following languages:"
 msgstr  ""
 
-#: tasks.py:112
+#: tasks.py:105
 #, python-format
 msgid   "How to set <a href=\"%s\">the default document language</a>"
 msgstr  ""
 
-#: tasks.py:114
+#: tasks.py:107
 msgid   "Homepage not available"
 msgstr  ""
 
-#: tasks.py:115
+#: tasks.py:108
 msgid   "Translate description"
 msgstr  ""
 
-#: tasks.py:116
+#: tasks.py:109
 msgid   "Fix translated description"
 msgstr  ""
 
-#: tasks.py:128
+#: tasks.py:121
 msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
         "a>"
 msgstr  ""
 
-#: tasks.py:129
+#: tasks.py:122
 msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:130
+#: tasks.py:123
 msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:135
+#: tasks.py:128
 msgid   "Dependant"
 msgstr  ""
 
-#: tasks.py:136
+#: tasks.py:129
 msgid   "Recommended"
 msgstr  ""
 
-#: tasks.py:137
+#: tasks.py:130
 msgid   "Suggested"
 msgstr  ""
 
-#: tasks.py:138
+#: tasks.py:131
 msgid   "Unofficial"
 msgstr  ""
 
-#: tasks.py:139
+#: tasks.py:132
 msgid   "Prospective"
 msgstr  ""
 
-#: tasks.py:142
+#: tasks.py:135
 msgid   "Official Debian packages"
 msgstr  ""
 
-#: tasks.py:143
+#: tasks.py:136
 msgid   "Official Debian packages (Recommended)"
 msgstr  ""
 
-#: tasks.py:144
+#: tasks.py:137
 msgid   "Official Debian packages (Suggested)"
 msgstr  ""
 
-#: tasks.py:145
+#: tasks.py:138
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  ""
 
-#: tasks.py:146
+#: tasks.py:139
 msgid   "Debian packages not available"
 msgstr  ""
 
-#: tasks.py:148
+#: tasks.py:141
 msgid   "Packages"
 msgstr  ""
 
-#: tasks.py:149
+#: tasks.py:142
 #, python-format
-msgid   "A %sDebian Integrated Solution%s is a Debian internal project which assembles\n"
+msgid   "A %sDebian Pure Blend%s is a Debian internal project which assembles\n"
         "a set of packages that might help users to solve certain tasks of their work.  The list "
         "on\n"
         "the right shows the tasks of %s."
 msgstr  ""
 
-#: tasks.py:207
+#: tasks.py:200
 msgid   "Links to other tasks"
 msgstr  ""
 
-#: tasks.py:208
+#: tasks.py:201
 msgid   "Index of all tasks"
 msgstr  ""
 
@@ -253,7 +253,7 @@
 msgstr  ""
 
 #: ../index.php:15
-msgid   "The Debian-Med project presents packages that are associated with <ul><li>medicine</"
+msgid   "The Debian Med project presents packages that are associated with <ul><li>medicine</"
         "li><li>pre-clinical research</li><li>life science.</li></ul> Its developments are mostly "
         "focused on three areas for the moment: <ul><li>medical practice</li><li>imaging</"
         "li><li>bioinformatics</li></ul>and can be installed directly from every Debian "
@@ -297,7 +297,7 @@
 msgstr  ""
 
 #: ../index.php:46
-msgid   "Tasks of our DIS"
+msgid   "Tasks of our Blend"
 msgstr  ""
 
 #: ../index.php:47
@@ -386,7 +386,7 @@
 
 #: ../locales.php:31
 #, php-format
-msgid   "More information on how to contribute to the Debian-Med project, can be found in the %"
+msgid   "More information on how to contribute to the Debian Med project, can be found in the %"
         "sHow to Contribute%s page."
 msgstr  ""
 
@@ -416,7 +416,7 @@
 
 #: ../tasks.tmpl:18
 msgid   "The list to the right includes various software projects which are of some interest to "
-        "the Debian-Med Project."
+        "the Debian Med Project."
 msgstr  ""
 
 #: ../tasks.tmpl:19
@@ -424,15 +424,15 @@
 msgstr  ""
 
 #: ../tasks.tmpl:20
-msgid   "It is our goal, however, to include all software in Debian-Med which can sensibly add to "
-        "a high quality Debian Integrated Solution."
+msgid   "It is our goal, however, to include all software in Debian Med which can sensibly add to "
+        "a high quality Debian Pure Blend."
 msgstr  ""
 
 #: ../tasks.tmpl:31
 #, php-format
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
+msgid   "If you discover a project which looks like a good candidate for Debian Med to you, or if "
         "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the %sDebian-Med mailing list%s"
+        "description of that project to the %sDebian Med mailing list%s"
 msgstr  ""
 
 #

Modified: cdd/trunk/webtools/po/da.po
==============================================================================
--- cdd/trunk/webtools/po/da.po	(original)
+++ cdd/trunk/webtools/po/da.po	Sat Nov  1 13:21:47 2008
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Debian Integrated Solution Team <debian-custom at lists.debian.org>
+# Copyright (C) 2008 Debian Pure Blends Team <debian-custom at lists.debian.org>
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: dis-webtools 0.1.1\n"
         "Report-Msgid-Bugs-To: debian-custom at lists.debian.org\n"
-        "POT-Creation-Date: 2008-09-21 11:35+0200\n"
+        "POT-Creation-Date: 2008-10-29 20:29+0100\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
         "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -15,64 +15,64 @@
         "Content-Type: text/plain; charset=UTF-8\n"
         "Content-Transfer-Encoding: 8bit\n"
 
-#: tasks.py:86
+#: tasks.py:79
 msgid   "Maintainer"
 msgstr  ""
 
-#: tasks.py:87
+#: tasks.py:80
 msgid   "Responsible"
 msgstr  ""
 
-#: tasks.py:88
+#: tasks.py:81
 msgid   "License"
 msgstr  ""
 
-#: tasks.py:89
+#: tasks.py:82
 msgid   "Version"
 msgstr  ""
 
-#: tasks.py:90
+#: tasks.py:83
 msgid   "Summary"
 msgstr  ""
 
-#: tasks.py:91
+#: tasks.py:84
 msgid   "Last update:"
 msgstr  ""
 
-#: tasks.py:93 tasks.py:101
+#: tasks.py:86 tasks.py:94
 msgid   "Official Debian package"
 msgstr  ""
 
-#: tasks.py:94
+#: tasks.py:87
 msgid   "Official Debian package (recommended)"
 msgstr  ""
 
-#: tasks.py:95
+#: tasks.py:88
 msgid   "Official Debian package (suggested)"
 msgstr  ""
 
-#: tasks.py:96
+#: tasks.py:89
 msgid   "Debian package in non-free"
 msgstr  ""
 
-#: tasks.py:97
+#: tasks.py:90
 msgid   "Debian package in contrib"
 msgstr  ""
 
-#: tasks.py:98
+#: tasks.py:91
 msgid   "Unofficial Debian package"
 msgstr  ""
 
-#: tasks.py:99
+#: tasks.py:92
 msgid   "Debian package not available"
 msgstr  ""
 
-#: tasks.py:102
+#: tasks.py:95
 msgid   "For a better overview of the project's availability as a Debian package, each head row "
         "has a color code according to this scheme:"
 msgstr  ""
 
-#: tasks.py:103
+#: tasks.py:96
 #, python-format
 msgid   "If you discover a project which looks like a good candidate for %s\n"
         "                              to you, or if you have prepared an unofficial Debian "
@@ -81,120 +81,120 @@
         "s\">%s mailing list</a>"
 msgstr  ""
 
-#: tasks.py:107
+#: tasks.py:100
 #, python-format
 msgid   "The list to the right includes various software projects which are of some interest to "
         "the %s Project. Currently, only a few of them are available as Debian packages. It is our "
         "goal, however, to include all software in %s which can sensibly add to a high quality "
-        "Debian Integrated Solution."
+        "Debian Pure Blend."
 msgstr  ""
 
-#: tasks.py:108
+#: tasks.py:101
 msgid   "Tasks page"
 msgstr  ""
 
-#: tasks.py:109
+#: tasks.py:102
 msgid   "Project"
 msgstr  ""
 
-#: tasks.py:110
+#: tasks.py:103
 #, python-format
 msgid   "This is a list of the Tasks %s is made of:"
 msgstr  ""
 
-#: tasks.py:111
+#: tasks.py:104
 msgid   "This page is also available in the following languages:"
 msgstr  ""
 
-#: tasks.py:112
+#: tasks.py:105
 #, python-format
 msgid   "How to set <a href=\"%s\">the default document language</a>"
 msgstr  ""
 
-#: tasks.py:114
+#: tasks.py:107
 msgid   "Homepage not available"
 msgstr  ""
 
-#: tasks.py:115
+#: tasks.py:108
 msgid   "Translate description"
 msgstr  ""
 
-#: tasks.py:116
+#: tasks.py:109
 msgid   "Fix translated description"
 msgstr  ""
 
-#: tasks.py:128
+#: tasks.py:121
 msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
         "a>"
 msgstr  ""
 
-#: tasks.py:129
+#: tasks.py:122
 msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:130
+#: tasks.py:123
 msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:135
+#: tasks.py:128
 msgid   "Dependant"
 msgstr  ""
 
-#: tasks.py:136
+#: tasks.py:129
 msgid   "Recommended"
 msgstr  ""
 
-#: tasks.py:137
+#: tasks.py:130
 msgid   "Suggested"
 msgstr  ""
 
-#: tasks.py:138
+#: tasks.py:131
 msgid   "Unofficial"
 msgstr  ""
 
-#: tasks.py:139
+#: tasks.py:132
 msgid   "Prospective"
 msgstr  ""
 
-#: tasks.py:142
+#: tasks.py:135
 msgid   "Official Debian packages"
 msgstr  ""
 
-#: tasks.py:143
+#: tasks.py:136
 msgid   "Official Debian packages (Recommended)"
 msgstr  ""
 
-#: tasks.py:144
+#: tasks.py:137
 msgid   "Official Debian packages (Suggested)"
 msgstr  ""
 
-#: tasks.py:145
+#: tasks.py:138
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  ""
 
-#: tasks.py:146
+#: tasks.py:139
 msgid   "Debian packages not available"
 msgstr  ""
 
-#: tasks.py:148
+#: tasks.py:141
 msgid   "Packages"
 msgstr  ""
 
-#: tasks.py:149
+#: tasks.py:142
 #, python-format
-msgid   "A %sDebian Integrated Solution%s is a Debian internal project which assembles\n"
+msgid   "A %sDebian Pure Blend%s is a Debian internal project which assembles\n"
         "a set of packages that might help users to solve certain tasks of their work.  The list "
         "on\n"
         "the right shows the tasks of %s."
 msgstr  ""
 
-#: tasks.py:207
+#: tasks.py:200
 msgid   "Links to other tasks"
 msgstr  ""
 
-#: tasks.py:208
+#: tasks.py:201
 msgid   "Index of all tasks"
 msgstr  ""
 
@@ -270,7 +270,7 @@
 msgstr  ""
 
 #: ../index.php:15
-msgid   "The Debian-Med project presents packages that are associated with <ul><li>medicine</"
+msgid   "The Debian Med project presents packages that are associated with <ul><li>medicine</"
         "li><li>pre-clinical research</li><li>life science.</li></ul> Its developments are mostly "
         "focused on three areas for the moment: <ul><li>medical practice</li><li>imaging</"
         "li><li>bioinformatics</li></ul>and can be installed directly from every Debian "
@@ -314,7 +314,7 @@
 msgstr  ""
 
 #: ../index.php:46
-msgid   "Tasks of our DIS"
+msgid   "Tasks of our Blend"
 msgstr  ""
 
 #: ../index.php:47
@@ -403,7 +403,7 @@
 
 #: ../locales.php:31
 #, php-format
-msgid   "More information on how to contribute to the Debian-Med project, can be found in the %"
+msgid   "More information on how to contribute to the Debian Med project, can be found in the %"
         "sHow to Contribute%s page."
 msgstr  ""
 
@@ -433,7 +433,7 @@
 
 #: ../tasks.tmpl:18
 msgid   "The list to the right includes various software projects which are of some interest to "
-        "the Debian-Med Project."
+        "the Debian Med Project."
 msgstr  ""
 
 #: ../tasks.tmpl:19
@@ -441,15 +441,15 @@
 msgstr  ""
 
 #: ../tasks.tmpl:20
-msgid   "It is our goal, however, to include all software in Debian-Med which can sensibly add to "
-        "a high quality Debian Integrated Solution."
+msgid   "It is our goal, however, to include all software in Debian Med which can sensibly add to "
+        "a high quality Debian Pure Blend."
 msgstr  ""
 
 #: ../tasks.tmpl:31
 #, php-format
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
+msgid   "If you discover a project which looks like a good candidate for Debian Med to you, or if "
         "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the %sDebian-Med mailing list%s"
+        "description of that project to the %sDebian Med mailing list%s"
 msgstr  ""
 
 #

Modified: cdd/trunk/webtools/po/de.po
==============================================================================
--- cdd/trunk/webtools/po/de.po	(original)
+++ cdd/trunk/webtools/po/de.po	Sat Nov  1 13:21:47 2008
@@ -1,5 +1,5 @@
-# Translation file for Debian-Med homepage.
-# Copyright (C) 2007, Debian-Med Team <debian-med at lists.debian.org>
+# Translation file for Debian Pure Blends webtools.
+# Copyright (C) 2007, Debian Pure Blends Team <debian-custom at lists.debian.org>
 # This file is distributed under the GNU General Public License v2+.
 # David Paleino <d.paleino at gmail.com>, 2007.
 #
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: 0.1\n"
         "Report-Msgid-Bugs-To: debian-custom at lists.debian.org\n"
-        "POT-Creation-Date: 2008-09-21 11:35+0200\n"
+        "POT-Creation-Date: 2008-10-29 20:29+0100\n"
         "PO-Revision-Date: 2008-02-17 17:13:51+0200\n"
         "Last-Translator: Steffen Möller, Andreas Tille <{moeller,tille}@debian.org>\n"
         "Language-Team: German <de at li.org>\n"
@@ -15,65 +15,65 @@
         "Content-Type: text/plain; charset=UTF-8\n"
         "Content-Transfer-Encoding: 8bit\n"
 
-#: tasks.py:86
+#: tasks.py:79
 msgid   "Maintainer"
 msgstr  "Betreuer"
 
-#: tasks.py:87
+#: tasks.py:80
 msgid   "Responsible"
 msgstr  "Verantwortlich"
 
-#: tasks.py:88
+#: tasks.py:81
 msgid   "License"
 msgstr  "Lizenz"
 
-#: tasks.py:89
+#: tasks.py:82
 msgid   "Version"
 msgstr  "Version"
 
-#: tasks.py:90
+#: tasks.py:83
 msgid   "Summary"
 msgstr  "Zusammenfassung"
 
-#: tasks.py:91
+#: tasks.py:84
 msgid   "Last update:"
 msgstr  "Zuletzt aktualisiert:"
 
-#: tasks.py:93 tasks.py:101
+#: tasks.py:86 tasks.py:94
 msgid   "Official Debian package"
 msgstr  "Offizielles Debianpaket"
 
-#: tasks.py:94
+#: tasks.py:87
 msgid   "Official Debian package (recommended)"
 msgstr  "Offizielles Debianpaket (empfohlen)"
 
-#: tasks.py:95
+#: tasks.py:88
 msgid   "Official Debian package (suggested)"
 msgstr  "Offizielle Debianpakete (vorgeschlagen)"
 
-#: tasks.py:96
+#: tasks.py:89
 msgid   "Debian package in non-free"
 msgstr  "Debianpaket in non-free"
 
-#: tasks.py:97
+#: tasks.py:90
 msgid   "Debian package in contrib"
 msgstr  "Debianpaket in contrib"
 
-#: tasks.py:98
+#: tasks.py:91
 msgid   "Unofficial Debian package"
 msgstr  "Inoffizielles Debianpaket"
 
-#: tasks.py:99
+#: tasks.py:92
 msgid   "Debian package not available"
 msgstr  "Debianpaket nicht verfügbar"
 
-#: tasks.py:102
+#: tasks.py:95
 msgid   "For a better overview of the project's availability as a Debian package, each head row "
         "has a color code according to this scheme:"
 msgstr  "Um einen besseren Überblick über die Verfügbarkeit der Projekte als Debian Paket zu "
         "geben, hat jede Kopfzeile einen Farbcode entsprechend diesem Schema:"
 
-#: tasks.py:103
+#: tasks.py:96
 #, python-format
 msgid   "If you discover a project which looks like a good candidate for %s\n"
         "                              to you, or if you have prepared an unofficial Debian "
@@ -84,131 +84,129 @@
         "Sie ein inoffizielles Debianpaket erstellt haben, zögern Sie bitte nicht eine "
         "Beschreibung des Projekts an die <a href=\"mailto:%s\">%s Mailingliste</a> zu schicken."
 
-#: tasks.py:107
-#, python-format
+#: tasks.py:100
 msgid   "The list to the right includes various software projects which are of some interest to "
         "the %s Project. Currently, only a few of them are available as Debian packages. It is our "
         "goal, however, to include all software in %s which can sensibly add to a high quality "
-        "Debian Integrated Solution."
+        "Debian Pure Blend."
 msgstr  "Die Liste auf der rechten Seite enthält verschiedene Softwareprojekte, die für das %s "
         "Projekt von Interesse sind. Derzeit sind nur einige von diesen als Debianpakete "
         "verfügbar. Zielsetzung ist es jedoch, all die Software für %s zu paketieren, um einen "
-        "qualitativ hochwertige Debian Integrated Solution (interne Anpassung von Debian an "
+        "qualitativ hochwertiges Debian Pure Blend (interne Anpassung von Debian an "
         "spezielle Bedürfnisse) zu erstellen."
 
-#: tasks.py:108
+#: tasks.py:101
 msgid   "Tasks page"
 msgstr  "Aufgaben Seite"
 
-#: tasks.py:109
+#: tasks.py:102
 msgid   "Project"
 msgstr  "Projekt"
 
-#: tasks.py:110
+#: tasks.py:103
 #, python-format
 msgid   "This is a list of the Tasks %s is made of:"
 msgstr  "Dies ist die Liste der Aufgaben des %s Projekts:"
 
-#: tasks.py:111
+#: tasks.py:104
 msgid   "This page is also available in the following languages:"
 msgstr  "Diese Seite gibt es auch in den folgenden Sprachen:"
 
-#: tasks.py:112
+#: tasks.py:105
 #, python-format
 msgid   "How to set <a href=\"%s\">the default document language</a>"
 msgstr  "Wie stellt man <a href=\"%s\">die Standardsprache</a> ein"
 
-#: tasks.py:114
+#: tasks.py:107
 msgid   "Homepage not available"
 msgstr  "Homepage nicht verfügbar"
 
-#: tasks.py:115
+#: tasks.py:108
 msgid   "Translate description"
 msgstr  "Beschreibung übersetzen"
 
-#: tasks.py:116
+#: tasks.py:109
 msgid   "Fix translated description"
 msgstr  "Korrigiere Beschreibungsübersetzung"
 
-#: tasks.py:128
+#: tasks.py:121
 msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
         "a>"
 msgstr  "Grün: Das Projekt <a href=\"#official-debs\">ist als ein offizielles Debianpaket "
         "verfügbar</a>"
 
-#: tasks.py:129
+#: tasks.py:122
 msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  "Gelb: Das Projekt <a href=\"#unofficial-debs\">ist als ein inoffizielles Debianpaket "
         "verfügbar</a>"
 
-#: tasks.py:130
+#: tasks.py:123
 msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
         "package</a>"
 msgstr  "Rot: Das Projekt <a href=\"#prospective-debs\">ist (noch) nicht als Debianpaket "
         "verfügbar</a>"
 
-#: tasks.py:135
+#: tasks.py:128
 msgid   "Dependant"
-msgstr  ""
+msgstr  "Abhängig"
 
-#: tasks.py:136
+#: tasks.py:129
 msgid   "Recommended"
 msgstr  "Empfohlen"
 
-#: tasks.py:137
+#: tasks.py:130
 msgid   "Suggested"
-msgstr  ""
+msgstr  "Vorgeschlagen"
 
-#: tasks.py:138
+#: tasks.py:131
 msgid   "Unofficial"
 msgstr  "Inoffiziell"
 
-#: tasks.py:139
+#: tasks.py:132
 msgid   "Prospective"
 msgstr  "Voraussichtlich"
 
-#: tasks.py:142
+#: tasks.py:135
 msgid   "Official Debian packages"
 msgstr  "Offizielle Debianpakete"
 
-#: tasks.py:143
+#: tasks.py:136
 msgid   "Official Debian packages (Recommended)"
 msgstr  "Offizielle Debianpakete (Empfohlen)"
 
-#: tasks.py:144
+#: tasks.py:137
 msgid   "Official Debian packages (Suggested)"
 msgstr  "Offizielle Debianpakete (Vorgeschlagen)"
 
-#: tasks.py:145
+#: tasks.py:138
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  "Experimentelle oder inoffizielle Debianpakete, Projekte mit Code zum Paketieren im SVN"
 
-#: tasks.py:146
+#: tasks.py:139
 msgid   "Debian packages not available"
 msgstr  "Debianpakete nicht verfügbar"
 
-#: tasks.py:148
+#: tasks.py:141
 msgid   "Packages"
 msgstr  "Pakete"
 
-#: tasks.py:149
-#, python-format
-msgid   "A %sDebian Integrated Solution%s is a Debian internal project which assembles\n"
+#: tasks.py:142
+msgid   "A %sDebian Pure Blend%s is a Debian internal project which assembles\n"
         "a set of packages that might help users to solve certain tasks of their work.  The list "
         "on\n"
         "the right shows the tasks of %s."
-msgstr  "Eine %sDebian Integrated Solution%s (Debian Integrierte Lösung) ist ein internes "
+msgstr  "Ein %sDebian Pure Blend%s ist ein internes "
         "Debianprojekt, das einen Satz von Paketen zusammenstellt, der Nutzern hilft, bestimmte "
         "Aufgaben Ihrer Arbeit zu bewältigen.  Die Liste rechts zeigt Aufgaben, die durch %s "
         "zusammengestellt wurden."
 
-#: tasks.py:207
+#: tasks.py:200
 msgid   "Links to other tasks"
 msgstr  "Links zu Aufgaben"
 
 # # 'anderen' wird hier weggelassen - sonst wird das Layout vermurkst
-#: tasks.py:208
+#: tasks.py:201
 msgid   "Index of all tasks"
 msgstr  "Index aller Aufgaben"
 
@@ -278,15 +276,15 @@
 
 #: ../index.php:12
 msgid   "Wiki page"
-msgstr  "Debian-Med Wiki Seiten"
+msgstr  "Debian Med Wiki Seiten"
 
 #: ../index.php:15
-msgid   "The Debian-Med project presents packages that are associated with <ul><li>medicine</"
+msgid   "The Debian Med project presents packages that are associated with <ul><li>medicine</"
         "li><li>pre-clinical research</li><li>life science.</li></ul> Its developments are mostly "
         "focused on three areas for the moment: <ul><li>medical practice</li><li>imaging</"
         "li><li>bioinformatics</li></ul>and can be installed directly from every Debian "
         "installation."
-msgstr  "Das Debian-Med Projekt präsentiert Pakete für die<ul><li>Medizin</li><li>Vorklinik</"
+msgstr  "Das Debian Med Projekt präsentiert Pakete für die<ul><li>Medizin</li><li>Vorklinik</"
         "li><li>Biowissenschaften.</li></ul> Aktuelle Pakete kommen aus den Bereichen "
         "<ul><li>Praxisverwaltung</li><li>Bildverarbeitung</li><li>Bioinformatik</li></ul>und von "
         "jedem Debian-Rechner direkt zu installieren."
@@ -330,7 +328,7 @@
 msgstr  ""
 
 #: ../index.php:46
-msgid   "Tasks of our DIS"
+msgid   "Tasks of our Blend"
 msgstr  ""
 
 #: ../index.php:47
@@ -420,7 +418,7 @@
 
 #: ../locales.php:31
 #, php-format
-msgid   "More information on how to contribute to the Debian-Med project, can be found in the %"
+msgid   "More information on how to contribute to the Debian Med project, can be found in the %"
         "sHow to Contribute%s page."
 msgstr  "Mehr Informationen dazu, wie Du dem Projekt zuarbeiten kannst, können auf der Seite %sHow "
         "to Contribute%s abgerufen werden."
@@ -451,7 +449,7 @@
 
 #: ../tasks.tmpl:18
 msgid   "The list to the right includes various software projects which are of some interest to "
-        "the Debian-Med Project."
+        "the Debian Med Project."
 msgstr  "Die Liste auf der rechten Seite enthält verschiedene Softwareprojekte, die für das Debian-"
         "Med Projekt von Interesse sind."
 
@@ -460,19 +458,19 @@
 msgstr  "Derzeit sind noch nicht alle als Debian-Paket verfügbar."
 
 #: ../tasks.tmpl:20
-msgid   "It is our goal, however, to include all software in Debian-Med which can sensibly add to "
-        "a high quality Debian Integrated Solution."
-msgstr  "Es ist jedoch unser Ziel, diese Software in Debian-Med zu integrieren, um eine qualitativ "
-        "hochwertige Debian Integrated Solution zu erstellen."
+msgid   "It is our goal, however, to include all software in Debian Med which can sensibly add to "
+        "a high quality Debian Pure Blend."
+msgstr  "Es ist jedoch unser Ziel, diese Software in Debian Med zu integrieren, um eine qualitativ "
+        "hochwertige Debian Pure Blend zu erstellen."
 
 #: ../tasks.tmpl:31
 #, php-format
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
+msgid   "If you discover a project which looks like a good candidate for Debian Med to you, or if "
         "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the %sDebian-Med mailing list%s"
-msgstr  "Wenn Sie ein Projekt entdecken, das ein guter Kandidat für Debian-Med zu sein scheint, "
+        "description of that project to the %sDebian Med mailing list%s"
+msgstr  "Wenn Sie ein Projekt entdecken, das ein guter Kandidat für Debian Med zu sein scheint, "
         "oder wenn Sie ein inoffizielles Debianpaket erstellt haben, zögern Sie bitte nicht eine "
-        "Beschreibung des Projekts an die %sDebian-Med Mailingliste%s zu schicken."
+        "Beschreibung des Projekts an die %sDebian Med Mailingliste%s zu schicken."
 
 #
 # These strings are manually added, they

Modified: cdd/trunk/webtools/po/dis-webtools.pot
==============================================================================
--- cdd/trunk/webtools/po/dis-webtools.pot	(original)
+++ cdd/trunk/webtools/po/dis-webtools.pot	Sat Nov  1 13:21:47 2008
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Debian Integrated Solutions Team <debian-custom at lists.debian.org>
+# Copyright (C) YEAR Debian Pure Blends Team <debian-custom at lists.debian.org>
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: dis-webtools 0.1.1\n"
 "Report-Msgid-Bugs-To: debian-custom at lists.debian.org\n"
-"POT-Creation-Date: 2008-09-21 11:35+0200\n"
+"POT-Creation-Date: 2008-10-29 20:29+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,65 +16,65 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tasks.py:86
+#: tasks.py:79
 msgid "Maintainer"
 msgstr ""
 
-#: tasks.py:87
+#: tasks.py:80
 msgid "Responsible"
 msgstr ""
 
-#: tasks.py:88
+#: tasks.py:81
 msgid "License"
 msgstr ""
 
-#: tasks.py:89
+#: tasks.py:82
 msgid "Version"
 msgstr ""
 
-#: tasks.py:90
+#: tasks.py:83
 msgid "Summary"
 msgstr ""
 
-#: tasks.py:91
+#: tasks.py:84
 msgid "Last update:"
 msgstr ""
 
-#: tasks.py:93 tasks.py:101
+#: tasks.py:86 tasks.py:94
 msgid "Official Debian package"
 msgstr ""
 
-#: tasks.py:94
+#: tasks.py:87
 msgid "Official Debian package (recommended)"
 msgstr ""
 
-#: tasks.py:95
+#: tasks.py:88
 msgid "Official Debian package (suggested)"
 msgstr ""
 
-#: tasks.py:96
+#: tasks.py:89
 msgid "Debian package in non-free"
 msgstr ""
 
-#: tasks.py:97
+#: tasks.py:90
 msgid "Debian package in contrib"
 msgstr ""
 
-#: tasks.py:98
+#: tasks.py:91
 msgid "Unofficial Debian package"
 msgstr ""
 
-#: tasks.py:99
+#: tasks.py:92
 msgid "Debian package not available"
 msgstr ""
 
-#: tasks.py:102
+#: tasks.py:95
 msgid ""
 "For a better overview of the project's availability as a Debian package, "
 "each head row has a color code according to this scheme:"
 msgstr ""
 
-#: tasks.py:103
+#: tasks.py:96
 #, python-format
 msgid ""
 "If you discover a project which looks like a good candidate for %s\n"
@@ -84,128 +84,127 @@
 "href=\"mailto:%s\">%s mailing list</a>"
 msgstr ""
 
-#: tasks.py:107
+#: tasks.py:100
 #, python-format
 msgid ""
 "The list to the right includes various software projects which are of some "
 "interest to the %s Project. Currently, only a few of them are available as "
 "Debian packages. It is our goal, however, to include all software in %s "
-"which can sensibly add to a high quality Debian Integrated Solution."
+"which can sensibly add to a high quality Debian Pure Blend."
 msgstr ""
 
-#: tasks.py:108
+#: tasks.py:101
 msgid "Tasks page"
 msgstr ""
 
-#: tasks.py:109
+#: tasks.py:102
 msgid "Project"
 msgstr ""
 
-#: tasks.py:110
+#: tasks.py:103
 #, python-format
 msgid "This is a list of the Tasks %s is made of:"
 msgstr ""
 
-#: tasks.py:111
+#: tasks.py:104
 msgid "This page is also available in the following languages:"
 msgstr ""
 
-#: tasks.py:112
+#: tasks.py:105
 #, python-format
 msgid "How to set <a href=\"%s\">the default document language</a>"
 msgstr ""
 
-#: tasks.py:114
+#: tasks.py:107
 msgid "Homepage not available"
 msgstr ""
 
-#: tasks.py:115
+#: tasks.py:108
 msgid "Translate description"
 msgstr ""
 
-#: tasks.py:116
+#: tasks.py:109
 msgid "Fix translated description"
 msgstr ""
 
-#: tasks.py:128
+#: tasks.py:121
 msgid ""
 "Green: The project is <a href=\"#official-debs\">available as an official "
 "Debian package</a>"
 msgstr ""
 
-#: tasks.py:129
+#: tasks.py:122
 msgid ""
 "Yellow: The project is <a href=\"#unofficial-debs\">available as an "
 "unofficial Debian package</a>"
 msgstr ""
 
-#: tasks.py:130
+#: tasks.py:123
 msgid ""
 "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a "
 "Debian package</a>"
 msgstr ""
 
-#: tasks.py:135
+#: tasks.py:128
 msgid "Dependant"
 msgstr ""
 
-#: tasks.py:136
+#: tasks.py:129
 msgid "Recommended"
 msgstr ""
 
-#: tasks.py:137
+#: tasks.py:130
 msgid "Suggested"
 msgstr ""
 
-#: tasks.py:138
+#: tasks.py:131
 msgid "Unofficial"
 msgstr ""
 
-#: tasks.py:139
+#: tasks.py:132
 msgid "Prospective"
 msgstr ""
 
-#: tasks.py:142
+#: tasks.py:135
 msgid "Official Debian packages"
 msgstr ""
 
-#: tasks.py:143
+#: tasks.py:136
 msgid "Official Debian packages (Recommended)"
 msgstr ""
 
-#: tasks.py:144
+#: tasks.py:137
 msgid "Official Debian packages (Suggested)"
 msgstr ""
 
-#: tasks.py:145
+#: tasks.py:138
 msgid ""
 "Experimental or unofficial Debian packages, projects with packaging stuff in "
 "SVN"
 msgstr ""
 
-#: tasks.py:146
+#: tasks.py:139
 msgid "Debian packages not available"
 msgstr ""
 
-#: tasks.py:148
+#: tasks.py:141
 msgid "Packages"
 msgstr ""
 
-#: tasks.py:149
+#: tasks.py:142
 #, python-format
 msgid ""
-"A %sDebian Integrated Solution%s is a Debian internal project which "
-"assembles\n"
+"A %sDebian Pure Blend%s is a Debian internal project which assembles\n"
 "a set of packages that might help users to solve certain tasks of their "
 "work.  The list on\n"
 "the right shows the tasks of %s."
 msgstr ""
 
-#: tasks.py:207
+#: tasks.py:200
 msgid "Links to other tasks"
 msgstr ""
 
-#: tasks.py:208
+#: tasks.py:201
 msgid "Index of all tasks"
 msgstr ""
 

Modified: cdd/trunk/webtools/po/es.po
==============================================================================
--- cdd/trunk/webtools/po/es.po	(original)
+++ cdd/trunk/webtools/po/es.po	Sat Nov  1 13:21:47 2008
@@ -1,61 +1,61 @@
-#: tasks.py:86
+#: tasks.py:79
 msgid   "Maintainer"
 msgstr  ""
 
-#: tasks.py:87
+#: tasks.py:80
 msgid   "Responsible"
 msgstr  ""
 
-#: tasks.py:88
+#: tasks.py:81
 msgid   "License"
 msgstr  ""
 
-#: tasks.py:89
+#: tasks.py:82
 msgid   "Version"
 msgstr  ""
 
-#: tasks.py:90
+#: tasks.py:83
 msgid   "Summary"
 msgstr  ""
 
-#: tasks.py:91
+#: tasks.py:84
 msgid   "Last update:"
 msgstr  ""
 
-#: tasks.py:93 tasks.py:101
+#: tasks.py:86 tasks.py:94
 msgid   "Official Debian package"
 msgstr  ""
 
-#: tasks.py:94
+#: tasks.py:87
 msgid   "Official Debian package (recommended)"
 msgstr  ""
 
-#: tasks.py:95
+#: tasks.py:88
 msgid   "Official Debian package (suggested)"
 msgstr  ""
 
-#: tasks.py:96
+#: tasks.py:89
 msgid   "Debian package in non-free"
 msgstr  ""
 
-#: tasks.py:97
+#: tasks.py:90
 msgid   "Debian package in contrib"
 msgstr  ""
 
-#: tasks.py:98
+#: tasks.py:91
 msgid   "Unofficial Debian package"
 msgstr  ""
 
-#: tasks.py:99
+#: tasks.py:92
 msgid   "Debian package not available"
 msgstr  ""
 
-#: tasks.py:102
+#: tasks.py:95
 msgid   "For a better overview of the project's availability as a Debian package, each head row "
         "has a color code according to this scheme:"
 msgstr  ""
 
-#: tasks.py:103
+#: tasks.py:96
 #, python-format
 msgid   "If you discover a project which looks like a good candidate for %s\n"
         "                              to you, or if you have prepared an unofficial Debian "
@@ -64,120 +64,120 @@
         "s\">%s mailing list</a>"
 msgstr  ""
 
-#: tasks.py:107
+#: tasks.py:100
 #, python-format
 msgid   "The list to the right includes various software projects which are of some interest to "
         "the %s Project. Currently, only a few of them are available as Debian packages. It is our "
         "goal, however, to include all software in %s which can sensibly add to a high quality "
-        "Debian Integrated Solution."
+        "Debian Pure Blend."
 msgstr  ""
 
-#: tasks.py:108
+#: tasks.py:101
 msgid   "Tasks page"
 msgstr  ""
 
-#: tasks.py:109
+#: tasks.py:102
 msgid   "Project"
 msgstr  ""
 
-#: tasks.py:110
+#: tasks.py:103
 #, python-format
 msgid   "This is a list of the Tasks %s is made of:"
 msgstr  ""
 
-#: tasks.py:111
+#: tasks.py:104
 msgid   "This page is also available in the following languages:"
 msgstr  ""
 
-#: tasks.py:112
+#: tasks.py:105
 #, python-format
 msgid   "How to set <a href=\"%s\">the default document language</a>"
 msgstr  ""
 
-#: tasks.py:114
+#: tasks.py:107
 msgid   "Homepage not available"
 msgstr  ""
 
-#: tasks.py:115
+#: tasks.py:108
 msgid   "Translate description"
 msgstr  ""
 
-#: tasks.py:116
+#: tasks.py:109
 msgid   "Fix translated description"
 msgstr  ""
 
-#: tasks.py:128
+#: tasks.py:121
 msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
         "a>"
 msgstr  ""
 
-#: tasks.py:129
+#: tasks.py:122
 msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:130
+#: tasks.py:123
 msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:135
+#: tasks.py:128
 msgid   "Dependant"
 msgstr  ""
 
-#: tasks.py:136
+#: tasks.py:129
 msgid   "Recommended"
 msgstr  ""
 
-#: tasks.py:137
+#: tasks.py:130
 msgid   "Suggested"
 msgstr  ""
 
-#: tasks.py:138
+#: tasks.py:131
 msgid   "Unofficial"
 msgstr  ""
 
-#: tasks.py:139
+#: tasks.py:132
 msgid   "Prospective"
 msgstr  ""
 
-#: tasks.py:142
+#: tasks.py:135
 msgid   "Official Debian packages"
 msgstr  ""
 
-#: tasks.py:143
+#: tasks.py:136
 msgid   "Official Debian packages (Recommended)"
 msgstr  ""
 
-#: tasks.py:144
+#: tasks.py:137
 msgid   "Official Debian packages (Suggested)"
 msgstr  ""
 
-#: tasks.py:145
+#: tasks.py:138
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  ""
 
-#: tasks.py:146
+#: tasks.py:139
 msgid   "Debian packages not available"
 msgstr  ""
 
-#: tasks.py:148
+#: tasks.py:141
 msgid   "Packages"
 msgstr  ""
 
-#: tasks.py:149
+#: tasks.py:142
 #, python-format
-msgid   "A %sDebian Integrated Solution%s is a Debian internal project which assembles\n"
+msgid   "A %sDebian Pure Blend%s is a Debian internal project which assembles\n"
         "a set of packages that might help users to solve certain tasks of their work.  The list "
         "on\n"
         "the right shows the tasks of %s."
 msgstr  ""
 
-#: tasks.py:207
+#: tasks.py:200
 msgid   "Links to other tasks"
 msgstr  ""
 
-#: tasks.py:208
+#: tasks.py:201
 msgid   "Index of all tasks"
 msgstr  ""
 
@@ -253,7 +253,7 @@
 msgstr  ""
 
 #: ../index.php:15
-msgid   "The Debian-Med project presents packages that are associated with <ul><li>medicine</"
+msgid   "The Debian Med project presents packages that are associated with <ul><li>medicine</"
         "li><li>pre-clinical research</li><li>life science.</li></ul> Its developments are mostly "
         "focused on three areas for the moment: <ul><li>medical practice</li><li>imaging</"
         "li><li>bioinformatics</li></ul>and can be installed directly from every Debian "
@@ -297,7 +297,7 @@
 msgstr  ""
 
 #: ../index.php:46
-msgid   "Tasks of our DIS"
+msgid   "Tasks of our Blend"
 msgstr  ""
 
 #: ../index.php:47
@@ -386,7 +386,7 @@
 
 #: ../locales.php:31
 #, php-format
-msgid   "More information on how to contribute to the Debian-Med project, can be found in the %"
+msgid   "More information on how to contribute to the Debian Med project, can be found in the %"
         "sHow to Contribute%s page."
 msgstr  ""
 
@@ -416,7 +416,7 @@
 
 #: ../tasks.tmpl:18
 msgid   "The list to the right includes various software projects which are of some interest to "
-        "the Debian-Med Project."
+        "the Debian Med Project."
 msgstr  ""
 
 #: ../tasks.tmpl:19
@@ -424,15 +424,15 @@
 msgstr  ""
 
 #: ../tasks.tmpl:20
-msgid   "It is our goal, however, to include all software in Debian-Med which can sensibly add to "
-        "a high quality Debian Integrated Solution."
+msgid   "It is our goal, however, to include all software in Debian Med which can sensibly add to "
+        "a high quality Debian Pure Blend."
 msgstr  ""
 
 #: ../tasks.tmpl:31
 #, php-format
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
+msgid   "If you discover a project which looks like a good candidate for Debian Med to you, or if "
         "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the %sDebian-Med mailing list%s"
+        "description of that project to the %sDebian Med mailing list%s"
 msgstr  ""
 
 #

Modified: cdd/trunk/webtools/po/fi.po
==============================================================================
--- cdd/trunk/webtools/po/fi.po	(original)
+++ cdd/trunk/webtools/po/fi.po	Sat Nov  1 13:21:47 2008
@@ -1,61 +1,61 @@
-#: tasks.py:86
+#: tasks.py:79
 msgid   "Maintainer"
 msgstr  ""
 
-#: tasks.py:87
+#: tasks.py:80
 msgid   "Responsible"
 msgstr  ""
 
-#: tasks.py:88
+#: tasks.py:81
 msgid   "License"
 msgstr  ""
 
-#: tasks.py:89
+#: tasks.py:82
 msgid   "Version"
 msgstr  ""
 
-#: tasks.py:90
+#: tasks.py:83
 msgid   "Summary"
 msgstr  ""
 
-#: tasks.py:91
+#: tasks.py:84
 msgid   "Last update:"
 msgstr  ""
 
-#: tasks.py:93 tasks.py:101
+#: tasks.py:86 tasks.py:94
 msgid   "Official Debian package"
 msgstr  ""
 
-#: tasks.py:94
+#: tasks.py:87
 msgid   "Official Debian package (recommended)"
 msgstr  ""
 
-#: tasks.py:95
+#: tasks.py:88
 msgid   "Official Debian package (suggested)"
 msgstr  ""
 
-#: tasks.py:96
+#: tasks.py:89
 msgid   "Debian package in non-free"
 msgstr  ""
 
-#: tasks.py:97
+#: tasks.py:90
 msgid   "Debian package in contrib"
 msgstr  ""
 
-#: tasks.py:98
+#: tasks.py:91
 msgid   "Unofficial Debian package"
 msgstr  ""
 
-#: tasks.py:99
+#: tasks.py:92
 msgid   "Debian package not available"
 msgstr  ""
 
-#: tasks.py:102
+#: tasks.py:95
 msgid   "For a better overview of the project's availability as a Debian package, each head row "
         "has a color code according to this scheme:"
 msgstr  ""
 
-#: tasks.py:103
+#: tasks.py:96
 #, python-format
 msgid   "If you discover a project which looks like a good candidate for %s\n"
         "                              to you, or if you have prepared an unofficial Debian "
@@ -64,120 +64,120 @@
         "s\">%s mailing list</a>"
 msgstr  ""
 
-#: tasks.py:107
+#: tasks.py:100
 #, python-format
 msgid   "The list to the right includes various software projects which are of some interest to "
         "the %s Project. Currently, only a few of them are available as Debian packages. It is our "
         "goal, however, to include all software in %s which can sensibly add to a high quality "
-        "Debian Integrated Solution."
+        "Debian Pure Blend."
 msgstr  ""
 
-#: tasks.py:108
+#: tasks.py:101
 msgid   "Tasks page"
 msgstr  ""
 
-#: tasks.py:109
+#: tasks.py:102
 msgid   "Project"
 msgstr  ""
 
-#: tasks.py:110
+#: tasks.py:103
 #, python-format
 msgid   "This is a list of the Tasks %s is made of:"
 msgstr  ""
 
-#: tasks.py:111
+#: tasks.py:104
 msgid   "This page is also available in the following languages:"
 msgstr  ""
 
-#: tasks.py:112
+#: tasks.py:105
 #, python-format
 msgid   "How to set <a href=\"%s\">the default document language</a>"
 msgstr  ""
 
-#: tasks.py:114
+#: tasks.py:107
 msgid   "Homepage not available"
 msgstr  ""
 
-#: tasks.py:115
+#: tasks.py:108
 msgid   "Translate description"
 msgstr  ""
 
-#: tasks.py:116
+#: tasks.py:109
 msgid   "Fix translated description"
 msgstr  ""
 
-#: tasks.py:128
+#: tasks.py:121
 msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
         "a>"
 msgstr  ""
 
-#: tasks.py:129
+#: tasks.py:122
 msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:130
+#: tasks.py:123
 msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:135
+#: tasks.py:128
 msgid   "Dependant"
 msgstr  ""
 
-#: tasks.py:136
+#: tasks.py:129
 msgid   "Recommended"
 msgstr  ""
 
-#: tasks.py:137
+#: tasks.py:130
 msgid   "Suggested"
 msgstr  ""
 
-#: tasks.py:138
+#: tasks.py:131
 msgid   "Unofficial"
 msgstr  ""
 
-#: tasks.py:139
+#: tasks.py:132
 msgid   "Prospective"
 msgstr  ""
 
-#: tasks.py:142
+#: tasks.py:135
 msgid   "Official Debian packages"
 msgstr  ""
 
-#: tasks.py:143
+#: tasks.py:136
 msgid   "Official Debian packages (Recommended)"
 msgstr  ""
 
-#: tasks.py:144
+#: tasks.py:137
 msgid   "Official Debian packages (Suggested)"
 msgstr  ""
 
-#: tasks.py:145
+#: tasks.py:138
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  ""
 
-#: tasks.py:146
+#: tasks.py:139
 msgid   "Debian packages not available"
 msgstr  ""
 
-#: tasks.py:148
+#: tasks.py:141
 msgid   "Packages"
 msgstr  ""
 
-#: tasks.py:149
+#: tasks.py:142
 #, python-format
-msgid   "A %sDebian Integrated Solution%s is a Debian internal project which assembles\n"
+msgid   "A %sDebian Pure Blend%s is a Debian internal project which assembles\n"
         "a set of packages that might help users to solve certain tasks of their work.  The list "
         "on\n"
         "the right shows the tasks of %s."
 msgstr  ""
 
-#: tasks.py:207
+#: tasks.py:200
 msgid   "Links to other tasks"
 msgstr  ""
 
-#: tasks.py:208
+#: tasks.py:201
 msgid   "Index of all tasks"
 msgstr  ""
 
@@ -253,7 +253,7 @@
 msgstr  ""
 
 #: ../index.php:15
-msgid   "The Debian-Med project presents packages that are associated with <ul><li>medicine</"
+msgid   "The Debian Med project presents packages that are associated with <ul><li>medicine</"
         "li><li>pre-clinical research</li><li>life science.</li></ul> Its developments are mostly "
         "focused on three areas for the moment: <ul><li>medical practice</li><li>imaging</"
         "li><li>bioinformatics</li></ul>and can be installed directly from every Debian "
@@ -297,7 +297,7 @@
 msgstr  ""
 
 #: ../index.php:46
-msgid   "Tasks of our DIS"
+msgid   "Tasks of our Blend"
 msgstr  ""
 
 #: ../index.php:47
@@ -386,7 +386,7 @@
 
 #: ../locales.php:31
 #, php-format
-msgid   "More information on how to contribute to the Debian-Med project, can be found in the %"
+msgid   "More information on how to contribute to the Debian Med project, can be found in the %"
         "sHow to Contribute%s page."
 msgstr  ""
 
@@ -416,7 +416,7 @@
 
 #: ../tasks.tmpl:18
 msgid   "The list to the right includes various software projects which are of some interest to "
-        "the Debian-Med Project."
+        "the Debian Med Project."
 msgstr  ""
 
 #: ../tasks.tmpl:19
@@ -424,15 +424,15 @@
 msgstr  ""
 
 #: ../tasks.tmpl:20
-msgid   "It is our goal, however, to include all software in Debian-Med which can sensibly add to "
-        "a high quality Debian Integrated Solution."
+msgid   "It is our goal, however, to include all software in Debian Med which can sensibly add to "
+        "a high quality Debian Pure Blend."
 msgstr  ""
 
 #: ../tasks.tmpl:31
 #, php-format
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
+msgid   "If you discover a project which looks like a good candidate for Debian Med to you, or if "
         "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the %sDebian-Med mailing list%s"
+        "description of that project to the %sDebian Med mailing list%s"
 msgstr  ""
 
 #

Modified: cdd/trunk/webtools/po/fr.po
==============================================================================
--- cdd/trunk/webtools/po/fr.po	(original)
+++ cdd/trunk/webtools/po/fr.po	Sat Nov  1 13:21:47 2008
@@ -1,6 +1,6 @@
 # translation of messages.po to français
-# Translation file for Debian-Med homepage.
-# Copyright (C) 2007, Debian-Med Team <debian-med at lists.debian.org>
+# Translation file for Debian Pure Blends webtools.
+# Copyright (C) 2008, Debian Pure Blends Team <debian-custom at lists.debian.org>
 # This file is distributed under the GNU General Public License v2+.
 #
 # David Paleino <d.paleino at gmail.com>, 2007.
@@ -10,7 +10,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: messages\n"
         "Report-Msgid-Bugs-To: debian-custom at lists.debian.org\n"
-        "POT-Creation-Date: 2008-09-21 11:35+0200\n"
+        "POT-Creation-Date: 2008-10-29 20:29+0100\n"
         "PO-Revision-Date: 2007-10-07 10:38+0900\n"
         "Last-Translator: Charles Plessy <charles-debian-nospam at plessy.org>\n"
         "Language-Team: français <fr at li.org.example>\n"
@@ -19,65 +19,65 @@
         "Content-Transfer-Encoding: 8bit\n"
         "X-Generator: KBabel 1.11.4\n"
 
-#: tasks.py:86
+#: tasks.py:79
 msgid   "Maintainer"
 msgstr  ""
 
-#: tasks.py:87
+#: tasks.py:80
 msgid   "Responsible"
 msgstr  ""
 
-#: tasks.py:88
+#: tasks.py:81
 msgid   "License"
 msgstr  ""
 
-#: tasks.py:89
+#: tasks.py:82
 msgid   "Version"
 msgstr  ""
 
-#: tasks.py:90
+#: tasks.py:83
 #, fuzzy
 msgid   "Summary"
 msgstr  "r&eacute;sum&eacute;"
 
-#: tasks.py:91
+#: tasks.py:84
 msgid   "Last update:"
 msgstr  ""
 
-#: tasks.py:93 tasks.py:101
+#: tasks.py:86 tasks.py:94
 msgid   "Official Debian package"
 msgstr  ""
 
-#: tasks.py:94
+#: tasks.py:87
 msgid   "Official Debian package (recommended)"
 msgstr  ""
 
-#: tasks.py:95
+#: tasks.py:88
 msgid   "Official Debian package (suggested)"
 msgstr  ""
 
-#: tasks.py:96
+#: tasks.py:89
 msgid   "Debian package in non-free"
 msgstr  ""
 
-#: tasks.py:97
+#: tasks.py:90
 msgid   "Debian package in contrib"
 msgstr  ""
 
-#: tasks.py:98
+#: tasks.py:91
 msgid   "Unofficial Debian package"
 msgstr  ""
 
-#: tasks.py:99
+#: tasks.py:92
 msgid   "Debian package not available"
 msgstr  ""
 
-#: tasks.py:102
+#: tasks.py:95
 msgid   "For a better overview of the project's availability as a Debian package, each head row "
         "has a color code according to this scheme:"
 msgstr  ""
 
-#: tasks.py:103
+#: tasks.py:96
 #, python-format
 msgid   "If you discover a project which looks like a good candidate for %s\n"
         "                              to you, or if you have prepared an unofficial Debian "
@@ -86,122 +86,122 @@
         "s\">%s mailing list</a>"
 msgstr  ""
 
-#: tasks.py:107
+#: tasks.py:100
 #, python-format
 msgid   "The list to the right includes various software projects which are of some interest to "
         "the %s Project. Currently, only a few of them are available as Debian packages. It is our "
         "goal, however, to include all software in %s which can sensibly add to a high quality "
-        "Debian Integrated Solution."
+        "Debian Pure Blend."
 msgstr  ""
 
-#: tasks.py:108
+#: tasks.py:101
 #, fuzzy
 msgid   "Tasks page"
 msgstr  "Localisation"
 
-#: tasks.py:109
+#: tasks.py:102
 msgid   "Project"
 msgstr  ""
 
-#: tasks.py:110
+#: tasks.py:103
 #, python-format
 msgid   "This is a list of the Tasks %s is made of:"
 msgstr  ""
 
-#: tasks.py:111
+#: tasks.py:104
 msgid   "This page is also available in the following languages:"
 msgstr  ""
 
-#: tasks.py:112
+#: tasks.py:105
 #, python-format
 msgid   "How to set <a href=\"%s\">the default document language</a>"
 msgstr  ""
 
-#: tasks.py:114
+#: tasks.py:107
 msgid   "Homepage not available"
 msgstr  ""
 
-#: tasks.py:115
+#: tasks.py:108
 msgid   "Translate description"
 msgstr  ""
 
-#: tasks.py:116
+#: tasks.py:109
 msgid   "Fix translated description"
 msgstr  ""
 
-#: tasks.py:128
+#: tasks.py:121
 msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
         "a>"
 msgstr  ""
 
-#: tasks.py:129
+#: tasks.py:122
 msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:130
+#: tasks.py:123
 msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:135
+#: tasks.py:128
 msgid   "Dependant"
 msgstr  ""
 
-#: tasks.py:136
+#: tasks.py:129
 msgid   "Recommended"
 msgstr  ""
 
-#: tasks.py:137
+#: tasks.py:130
 msgid   "Suggested"
 msgstr  ""
 
-#: tasks.py:138
+#: tasks.py:131
 msgid   "Unofficial"
 msgstr  ""
 
-#: tasks.py:139
+#: tasks.py:132
 msgid   "Prospective"
 msgstr  ""
 
-#: tasks.py:142
+#: tasks.py:135
 msgid   "Official Debian packages"
 msgstr  ""
 
-#: tasks.py:143
+#: tasks.py:136
 msgid   "Official Debian packages (Recommended)"
 msgstr  ""
 
-#: tasks.py:144
+#: tasks.py:137
 msgid   "Official Debian packages (Suggested)"
 msgstr  ""
 
-#: tasks.py:145
+#: tasks.py:138
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  ""
 
-#: tasks.py:146
+#: tasks.py:139
 msgid   "Debian packages not available"
 msgstr  ""
 
-#: tasks.py:148
+#: tasks.py:141
 #, fuzzy
 msgid   "Packages"
 msgstr  "Liens"
 
-#: tasks.py:149
+#: tasks.py:142
 #, python-format
-msgid   "A %sDebian Integrated Solution%s is a Debian internal project which assembles\n"
+msgid   "A %sDebian Pure Blend%s is a Debian internal project which assembles\n"
         "a set of packages that might help users to solve certain tasks of their work.  The list "
         "on\n"
         "the right shows the tasks of %s."
 msgstr  ""
 
-#: tasks.py:207
+#: tasks.py:200
 msgid   "Links to other tasks"
 msgstr  ""
 
-#: tasks.py:208
+#: tasks.py:201
 msgid   "Index of all tasks"
 msgstr  ""
 
@@ -273,12 +273,12 @@
 
 #: ../index.php:15
 #, fuzzy
-msgid   "The Debian-Med project presents packages that are associated with <ul><li>medicine</"
+msgid   "The Debian Med project presents packages that are associated with <ul><li>medicine</"
         "li><li>pre-clinical research</li><li>life science.</li></ul> Its developments are mostly "
         "focused on three areas for the moment: <ul><li>medical practice</li><li>imaging</"
         "li><li>bioinformatics</li></ul>and can be installed directly from every Debian "
         "installation."
-msgstr  "Le projet Debian-Med propose des paquets relatifs<ul><li>&agrave; la m&eacute;"
+msgstr  "Le projet Debian Med propose des paquets relatifs<ul><li>&agrave; la m&eacute;"
         "decine&nbsp;;</li><li>&agrave; la recherche pr&eacute;-clinique&nbsp;;</li><li>aux "
         "sciences de la vie.</li></ul> Son activit&eacute; se concentre en ce moment dans trois "
         "domaines&nbsp;;<ul><li>la pratique m&eacute;dicale&nbsp;;</li><li>l'imagerie&nbsp;;</"
@@ -322,7 +322,7 @@
 msgstr  ""
 
 #: ../index.php:46
-msgid   "Tasks of our DIS"
+msgid   "Tasks of our Blend"
 msgstr  ""
 
 #: ../index.php:47
@@ -413,9 +413,9 @@
 
 #: ../locales.php:31
 #, php-format
-msgid   "More information on how to contribute to the Debian-Med project, can be found in the %"
+msgid   "More information on how to contribute to the Debian Med project, can be found in the %"
         "sHow to Contribute%s page."
-msgstr  "Vous pouvez trouver plus d'information sur les moyens de participer &agrave; Debian-Med "
+msgstr  "Vous pouvez trouver plus d'information sur les moyens de participer &agrave; Debian Med "
         "dans la page <q>%sHow to Contribute%s</q>."
 
 #: ../locales.php:41
@@ -444,7 +444,7 @@
 
 #: ../tasks.tmpl:18
 msgid   "The list to the right includes various software projects which are of some interest to "
-        "the Debian-Med Project."
+        "the Debian Med Project."
 msgstr  ""
 
 #: ../tasks.tmpl:19
@@ -452,15 +452,15 @@
 msgstr  ""
 
 #: ../tasks.tmpl:20
-msgid   "It is our goal, however, to include all software in Debian-Med which can sensibly add to "
-        "a high quality Debian Integrated Solution."
+msgid   "It is our goal, however, to include all software in Debian Med which can sensibly add to "
+        "a high quality Debian Pure Blend."
 msgstr  ""
 
 #: ../tasks.tmpl:31
 #, php-format
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
+msgid   "If you discover a project which looks like a good candidate for Debian Med to you, or if "
         "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the %sDebian-Med mailing list%s"
+        "description of that project to the %sDebian Med mailing list%s"
 msgstr  ""
 
 #

Modified: cdd/trunk/webtools/po/it.po
==============================================================================
--- cdd/trunk/webtools/po/it.po	(original)
+++ cdd/trunk/webtools/po/it.po	Sat Nov  1 13:21:47 2008
@@ -1,5 +1,5 @@
-# Translation file for Debian-Med homepage.
-# Copyright (C) 2007, Debian-Med Team <debian-med at lists.debian.org>
+# Translation file for Debian Pure Blends webtools.
+# Copyright (C) 2007, Debian Pure Blends Team <debian-custom at lists.debian.org>
 # This file is distributed under the GNU General Public License v2+.
 # David Paleino <d.paleino at gmail.com>, 2007.
 #
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: 0.1\n"
         "Report-Msgid-Bugs-To: debian-custom at lists.debian.org\n"
-        "POT-Creation-Date: 2008-09-21 11:35+0200\n"
+        "POT-Creation-Date: 2008-10-29 20:29+0100\n"
         "PO-Revision-Date: 2008-02-17 13:30+0100\n"
         "Last-Translator: David Paleino <d.paleino at gmail.com>\n"
         "Language-Team: Italian <it at li.org>\n"
@@ -15,203 +15,203 @@
         "Content-Type: text/plain; charset=UTF-8\n"
         "Content-Transfer-Encoding: 8bit\n"
 
-#: tasks.py:86
+#: tasks.py:79
 msgid   "Maintainer"
 msgstr  ""
 
-#: tasks.py:87
+#: tasks.py:80
 msgid   "Responsible"
 msgstr  "Responsabile"
 
-#: tasks.py:88
+#: tasks.py:81
 msgid   "License"
 msgstr  ""
 
-#: tasks.py:89
+#: tasks.py:82
 #, fuzzy
 msgid   "Version"
 msgstr  "Revisione"
 
-#: tasks.py:90
+#: tasks.py:83
 #, fuzzy
 msgid   "Summary"
 msgstr  "riassunto"
 
-#: tasks.py:91
+#: tasks.py:84
 #, fuzzy
 msgid   "Last update:"
 msgstr  "Ultimo aggiornamento"
 
-#: tasks.py:93 tasks.py:101
+#: tasks.py:86 tasks.py:94
 msgid   "Official Debian package"
 msgstr  ""
 
-#: tasks.py:94
+#: tasks.py:87
 msgid   "Official Debian package (recommended)"
 msgstr  ""
 
-#: tasks.py:95
+#: tasks.py:88
 msgid   "Official Debian package (suggested)"
 msgstr  ""
 
-#: tasks.py:96
+#: tasks.py:89
 #, fuzzy
 msgid   "Debian package in non-free"
 msgstr  "pacchetto Debian non disponibile"
 
-#: tasks.py:97
+#: tasks.py:90
 #, fuzzy
 msgid   "Debian package in contrib"
 msgstr  "pacchetto Debian non disponibile"
 
-#: tasks.py:98
+#: tasks.py:91
 msgid   "Unofficial Debian package"
 msgstr  ""
 
-#: tasks.py:99
+#: tasks.py:92
 msgid   "Debian package not available"
 msgstr  "pacchetto Debian non disponibile"
 
-#: tasks.py:102
+#: tasks.py:95
 msgid   "For a better overview of the project's availability as a Debian package, each head row "
         "has a color code according to this scheme:"
 msgstr  "Per una migliore visione d'insieme della disponibilità del progetto come pacchetto "
         "Debian, ogni riga ha un colore codificato secondo il seguente schema:"
 
-#: tasks.py:103
+#: tasks.py:96
 #, fuzzy, python-format
 msgid   "If you discover a project which looks like a good candidate for %s\n"
         "                              to you, or if you have prepared an unofficial Debian "
         "package, please do not hesitate to\n"
         "                              send a description of that project to the <a href=\"mailto:%"
         "s\">%s mailing list</a>"
-msgstr  "Se hai trovato un progetto che sembra essere un buon candidato per Debian-Med, o se hai "
+msgstr  "Se hai trovato un progetto che sembra essere un buon candidato per Debian Med, o se hai "
         "preparato un pacchetto Debian non ufficiale, non esitare a mandare una descrizione di "
-        "quel progetto alla %smailing list Debian-Med%s"
+        "quel progetto alla %smailing list Debian Med%s"
 
-#: tasks.py:107
+#: tasks.py:100
 #, python-format
 msgid   "The list to the right includes various software projects which are of some interest to "
         "the %s Project. Currently, only a few of them are available as Debian packages. It is our "
         "goal, however, to include all software in %s which can sensibly add to a high quality "
-        "Debian Integrated Solution."
+        "Debian Pure Blend."
 msgstr  ""
 
-#: tasks.py:108
+#: tasks.py:101
 msgid   "Tasks page"
-msgstr  "Tasks della DIS"
+msgstr  "Tasks della Blend"
 
-#: tasks.py:109
+#: tasks.py:102
 msgid   "Project"
 msgstr  ""
 
-#: tasks.py:110
+#: tasks.py:103
 #, python-format
 msgid   "This is a list of the Tasks %s is made of:"
 msgstr  ""
 
-#: tasks.py:111
+#: tasks.py:104
 msgid   "This page is also available in the following languages:"
 msgstr  ""
 
-#: tasks.py:112
+#: tasks.py:105
 #, python-format
 msgid   "How to set <a href=\"%s\">the default document language</a>"
 msgstr  ""
 
-#: tasks.py:114
+#: tasks.py:107
 #, fuzzy
 msgid   "Homepage not available"
 msgstr  "pacchetto Debian non disponibile"
 
-#: tasks.py:115
+#: tasks.py:108
 #, fuzzy
 msgid   "Translate description"
 msgstr  "Descrizione breve"
 
-#: tasks.py:116
+#: tasks.py:109
 #, fuzzy
 msgid   "Fix translated description"
 msgstr  "Descrizione breve"
 
-#: tasks.py:128
+#: tasks.py:121
 #, fuzzy
 msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
         "a>"
 msgstr  "Verde: Il progetto è %sdisponibile come pacchetto Debian ufficiale%s"
 
-#: tasks.py:129
+#: tasks.py:122
 #, fuzzy
 msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  "Giallo: Il progetto è %sdisponibile come pacchetto Debian non ufficiale%s"
 
-#: tasks.py:130
+#: tasks.py:123
 #, fuzzy
 msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
         "package</a>"
 msgstr  "Rosso: Il progetto %snon è (ancora) disponibile come pacchetto Debian%s"
 
-#: tasks.py:135
+#: tasks.py:128
 msgid   "Dependant"
 msgstr  ""
 
-#: tasks.py:136
+#: tasks.py:129
 #, fuzzy
 msgid   "Recommended"
 msgstr  "Ricevuto"
 
-#: tasks.py:137
+#: tasks.py:130
 msgid   "Suggested"
 msgstr  ""
 
-#: tasks.py:138
+#: tasks.py:131
 msgid   "Unofficial"
 msgstr  ""
 
-#: tasks.py:139
+#: tasks.py:132
 msgid   "Prospective"
 msgstr  ""
 
-#: tasks.py:142
+#: tasks.py:135
 msgid   "Official Debian packages"
 msgstr  ""
 
-#: tasks.py:143
+#: tasks.py:136
 msgid   "Official Debian packages (Recommended)"
 msgstr  ""
 
-#: tasks.py:144
+#: tasks.py:137
 msgid   "Official Debian packages (Suggested)"
 msgstr  ""
 
-#: tasks.py:145
+#: tasks.py:138
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  ""
 
-#: tasks.py:146
+#: tasks.py:139
 #, fuzzy
 msgid   "Debian packages not available"
 msgstr  "pacchetto Debian non disponibile"
 
-#: tasks.py:148
+#: tasks.py:141
 #, fuzzy
 msgid   "Packages"
 msgstr  "pagine"
 
-#: tasks.py:149
+#: tasks.py:142
 #, python-format
-msgid   "A %sDebian Integrated Solution%s is a Debian internal project which assembles\n"
+msgid   "A %sDebian Pure Blend%s is a Debian internal project which assembles\n"
         "a set of packages that might help users to solve certain tasks of their work.  The list "
         "on\n"
         "the right shows the tasks of %s."
 msgstr  ""
 
-#: tasks.py:207
+#: tasks.py:200
 msgid   "Links to other tasks"
 msgstr  ""
 
-#: tasks.py:208
+#: tasks.py:201
 msgid   "Index of all tasks"
 msgstr  ""
 
@@ -286,12 +286,12 @@
 msgstr  "pagina Wiki"
 
 #: ../index.php:15
-msgid   "The Debian-Med project presents packages that are associated with <ul><li>medicine</"
+msgid   "The Debian Med project presents packages that are associated with <ul><li>medicine</"
         "li><li>pre-clinical research</li><li>life science.</li></ul> Its developments are mostly "
         "focused on three areas for the moment: <ul><li>medical practice</li><li>imaging</"
         "li><li>bioinformatics</li></ul>and can be installed directly from every Debian "
         "installation."
-msgstr  "Il progetto Debian-Med presenta pacchetti che sono associati con <ul><li>la medicina</"
+msgstr  "Il progetto Debian Med presenta pacchetti che sono associati con <ul><li>la medicina</"
         "li><li>la ricerca pre-clinica</li><li>le scienze della vita.</li></ul> Il suo sviluppo "
         "&egrave; principalmente concentrato su tre aree per il momento: <ul><li>attivit&agrave; "
         "mediche</li><li>imaging</li><li>bioinformatica</li></ul> e possono essere installati "
@@ -337,8 +337,8 @@
 msgstr  "Progetto Traduzione Descrizioni Debian"
 
 #: ../index.php:46
-msgid   "Tasks of our DIS"
-msgstr  "Tasks della DIS"
+msgid   "Tasks of our Blend"
+msgstr  "Tasks della Blend"
 
 #: ../index.php:47
 msgid   "SVN repository"
@@ -427,9 +427,9 @@
 
 #: ../locales.php:31
 #, php-format
-msgid   "More information on how to contribute to the Debian-Med project, can be found in the %"
+msgid   "More information on how to contribute to the Debian Med project, can be found in the %"
         "sHow to Contribute%s page."
-msgstr  "Maggiori informazioni su come contribuire al progetto Debian-Med possono essere trovate "
+msgstr  "Maggiori informazioni su come contribuire al progetto Debian Med possono essere trovate "
         "nella pagina %sCome contribuire%s."
 
 #: ../locales.php:41
@@ -458,28 +458,28 @@
 
 #: ../tasks.tmpl:18
 msgid   "The list to the right includes various software projects which are of some interest to "
-        "the Debian-Med Project."
+        "the Debian Med Project."
 msgstr  "L'elenco sulla destra include vari progetti software che sono di qualche interesse al "
-        "Progetto Debian-Med."
+        "Progetto Debian Med."
 
 #: ../tasks.tmpl:19
 msgid   "Currently, only a few of them are available as Debian packages."
 msgstr  "Attualmente, solo alcuni sono disponibili come pacchetti Debian."
 
 #: ../tasks.tmpl:20
-msgid   "It is our goal, however, to include all software in Debian-Med which can sensibly add to "
-        "a high quality Debian Integrated Solution."
-msgstr  "È nostro obiettivo, comunque, includere in Debian-Med tutto il software che può "
-        "sensibilmente contribuire a una Debian Integrated Solution di qualità."
+msgid   "It is our goal, however, to include all software in Debian Med which can sensibly add to "
+        "a high quality Debian Pure Blend."
+msgstr  "È nostro obiettivo, comunque, includere in Debian Med tutto il software che può "
+        "sensibilmente contribuire a una Debian Pure Blend di qualità."
 
 #: ../tasks.tmpl:31
 #, php-format
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
+msgid   "If you discover a project which looks like a good candidate for Debian Med to you, or if "
         "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the %sDebian-Med mailing list%s"
-msgstr  "Se hai trovato un progetto che sembra essere un buon candidato per Debian-Med, o se hai "
+        "description of that project to the %sDebian Med mailing list%s"
+msgstr  "Se hai trovato un progetto che sembra essere un buon candidato per Debian Med, o se hai "
         "preparato un pacchetto Debian non ufficiale, non esitare a mandare una descrizione di "
-        "quel progetto alla %smailing list Debian-Med%s"
+        "quel progetto alla %smailing list Debian Med%s"
 
 #
 # These strings are manually added, they

Modified: cdd/trunk/webtools/po/ja.po
==============================================================================
--- cdd/trunk/webtools/po/ja.po	(original)
+++ cdd/trunk/webtools/po/ja.po	Sat Nov  1 13:21:47 2008
@@ -1,61 +1,61 @@
-#: tasks.py:86
+#: tasks.py:79
 msgid   "Maintainer"
 msgstr  ""
 
-#: tasks.py:87
+#: tasks.py:80
 msgid   "Responsible"
 msgstr  ""
 
-#: tasks.py:88
+#: tasks.py:81
 msgid   "License"
 msgstr  ""
 
-#: tasks.py:89
+#: tasks.py:82
 msgid   "Version"
 msgstr  ""
 
-#: tasks.py:90
+#: tasks.py:83
 msgid   "Summary"
 msgstr  ""
 
-#: tasks.py:91
+#: tasks.py:84
 msgid   "Last update:"
 msgstr  ""
 
-#: tasks.py:93 tasks.py:101
+#: tasks.py:86 tasks.py:94
 msgid   "Official Debian package"
 msgstr  ""
 
-#: tasks.py:94
+#: tasks.py:87
 msgid   "Official Debian package (recommended)"
 msgstr  ""
 
-#: tasks.py:95
+#: tasks.py:88
 msgid   "Official Debian package (suggested)"
 msgstr  ""
 
-#: tasks.py:96
+#: tasks.py:89
 msgid   "Debian package in non-free"
 msgstr  ""
 
-#: tasks.py:97
+#: tasks.py:90
 msgid   "Debian package in contrib"
 msgstr  ""
 
-#: tasks.py:98
+#: tasks.py:91
 msgid   "Unofficial Debian package"
 msgstr  ""
 
-#: tasks.py:99
+#: tasks.py:92
 msgid   "Debian package not available"
 msgstr  ""
 
-#: tasks.py:102
+#: tasks.py:95
 msgid   "For a better overview of the project's availability as a Debian package, each head row "
         "has a color code according to this scheme:"
 msgstr  ""
 
-#: tasks.py:103
+#: tasks.py:96
 #, python-format
 msgid   "If you discover a project which looks like a good candidate for %s\n"
         "                              to you, or if you have prepared an unofficial Debian "
@@ -64,120 +64,120 @@
         "s\">%s mailing list</a>"
 msgstr  ""
 
-#: tasks.py:107
+#: tasks.py:100
 #, python-format
 msgid   "The list to the right includes various software projects which are of some interest to "
         "the %s Project. Currently, only a few of them are available as Debian packages. It is our "
         "goal, however, to include all software in %s which can sensibly add to a high quality "
-        "Debian Integrated Solution."
+        "Debian Pure Blend."
 msgstr  ""
 
-#: tasks.py:108
+#: tasks.py:101
 msgid   "Tasks page"
 msgstr  ""
 
-#: tasks.py:109
+#: tasks.py:102
 msgid   "Project"
 msgstr  ""
 
-#: tasks.py:110
+#: tasks.py:103
 #, python-format
 msgid   "This is a list of the Tasks %s is made of:"
 msgstr  ""
 
-#: tasks.py:111
+#: tasks.py:104
 msgid   "This page is also available in the following languages:"
 msgstr  ""
 
-#: tasks.py:112
+#: tasks.py:105
 #, python-format
 msgid   "How to set <a href=\"%s\">the default document language</a>"
 msgstr  ""
 
-#: tasks.py:114
+#: tasks.py:107
 msgid   "Homepage not available"
 msgstr  ""
 
-#: tasks.py:115
+#: tasks.py:108
 msgid   "Translate description"
 msgstr  ""
 
-#: tasks.py:116
+#: tasks.py:109
 msgid   "Fix translated description"
 msgstr  ""
 
-#: tasks.py:128
+#: tasks.py:121
 msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
         "a>"
 msgstr  ""
 
-#: tasks.py:129
+#: tasks.py:122
 msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:130
+#: tasks.py:123
 msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:135
+#: tasks.py:128
 msgid   "Dependant"
 msgstr  ""
 
-#: tasks.py:136
+#: tasks.py:129
 msgid   "Recommended"
 msgstr  ""
 
-#: tasks.py:137
+#: tasks.py:130
 msgid   "Suggested"
 msgstr  ""
 
-#: tasks.py:138
+#: tasks.py:131
 msgid   "Unofficial"
 msgstr  ""
 
-#: tasks.py:139
+#: tasks.py:132
 msgid   "Prospective"
 msgstr  ""
 
-#: tasks.py:142
+#: tasks.py:135
 msgid   "Official Debian packages"
 msgstr  ""
 
-#: tasks.py:143
+#: tasks.py:136
 msgid   "Official Debian packages (Recommended)"
 msgstr  ""
 
-#: tasks.py:144
+#: tasks.py:137
 msgid   "Official Debian packages (Suggested)"
 msgstr  ""
 
-#: tasks.py:145
+#: tasks.py:138
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  ""
 
-#: tasks.py:146
+#: tasks.py:139
 msgid   "Debian packages not available"
 msgstr  ""
 
-#: tasks.py:148
+#: tasks.py:141
 msgid   "Packages"
 msgstr  ""
 
-#: tasks.py:149
+#: tasks.py:142
 #, python-format
-msgid   "A %sDebian Integrated Solution%s is a Debian internal project which assembles\n"
+msgid   "A %sDebian Pure Blend%s is a Debian internal project which assembles\n"
         "a set of packages that might help users to solve certain tasks of their work.  The list "
         "on\n"
         "the right shows the tasks of %s."
 msgstr  ""
 
-#: tasks.py:207
+#: tasks.py:200
 msgid   "Links to other tasks"
 msgstr  ""
 
-#: tasks.py:208
+#: tasks.py:201
 msgid   "Index of all tasks"
 msgstr  ""
 
@@ -253,7 +253,7 @@
 msgstr  ""
 
 #: ../index.php:15
-msgid   "The Debian-Med project presents packages that are associated with <ul><li>medicine</"
+msgid   "The Debian Med project presents packages that are associated with <ul><li>medicine</"
         "li><li>pre-clinical research</li><li>life science.</li></ul> Its developments are mostly "
         "focused on three areas for the moment: <ul><li>medical practice</li><li>imaging</"
         "li><li>bioinformatics</li></ul>and can be installed directly from every Debian "
@@ -297,7 +297,7 @@
 msgstr  ""
 
 #: ../index.php:46
-msgid   "Tasks of our DIS"
+msgid   "Tasks of our Blend"
 msgstr  ""
 
 #: ../index.php:47
@@ -386,7 +386,7 @@
 
 #: ../locales.php:31
 #, php-format
-msgid   "More information on how to contribute to the Debian-Med project, can be found in the %"
+msgid   "More information on how to contribute to the Debian Med project, can be found in the %"
         "sHow to Contribute%s page."
 msgstr  ""
 
@@ -416,7 +416,7 @@
 
 #: ../tasks.tmpl:18
 msgid   "The list to the right includes various software projects which are of some interest to "
-        "the Debian-Med Project."
+        "the Debian Med Project."
 msgstr  ""
 
 #: ../tasks.tmpl:19
@@ -424,15 +424,15 @@
 msgstr  ""
 
 #: ../tasks.tmpl:20
-msgid   "It is our goal, however, to include all software in Debian-Med which can sensibly add to "
-        "a high quality Debian Integrated Solution."
+msgid   "It is our goal, however, to include all software in Debian Med which can sensibly add to "
+        "a high quality Debian Pure Blend."
 msgstr  ""
 
 #: ../tasks.tmpl:31
 #, php-format
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
+msgid   "If you discover a project which looks like a good candidate for Debian Med to you, or if "
         "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the %sDebian-Med mailing list%s"
+        "description of that project to the %sDebian Med mailing list%s"
 msgstr  ""
 
 #

Modified: cdd/trunk/webtools/po/ko.po
==============================================================================
--- cdd/trunk/webtools/po/ko.po	(original)
+++ cdd/trunk/webtools/po/ko.po	Sat Nov  1 13:21:47 2008
@@ -1,61 +1,61 @@
-#: tasks.py:86
+#: tasks.py:79
 msgid   "Maintainer"
 msgstr  ""
 
-#: tasks.py:87
+#: tasks.py:80
 msgid   "Responsible"
 msgstr  ""
 
-#: tasks.py:88
+#: tasks.py:81
 msgid   "License"
 msgstr  ""
 
-#: tasks.py:89
+#: tasks.py:82
 msgid   "Version"
 msgstr  ""
 
-#: tasks.py:90
+#: tasks.py:83
 msgid   "Summary"
 msgstr  ""
 
-#: tasks.py:91
+#: tasks.py:84
 msgid   "Last update:"
 msgstr  ""
 
-#: tasks.py:93 tasks.py:101
+#: tasks.py:86 tasks.py:94
 msgid   "Official Debian package"
 msgstr  ""
 
-#: tasks.py:94
+#: tasks.py:87
 msgid   "Official Debian package (recommended)"
 msgstr  ""
 
-#: tasks.py:95
+#: tasks.py:88
 msgid   "Official Debian package (suggested)"
 msgstr  ""
 
-#: tasks.py:96
+#: tasks.py:89
 msgid   "Debian package in non-free"
 msgstr  ""
 
-#: tasks.py:97
+#: tasks.py:90
 msgid   "Debian package in contrib"
 msgstr  ""
 
-#: tasks.py:98
+#: tasks.py:91
 msgid   "Unofficial Debian package"
 msgstr  ""
 
-#: tasks.py:99
+#: tasks.py:92
 msgid   "Debian package not available"
 msgstr  ""
 
-#: tasks.py:102
+#: tasks.py:95
 msgid   "For a better overview of the project's availability as a Debian package, each head row "
         "has a color code according to this scheme:"
 msgstr  ""
 
-#: tasks.py:103
+#: tasks.py:96
 #, python-format
 msgid   "If you discover a project which looks like a good candidate for %s\n"
         "                              to you, or if you have prepared an unofficial Debian "
@@ -64,120 +64,120 @@
         "s\">%s mailing list</a>"
 msgstr  ""
 
-#: tasks.py:107
+#: tasks.py:100
 #, python-format
 msgid   "The list to the right includes various software projects which are of some interest to "
         "the %s Project. Currently, only a few of them are available as Debian packages. It is our "
         "goal, however, to include all software in %s which can sensibly add to a high quality "
-        "Debian Integrated Solution."
+        "Debian Pure Blend."
 msgstr  ""
 
-#: tasks.py:108
+#: tasks.py:101
 msgid   "Tasks page"
 msgstr  ""
 
-#: tasks.py:109
+#: tasks.py:102
 msgid   "Project"
 msgstr  ""
 
-#: tasks.py:110
+#: tasks.py:103
 #, python-format
 msgid   "This is a list of the Tasks %s is made of:"
 msgstr  ""
 
-#: tasks.py:111
+#: tasks.py:104
 msgid   "This page is also available in the following languages:"
 msgstr  ""
 
-#: tasks.py:112
+#: tasks.py:105
 #, python-format
 msgid   "How to set <a href=\"%s\">the default document language</a>"
 msgstr  ""
 
-#: tasks.py:114
+#: tasks.py:107
 msgid   "Homepage not available"
 msgstr  ""
 
-#: tasks.py:115
+#: tasks.py:108
 msgid   "Translate description"
 msgstr  ""
 
-#: tasks.py:116
+#: tasks.py:109
 msgid   "Fix translated description"
 msgstr  ""
 
-#: tasks.py:128
+#: tasks.py:121
 msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
         "a>"
 msgstr  ""
 
-#: tasks.py:129
+#: tasks.py:122
 msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:130
+#: tasks.py:123
 msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:135
+#: tasks.py:128
 msgid   "Dependant"
 msgstr  ""
 
-#: tasks.py:136
+#: tasks.py:129
 msgid   "Recommended"
 msgstr  ""
 
-#: tasks.py:137
+#: tasks.py:130
 msgid   "Suggested"
 msgstr  ""
 
-#: tasks.py:138
+#: tasks.py:131
 msgid   "Unofficial"
 msgstr  ""
 
-#: tasks.py:139
+#: tasks.py:132
 msgid   "Prospective"
 msgstr  ""
 
-#: tasks.py:142
+#: tasks.py:135
 msgid   "Official Debian packages"
 msgstr  ""
 
-#: tasks.py:143
+#: tasks.py:136
 msgid   "Official Debian packages (Recommended)"
 msgstr  ""
 
-#: tasks.py:144
+#: tasks.py:137
 msgid   "Official Debian packages (Suggested)"
 msgstr  ""
 
-#: tasks.py:145
+#: tasks.py:138
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  ""
 
-#: tasks.py:146
+#: tasks.py:139
 msgid   "Debian packages not available"
 msgstr  ""
 
-#: tasks.py:148
+#: tasks.py:141
 msgid   "Packages"
 msgstr  ""
 
-#: tasks.py:149
+#: tasks.py:142
 #, python-format
-msgid   "A %sDebian Integrated Solution%s is a Debian internal project which assembles\n"
+msgid   "A %sDebian Pure Blend%s is a Debian internal project which assembles\n"
         "a set of packages that might help users to solve certain tasks of their work.  The list "
         "on\n"
         "the right shows the tasks of %s."
 msgstr  ""
 
-#: tasks.py:207
+#: tasks.py:200
 msgid   "Links to other tasks"
 msgstr  ""
 
-#: tasks.py:208
+#: tasks.py:201
 msgid   "Index of all tasks"
 msgstr  ""
 
@@ -253,7 +253,7 @@
 msgstr  ""
 
 #: ../index.php:15
-msgid   "The Debian-Med project presents packages that are associated with <ul><li>medicine</"
+msgid   "The Debian Med project presents packages that are associated with <ul><li>medicine</"
         "li><li>pre-clinical research</li><li>life science.</li></ul> Its developments are mostly "
         "focused on three areas for the moment: <ul><li>medical practice</li><li>imaging</"
         "li><li>bioinformatics</li></ul>and can be installed directly from every Debian "
@@ -297,7 +297,7 @@
 msgstr  ""
 
 #: ../index.php:46
-msgid   "Tasks of our DIS"
+msgid   "Tasks of our Blend"
 msgstr  ""
 
 #: ../index.php:47
@@ -386,7 +386,7 @@
 
 #: ../locales.php:31
 #, php-format
-msgid   "More information on how to contribute to the Debian-Med project, can be found in the %"
+msgid   "More information on how to contribute to the Debian Med project, can be found in the %"
         "sHow to Contribute%s page."
 msgstr  ""
 
@@ -416,7 +416,7 @@
 
 #: ../tasks.tmpl:18
 msgid   "The list to the right includes various software projects which are of some interest to "
-        "the Debian-Med Project."
+        "the Debian Med Project."
 msgstr  ""
 
 #: ../tasks.tmpl:19
@@ -424,15 +424,15 @@
 msgstr  ""
 
 #: ../tasks.tmpl:20
-msgid   "It is our goal, however, to include all software in Debian-Med which can sensibly add to "
-        "a high quality Debian Integrated Solution."
+msgid   "It is our goal, however, to include all software in Debian Med which can sensibly add to "
+        "a high quality Debian Pure Blend."
 msgstr  ""
 
 #: ../tasks.tmpl:31
 #, php-format
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
+msgid   "If you discover a project which looks like a good candidate for Debian Med to you, or if "
         "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the %sDebian-Med mailing list%s"
+        "description of that project to the %sDebian Med mailing list%s"
 msgstr  ""
 
 #

Modified: cdd/trunk/webtools/po/nl.po
==============================================================================
--- cdd/trunk/webtools/po/nl.po	(original)
+++ cdd/trunk/webtools/po/nl.po	Sat Nov  1 13:21:47 2008
@@ -1,61 +1,61 @@
-#: tasks.py:86
+#: tasks.py:79
 msgid   "Maintainer"
 msgstr  ""
 
-#: tasks.py:87
+#: tasks.py:80
 msgid   "Responsible"
 msgstr  ""
 
-#: tasks.py:88
+#: tasks.py:81
 msgid   "License"
 msgstr  ""
 
-#: tasks.py:89
+#: tasks.py:82
 msgid   "Version"
 msgstr  ""
 
-#: tasks.py:90
+#: tasks.py:83
 msgid   "Summary"
 msgstr  ""
 
-#: tasks.py:91
+#: tasks.py:84
 msgid   "Last update:"
 msgstr  ""
 
-#: tasks.py:93 tasks.py:101
+#: tasks.py:86 tasks.py:94
 msgid   "Official Debian package"
 msgstr  ""
 
-#: tasks.py:94
+#: tasks.py:87
 msgid   "Official Debian package (recommended)"
 msgstr  ""
 
-#: tasks.py:95
+#: tasks.py:88
 msgid   "Official Debian package (suggested)"
 msgstr  ""
 
-#: tasks.py:96
+#: tasks.py:89
 msgid   "Debian package in non-free"
 msgstr  ""
 
-#: tasks.py:97
+#: tasks.py:90
 msgid   "Debian package in contrib"
 msgstr  ""
 
-#: tasks.py:98
+#: tasks.py:91
 msgid   "Unofficial Debian package"
 msgstr  ""
 
-#: tasks.py:99
+#: tasks.py:92
 msgid   "Debian package not available"
 msgstr  ""
 
-#: tasks.py:102
+#: tasks.py:95
 msgid   "For a better overview of the project's availability as a Debian package, each head row "
         "has a color code according to this scheme:"
 msgstr  ""
 
-#: tasks.py:103
+#: tasks.py:96
 #, python-format
 msgid   "If you discover a project which looks like a good candidate for %s\n"
         "                              to you, or if you have prepared an unofficial Debian "
@@ -64,120 +64,120 @@
         "s\">%s mailing list</a>"
 msgstr  ""
 
-#: tasks.py:107
+#: tasks.py:100
 #, python-format
 msgid   "The list to the right includes various software projects which are of some interest to "
         "the %s Project. Currently, only a few of them are available as Debian packages. It is our "
         "goal, however, to include all software in %s which can sensibly add to a high quality "
-        "Debian Integrated Solution."
+        "Debian Pure Blend."
 msgstr  ""
 
-#: tasks.py:108
+#: tasks.py:101
 msgid   "Tasks page"
 msgstr  ""
 
-#: tasks.py:109
+#: tasks.py:102
 msgid   "Project"
 msgstr  ""
 
-#: tasks.py:110
+#: tasks.py:103
 #, python-format
 msgid   "This is a list of the Tasks %s is made of:"
 msgstr  ""
 
-#: tasks.py:111
+#: tasks.py:104
 msgid   "This page is also available in the following languages:"
 msgstr  ""
 
-#: tasks.py:112
+#: tasks.py:105
 #, python-format
 msgid   "How to set <a href=\"%s\">the default document language</a>"
 msgstr  ""
 
-#: tasks.py:114
+#: tasks.py:107
 msgid   "Homepage not available"
 msgstr  ""
 
-#: tasks.py:115
+#: tasks.py:108
 msgid   "Translate description"
 msgstr  ""
 
-#: tasks.py:116
+#: tasks.py:109
 msgid   "Fix translated description"
 msgstr  ""
 
-#: tasks.py:128
+#: tasks.py:121
 msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
         "a>"
 msgstr  ""
 
-#: tasks.py:129
+#: tasks.py:122
 msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:130
+#: tasks.py:123
 msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:135
+#: tasks.py:128
 msgid   "Dependant"
 msgstr  ""
 
-#: tasks.py:136
+#: tasks.py:129
 msgid   "Recommended"
 msgstr  ""
 
-#: tasks.py:137
+#: tasks.py:130
 msgid   "Suggested"
 msgstr  ""
 
-#: tasks.py:138
+#: tasks.py:131
 msgid   "Unofficial"
 msgstr  ""
 
-#: tasks.py:139
+#: tasks.py:132
 msgid   "Prospective"
 msgstr  ""
 
-#: tasks.py:142
+#: tasks.py:135
 msgid   "Official Debian packages"
 msgstr  ""
 
-#: tasks.py:143
+#: tasks.py:136
 msgid   "Official Debian packages (Recommended)"
 msgstr  ""
 
-#: tasks.py:144
+#: tasks.py:137
 msgid   "Official Debian packages (Suggested)"
 msgstr  ""
 
-#: tasks.py:145
+#: tasks.py:138
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  ""
 
-#: tasks.py:146
+#: tasks.py:139
 msgid   "Debian packages not available"
 msgstr  ""
 
-#: tasks.py:148
+#: tasks.py:141
 msgid   "Packages"
 msgstr  ""
 
-#: tasks.py:149
+#: tasks.py:142
 #, python-format
-msgid   "A %sDebian Integrated Solution%s is a Debian internal project which assembles\n"
+msgid   "A %sDebian Pure Blend%s is a Debian internal project which assembles\n"
         "a set of packages that might help users to solve certain tasks of their work.  The list "
         "on\n"
         "the right shows the tasks of %s."
 msgstr  ""
 
-#: tasks.py:207
+#: tasks.py:200
 msgid   "Links to other tasks"
 msgstr  ""
 
-#: tasks.py:208
+#: tasks.py:201
 msgid   "Index of all tasks"
 msgstr  ""
 
@@ -253,7 +253,7 @@
 msgstr  ""
 
 #: ../index.php:15
-msgid   "The Debian-Med project presents packages that are associated with <ul><li>medicine</"
+msgid   "The Debian Med project presents packages that are associated with <ul><li>medicine</"
         "li><li>pre-clinical research</li><li>life science.</li></ul> Its developments are mostly "
         "focused on three areas for the moment: <ul><li>medical practice</li><li>imaging</"
         "li><li>bioinformatics</li></ul>and can be installed directly from every Debian "
@@ -297,7 +297,7 @@
 msgstr  ""
 
 #: ../index.php:46
-msgid   "Tasks of our DIS"
+msgid   "Tasks of our Blend"
 msgstr  ""
 
 #: ../index.php:47
@@ -386,7 +386,7 @@
 
 #: ../locales.php:31
 #, php-format
-msgid   "More information on how to contribute to the Debian-Med project, can be found in the %"
+msgid   "More information on how to contribute to the Debian Med project, can be found in the %"
         "sHow to Contribute%s page."
 msgstr  ""
 
@@ -416,7 +416,7 @@
 
 #: ../tasks.tmpl:18
 msgid   "The list to the right includes various software projects which are of some interest to "
-        "the Debian-Med Project."
+        "the Debian Med Project."
 msgstr  ""
 
 #: ../tasks.tmpl:19
@@ -424,15 +424,15 @@
 msgstr  ""
 
 #: ../tasks.tmpl:20
-msgid   "It is our goal, however, to include all software in Debian-Med which can sensibly add to "
-        "a high quality Debian Integrated Solution."
+msgid   "It is our goal, however, to include all software in Debian Med which can sensibly add to "
+        "a high quality Debian Pure Blend."
 msgstr  ""
 
 #: ../tasks.tmpl:31
 #, php-format
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
+msgid   "If you discover a project which looks like a good candidate for Debian Med to you, or if "
         "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the %sDebian-Med mailing list%s"
+        "description of that project to the %sDebian Med mailing list%s"
 msgstr  ""
 
 #

Modified: cdd/trunk/webtools/po/php-message-strings.pot
==============================================================================
--- cdd/trunk/webtools/po/php-message-strings.pot	(original)
+++ cdd/trunk/webtools/po/php-message-strings.pot	Sat Nov  1 13:21:47 2008
@@ -63,7 +63,7 @@
 
 #: ../index.php:15
 msgid ""
-"The Debian-Med project presents packages that are associated with <ul><li>medicine</li><li>pre-clinical research</li><li>life science.</li></ul> "
+"The Debian Med project presents packages that are associated with <ul><li>medicine</li><li>pre-clinical research</li><li>life science.</li></ul> "
 "Its developments are mostly focused on three areas for the moment: <ul><li>medical practice</li><li>imaging</li><li>bioinformatics</li></ul>and can "
 "be installed directly from every Debian installation."
 msgstr ""
@@ -105,7 +105,7 @@
 msgstr ""
 
 #: ../index.php:46
-msgid "Tasks of our DIS"
+msgid "Tasks of our Blend"
 msgstr ""
 
 #: ../index.php:47
@@ -194,7 +194,7 @@
 
 #: ../locales.php:31
 #, php-format
-msgid "More information on how to contribute to the Debian-Med project, can be found in the %sHow to Contribute%s page."
+msgid "More information on how to contribute to the Debian Med project, can be found in the %sHow to Contribute%s page."
 msgstr ""
 
 #: ../locales.php:41
@@ -222,7 +222,7 @@
 msgstr ""
 
 #: ../tasks.tmpl:18
-msgid "The list to the right includes various software projects which are of some interest to the Debian-Med Project."
+msgid "The list to the right includes various software projects which are of some interest to the Debian Med Project."
 msgstr ""
 
 #: ../tasks.tmpl:19
@@ -230,12 +230,12 @@
 msgstr ""
 
 #: ../tasks.tmpl:20
-msgid "It is our goal, however, to include all software in Debian-Med which can sensibly add to a high quality Debian Integrated Solution."
+msgid "It is our goal, however, to include all software in Debian Med which can sensibly add to a high quality Debian Pure Blend."
 msgstr ""
 
 #: ../tasks.tmpl:31
 #, php-format
 msgid ""
-"If you discover a project which looks like a good candidate for Debian-Med to you, or if you have prepared an inofficial Debian package, please do "
-"not hesitate to send a description of that project to the %sDebian-Med mailing list%s"
+"If you discover a project which looks like a good candidate for Debian Med to you, or if you have prepared an inofficial Debian package, please do "
+"not hesitate to send a description of that project to the %sDebian Med mailing list%s"
 msgstr ""

Modified: cdd/trunk/webtools/po/pl.po
==============================================================================
--- cdd/trunk/webtools/po/pl.po	(original)
+++ cdd/trunk/webtools/po/pl.po	Sat Nov  1 13:21:47 2008
@@ -1,61 +1,61 @@
-#: tasks.py:86
+#: tasks.py:79
 msgid   "Maintainer"
 msgstr  ""
 
-#: tasks.py:87
+#: tasks.py:80
 msgid   "Responsible"
 msgstr  ""
 
-#: tasks.py:88
+#: tasks.py:81
 msgid   "License"
 msgstr  ""
 
-#: tasks.py:89
+#: tasks.py:82
 msgid   "Version"
 msgstr  ""
 
-#: tasks.py:90
+#: tasks.py:83
 msgid   "Summary"
 msgstr  ""
 
-#: tasks.py:91
+#: tasks.py:84
 msgid   "Last update:"
 msgstr  ""
 
-#: tasks.py:93 tasks.py:101
+#: tasks.py:86 tasks.py:94
 msgid   "Official Debian package"
 msgstr  ""
 
-#: tasks.py:94
+#: tasks.py:87
 msgid   "Official Debian package (recommended)"
 msgstr  ""
 
-#: tasks.py:95
+#: tasks.py:88
 msgid   "Official Debian package (suggested)"
 msgstr  ""
 
-#: tasks.py:96
+#: tasks.py:89
 msgid   "Debian package in non-free"
 msgstr  ""
 
-#: tasks.py:97
+#: tasks.py:90
 msgid   "Debian package in contrib"
 msgstr  ""
 
-#: tasks.py:98
+#: tasks.py:91
 msgid   "Unofficial Debian package"
 msgstr  ""
 
-#: tasks.py:99
+#: tasks.py:92
 msgid   "Debian package not available"
 msgstr  ""
 
-#: tasks.py:102
+#: tasks.py:95
 msgid   "For a better overview of the project's availability as a Debian package, each head row "
         "has a color code according to this scheme:"
 msgstr  ""
 
-#: tasks.py:103
+#: tasks.py:96
 #, python-format
 msgid   "If you discover a project which looks like a good candidate for %s\n"
         "                              to you, or if you have prepared an unofficial Debian "
@@ -64,120 +64,120 @@
         "s\">%s mailing list</a>"
 msgstr  ""
 
-#: tasks.py:107
+#: tasks.py:100
 #, python-format
 msgid   "The list to the right includes various software projects which are of some interest to "
         "the %s Project. Currently, only a few of them are available as Debian packages. It is our "
         "goal, however, to include all software in %s which can sensibly add to a high quality "
-        "Debian Integrated Solution."
+        "Debian Pure Blend."
 msgstr  ""
 
-#: tasks.py:108
+#: tasks.py:101
 msgid   "Tasks page"
 msgstr  ""
 
-#: tasks.py:109
+#: tasks.py:102
 msgid   "Project"
 msgstr  ""
 
-#: tasks.py:110
+#: tasks.py:103
 #, python-format
 msgid   "This is a list of the Tasks %s is made of:"
 msgstr  ""
 
-#: tasks.py:111
+#: tasks.py:104
 msgid   "This page is also available in the following languages:"
 msgstr  ""
 
-#: tasks.py:112
+#: tasks.py:105
 #, python-format
 msgid   "How to set <a href=\"%s\">the default document language</a>"
 msgstr  ""
 
-#: tasks.py:114
+#: tasks.py:107
 msgid   "Homepage not available"
 msgstr  ""
 
-#: tasks.py:115
+#: tasks.py:108
 msgid   "Translate description"
 msgstr  ""
 
-#: tasks.py:116
+#: tasks.py:109
 msgid   "Fix translated description"
 msgstr  ""
 
-#: tasks.py:128
+#: tasks.py:121
 msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
         "a>"
 msgstr  ""
 
-#: tasks.py:129
+#: tasks.py:122
 msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:130
+#: tasks.py:123
 msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:135
+#: tasks.py:128
 msgid   "Dependant"
 msgstr  ""
 
-#: tasks.py:136
+#: tasks.py:129
 msgid   "Recommended"
 msgstr  ""
 
-#: tasks.py:137
+#: tasks.py:130
 msgid   "Suggested"
 msgstr  ""
 
-#: tasks.py:138
+#: tasks.py:131
 msgid   "Unofficial"
 msgstr  ""
 
-#: tasks.py:139
+#: tasks.py:132
 msgid   "Prospective"
 msgstr  ""
 
-#: tasks.py:142
+#: tasks.py:135
 msgid   "Official Debian packages"
 msgstr  ""
 
-#: tasks.py:143
+#: tasks.py:136
 msgid   "Official Debian packages (Recommended)"
 msgstr  ""
 
-#: tasks.py:144
+#: tasks.py:137
 msgid   "Official Debian packages (Suggested)"
 msgstr  ""
 
-#: tasks.py:145
+#: tasks.py:138
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  ""
 
-#: tasks.py:146
+#: tasks.py:139
 msgid   "Debian packages not available"
 msgstr  ""
 
-#: tasks.py:148
+#: tasks.py:141
 msgid   "Packages"
 msgstr  ""
 
-#: tasks.py:149
+#: tasks.py:142
 #, python-format
-msgid   "A %sDebian Integrated Solution%s is a Debian internal project which assembles\n"
+msgid   "A %sDebian Pure Blend%s is a Debian internal project which assembles\n"
         "a set of packages that might help users to solve certain tasks of their work.  The list "
         "on\n"
         "the right shows the tasks of %s."
 msgstr  ""
 
-#: tasks.py:207
+#: tasks.py:200
 msgid   "Links to other tasks"
 msgstr  ""
 
-#: tasks.py:208
+#: tasks.py:201
 msgid   "Index of all tasks"
 msgstr  ""
 
@@ -253,7 +253,7 @@
 msgstr  ""
 
 #: ../index.php:15
-msgid   "The Debian-Med project presents packages that are associated with <ul><li>medicine</"
+msgid   "The Debian Med project presents packages that are associated with <ul><li>medicine</"
         "li><li>pre-clinical research</li><li>life science.</li></ul> Its developments are mostly "
         "focused on three areas for the moment: <ul><li>medical practice</li><li>imaging</"
         "li><li>bioinformatics</li></ul>and can be installed directly from every Debian "
@@ -297,7 +297,7 @@
 msgstr  ""
 
 #: ../index.php:46
-msgid   "Tasks of our DIS"
+msgid   "Tasks of our Blend"
 msgstr  ""
 
 #: ../index.php:47
@@ -386,7 +386,7 @@
 
 #: ../locales.php:31
 #, php-format
-msgid   "More information on how to contribute to the Debian-Med project, can be found in the %"
+msgid   "More information on how to contribute to the Debian Med project, can be found in the %"
         "sHow to Contribute%s page."
 msgstr  ""
 
@@ -416,7 +416,7 @@
 
 #: ../tasks.tmpl:18
 msgid   "The list to the right includes various software projects which are of some interest to "
-        "the Debian-Med Project."
+        "the Debian Med Project."
 msgstr  ""
 
 #: ../tasks.tmpl:19
@@ -424,15 +424,15 @@
 msgstr  ""
 
 #: ../tasks.tmpl:20
-msgid   "It is our goal, however, to include all software in Debian-Med which can sensibly add to "
-        "a high quality Debian Integrated Solution."
+msgid   "It is our goal, however, to include all software in Debian Med which can sensibly add to "
+        "a high quality Debian Pure Blend."
 msgstr  ""
 
 #: ../tasks.tmpl:31
 #, php-format
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
+msgid   "If you discover a project which looks like a good candidate for Debian Med to you, or if "
         "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the %sDebian-Med mailing list%s"
+        "description of that project to the %sDebian Med mailing list%s"
 msgstr  ""
 
 #

Modified: cdd/trunk/webtools/po/pt.po
==============================================================================
--- cdd/trunk/webtools/po/pt.po	(original)
+++ cdd/trunk/webtools/po/pt.po	Sat Nov  1 13:21:47 2008
@@ -1,5 +1,5 @@
-# Translation file for Debian-Med homepage.
-# Copyright (C) 2007, Debian-Med Team <debian-med at lists.debian.org>
+# Translation file for Debian Pure Blends webtools.
+# Copyright (C) 2007, Debian Pure Blends Team <debian-custom at lists.debian.org>
 # This file is distributed under the GNU General Public License v2+.
 # David Paleino <d.paleino at gmail.com>, 2007.
 # Nelson A. de Oliveira <naoliv at debian.org>, 2007-2008.
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: \n"
         "Report-Msgid-Bugs-To: debian-custom at lists.debian.org\n"
-        "POT-Creation-Date: 2008-09-21 11:35+0200\n"
+        "POT-Creation-Date: 2008-10-29 20:29+0100\n"
         "PO-Revision-Date: 2008-02-10 21:36-0300\n"
         "Last-Translator: Nelson A. de Oliveira <naoliv at debian.org>\n"
         "Language-Team: Debian i10n Portugu&ecirc;s <debian-l10n-portuguese at lists.debian.org>\n"
@@ -15,69 +15,69 @@
         "Content-Type: text/plain; charset=UTF-8\n"
         "Content-Transfer-Encoding: 8bit\n"
 
-#: tasks.py:86
+#: tasks.py:79
 msgid   "Maintainer"
 msgstr  ""
 
-#: tasks.py:87
+#: tasks.py:80
 msgid   "Responsible"
 msgstr  ""
 
-#: tasks.py:88
+#: tasks.py:81
 msgid   "License"
 msgstr  ""
 
-#: tasks.py:89
+#: tasks.py:82
 #, fuzzy
 msgid   "Version"
 msgstr  "Revis&atilde;o"
 
-#: tasks.py:90
+#: tasks.py:83
 #, fuzzy
 msgid   "Summary"
 msgstr  "sum&aacute;rio"
 
-#: tasks.py:91
+#: tasks.py:84
 #, fuzzy
 msgid   "Last update:"
 msgstr  "&Uacute;ltima atualiza&ccedil;&atilde;o"
 
-#: tasks.py:93 tasks.py:101
+#: tasks.py:86 tasks.py:94
 msgid   "Official Debian package"
 msgstr  ""
 
-#: tasks.py:94
+#: tasks.py:87
 msgid   "Official Debian package (recommended)"
 msgstr  ""
 
-#: tasks.py:95
+#: tasks.py:88
 msgid   "Official Debian package (suggested)"
 msgstr  ""
 
-#: tasks.py:96
+#: tasks.py:89
 #, fuzzy
 msgid   "Debian package in non-free"
 msgstr  "status das tradu&ccedil;&otilde;es"
 
-#: tasks.py:97
+#: tasks.py:90
 #, fuzzy
 msgid   "Debian package in contrib"
 msgstr  "status das tradu&ccedil;&otilde;es"
 
-#: tasks.py:98
+#: tasks.py:91
 msgid   "Unofficial Debian package"
 msgstr  ""
 
-#: tasks.py:99
+#: tasks.py:92
 msgid   "Debian package not available"
 msgstr  ""
 
-#: tasks.py:102
+#: tasks.py:95
 msgid   "For a better overview of the project's availability as a Debian package, each head row "
         "has a color code according to this scheme:"
 msgstr  ""
 
-#: tasks.py:103
+#: tasks.py:96
 #, python-format
 msgid   "If you discover a project which looks like a good candidate for %s\n"
         "                              to you, or if you have prepared an unofficial Debian "
@@ -86,127 +86,127 @@
         "s\">%s mailing list</a>"
 msgstr  ""
 
-#: tasks.py:107
+#: tasks.py:100
 #, python-format
 msgid   "The list to the right includes various software projects which are of some interest to "
         "the %s Project. Currently, only a few of them are available as Debian packages. It is our "
         "goal, however, to include all software in %s which can sensibly add to a high quality "
-        "Debian Integrated Solution."
+        "Debian Pure Blend."
 msgstr  ""
 
-#: tasks.py:108
+#: tasks.py:101
 #, fuzzy
 msgid   "Tasks page"
 msgstr  "P&aacute;gina de tradu&ccedil;&otilde;es"
 
-#: tasks.py:109
+#: tasks.py:102
 msgid   "Project"
 msgstr  ""
 
-#: tasks.py:110
+#: tasks.py:103
 #, python-format
 msgid   "This is a list of the Tasks %s is made of:"
 msgstr  ""
 
-#: tasks.py:111
+#: tasks.py:104
 msgid   "This page is also available in the following languages:"
 msgstr  ""
 
-#: tasks.py:112
+#: tasks.py:105
 #, python-format
 msgid   "How to set <a href=\"%s\">the default document language</a>"
 msgstr  ""
 
-#: tasks.py:114
+#: tasks.py:107
 #, fuzzy
 msgid   "Homepage not available"
 msgstr  "status das tradu&ccedil;&otilde;es"
 
-#: tasks.py:115
+#: tasks.py:108
 #, fuzzy
 msgid   "Translate description"
 msgstr  "Descri&ccedil;&atilde;o resumida"
 
-#: tasks.py:116
+#: tasks.py:109
 #, fuzzy
 msgid   "Fix translated description"
 msgstr  "Descri&ccedil;&atilde;o resumida"
 
-#: tasks.py:128
+#: tasks.py:121
 msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
         "a>"
 msgstr  ""
 
-#: tasks.py:129
+#: tasks.py:122
 msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:130
+#: tasks.py:123
 msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:135
+#: tasks.py:128
 msgid   "Dependant"
 msgstr  ""
 
-#: tasks.py:136
+#: tasks.py:129
 #, fuzzy
 msgid   "Recommended"
 msgstr  "Recebido"
 
-#: tasks.py:137
+#: tasks.py:130
 msgid   "Suggested"
 msgstr  ""
 
-#: tasks.py:138
+#: tasks.py:131
 msgid   "Unofficial"
 msgstr  ""
 
-#: tasks.py:139
+#: tasks.py:132
 msgid   "Prospective"
 msgstr  ""
 
-#: tasks.py:142
+#: tasks.py:135
 msgid   "Official Debian packages"
 msgstr  ""
 
-#: tasks.py:143
+#: tasks.py:136
 msgid   "Official Debian packages (Recommended)"
 msgstr  ""
 
-#: tasks.py:144
+#: tasks.py:137
 msgid   "Official Debian packages (Suggested)"
 msgstr  ""
 
-#: tasks.py:145
+#: tasks.py:138
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  ""
 
-#: tasks.py:146
+#: tasks.py:139
 #, fuzzy
 msgid   "Debian packages not available"
 msgstr  "status das tradu&ccedil;&otilde;es"
 
-#: tasks.py:148
+#: tasks.py:141
 #, fuzzy
 msgid   "Packages"
 msgstr  "links"
 
-#: tasks.py:149
+#: tasks.py:142
 #, python-format
-msgid   "A %sDebian Integrated Solution%s is a Debian internal project which assembles\n"
+msgid   "A %sDebian Pure Blend%s is a Debian internal project which assembles\n"
         "a set of packages that might help users to solve certain tasks of their work.  The list "
         "on\n"
         "the right shows the tasks of %s."
 msgstr  ""
 
-#: tasks.py:207
+#: tasks.py:200
 msgid   "Links to other tasks"
 msgstr  ""
 
-#: tasks.py:208
+#: tasks.py:201
 msgid   "Index of all tasks"
 msgstr  ""
 
@@ -278,12 +278,12 @@
 msgstr  "P&aacute;gina Wiki"
 
 #: ../index.php:15
-msgid   "The Debian-Med project presents packages that are associated with <ul><li>medicine</"
+msgid   "The Debian Med project presents packages that are associated with <ul><li>medicine</"
         "li><li>pre-clinical research</li><li>life science.</li></ul> Its developments are mostly "
         "focused on three areas for the moment: <ul><li>medical practice</li><li>imaging</"
         "li><li>bioinformatics</li></ul>and can be installed directly from every Debian "
         "installation."
-msgstr  "O projeto Debian-Med disponibiliza pacotes que est&atilde;o associados com "
+msgstr  "O projeto Debian Med disponibiliza pacotes que est&atilde;o associados com "
         "<ul><li>medicina</li><li>avalia&ccedil;&atilde;o pr&eacute;-cl&iacute;nica</"
         "li><li>ci&ecirc;ncia da vida.</li></ul> Seu desenvolvimento &eacute; focado em tr&ecirc;s "
         "&aacute;reas no momento: <ul><li>pr&aacute;tica m&eacute;dica</li><li>imagem</"
@@ -332,7 +332,7 @@
 msgstr  ""
 
 #: ../index.php:46
-msgid   "Tasks of our DIS"
+msgid   "Tasks of our Blend"
 msgstr  ""
 
 #: ../index.php:47
@@ -423,9 +423,9 @@
 
 #: ../locales.php:31
 #, php-format
-msgid   "More information on how to contribute to the Debian-Med project, can be found in the %"
+msgid   "More information on how to contribute to the Debian Med project, can be found in the %"
         "sHow to Contribute%s page."
-msgstr  "Mais informa&ccedil;&otilde;es sobre como contribuir para o projeto Debian-Med podem ser "
+msgstr  "Mais informa&ccedil;&otilde;es sobre como contribuir para o projeto Debian Med podem ser "
         "encontradas na p&aacute;gina %sComo Contribuir%s."
 
 #: ../locales.php:41
@@ -454,7 +454,7 @@
 
 #: ../tasks.tmpl:18
 msgid   "The list to the right includes various software projects which are of some interest to "
-        "the Debian-Med Project."
+        "the Debian Med Project."
 msgstr  ""
 
 #: ../tasks.tmpl:19
@@ -462,15 +462,15 @@
 msgstr  ""
 
 #: ../tasks.tmpl:20
-msgid   "It is our goal, however, to include all software in Debian-Med which can sensibly add to "
-        "a high quality Debian Integrated Solution."
+msgid   "It is our goal, however, to include all software in Debian Med which can sensibly add to "
+        "a high quality Debian Pure Blend."
 msgstr  ""
 
 #: ../tasks.tmpl:31
 #, php-format
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
+msgid   "If you discover a project which looks like a good candidate for Debian Med to you, or if "
         "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the %sDebian-Med mailing list%s"
+        "description of that project to the %sDebian Med mailing list%s"
 msgstr  ""
 
 #

Modified: cdd/trunk/webtools/po/ru.po
==============================================================================
--- cdd/trunk/webtools/po/ru.po	(original)
+++ cdd/trunk/webtools/po/ru.po	Sat Nov  1 13:21:47 2008
@@ -1,61 +1,61 @@
-#: tasks.py:86
+#: tasks.py:79
 msgid   "Maintainer"
 msgstr  ""
 
-#: tasks.py:87
+#: tasks.py:80
 msgid   "Responsible"
 msgstr  ""
 
-#: tasks.py:88
+#: tasks.py:81
 msgid   "License"
 msgstr  ""
 
-#: tasks.py:89
+#: tasks.py:82
 msgid   "Version"
 msgstr  ""
 
-#: tasks.py:90
+#: tasks.py:83
 msgid   "Summary"
 msgstr  ""
 
-#: tasks.py:91
+#: tasks.py:84
 msgid   "Last update:"
 msgstr  ""
 
-#: tasks.py:93 tasks.py:101
+#: tasks.py:86 tasks.py:94
 msgid   "Official Debian package"
 msgstr  ""
 
-#: tasks.py:94
+#: tasks.py:87
 msgid   "Official Debian package (recommended)"
 msgstr  ""
 
-#: tasks.py:95
+#: tasks.py:88
 msgid   "Official Debian package (suggested)"
 msgstr  ""
 
-#: tasks.py:96
+#: tasks.py:89
 msgid   "Debian package in non-free"
 msgstr  ""
 
-#: tasks.py:97
+#: tasks.py:90
 msgid   "Debian package in contrib"
 msgstr  ""
 
-#: tasks.py:98
+#: tasks.py:91
 msgid   "Unofficial Debian package"
 msgstr  ""
 
-#: tasks.py:99
+#: tasks.py:92
 msgid   "Debian package not available"
 msgstr  ""
 
-#: tasks.py:102
+#: tasks.py:95
 msgid   "For a better overview of the project's availability as a Debian package, each head row "
         "has a color code according to this scheme:"
 msgstr  ""
 
-#: tasks.py:103
+#: tasks.py:96
 #, python-format
 msgid   "If you discover a project which looks like a good candidate for %s\n"
         "                              to you, or if you have prepared an unofficial Debian "
@@ -64,120 +64,120 @@
         "s\">%s mailing list</a>"
 msgstr  ""
 
-#: tasks.py:107
+#: tasks.py:100
 #, python-format
 msgid   "The list to the right includes various software projects which are of some interest to "
         "the %s Project. Currently, only a few of them are available as Debian packages. It is our "
         "goal, however, to include all software in %s which can sensibly add to a high quality "
-        "Debian Integrated Solution."
+        "Debian Pure Blend."
 msgstr  ""
 
-#: tasks.py:108
+#: tasks.py:101
 msgid   "Tasks page"
 msgstr  ""
 
-#: tasks.py:109
+#: tasks.py:102
 msgid   "Project"
 msgstr  ""
 
-#: tasks.py:110
+#: tasks.py:103
 #, python-format
 msgid   "This is a list of the Tasks %s is made of:"
 msgstr  ""
 
-#: tasks.py:111
+#: tasks.py:104
 msgid   "This page is also available in the following languages:"
 msgstr  ""
 
-#: tasks.py:112
+#: tasks.py:105
 #, python-format
 msgid   "How to set <a href=\"%s\">the default document language</a>"
 msgstr  ""
 
-#: tasks.py:114
+#: tasks.py:107
 msgid   "Homepage not available"
 msgstr  ""
 
-#: tasks.py:115
+#: tasks.py:108
 msgid   "Translate description"
 msgstr  ""
 
-#: tasks.py:116
+#: tasks.py:109
 msgid   "Fix translated description"
 msgstr  ""
 
-#: tasks.py:128
+#: tasks.py:121
 msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
         "a>"
 msgstr  ""
 
-#: tasks.py:129
+#: tasks.py:122
 msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:130
+#: tasks.py:123
 msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:135
+#: tasks.py:128
 msgid   "Dependant"
 msgstr  ""
 
-#: tasks.py:136
+#: tasks.py:129
 msgid   "Recommended"
 msgstr  ""
 
-#: tasks.py:137
+#: tasks.py:130
 msgid   "Suggested"
 msgstr  ""
 
-#: tasks.py:138
+#: tasks.py:131
 msgid   "Unofficial"
 msgstr  ""
 
-#: tasks.py:139
+#: tasks.py:132
 msgid   "Prospective"
 msgstr  ""
 
-#: tasks.py:142
+#: tasks.py:135
 msgid   "Official Debian packages"
 msgstr  ""
 
-#: tasks.py:143
+#: tasks.py:136
 msgid   "Official Debian packages (Recommended)"
 msgstr  ""
 
-#: tasks.py:144
+#: tasks.py:137
 msgid   "Official Debian packages (Suggested)"
 msgstr  ""
 
-#: tasks.py:145
+#: tasks.py:138
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  ""
 
-#: tasks.py:146
+#: tasks.py:139
 msgid   "Debian packages not available"
 msgstr  ""
 
-#: tasks.py:148
+#: tasks.py:141
 msgid   "Packages"
 msgstr  ""
 
-#: tasks.py:149
+#: tasks.py:142
 #, python-format
-msgid   "A %sDebian Integrated Solution%s is a Debian internal project which assembles\n"
+msgid   "A %sDebian Pure Blend%s is a Debian internal project which assembles\n"
         "a set of packages that might help users to solve certain tasks of their work.  The list "
         "on\n"
         "the right shows the tasks of %s."
 msgstr  ""
 
-#: tasks.py:207
+#: tasks.py:200
 msgid   "Links to other tasks"
 msgstr  ""
 
-#: tasks.py:208
+#: tasks.py:201
 msgid   "Index of all tasks"
 msgstr  ""
 
@@ -253,7 +253,7 @@
 msgstr  ""
 
 #: ../index.php:15
-msgid   "The Debian-Med project presents packages that are associated with <ul><li>medicine</"
+msgid   "The Debian Med project presents packages that are associated with <ul><li>medicine</"
         "li><li>pre-clinical research</li><li>life science.</li></ul> Its developments are mostly "
         "focused on three areas for the moment: <ul><li>medical practice</li><li>imaging</"
         "li><li>bioinformatics</li></ul>and can be installed directly from every Debian "
@@ -297,7 +297,7 @@
 msgstr  ""
 
 #: ../index.php:46
-msgid   "Tasks of our DIS"
+msgid   "Tasks of our Blend"
 msgstr  ""
 
 #: ../index.php:47
@@ -386,7 +386,7 @@
 
 #: ../locales.php:31
 #, php-format
-msgid   "More information on how to contribute to the Debian-Med project, can be found in the %"
+msgid   "More information on how to contribute to the Debian Med project, can be found in the %"
         "sHow to Contribute%s page."
 msgstr  ""
 
@@ -416,7 +416,7 @@
 
 #: ../tasks.tmpl:18
 msgid   "The list to the right includes various software projects which are of some interest to "
-        "the Debian-Med Project."
+        "the Debian Med Project."
 msgstr  ""
 
 #: ../tasks.tmpl:19
@@ -424,15 +424,15 @@
 msgstr  ""
 
 #: ../tasks.tmpl:20
-msgid   "It is our goal, however, to include all software in Debian-Med which can sensibly add to "
-        "a high quality Debian Integrated Solution."
+msgid   "It is our goal, however, to include all software in Debian Med which can sensibly add to "
+        "a high quality Debian Pure Blend."
 msgstr  ""
 
 #: ../tasks.tmpl:31
 #, php-format
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
+msgid   "If you discover a project which looks like a good candidate for Debian Med to you, or if "
         "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the %sDebian-Med mailing list%s"
+        "description of that project to the %sDebian Med mailing list%s"
 msgstr  ""
 
 #

Modified: cdd/trunk/webtools/po/zh.po
==============================================================================
--- cdd/trunk/webtools/po/zh.po	(original)
+++ cdd/trunk/webtools/po/zh.po	Sat Nov  1 13:21:47 2008
@@ -1,61 +1,61 @@
-#: tasks.py:86
+#: tasks.py:79
 msgid   "Maintainer"
 msgstr  ""
 
-#: tasks.py:87
+#: tasks.py:80
 msgid   "Responsible"
 msgstr  ""
 
-#: tasks.py:88
+#: tasks.py:81
 msgid   "License"
 msgstr  ""
 
-#: tasks.py:89
+#: tasks.py:82
 msgid   "Version"
 msgstr  ""
 
-#: tasks.py:90
+#: tasks.py:83
 msgid   "Summary"
 msgstr  ""
 
-#: tasks.py:91
+#: tasks.py:84
 msgid   "Last update:"
 msgstr  ""
 
-#: tasks.py:93 tasks.py:101
+#: tasks.py:86 tasks.py:94
 msgid   "Official Debian package"
 msgstr  ""
 
-#: tasks.py:94
+#: tasks.py:87
 msgid   "Official Debian package (recommended)"
 msgstr  ""
 
-#: tasks.py:95
+#: tasks.py:88
 msgid   "Official Debian package (suggested)"
 msgstr  ""
 
-#: tasks.py:96
+#: tasks.py:89
 msgid   "Debian package in non-free"
 msgstr  ""
 
-#: tasks.py:97
+#: tasks.py:90
 msgid   "Debian package in contrib"
 msgstr  ""
 
-#: tasks.py:98
+#: tasks.py:91
 msgid   "Unofficial Debian package"
 msgstr  ""
 
-#: tasks.py:99
+#: tasks.py:92
 msgid   "Debian package not available"
 msgstr  ""
 
-#: tasks.py:102
+#: tasks.py:95
 msgid   "For a better overview of the project's availability as a Debian package, each head row "
         "has a color code according to this scheme:"
 msgstr  ""
 
-#: tasks.py:103
+#: tasks.py:96
 #, python-format
 msgid   "If you discover a project which looks like a good candidate for %s\n"
         "                              to you, or if you have prepared an unofficial Debian "
@@ -64,120 +64,120 @@
         "s\">%s mailing list</a>"
 msgstr  ""
 
-#: tasks.py:107
+#: tasks.py:100
 #, python-format
 msgid   "The list to the right includes various software projects which are of some interest to "
         "the %s Project. Currently, only a few of them are available as Debian packages. It is our "
         "goal, however, to include all software in %s which can sensibly add to a high quality "
-        "Debian Integrated Solution."
+        "Debian Pure Blend."
 msgstr  ""
 
-#: tasks.py:108
+#: tasks.py:101
 msgid   "Tasks page"
 msgstr  ""
 
-#: tasks.py:109
+#: tasks.py:102
 msgid   "Project"
 msgstr  ""
 
-#: tasks.py:110
+#: tasks.py:103
 #, python-format
 msgid   "This is a list of the Tasks %s is made of:"
 msgstr  ""
 
-#: tasks.py:111
+#: tasks.py:104
 msgid   "This page is also available in the following languages:"
 msgstr  ""
 
-#: tasks.py:112
+#: tasks.py:105
 #, python-format
 msgid   "How to set <a href=\"%s\">the default document language</a>"
 msgstr  ""
 
-#: tasks.py:114
+#: tasks.py:107
 msgid   "Homepage not available"
 msgstr  ""
 
-#: tasks.py:115
+#: tasks.py:108
 msgid   "Translate description"
 msgstr  ""
 
-#: tasks.py:116
+#: tasks.py:109
 msgid   "Fix translated description"
 msgstr  ""
 
-#: tasks.py:128
+#: tasks.py:121
 msgid   "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
         "a>"
 msgstr  ""
 
-#: tasks.py:129
+#: tasks.py:122
 msgid   "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:130
+#: tasks.py:123
 msgid   "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
         "package</a>"
 msgstr  ""
 
-#: tasks.py:135
+#: tasks.py:128
 msgid   "Dependant"
 msgstr  ""
 
-#: tasks.py:136
+#: tasks.py:129
 msgid   "Recommended"
 msgstr  ""
 
-#: tasks.py:137
+#: tasks.py:130
 msgid   "Suggested"
 msgstr  ""
 
-#: tasks.py:138
+#: tasks.py:131
 msgid   "Unofficial"
 msgstr  ""
 
-#: tasks.py:139
+#: tasks.py:132
 msgid   "Prospective"
 msgstr  ""
 
-#: tasks.py:142
+#: tasks.py:135
 msgid   "Official Debian packages"
 msgstr  ""
 
-#: tasks.py:143
+#: tasks.py:136
 msgid   "Official Debian packages (Recommended)"
 msgstr  ""
 
-#: tasks.py:144
+#: tasks.py:137
 msgid   "Official Debian packages (Suggested)"
 msgstr  ""
 
-#: tasks.py:145
+#: tasks.py:138
 msgid   "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
 msgstr  ""
 
-#: tasks.py:146
+#: tasks.py:139
 msgid   "Debian packages not available"
 msgstr  ""
 
-#: tasks.py:148
+#: tasks.py:141
 msgid   "Packages"
 msgstr  ""
 
-#: tasks.py:149
+#: tasks.py:142
 #, python-format
-msgid   "A %sDebian Integrated Solution%s is a Debian internal project which assembles\n"
+msgid   "A %sDebian Pure Blend%s is a Debian internal project which assembles\n"
         "a set of packages that might help users to solve certain tasks of their work.  The list "
         "on\n"
         "the right shows the tasks of %s."
 msgstr  ""
 
-#: tasks.py:207
+#: tasks.py:200
 msgid   "Links to other tasks"
 msgstr  ""
 
-#: tasks.py:208
+#: tasks.py:201
 msgid   "Index of all tasks"
 msgstr  ""
 
@@ -253,7 +253,7 @@
 msgstr  ""
 
 #: ../index.php:15
-msgid   "The Debian-Med project presents packages that are associated with <ul><li>medicine</"
+msgid   "The Debian Med project presents packages that are associated with <ul><li>medicine</"
         "li><li>pre-clinical research</li><li>life science.</li></ul> Its developments are mostly "
         "focused on three areas for the moment: <ul><li>medical practice</li><li>imaging</"
         "li><li>bioinformatics</li></ul>and can be installed directly from every Debian "
@@ -297,7 +297,7 @@
 msgstr  ""
 
 #: ../index.php:46
-msgid   "Tasks of our DIS"
+msgid   "Tasks of our Blend"
 msgstr  ""
 
 #: ../index.php:47
@@ -386,7 +386,7 @@
 
 #: ../locales.php:31
 #, php-format
-msgid   "More information on how to contribute to the Debian-Med project, can be found in the %"
+msgid   "More information on how to contribute to the Debian Med project, can be found in the %"
         "sHow to Contribute%s page."
 msgstr  ""
 
@@ -416,7 +416,7 @@
 
 #: ../tasks.tmpl:18
 msgid   "The list to the right includes various software projects which are of some interest to "
-        "the Debian-Med Project."
+        "the Debian Med Project."
 msgstr  ""
 
 #: ../tasks.tmpl:19
@@ -424,15 +424,15 @@
 msgstr  ""
 
 #: ../tasks.tmpl:20
-msgid   "It is our goal, however, to include all software in Debian-Med which can sensibly add to "
-        "a high quality Debian Integrated Solution."
+msgid   "It is our goal, however, to include all software in Debian Med which can sensibly add to "
+        "a high quality Debian Pure Blend."
 msgstr  ""
 
 #: ../tasks.tmpl:31
 #, php-format
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
+msgid   "If you discover a project which looks like a good candidate for Debian Med to you, or if "
         "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the %sDebian-Med mailing list%s"
+        "description of that project to the %sDebian Med mailing list%s"
 msgstr  ""
 
 #

Modified: cdd/trunk/webtools/tasks.py
==============================================================================
--- cdd/trunk/webtools/tasks.py	(original)
+++ cdd/trunk/webtools/tasks.py	Sat Nov  1 13:21:47 2008
@@ -20,7 +20,7 @@
 languages = ('en', 'cs', 'da', 'de', 'es', 'fi', 'fr', 'it', 'ja', 'ko', 'nl', 'pl', 'pt_BR', 'ru', 'zh_CN')
 
 if len(argv) <= 1:
-	print >>stderr, "Usage: %s <DIS name>\n       The <DIS name> needs a matching config file webconf/<DIS name>.conf"\
+	print >>stderr, "Usage: %s <Blend name>\n       The <Blend name> needs a matching config file webconf/<Blend name>.conf"\
                         % argv[0]
 	exit(-1)
 
@@ -97,7 +97,7 @@
                               to you, or if you have prepared an unofficial Debian package, please do not hesitate to
                               send a description of that project to the <a href="mailto:%s">%s mailing list</a>""") % \
                                   (data['projectname'], data['projectlist'], data['projectname']))
-        data['description']       = _("The list to the right includes various software projects which are of some interest to the %s Project. Currently, only a few of them are available as Debian packages. It is our goal, however, to include all software in %s which can sensibly add to a high quality Debian Integrated Solution.") % (data['projectname'], data['projectname'])
+        data['description']       = _("The list to the right includes various software projects which are of some interest to the %s Project. Currently, only a few of them are available as Debian packages. It is our goal, however, to include all software in %s which can sensibly add to a high quality Debian Pure Blend.") % (data['projectname'], data['projectname'])
 	data['gtstrTasksPage']     = _('Tasks page')
 	data['gtstrProject']	   = _('Project')
 	data['gtstrThisIsAList']   = _('This is a list of the Tasks %s is made of:') % data['projectname']
@@ -139,7 +139,7 @@
                       prospective = _('Debian packages not available')
                     )
         data['packages']          = _('Packages')
-	data['idxsummary']        = _("""A %sDebian Integrated Solution%s is a Debian internal project which assembles
+	data['idxsummary']        = _("""A %sDebian Pure Blend%s is a Debian internal project which assembles
 a set of packages that might help users to solve certain tasks of their work.  The list on
 the right shows the tasks of %s.""" ) \
                                       % ('<a href="http://dis.alioth.debian.org/dis/">', '</a>', data['projectname'])

Modified: cdd/trunk/webtools/templates/bugs.xhtml
==============================================================================
--- cdd/trunk/webtools/templates/bugs.xhtml	(original)
+++ cdd/trunk/webtools/templates/bugs.xhtml	Sat Nov  1 13:21:47 2008
@@ -62,52 +62,41 @@
 		<div class="pageBody">
 
 <h1>Summary bugs page of ${tasks[task].metapkg.PrintedName.capitalize()} meta package</h1>
-<span py:choose="">
-  <span py:when="nbugs[task] > 0">
-			<h2>Open bugs</h2>
-<table class="bugs">
-  <py:for each="pkgbug in pkgbugs">
-    <span py:if="pkgbug.nbugs > 0">
-      <tr>
-	<td colspan="2" class="package"><a href="http://packages.qa.debian.org/${pkgbug.source[0]}/${pkgbug.source}.html">${pkgbug.pkgname}</a> (${pkgbug.nbugs})</td>
-	<td></td>
-      </tr>
-      <py:for each="bug in pkgbug.bugs">
-	 <tr>
-	   <td class="bugid ${bug['severity']}"><a href="http://bugs.debian.org/${bug['bug']}">${bug['bug']}</a></td>
-	   <td class="summary ${bug['severity']}">${bug['summary']}</td>
-	   <td class="severity ${bug['severity']}">${bug['severity']}</td>
-	 </tr>
-      </py:for>
-    </span>
-  </py:for>
-</table>
-</span>
-<span py:otherwise=""><h2>$projectname ${tasks[task].metapkg.PrintedName.capitalize()} has no known open bugs</h2></span>
-</span>
 
 <span py:choose="">
-<span py:when="ndone[task] > 0">
-<h2>Fixed bugs</h2>
-<table class="bugs">
-  <py:for each="pkgbug in pkgbugs">
-    <span py:if="pkgbug.ndone > 0">
-      <tr>
-	<td class="package"><a href="http://packages.qa.debian.org/${pkgbug.source[0]}/${pkgbug.source}.html">${pkgbug.pkgname}</a> (${pkgbug.ndone}))</td>
-	<td colspan="2"></td>
-      </tr>
-      <py:for each="bug in pkgbug.done">
-	 <tr>
-	   <td class="bugid ${bug['severity']}"><a href="http://bugs.debian.org/${bug['bug']}">${bug['bug']}</a></td>
-	   <td class="summary ${bug['severity']}">${bug['summary']}</td>
-	   <td class="severity ${bug['severity']}">${bug['severity']}</td>
-	 </tr>
-      </py:for>
-    </span>
-  </py:for>
-</table>
-</span>
-<span py:otherwise=""><h1>$projectname ${tasks[task].metapkg.PrintedName.capitalize()} has no known done bugs</h1></span>
+  <span py:when="nbugs[task]+ndone[task] != 0">
+    <py:for each="cat in buglistcat">
+      <span py:choose="">
+	<span py:when="buglist[cat].pkgbugs != []">
+	  <h2>Open bugs</h2>
+	  <table class="bugs">
+	    <py:for each="pkgbug in buglist[cat].pkgbugs">
+	      <span py:if="pkgbug.nbugs > 0">
+		<tr>
+		  <td colspan="2" class="package"><a href="http://packages.qa.debian.org/${pkgbug.source[0]}/${pkgbug.source}.html">${pkgbug.pkgname}</a> (${pkgbug.nbugs})</td>
+		  <td></td>
+		</tr>
+		<py:for each="bug in pkgbug.bugs">
+		  <tr>
+		    <td class="bugid ${bug['severity']}"><a href="http://bugs.debian.org/${bug['bug']}">${bug['bug']}</a></td>
+		    <td class="summary ${bug['severity']}">${bug['summary']}</td>
+		    <td class="severity ${bug['severity']}">${bug['severity']}</td>
+		  </tr>
+		</py:for>
+	      </span>
+	    </py:for>
+	  </table>
+	</span>
+	<span py:otherwise="">${type(pkgbugs)}
+                              empty list of bugs
+                              ${str(pkgbugs)}
+	</span>
+      </span>
+    </py:for>
+   </span>
+  <span py:otherwise=""><h2>$projectname
+  ${tasks[task].metapkg.PrintedName.capitalize()} has no known nbugs =
+  ${nbugs[task]}  ndone = ${ndone[task]}</h2></span>
 </span>
 		</div>
 	</td>



More information about the Cdd-commits mailing list