* Eugeniy Meshcheryako

- Fix utf8 support. Closes: #238739, #235433 - Move Debian Jr. to the misc ghetto. - Dropped the tcl/tk task as not being a popular enough language these days.
19 years ago · f90cf114e5
40 changed files with 727 additions and 782 deletions
--- a/4
+++ b/4
@ -8,10 +8,10 @@ CC=gcc
 CFLAGS=-g -Wall  #-Os
 DEBUG=1
 ifeq (0,$(DEBUG))
-DEFS=-DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PROGRAM)\" -DLOCALEDIR=\"/usr/share/locale\" \
+DEFS=-DUTF8 -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PROGRAM)\" -DLOCALEDIR=\"/usr/share/locale\" \
     -DTASKDIR=\"$(TASKDIR)\"
 else
-DEFS=-DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PROGRAM)\" -DLOCALEDIR=\"/usr/share/locale\" \
+DEFS=-DUTF8 -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PROGRAM)\" -DLOCALEDIR=\"/usr/share/locale\" \
     -DTASKDIR=\".\" -DDEBUG
 endif
 VERSION=$(shell expr "`dpkg-parsechangelog 2>/dev/null |grep Version:`" : '.*Version: \(.*\)' | cut -d - -f 1)
--- a/debian/changelog
+++ b/debian/changelog
@ -1,5 +1,11 @@
-tasksel (1.48) UNRELEASED; urgency=low
+tasksel (1.48) unstable; urgency=low

+  * Eugeniy Meshcheryako
+    - Fix utf8 support. Closes: #238739, #235433
+  * Joey Hess
+    - Move Debian Jr. to the misc ghetto.
+    - Dropped the tcl/tk task as not being a popular enough language these
+      days.
  * Translations:
    - Kęstutis Biliūnas
      - Updated Lithuanian translation (tasks/po/uk.po).
@ -16,7 +22,7 @@ tasksel (1.48) UNRELEASED; urgency=low
    - Peter Mann
      - Updated Slovak translation (tasks/po/sk.po)

- -- Christian Perrier <bubulle@kheops.frmug.org>  Fri,  2 Apr 2004 09:06:30 +0200
+ -- Joey Hess <joeyh@debian.org>  Thu,  1 Apr 2004 17:48:14 -0500

 tasksel (1.47) unstable; urgency=low

--- a/po/tasksel.pot
+++ b/po/tasksel.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-12 16:22-0500\n"
+"POT-Creation-Date: 2004-03-29 13:21-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -95,20 +95,20 @@ msgstr ""
 msgid "Select tasks to install"
 msgstr ""

-#: ../slangui.c:576
+#: ../slangui.c:582
 msgid "Ok"
 msgstr ""

-#: ../slangui.c:685 ../slangui.c:699 ../slangui.c:810
+#: ../slangui.c:691 ../slangui.c:705 ../slangui.c:816
 #, c-format
 msgid "Index out of bounds: %d >= %d"
 msgstr ""

-#: ../slangui.c:776
+#: ../slangui.c:782
 msgid "Help"
 msgstr ""

-#: ../slangui.c:777
+#: ../slangui.c:783
 msgid ""
 "Tasks allow you to quickly install a selection of packages that performs a "
 "given task.\n"
@ -124,7 +124,7 @@ msgid ""
 "Press enter to return to the task selection screen"
 msgstr ""

-#: ../slangui.c:818
+#: ../slangui.c:824
 #, c-format
 msgid ""
 "Description:\n"
@ -133,7 +133,7 @@ msgid ""
 "Included packages:\n"
 msgstr ""

-#: ../slangui.c:826
+#: ../slangui.c:832
 msgid "(no description available)"
 msgstr ""

--- a/slangui.c
+++ b/slangui.c
@ -239,7 +239,7 @@ void ui_resize(void)
 	   _("Debian Task Installer v%s - (c) 1999-2004 SPI and others"),
 	   VERSION);
  SLsmg_gotorc(0, 0);
-  SLsmg_write_nstring(buf, strlen(buf));
+  SLsmg_write_string(buf);
  
  _resizing = 0;
  switch (_chooserinfo.whichwindow) {
@ -350,7 +350,7 @@ int ui_eventloop(void)
 void ui_shadow(int y, int x, unsigned int dy, unsigned int dx)
 {
  int c;
-  unsigned short ch;
+  SLsmg_Char_Type ch;
  
  if (SLtt_Use_Ansi_Colors) {
    for (c=0;c<dy-1;c++) {
@ -360,13 +360,13 @@ void ui_shadow(int y, int x, unsigned int dy, unsigned int dx)
       * character plus alternate character set attribute. -- JED
       */
      ch = SLsmg_char_at();
-      ch = (ch & 0x80FF) | (0x02 << 8);
+      ch = SLSMG_BUILD_CHAR(SLSMG_EXTRACT_CHAR(ch), 0x2);
      SLsmg_write_raw(&ch, 1);
    }
    for (c=0;c<dx;c++) {
      SLsmg_gotorc(y+dy, x+1+c);
      ch = SLsmg_char_at();
-      ch = (ch & 0x80FF) | (0x02 << 8);
+      ch = SLSMG_BUILD_CHAR(SLSMG_EXTRACT_CHAR(ch), 0x2);
      SLsmg_write_raw(&ch, 1);
    }
  }
@ -398,12 +398,12 @@ void _drawbutton(int which, int issel)
       * of the other buttons into account.
       */
      ui_button(_chooserinfo.rowoffset + _chooserinfo.height + 1,
-                _chooserinfo.coloffset + (_chooserinfo.width - strlen(_("Task ^Info")) + 1) / 2,
+                _chooserinfo.coloffset + (_chooserinfo.width - ts_mbstrwidth(_("Task ^Info")) + 1) / 2,
                _("Task ^Info"), issel);
      break;
    case BUTTON_HELP:  // Right justified
      ui_button(_chooserinfo.rowoffset + _chooserinfo.height + 1,
-                _chooserinfo.coloffset + _chooserinfo.width - 5 - strlen(_("^Help")) + 1,
+                _chooserinfo.coloffset + _chooserinfo.width - 5 - ts_mbstrwidth(_("^Help")) + 1,
                _("^Help"), issel);
      break;
  }
@ -512,18 +512,24 @@ void ui_button(int row, int col, char *txt, int selected)
  SLsmg_gotorc(row, col);
  SLsmg_write_char('<');
  /* Anything following a ^ in txt is highlighted, and the ^ removed. */
-  p = strchr(txt, '^');
+  p = ts_mbstrchr(txt, L'^');
  if (p) {
+    wchar_t w;
+    int ret;
+    
    if (p > txt) {
-      SLsmg_write_nstring(txt, p - txt);
+      SLsmg_write_nchars(txt, p - txt);
    }
    p++;
    if (selected)
      SLsmg_set_color(SELHIGHLIGHT);
    else
      SLsmg_set_color(HIGHLIGHT);
-    SLsmg_write_char(p[0]);
-    p++;
+    ret = mbtowc(&w, p, MB_CUR_MAX);
+    if (ret <=0)
+      return;
+    SLsmg_write_char(w);
+    p += ret;
    if (selected)
      SLsmg_set_color(SELBUTTONOBJ);
    else
@ -537,7 +543,7 @@ void ui_button(int row, int col, char *txt, int selected)

 void ui_title(int row, int col, int width, char *title)
 {
-  int pos = col + (width - strlen(title))/2;
+  int pos = col + (width - ts_mbstrwidth(title))/2;
  SLsmg_gotorc(row, pos - 1);
  SLsmg_set_char_set(1);
  SLsmg_write_char(SLSMG_RTEE_CHAR);
@ -564,7 +570,7 @@ static void ui_dialog_drawlines(int row, int col, int height, int width,
  SLsmg_fill_region(row+1, col+1, height-2, width-2, ' ');
  for (ri = topline; ri < numlines && ri - topline < height - hoffset; ri++) {
    SLsmg_gotorc(row + 1 + ri-topline, col + 1);
-    if (strlen(buf[ri]) > leftcol)
+    if (ts_mbstrwidth(buf[ri]) > leftcol)
      SLsmg_write_nstring(buf[ri]+leftcol, width - woffset);
  }
  if (scroll & SCROLLBAR_VERT && numlines > height-hoffset) 
@ -671,7 +677,7 @@ void ui_drawsection(int row, int index)
  SLsmg_gotorc(row, _chooserinfo.coloffset + 1 + 2);
  snprintf(buf, 1024, " %s ", getsectiondesc(TASK_SECTION(_tasksary[index])));
  SLsmg_write_nstring(buf, _chooserinfo.width - 1 - 2);
-  spot = 1 + 2 + strlen(buf);
+  spot = 1 + 2 + ts_mbstrwidth(buf);
  if (spot > _chooserinfo.width / 2 - 3) spot = _chooserinfo.width / 2 - 3;
  SLsmg_gotorc(row, _chooserinfo.coloffset + spot);
  SLsmg_draw_hline( _chooserinfo.width / 2 - spot );
--- a/strutl.c
+++ b/strutl.c
@ -17,3 +17,39 @@ char *reflowtext(int width, char *ptxt)
  return textwrap(&t, ptxt);
 }

+char *ts_mbstrchr(char *s, wchar_t c)
+{
+  char *p = s;
+
+  while (*p) {
+    wchar_t w;
+    int ret;
+
+    ret = mbtowc(&w, p, MB_CUR_MAX);
+    if (ret <= 0)
+      return NULL;
+    if (w == c)
+      return p;
+    p += ret;
+  }
+  return NULL;
+}
+
+int ts_mbstrwidth(const char *s)
+{
+  const char *p = s;
+  int width = 0;
+  
+  while (*p) {
+    wchar_t w;
+    int ret;
+
+    ret = mbtowc(&w, p, MB_CUR_MAX);
+    if (ret < 0) return 0;
+    if (ret == 0) break;
+    width += wcwidth(w);
+    p += ret;
+  }
+  return width;
+}
+
--- a/strutl.h
+++ b/strutl.h
@ -1,7 +1,10 @@
 /* $Id: strutl.h,v 1.1 1999/11/21 22:01:04 tausq Rel $ */
 #ifndef _STRUTL_H
 #define _STRUTL_H
+#include <wchar.h>

 char *reflowtext(int width, char *txt);
+char *ts_mbstrchr(char *, wchar_t);
+int ts_mbstrwidth(const char *);

 #endif
--- a/tasks/junior
+++ b/tasks/junior
@ -1,5 +1,5 @@
 Task: junior
-Section: user
+Section: misc
 Description: Debian Jr.
 Debian Jr. is a collection of Debian packages suitable for children.
 Packages:
--- a/tasks/po/bg.po
+++ b/tasks/po/bg.po
@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel 1.44\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-29 11:46-0500\n"
+"POT-Creation-Date: 2004-04-01 17:50-0500\n"
 "PO-Revision-Date: 2004-03-07 12:22+0200\n"
 "Last-Translator: Ognyan Kulev <ogi@fmi.uni-sofia.bg>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@ -560,48 +560,34 @@ msgstr ""

 #. Description
 #: ../po/debian-tasks.desc:342
-msgid "Tcl/Tk"
-msgstr "Tcl/Tk"
-
-#. Description
-#: ../po/debian-tasks.desc:342
-msgid ""
-"Packages commonly used in developing applications using the Tcl language and "
-"Tk Toolkit."
-msgstr ""
-"Пакети, често използвани в разработката на приложения, написани на езика Tcl "
-"и използващи библиотеката Tk."
-
-#. Description
-#: ../po/debian-tasks.desc:351
 msgid "TeX/LaTeX environment"
 msgstr "Среда за TeX/LaTeX"

 #. Description
-#: ../po/debian-tasks.desc:351
+#: ../po/debian-tasks.desc:342
 msgid ""
 "This task provides necessary packages for composing documents in TeX/LaTeX."
 msgstr ""

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "Thai environment"
 msgstr "Среда за Таи"

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "This task installs packages that make it easier for Thai to use Debian."
 msgstr ""
 "Тази задача инсталира пакети, които улесняват говорещите Таи потребители на "
 "Debian."

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid "Conventional Unix server"
 msgstr "Класически Unix сървър"

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid ""
 "This task selects packages that would typically be found on a conventional "
 "multi-user unix system with remote users. Do be warned that this includes a "
@ -612,15 +598,25 @@ msgstr ""
 "че това включва известно количество демони."

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid "Web server"
 msgstr "Уеб сървър"

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid ""
 "This task selects a packages useful for a general purpose web server system."
 msgstr "Тази задача избира пакети, подходящи за общоцелеви уеб сървър."

+#~ msgid "Tcl/Tk"
+#~ msgstr "Tcl/Tk"
+
+#~ msgid ""
+#~ "Packages commonly used in developing applications using the Tcl language "
+#~ "and Tk Toolkit."
+#~ msgstr ""
+#~ "Пакети, често използвани в разработката на приложения, написани на езика "
+#~ "Tcl и използващи библиотеката Tk."
+
 #~ msgid "a TeX/LaTeX environment"
 #~ msgstr "Среда·за·TeX/LaTeX"
--- a/tasks/po/bs.po
+++ b/tasks/po/bs.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel_tasks\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-29 11:46-0500\n"
+"POT-Creation-Date: 2004-04-01 17:50-0500\n"
 "PO-Revision-Date: 2004-02-01 15:41+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@ -555,49 +555,35 @@ msgstr ""

 #. Description
 #: ../po/debian-tasks.desc:342
-msgid "Tcl/Tk"
-msgstr "Tcl/Tk"
-
-#. Description
-#: ../po/debian-tasks.desc:342
-msgid ""
-"Packages commonly used in developing applications using the Tcl language and "
-"Tk Toolkit."
-msgstr ""
-"Paketi koji se obično koriste za razvijanje aplikacija koristeći Tcl "
-"programski jezik i Tk Toolkit."
-
-#. Description
-#: ../po/debian-tasks.desc:351
 msgid "TeX/LaTeX environment"
 msgstr "TeX/LaTeX aplikacije"

 #. Description
-#: ../po/debian-tasks.desc:351
+#: ../po/debian-tasks.desc:342
 msgid ""
 "This task provides necessary packages for composing documents in TeX/LaTeX."
 msgstr ""

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "Thai environment"
 msgstr "Podrška za tajlandski jezik"

 #  Description
 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "This task installs packages that make it easier for Thai to use Debian."
 msgstr ""
 "Ovaj zadatak instalira pakete koji olakšavaju korištenje Debiana onima koji "
 "govore tajlandski jezik."

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid "Conventional Unix server"
 msgstr "Konvecionalni Unix server"

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid ""
 "This task selects packages that would typically be found on a conventional "
 "multi-user unix system with remote users. Do be warned that this includes a "
@ -608,15 +594,25 @@ msgstr ""
 "ovo uključuje određeni broj daemon servisa."

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid "Web server"
 msgstr "Web server"

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid ""
 "This task selects a packages useful for a general purpose web server system."
 msgstr "Ovaj zadatak odabire pakete korisne za web server opšte namjene."

+#~ msgid "Tcl/Tk"
+#~ msgstr "Tcl/Tk"
+
+#~ msgid ""
+#~ "Packages commonly used in developing applications using the Tcl language "
+#~ "and Tk Toolkit."
+#~ msgstr ""
+#~ "Paketi koji se obično koriste za razvijanje aplikacija koristeći Tcl "
+#~ "programski jezik i Tk Toolkit."
+
 #~ msgid "a TeX/LaTeX environment"
 #~ msgstr "TeX/LaTeX aplikacije za obradu teksta"
--- a/tasks/po/ca.po
+++ b/tasks/po/ca.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-29 11:46-0500\n"
+"POT-Creation-Date: 2004-04-01 17:50-0500\n"
 "PO-Revision-Date: 2004-03-30 16:34+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@ -218,7 +218,9 @@ msgstr "Servidor de fitxers"
 msgid ""
 "This task sets up your system to be a file server, supporting both NetBIOS "
 "and NFS."
-msgstr "Aquesta tasca configura el vostre sistema per a que siga un servidor de fitxers, suportant tant NetBIOS com NFS."
+msgstr ""
+"Aquesta tasca configura el vostre sistema per a que siga un servidor de "
+"fitxers, suportant tant NetBIOS com NFS."

 #. Description
 #: ../po/debian-tasks.desc:139
@ -289,7 +291,9 @@ msgstr "Entorn en hebreu"
 msgid ""
 "This task installs programs and documentation in Hebrew to help Hebrew "
 "speaking people use Debian."
-msgstr "Aquesta tasca instal·la paquets i documentació en hebreu per a ajudar als usuaris de parla hebrea a utilitzar Debian."
+msgstr ""
+"Aquesta tasca instal·la paquets i documentació en hebreu per a ajudar als "
+"usuaris de parla hebrea a utilitzar Debian."

 #. Description
 #: ../po/debian-tasks.desc:179
@ -365,7 +369,11 @@ msgid ""
 "This is a collection of tools that laptop users will expect to find on a "
 "system. It includes some special utilities for laptops including IBM "
 "Thinkpads, Sony Vaios, Toshibas, and Dell Inspirons."
-msgstr "Aquesta és una col·leció d'eines que els usuaris de portàtils esperen trobar al sistema. Inclou algunes utilitats especials que per a portàtils que inclouen els Thinkpad d'IBM, els Vaio de Sony, els Toshiba i els Inpiron de Dell."
+msgstr ""
+"Aquesta és una col·leció d'eines que els usuaris de portàtils esperen trobar "
+"al sistema. Inclou algunes utilitats especials que per a portàtils que "
+"inclouen els Thinkpad d'IBM, els Vaio de Sony, els Toshiba i els Inpiron de "
+"Dell."

 #. Description
 #: ../po/debian-tasks.desc:234
@ -377,7 +385,9 @@ msgstr "Entorn en lituà"
 msgid ""
 "This task installs packages and documentation in Lithuanian to help "
 "Lithuanian speaking people use Debian."
-msgstr "Aquesta tasca instal·la paquets i documentació en lituà, per ajudar als usuaris de parla lituana a utilitzar Debian."
+msgstr ""
+"Aquesta tasca instal·la paquets i documentació en lituà, per ajudar als "
+"usuaris de parla lituana a utilitzar Debian."

 #. Description
 #: ../po/debian-tasks.desc:242
@ -551,48 +561,36 @@ msgstr ""

 #. Description
 #: ../po/debian-tasks.desc:342
-msgid "Tcl/Tk"
-msgstr "Tcl/Tk"
-
-#. Description
-#: ../po/debian-tasks.desc:342
-msgid ""
-"Packages commonly used in developing applications using the Tcl language and "
-"Tk Toolkit."
-msgstr ""
-"Paquets utilitzats habitualment per al desenvolupament d'aplicacions que "
-"utilitzen el llenguatge Tcl i el toolkit Tk."
-
-#. Description
-#: ../po/debian-tasks.desc:351
 msgid "TeX/LaTeX environment"
 msgstr "Entorn de Tex/LaTeX"

 #. Description
-#: ../po/debian-tasks.desc:351
+#: ../po/debian-tasks.desc:342
 msgid ""
 "This task provides necessary packages for composing documents in TeX/LaTeX."
-msgstr "Aquesta tasca proveeix els paquets necessaris per a composar documents en TeX/LaTeX."
+msgstr ""
+"Aquesta tasca proveeix els paquets necessaris per a composar documents en "
+"TeX/LaTeX."

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "Thai environment"
 msgstr "Entorn en tailandès"

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "This task installs packages that make it easier for Thai to use Debian."
 msgstr ""
 "Aquesta tasca instal·la paquets que fan l'ús de Debian més fàcil als usuaris "
 "tailandessos."

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid "Conventional Unix server"
 msgstr "Servidor UNIX convencional"

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid ""
 "This task selects packages that would typically be found on a conventional "
 "multi-user unix system with remote users. Do be warned that this includes a "
@ -603,16 +601,26 @@ msgstr ""
 "inclou un nombre de dimonis."

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid "Web server"
 msgstr "Servidor web"

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid ""
 "This task selects a packages useful for a general purpose web server system."
 msgstr ""
 "Aquesta tasca selecciona paquets útils per a un servidor de web normal."

+#~ msgid "Tcl/Tk"
+#~ msgstr "Tcl/Tk"
+
+#~ msgid ""
+#~ "Packages commonly used in developing applications using the Tcl language "
+#~ "and Tk Toolkit."
+#~ msgstr ""
+#~ "Paquets utilitzats habitualment per al desenvolupament d'aplicacions que "
+#~ "utilitzen el llenguatge Tcl i el toolkit Tk."
+
 #~ msgid "a TeX/LaTeX environment"
 #~ msgstr "Un entorn amb TeX/LaTeX"
--- a/tasks/po/cs.po
+++ b/tasks/po/cs.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-29 11:46-0500\n"
+"POT-Creation-Date: 2004-04-01 17:50-0500\n"
 "PO-Revision-Date: 2004-03-30 18:20+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.org>\n"
 "Language-Team: Czech <provoz@debian.cz>\n"
@ -514,48 +514,36 @@ msgstr "Tato

 #. Description
 #: ../po/debian-tasks.desc:342
-msgid "Tcl/Tk"
-msgstr "Tcl/Tk"
-
-#. Description
-#: ../po/debian-tasks.desc:342
-msgid ""
-"Packages commonly used in developing applications using the Tcl language and "
-"Tk Toolkit."
-msgstr "Balíky obvykle pou¾ívané pøi vývoji aplikací v jazyce Tcl/Tk."
-
-#. Description
-#: ../po/debian-tasks.desc:351
 msgid "TeX/LaTeX environment"
 msgstr "TeX/LaTeX"

 #. Description
-#: ../po/debian-tasks.desc:351
+#: ../po/debian-tasks.desc:342
 msgid ""
 "This task provides necessary packages for composing documents in TeX/LaTeX."
 msgstr ""
-"Tato úloha poskytuje nezbytné balíky pro vytváøení dokumentù v systému "
-"TeX/LaTeX."
+"Tato úloha poskytuje nezbytné balíky pro vytváøení dokumentù v systému TeX/"
+"LaTeX."

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "Thai environment"
 msgstr "Thaiské prostøedí"

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "This task installs packages that make it easier for Thai to use Debian."
 msgstr ""
 "Tato úloha instaluje balíky, které usnadní pou¾ívání Debianu v Thaiském "
 "prostøedí."

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid "Conventional Unix server"
 msgstr "Obvyklý unixový server"

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid ""
 "This task selects packages that would typically be found on a conventional "
 "multi-user unix system with remote users. Do be warned that this includes a "
@ -566,12 +554,20 @@ msgstr ""
 "¾e to zahrnuje i mno¾ství démonù."

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid "Web server"
 msgstr "Webový server"

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid ""
 "This task selects a packages useful for a general purpose web server system."
 msgstr "Úloha vybere balíky u¾iteèné pro webový server."
+
+#~ msgid "Tcl/Tk"
+#~ msgstr "Tcl/Tk"
+
+#~ msgid ""
+#~ "Packages commonly used in developing applications using the Tcl language "
+#~ "and Tk Toolkit."
+#~ msgstr "Balíky obvykle pou¾ívané pøi vývoji aplikací v jazyce Tcl/Tk."
--- a/tasks/po/cy.po
+++ b/tasks/po/cy.po
@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-29 11:46-0500\n"
+"POT-Creation-Date: 2004-04-01 17:50-0500\n"
 "PO-Revision-Date: 2004-03-11 00:27+0000\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@ -554,48 +554,34 @@ msgstr ""

 #. Description
 #: ../po/debian-tasks.desc:342
-msgid "Tcl/Tk"
-msgstr "Tcl/Tk"
-
-#. Description
-#: ../po/debian-tasks.desc:342
-msgid ""
-"Packages commonly used in developing applications using the Tcl language and "
-"Tk Toolkit."
-msgstr ""
-"Pecynnau a ddefnyddir yn aml wrth ddatblygu rhaglenni gan ddefnyddio'r iaith "
-"Tcl a'r teclynnau Tk."
-
-#. Description
-#: ../po/debian-tasks.desc:351
 msgid "TeX/LaTeX environment"
 msgstr "Amgylchedd TeX/LaTeX"

 #. Description
-#: ../po/debian-tasks.desc:351
+#: ../po/debian-tasks.desc:342
 msgid ""
 "This task provides necessary packages for composing documents in TeX/LaTeX."
 msgstr ""

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "Thai environment"
 msgstr "Amgylchedd Thai"

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "This task installs packages that make it easier for Thai to use Debian."
 msgstr ""
 "Mae'r tasg hwn yn sefydlu pecynnau sy'n ei gwneud hi'n haws i bobl Thai "
 "ddefnyddio Debian."

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid "Conventional Unix server"
 msgstr "Gweinydd Unix confensiynol"

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid ""
 "This task selects packages that would typically be found on a conventional "
 "multi-user unix system with remote users. Do be warned that this includes a "
@ -606,17 +592,27 @@ msgstr ""
 "nifer o ellyllau."

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid "Web server"
 msgstr "Gweinydd Gwe"

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid ""
 "This task selects a packages useful for a general purpose web server system."
 msgstr ""
 "Mae'r tasg hwn yn dewis pecynnau sy'n ddefnyddiol ar gyfer gweinydd gwe "
 "cyffredinol."

+#~ msgid "Tcl/Tk"
+#~ msgstr "Tcl/Tk"
+
+#~ msgid ""
+#~ "Packages commonly used in developing applications using the Tcl language "
+#~ "and Tk Toolkit."
+#~ msgstr ""
+#~ "Pecynnau a ddefnyddir yn aml wrth ddatblygu rhaglenni gan ddefnyddio'r "
+#~ "iaith Tcl a'r teclynnau Tk."
+
 #~ msgid "a TeX/LaTeX environment"
 #~ msgstr "amgylchedd TeX/LaTeX"
--- a/tasks/po/da.po
+++ b/tasks/po/da.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-29 11:46-0500\n"
+"POT-Creation-Date: 2004-04-01 17:50-0500\n"
 "PO-Revision-Date: 2004-03-31 13:45+0200\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@ -144,8 +144,10 @@ msgstr "SQL-database"

 #. Description
 #: ../po/debian-tasks.desc:89
-msgid "This task selects client and server packages for the PostgreSQL database."
-msgstr "Denne opgavepakke omfatter klient- og serverpakker til PostgreSQL-databasen."
+msgid ""
+"This task selects client and server packages for the PostgreSQL database."
+msgstr ""
+"Denne opgavepakke omfatter klient- og serverpakker til PostgreSQL-databasen."

 #. Description
 #: ../po/debian-tasks.desc:89
@ -199,8 +201,10 @@ msgstr "DNS-server"

 #. Description
 #: ../po/debian-tasks.desc:123
-msgid "Selects the BIND DNS server, and related documentation and utility packages."
-msgstr "Vælger DNS-serveren BIND samt tilhørende dokumentation og værktøjsprogrammer."
+msgid ""
+"Selects the BIND DNS server, and related documentation and utility packages."
+msgstr ""
+"Vælger DNS-serveren BIND samt tilhørende dokumentation og værktøjsprogrammer."

 #. Description
 #: ../po/debian-tasks.desc:130
@ -213,8 +217,8 @@ msgid ""
 "This task sets up your system to be a file server, supporting both NetBIOS "
 "and NFS."
 msgstr ""
-"Denne opgavesamling sætter dit system op som filserver, der både understøtter "
-"NetBIOS og NFS."
+"Denne opgavesamling sætter dit system op som filserver, der både "
+"understøtter NetBIOS og NFS."

 #. Description
 #: ../po/debian-tasks.desc:139
@ -285,8 +289,8 @@ msgid ""
 "This task installs programs and documentation in Hebrew to help Hebrew "
 "speaking people use Debian."
 msgstr ""
-"Denne opgavepakke installerer hebraiske pakker og dokumentation, til brug for "
-"Debianbrugere, der taler hebraisk."
+"Denne opgavepakke installerer hebraiske pakker og dokumentation, til brug "
+"for Debianbrugere, der taler hebraisk."

 #. Description
 #: ../po/debian-tasks.desc:179
@ -364,7 +368,8 @@ msgid ""
 msgstr ""
 "Dette er en samling værktøjer, som brugere af bærbare computere forventer at "
 "have på deres system. Det omfatter bl.a. nogle specielle værktøjer til "
-"bærbare computere som f.eks. IBM Thinkpad, Sony Vaio, Toshiba og Dell Inspirion."
+"bærbare computere som f.eks. IBM Thinkpad, Sony Vaio, Toshiba og Dell "
+"Inspirion."

 #. Description
 #: ../po/debian-tasks.desc:234
@ -548,49 +553,36 @@ msgstr ""

 #. Description
 #: ../po/debian-tasks.desc:342
-msgid "Tcl/Tk"
-msgstr "Tcl/Tk"
-
-#. Description
-#: ../po/debian-tasks.desc:342
-msgid ""
-"Packages commonly used in developing applications using the Tcl language and "
-"Tk Toolkit."
-msgstr ""
-"Pakker, der typisk benyttes ved udvikling af programmer i sproget Tcl og med "
-"Tk-værktøjssættet."
-
-#. Description
-#: ../po/debian-tasks.desc:351
 msgid "TeX/LaTeX environment"
 msgstr "TeX/LaTeX-miljø"

 #. Description
-#: ../po/debian-tasks.desc:351
-msgid "This task provides necessary packages for composing documents in TeX/LaTeX."
+#: ../po/debian-tasks.desc:342
+msgid ""
+"This task provides necessary packages for composing documents in TeX/LaTeX."
 msgstr ""
-"Denne opgavepakke indeholder de nødvendige pakker til at lave "
-"dokumenter med TeX/LaTeX."
+"Denne opgavepakke indeholder de nødvendige pakker til at lave dokumenter med "
+"TeX/LaTeX."

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "Thai environment"
 msgstr "Thai miljø"

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "This task installs packages that make it easier for Thai to use Debian."
 msgstr ""
 "Denne opgavepakke installerer pakker der gøre det lettere for thai-talende "
 "at bruge Debian."

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid "Conventional Unix server"
 msgstr "Almindelig unix-server"

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid ""
 "This task selects packages that would typically be found on a conventional "
 "multi-user unix system with remote users. Do be warned that this includes a "
@ -601,17 +593,27 @@ msgstr ""
 "dæmoner."

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid "Web server"
 msgstr "Webserver"

 #. Description
-#: ../po/debian-tasks.desc:378
-msgid "This task selects a packages useful for a general purpose web server system."
+#: ../po/debian-tasks.desc:369
+msgid ""
+"This task selects a packages useful for a general purpose web server system."
 msgstr ""
 "Denne opgavepakke vælger pakker, der er nyttige på et almindeligt webserver-"
 "system."

+#~ msgid "Tcl/Tk"
+#~ msgstr "Tcl/Tk"
+
+#~ msgid ""
+#~ "Packages commonly used in developing applications using the Tcl language "
+#~ "and Tk Toolkit."
+#~ msgstr ""
+#~ "Pakker, der typisk benyttes ved udvikling af programmer i sproget Tcl og "
+#~ "med Tk-værktøjssættet."
+
 #~ msgid "a TeX/LaTeX environment"
 #~ msgstr "et TeX/LaTeX-miljø"
-
--- a/tasks/po/de.po
+++ b/tasks/po/de.po
@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel-tasks\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-29 11:46-0500\n"
+"POT-Creation-Date: 2004-04-01 17:50-0500\n"
 "PO-Revision-Date: 2004-03-12 22:15GMT\n"
 "Last-Translator: Dennis Stampfer <seppy@debian.org>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@ -566,48 +566,34 @@ msgstr ""

 #. Description
 #: ../po/debian-tasks.desc:342
-msgid "Tcl/Tk"
-msgstr "Tcl/Tk"
-
-#. Description
-#: ../po/debian-tasks.desc:342
-msgid ""
-"Packages commonly used in developing applications using the Tcl language and "
-"Tk Toolkit."
-msgstr ""
-"Pakete, die normalerweise für die Entwicklung von Anwendungen mit der Tcl-"
-"Sprache und dem Tk-Toolkit gebraucht werden."
-
-#. Description
-#: ../po/debian-tasks.desc:351
 msgid "TeX/LaTeX environment"
 msgstr "TeX/LaTeX-Umgebung"

 #. Description
-#: ../po/debian-tasks.desc:351
+#: ../po/debian-tasks.desc:342
 msgid ""
 "This task provides necessary packages for composing documents in TeX/LaTeX."
 msgstr ""

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "Thai environment"
 msgstr "Thailändische Umgebung"

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "This task installs packages that make it easier for Thai to use Debian."
 msgstr ""
 "Dieser Task installiert Pakete, die es Thailändern einfacher machen, Debian "
 "zu benutzen."

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid "Conventional Unix server"
 msgstr "Traditioneller Unix-Server"

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid ""
 "This task selects packages that would typically be found on a conventional "
 "multi-user unix system with remote users. Do be warned that this includes a "
@ -618,17 +604,27 @@ msgstr ""
 "gewarnt, dass dies einige Daemons mit einschließt."

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid "Web server"
 msgstr "Web-Server"

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid ""
 "This task selects a packages useful for a general purpose web server system."
 msgstr ""
 "Dieser Task wählt Pakete aus, die für den allgemeinen Gebrauch als Web-"
 "Server nützlich sind."

+#~ msgid "Tcl/Tk"
+#~ msgstr "Tcl/Tk"
+
+#~ msgid ""
+#~ "Packages commonly used in developing applications using the Tcl language "
+#~ "and Tk Toolkit."
+#~ msgstr ""
+#~ "Pakete, die normalerweise für die Entwicklung von Anwendungen mit der Tcl-"
+#~ "Sprache und dem Tk-Toolkit gebraucht werden."
+
 #~ msgid "a TeX/LaTeX environment"
 #~ msgstr "eine TeX/LaTeX-Umgebung"
--- a/tasks/po/debian-tasks.pot
+++ b/tasks/po/debian-tasks.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-29 11:22-0500\n"
+"POT-Creation-Date: 2004-04-01 17:50-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -470,44 +470,32 @@ msgstr ""

 #. Description
 #: ../po/debian-tasks.desc:342
-msgid "Tcl/Tk"
-msgstr ""
-
-#. Description
-#: ../po/debian-tasks.desc:342
-msgid ""
-"Packages commonly used in developing applications using the Tcl language and "
-"Tk Toolkit."
-msgstr ""
-
-#. Description
-#: ../po/debian-tasks.desc:351
 msgid "TeX/LaTeX environment"
 msgstr ""

 #. Description
-#: ../po/debian-tasks.desc:351
+#: ../po/debian-tasks.desc:342
 msgid ""
 "This task provides necessary packages for composing documents in TeX/LaTeX."
 msgstr ""

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "Thai environment"
 msgstr ""

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "This task installs packages that make it easier for Thai to use Debian."
 msgstr ""

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid "Conventional Unix server"
 msgstr ""

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid ""
 "This task selects packages that would typically be found on a conventional "
 "multi-user unix system with remote users. Do be warned that this includes a "
@ -515,12 +503,12 @@ msgid ""
 msgstr ""

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid "Web server"
 msgstr ""

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid ""
 "This task selects a packages useful for a general purpose web server system."
 msgstr ""
--- a/tasks/po/el.po
+++ b/tasks/po/el.po
@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-29 11:46-0500\n"
+"POT-Creation-Date: 2004-04-01 17:50-0500\n"
 "PO-Revision-Date: 2004-04-01 13:46EEST\n"
 "Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@ -145,7 +145,8 @@ msgstr "Βάση Δεδομένων SQL"

 #. Description
 #: ../po/debian-tasks.desc:89
-msgid "This task selects client and server packages for the PostgreSQL database."
+msgid ""
+"This task selects client and server packages for the PostgreSQL database."
 msgstr ""
 "Αυτή η ομάδα εγκαθιστά πακέτα για λογισμικό πελάτη και εξυπηρετητή για τη "
 "βάση δεδομένων PostgreSQL."
@ -205,7 +206,8 @@ msgstr "Διακομιστής Ονομάτων (DNS)"

 #. Description
 #: ../po/debian-tasks.desc:123
-msgid "Selects the BIND DNS server, and related documentation and utility packages."
+msgid ""
+"Selects the BIND DNS server, and related documentation and utility packages."
 msgstr ""
 "Επιλέγει για εγκατάσταση το διακομιστή ονομάτων BIND, και σχετικά εργαλεία "
 "και οδηγίες χρήσης."
@ -329,7 +331,8 @@ msgstr "Debian Jr."
 #. Description
 #: ../po/debian-tasks.desc:200
 msgid "Debian Jr. is a collection of Debian packages suitable for children."
-msgstr "Το Debian Jr. είναι μια συλλογή προγραμμάτων του Debian κατάλληλα για παιδιά."
+msgstr ""
+"Το Debian Jr. είναι μια συλλογή προγραμμάτων του Debian κατάλληλα για παιδιά."

 #. Description
 #: ../po/debian-tasks.desc:205
@ -560,49 +563,36 @@ msgstr ""

 #. Description
 #: ../po/debian-tasks.desc:342
-msgid "Tcl/Tk"
-msgstr "Tcl/Tk"
-
-#. Description
-#: ../po/debian-tasks.desc:342
-msgid ""
-"Packages commonly used in developing applications using the Tcl language and "
-"Tk Toolkit."
-msgstr ""
-"Τα πακέτα που χρησιμοποιούνται συχνά στην ανάπτυξη εφαρμογών με τη γλώσσα "
-"Tcl και το Σετ Εργαλείων Tk."
-
-#. Description
-#: ../po/debian-tasks.desc:351
 msgid "TeX/LaTeX environment"
 msgstr "Περιβάλλον TeX/LaTeX"

 #. Description
-#: ../po/debian-tasks.desc:351
-msgid "This task provides necessary packages for composing documents in TeX/LaTeX."
+#: ../po/debian-tasks.desc:342
+msgid ""
+"This task provides necessary packages for composing documents in TeX/LaTeX."
 msgstr ""
 "Τα πακέτα αυτά χρησιμοποιούνται στην σύνταξη και δημιουργία κειμένων με το "
 "σύστημα TeX/LaTeX."

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "Thai environment"
 msgstr "Ταϊλανδέζικο περιβάλλον"

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "This task installs packages that make it easier for Thai to use Debian."
 msgstr ""
 "Αυτή η ομάδα εγκαθιστά πακέτα για διευκόλυνση των χρηστών του Debian που "
 "ομιλούν Ταϊλανδέζικα."

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid "Conventional Unix server"
 msgstr "Τυπικός εξυπηρετητής UNIX"

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid ""
 "This task selects packages that would typically be found on a conventional "
 "multi-user unix system with remote users. Do be warned that this includes a "
@ -613,14 +603,24 @@ msgstr ""
 "ένα σημαντικό αριθμό προγραμμάτων δαιμόνων (daemons)."

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid "Web server"
 msgstr "Διακομιστής Ιστοσελίδων"

 #. Description
-#: ../po/debian-tasks.desc:378
-msgid "This task selects a packages useful for a general purpose web server system."
+#: ../po/debian-tasks.desc:369
+msgid ""
+"This task selects a packages useful for a general purpose web server system."
 msgstr ""
 "Η ομάδα αυτή επιλέγει για εγκατάσταση πακέτα χρήσιμα για ένα διακομιστή "
 "ιστοσελίδων γενικών αναγκών."

+#~ msgid "Tcl/Tk"
+#~ msgstr "Tcl/Tk"
+
+#~ msgid ""
+#~ "Packages commonly used in developing applications using the Tcl language "
+#~ "and Tk Toolkit."
+#~ msgstr ""
+#~ "Τα πακέτα που χρησιμοποιούνται συχνά στην ανάπτυξη εφαρμογών με τη γλώσσα "
+#~ "Tcl και το Σετ Εργαλείων Tk."
--- a/tasks/po/es.po
+++ b/tasks/po/es.po
@ -30,7 +30,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel 1.40\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-29 11:46-0500\n"
+"POT-Creation-Date: 2004-04-01 17:50-0500\n"
 "PO-Revision-Date: 2004-03-26 18:48+0100\n"
 "Last-Translator: Javier Fernandez-Sanguino Peña <jfs@computer.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@ -589,48 +589,34 @@ msgstr ""

 #. Description
 #: ../po/debian-tasks.desc:342
-msgid "Tcl/Tk"
-msgstr "Tcl/Tk"
-
-#. Description
-#: ../po/debian-tasks.desc:342
-msgid ""
-"Packages commonly used in developing applications using the Tcl language and "
-"Tk Toolkit."
-msgstr ""
-"Paquetes habitualmente utilizados en el desarrollo de aplicaciones que "
-"utilizan el lenguaje Tcl y el conjunto de herramientas Tk."
-
-#. Description
-#: ../po/debian-tasks.desc:351
 msgid "TeX/LaTeX environment"
 msgstr "Entorno para TeX/LaTeX"

 #. Description
-#: ../po/debian-tasks.desc:351
+#: ../po/debian-tasks.desc:342
 msgid ""
 "This task provides necessary packages for composing documents in TeX/LaTeX."
 msgstr ""

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "Thai environment"
 msgstr "Entorno en tailandés"

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "This task installs packages that make it easier for Thai to use Debian."
 msgstr ""
 "Esta tarea instala paquetes que harán más fácil el uso de Debian a "
 "tailandeses."

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid "Conventional Unix server"
 msgstr "Servidor Unix convencional"

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid ""
 "This task selects packages that would typically be found on a conventional "
 "multi-user unix system with remote users. Do be warned that this includes a "
@ -641,17 +627,27 @@ msgstr ""
 "cuenta que esta tarea incluye una cierta cantidad de servidores."

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid "Web server"
 msgstr "Servidor de web"

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid ""
 "This task selects a packages useful for a general purpose web server system."
 msgstr ""
 "Esta tarea selecciona paquetes útiles para instalar un servidor de web de "
 "propósito general."

+#~ msgid "Tcl/Tk"
+#~ msgstr "Tcl/Tk"
+
+#~ msgid ""
+#~ "Packages commonly used in developing applications using the Tcl language "
+#~ "and Tk Toolkit."
+#~ msgstr ""
+#~ "Paquetes habitualmente utilizados en el desarrollo de aplicaciones que "
+#~ "utilizan el lenguaje Tcl y el conjunto de herramientas Tk."
+
 #~ msgid "a TeX/LaTeX environment"
 #~ msgstr "un entorno TeX/LaTeX"
--- a/tasks/po/fi.po
+++ b/tasks/po/fi.po
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-29 11:46-0500\n"
+"POT-Creation-Date: 2004-04-01 17:50-0500\n"
 "PO-Revision-Date: 2004-02-07 19:08+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@ -552,46 +552,32 @@ msgstr ""

 #. Description
 #: ../po/debian-tasks.desc:342
-msgid "Tcl/Tk"
-msgstr "Tcl/Tk"
-
-#. Description
-#: ../po/debian-tasks.desc:342
-msgid ""
-"Packages commonly used in developing applications using the Tcl language and "
-"Tk Toolkit."
-msgstr ""
-"Paketit, joita yleensä käytetään kehitettäessä sovelluksia Tcl-kielellä ja "
-"Tk-työkaluohjelmistolla."
-
-#. Description
-#: ../po/debian-tasks.desc:351
 msgid "TeX/LaTeX environment"
 msgstr "TeX/LaTeX-ympäristö"

 #. Description
-#: ../po/debian-tasks.desc:351
+#: ../po/debian-tasks.desc:342
 msgid ""
 "This task provides necessary packages for composing documents in TeX/LaTeX."
 msgstr ""

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "Thai environment"
 msgstr "Thailainen ympäristö"

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "This task installs packages that make it easier for Thai to use Debian."
 msgstr "Asentaa paketit auttamaan thainkielisiä Debianin käytössä."

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid "Conventional Unix server"
 msgstr "Perinteinen Unix-palvelin"

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid ""
 "This task selects packages that would typically be found on a conventional "
 "multi-user unix system with remote users. Do be warned that this includes a "
@ -602,17 +588,27 @@ msgstr ""
 "palveluita jotka käynnistyvät asennuksen jälkeen."

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid "Web server"
 msgstr "Www-palvelin"

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid ""
 "This task selects a packages useful for a general purpose web server system."
 msgstr ""
 "Valitsee paketit, jotka ovat hyödyllisiä yleiskäyttöisessä www-"
 "palvelinjärjestelmässä."

+#~ msgid "Tcl/Tk"
+#~ msgstr "Tcl/Tk"
+
+#~ msgid ""
+#~ "Packages commonly used in developing applications using the Tcl language "
+#~ "and Tk Toolkit."
+#~ msgstr ""
+#~ "Paketit, joita yleensä käytetään kehitettäessä sovelluksia Tcl-kielellä "
+#~ "ja Tk-työkaluohjelmistolla."
+
 #~ msgid "a TeX/LaTeX environment"
 #~ msgstr "TeX/LaTeX-ympäristö"
--- a/tasks/po/hu.po
+++ b/tasks/po/hu.po
@ -11,13 +11,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel-tasks\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-29 11:46-0500\n"
+"POT-Creation-Date: 2004-04-01 17:50-0500\n"
 "PO-Revision-Date: 2004-03-30 17:13+0200\n"
 "Last-Translator: VERÓK István <vi@fsf.hu>\n"
 "Language-Team: Hungarian Debian team <debian-l10n-hungarian@lists.debian>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"

 #. Description
 #: ../po/debian-tasks.desc:4
@ -219,8 +219,9 @@ msgstr "Fájlkiszolgáló"
 msgid ""
 "This task sets up your system to be a file server, supporting both NetBIOS "
 "and NFS."
-msgstr "E metacsomag révén NetBIOS- és NFS-fájlszerveri képességekkel "
-"ruházhatja fel gépét."
+msgstr ""
+"E metacsomag révén NetBIOS- és NFS-fájlszerveri képességekkel ruházhatja fel "
+"gépét."

 #. Description
 #: ../po/debian-tasks.desc:139
@ -557,48 +558,34 @@ msgstr ""

 #. Description
 #: ../po/debian-tasks.desc:342
-msgid "Tcl/Tk"
-msgstr "Tcl/Tk"
-
-#. Description
-#: ../po/debian-tasks.desc:342
-msgid ""
-"Packages commonly used in developing applications using the Tcl language and "
-"Tk Toolkit."
-msgstr ""
-"A Tcl nyelv és a Tk vezérlőelem-könyvtár használatára alapuló "
-"programfejlesztést segítő csomagok."
-
-#. Description
-#: ../po/debian-tasks.desc:351
 msgid "TeX/LaTeX environment"
 msgstr "TeX/LaTeX környezet"

 #. Description
-#: ../po/debian-tasks.desc:351
+#: ../po/debian-tasks.desc:342
 msgid ""
 "This task provides necessary packages for composing documents in TeX/LaTeX."
 msgstr ""
-"Ez a metacsomag TeX/LaTeX-dokumentumok megalkotásához szükséges "
-"csomagokat telepít."
+"Ez a metacsomag TeX/LaTeX-dokumentumok megalkotásához szükséges csomagokat "
+"telepít."

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "Thai environment"
 msgstr "Thai környezet"

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "This task installs packages that make it easier for Thai to use Debian."
 msgstr "Ez a metacsomag thai nyelven beszélőknek szánt csomagokat telepít."

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid "Conventional Unix server"
 msgstr "Hagyományos Unix-kiszolgáló"

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid ""
 "This task selects packages that would typically be found on a conventional "
 "multi-user unix system with remote users. Do be warned that this includes a "
@ -609,16 +596,26 @@ msgstr ""
 "daemonokat futtató csomagok is."

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid "Web server"
 msgstr "Webkiszolgáló"

 #. Description
-#: ../po/debian-tasks.desc:378
+#: ../po/debian-tasks.desc:369
 msgid ""
 "This task selects a packages useful for a general purpose web server system."
 msgstr ""
 "Ez a metacsomag egy általános célú webkiszolgálón hasznos csomagokat telepít."

+#~ msgid "Tcl/Tk"
+#~ msgstr "Tcl/Tk"
+
+#~ msgid ""
+#~ "Packages commonly used in developing applications using the Tcl language "
+#~ "and Tk Toolkit."
+#~ msgstr ""
+#~ "A Tcl nyelv és a Tk vezérlőelem-könyvtár használatára alapuló "
+#~ "programfejlesztést segítő csomagok."
+
 #~ msgid "a TeX/LaTeX environment"
 #~ msgstr "Egy TeX/LaTeX környezet"
--- a/tasks/po/it.po
+++ b/tasks/po/it.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasksel 1.47\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-29 11:46-0500\n"
+"POT-Creation-Date: 2004-04-01 17:50-0500\n"
 "PO-Revision-Date: 2004-03-28 08:00+0200\n"
 "Last-Translator: Giuseppe Sacco <eppesuig@debian.org>\n"
 "Language-Team: italian <tp@lists.linux.it>\n"
@ -553,48 +553,34 @@ msgstr ""

 #. Description
 #: ../po/debian-tasks.desc:342
-msgid "Tcl/Tk"
-msgstr "Tcl/Tk"
-
-#. Description
-#: ../po/debian-tasks.desc:342
-msgid ""
-"Packages commonly used in developing applications using the Tcl language and "
-"Tk Toolkit."
-msgstr ""
-"Pacchetti normalmente usati nello sviluppo di applicazioni tramite il "
-"linguaggio Tcl e il toolkit Tk."
-
-#. Description
-#: ../po/debian-tasks.desc:351
 msgid "TeX/LaTeX environment"
 msgstr "Ambiente TeX/LaTeX"

 #. Description
-#: ../po/debian-tasks.desc:351
+#: ../po/debian-tasks.desc:342
 msgid ""
 "This task provides necessary packages for composing documents in TeX/LaTeX."
 msgstr ""

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "Thai environment"
 msgstr "Ambiente thai"

 #. Description
-#: ../po/debian-tasks.desc:361
+#: ../po/debian-tasks.desc:352
 msgid "This task installs packages that make it easier for Thai to use Debian."
 msgstr ""
 "Questo task installa pacchetti che rendono facile usare Debian per chi è "
 "Thai."

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid "Conventional Unix server"
 msgstr "Server unix convenzionale"

 #. Description
-#: ../po/debian-tasks.desc:371
+#: ../po/debian-tasks.desc:362
 msgid ""
 "This task selects packages that would typically be found on a conventional "
 "multi-user unix system with remote users. Do be warned that this includes a "