Browse Source

* Denis Barbier

- Remove a trailing space in tasks/{c-dev,chinese-t,python-dev}
       and update tasks/po/{de,no}.po
     - Add tasks/po/fr.po.  Closes: #204554
     - Fix a typo in news-server. Closes: #204145
     - Patched data.c to split multi-paragraph descriptions into
       separate gettext calls. Closes: #203829
   * Joey Hess
     - Remove openoffice.org-spellcheck-de-* from German task, no such packages
       any more, and I cannot find a replacement.
     - Add a Norwegian language task from Petter Reinholdtsen. Closes: #205360
     - Provisionally switched print server task to CUPS. We're not sure
       which is the better choice, and continue to solicit comments on this
       change. Closes: #205358
     - Use apt-cache dumpavail via popen, instead of reading the often
       outdated available file. Closes: #114721, #192306, #211072
     - Doc updates for above change.
tags/version_1_32
Joey Hess 18 years ago
parent
commit
4f5f612fd1
19 changed files with 233 additions and 105 deletions
  1. +5
    -5
      README
  2. +68
    -19
      data.c
  3. +15
    -2
      debian/changelog
  4. +1
    -1
      debian/control
  5. +1
    -1
      doincludes.pl
  6. +1
    -1
      makedesc.pl
  7. +1
    -1
      tasks/chinese-t
  8. +1
    -1
      tasks/games
  9. +0
    -3
      tasks/german
  10. +1
    -1
      tasks/news-server
  11. +18
    -0
      tasks/norwegian
  12. +35
    -19
      tasks/po/de.po
  13. +42
    -22
      tasks/po/fr.po
  14. +31
    -21
      tasks/po/no.po
  15. +8
    -3
      tasks/print-server
  16. +1
    -1
      tasks/python-dev
  17. +2
    -2
      tasksel.c
  18. +0
    -1
      tasksel.pod
  19. +2
    -1
      util.c

+ 5
- 5
README View File

@@ -1,4 +1,4 @@
$Id: README,v 1.3 2003/07/25 17:33:24 joeyh Rel $
$Id: README,v 1.4 2003/09/16 23:38:46 joeyh Rel $
Task Selection UI v0.1
Nov 20, 1999
Randolph Chung <tausq@debian.org>
@@ -10,10 +10,10 @@ dependencies.

On startup, the tasksel program will read
/usr/share/tasksel/debian-tasks.desc for information about what tasks are
available and their descriptions and sections. Next it will read
/var/lib/dpkg/available. Task: fields in that file can be used to state
that a package belongs to a task or tasks. Also, the package names are used
to identify task packages (matching "task-*").
available and their descriptions and sections. Next it will read the output
of apt-cache dumpavail. Task: fields can be used to state that a package
belongs to a task or tasks. Also, the package names are used to identify
task packages (matching "task-*").

The tasks will be presented in a simple list selection screen with
their short descriptions. Users can drill down into the tasks to


+ 68
- 19
data.c View File

@@ -1,4 +1,4 @@
/* $Id: data.c,v 1.19 2003/08/01 01:54:55 joeyh Rel $ */
/* $Id: data.c,v 1.20 2003/09/16 23:38:46 joeyh Rel $ */
/* data.c - encapsulates functions for reading a package listing like dpkg's available file
* Internally, packages are stored in a binary tree format to faciliate search operations
*/
@@ -26,8 +26,8 @@
#define PRIORITYFIELD "Priority: "
#define SECTIONFIELD "Section: "
#define STATUSFIELD "Status: "
#define AVAILABLEFILE "/var/lib/dpkg/available"
#define STATUSFILE "/var/lib/dpkg/status"
#define DUMPAVAIL "apt-cache dumpavail"
#define BUF_SIZE 1024
#define MATCHFIELD(buf, s) (strncmp(buf, s, strlen(s)) == 0)
#define FIELDDATA(buf, s) (buf + strlen(s))
@@ -349,6 +349,30 @@ static void walktasks(const void *t, const VISIT which, const int depth)
}
}

static void add_translated_paragraph(char *domain, char **trans, char *msgid)
{
char *l, *msgstr;

l = msgid+strlen(msgid) - 1;
while (l[0] == '\n' || l[0] == ' ') {
l[0] = '\0';
if (l == msgid)
break;
l--;
}
msgstr = dgettext(domain, msgid);
if (*trans == NULL) {
/* '\n\n' will be appended */
*trans = MALLOC(strlen(msgstr) + 3);
**trans = '\0';
}
else {
*trans = REALLOC(*trans, strlen(*trans) + strlen(msgstr) + 3);
}
strcat(*trans, msgstr);
strcat(*trans, "\n\n");
}

void taskfile_read(char *fn, struct tasks_t *tasks, struct packages_t *pkgs,
unsigned char showempties)
{
@@ -363,23 +387,27 @@ void taskfile_read(char *fn, struct tasks_t *tasks, struct packages_t *pkgs,
FILE *f;
char buf[BUF_SIZE];
char *pkgname, *s;
char *task, *shortdesc, *longdesc, *section;
char *task, *shortdesc, *longdesc, *translongdesc, *section;
int relevance = 5;
struct package_t *p;
struct task_t *t;
char *package;
int key_missing;
char *domainname, *l;
char *domainname, *newdomainname, *l, *startdesc;
int verbatimline;
f = fopen(fn, "r");
if (f == NULL) PERROR(fn);

/* Use a domain matching the task file that's being read, so translations
* can be found. */
domainname=strdup(fn);
domainname=STRDUP(fn);
l = strrchr(domainname, '/');
if (l)
domainname=l;
if (l) {
newdomainname=STRDUP(l+1);
FREE(domainname);
domainname = newdomainname;
}
l = strrchr(domainname, '.');
if (l)
l[0] = '\0';
@@ -418,7 +446,6 @@ dontmakemethink:
if (fgets(buf, BUF_SIZE, f) == 0)
break;
if (buf[0] != ' ') goto dontmakemethink;
if (buf[1] == '.') buf[1] = ' ';
if (longdesc == NULL) {
longdesc = (char *)MALLOC(strlen(buf) + 1);
strcpy(longdesc, buf + 1);
@@ -453,15 +480,35 @@ dontmakemethink:
}
/* Munge long desc to something that gettext might be able to use. */
while ((l = strchr(longdesc, '\n'))) {
l[0] = ' ';
}
l = longdesc+strlen(longdesc) - 1;
while (l[0] == '\n' || l[0] == ' ') {
l[0] = '\0';
l--;
verbatimline = 0;
l = startdesc = longdesc;
translongdesc = NULL;
while ((l = strchr(l, '\n'))) {
if (l[1] == ' ')
verbatimline = 1;
else if (l[1] == '.' && l[2] == '\n') {
/* Translate current paragraph and pass to next one */
l[0] = '\0';
add_translated_paragraph(domainname, &translongdesc, startdesc);
startdesc = l + 3;
l += 2;
verbatimline = 0;
}
else {
if (!verbatimline)
l[0] = ' ';
verbatimline = 0;
}
l++;
}
longdesc = STRDUP(dgettext(domainname, longdesc));
add_translated_paragraph(domainname, &translongdesc, startdesc);
FREE(longdesc);
l = longdesc = translongdesc;
/* Dirty trick: text is reformatted in reflowtext(), but
* superfluous \n are already stripped, so keep remaining ones
*/
while ((l = strchr(l, '\n')))
l[0] = '\r';

/* packages_readlist must be called before this function, so we can
* tell if any packages are in this task, and ignore it if none are */
@@ -494,13 +541,14 @@ dontmakemethink:
if (section != NULL) FREE(section);
}
}
if (domainname != NULL) FREE(domainname);
fclose(f);
}

void packages_readlist(struct tasks_t *tasks, struct packages_t *pkgs)
{
/* Populates internal data structures with information from an available
* file */
/* Populates internal data structures with information about available
* packages */
FILE *f;
char buf[BUF_SIZE];
char *name, *shortdesc, *longdesc;
@@ -508,7 +556,8 @@ void packages_readlist(struct tasks_t *tasks, struct packages_t *pkgs)
char *section;
priority_t priority;
if ((f = fopen(AVAILABLEFILE, "r")) == NULL) PERROR(AVAILABLEFILE);
/* XXX This is hardly idea. */
if ((f = popen(DUMPAVAIL, "r")) == NULL) PERROR(DUMPAVAIL);
while (!feof(f)) {
fgets(buf, BUF_SIZE, f);
CHOMP(buf);


+ 15
- 2
debian/changelog View File

@@ -1,9 +1,22 @@
tasksel (1.32) UNRELEASED; urgency=low
tasksel (1.32) unstable; urgency=low

* Denis Barbier
- Remove a trailing space in tasks/{c-dev,chinese-t,python-dev}
and update tasks/po/{de,no}.po
- Add tasks/po/fr.po. Closes: #204554
- Fix a typo in news-server. Closes: #204145
- Patched data.c to split multi-paragraph descriptions into
separate gettext calls. Closes: #203829
* Joey Hess
- Remove openoffice.org-spellcheck-de-* from German task, no such packages
any more, and I cannot find a replacement.
- Add a Norwegian language task from Petter Reinholdtsen. Closes: #205360
- Provisionally switched print server task to CUPS. We're not sure
which is the better choice, and continue to solicit comments on this
change. Closes: #205358
- Use apt-cache dumpavail via popen, instead of reading the often
outdated available file. Closes: #114721, #192306, #211072
- Doc updates for above change.

-- Denis Barbier <barbier@debian.org> Sun, 14 Sep 2003 00:15:52 +0200

@@ -18,7 +31,7 @@ tasksel (1.31) unstable; urgency=low
- Started on tasks/po/no.po
* Several translation updates: at least da es and nn were updated.

-- Joey Hess <joeyh@debian.org> Tue, 26 Aug 2003 14:15:31 -0400
-- Joey Hess <joeyh@debian.org> Tue, 16 Sep 2003 19:35:07 -0400

tasksel (1.30) unstable; urgency=low



+ 1
- 1
debian/control View File

@@ -3,7 +3,7 @@ Section: base
Priority: optional
Maintainer: Randolph Chung <tausq@debian.org>
Uploaders: Joey Hess <joeyh@debian.org>
Standards-Version: 3.6.0
Standards-Version: 3.6.1.0
Build-Depends: po-debconf, debhelper (>= 4), slang1-dev, gettext, dpkg-dev (>= 1.9.0)

Package: tasksel


+ 1
- 1
doincludes.pl View File

@@ -13,7 +13,7 @@ my %depends;
{
local $/="\n\n";
if (! open (AVAIL, "apt-cache dumpavail |")) {
warn "cannot real available file, so not exanding includes\n";
warn "cannot real available info, so not exanding includes\n";
exit;
}
while (<AVAIL>) {


+ 1
- 1
makedesc.pl View File

@@ -30,7 +30,7 @@ my $dolint=1;
{
local $/="\n\n";
if (! open (AVAIL, "apt-cache dumpavail |")) {
warn "cannot real available file, so disabling lint check\n";
warn "cannot real available info, so disabling lint check\n";
$dolint=0;
}
while (<AVAIL>) {


+ 1
- 1
tasks/chinese-t View File

@@ -2,7 +2,7 @@ Task: chinese-t
Section: l10n
Description: Traditional Chinese environment
This task installs programs, data files, fonts, and
documentation that makes it easier for Chinese speakers
documentation that makes it easier for Chinese speakers
to use Debian, using the traditional Chinese encoding.
Key:
cpanel


+ 1
- 1
tasks/games View File

@@ -7,7 +7,7 @@ Description: Games
Packages:
# TODO: more games can be included now that this is not a package.
# Please only add very good, complete, classic or well-known games though.
# It would be good to have some emulators, if any are in main.
# It would be good to have some (more) emulators, if any are in main.
bsdgames
nethack
xgalaga


+ 0
- 3
tasks/german View File

@@ -14,8 +14,5 @@ Packages:
doc-linux-de
trans-de-en
ding
openoffice.org-spellcheck-de-de
openoffice.org-spellcheck-de-ch
openoffice.org-spellcheck-de-at
openoffice.org-l10n-de
kde-i18n-de

+ 1
- 1
tasks/news-server View File

@@ -4,7 +4,7 @@ Section: server
# to warrant this task?
# HELP: should usenet really be all caps? (if so, what does it expand to?)
Description: Usenet news server
This task selects select the preferred version of the INN news server
This task selects the preferred version of the INN news server
software for new Debian installations.
.
You do not need this package if you merely wish to read news from an


+ 18
- 0
tasks/norwegian View File

@@ -0,0 +1,18 @@
Task: norwegian
Section: l10n
Description: Norwegian (Bokmaal and Nynorsk) environment
This task installs packages and documentation in Norwegian
to help Norwegian speaking people use Debian.
Maintainer: Petter Reinholdtsen <pere@debian.org>
Key:
locales
language-env
Packages:
util-linux-locales
wnorwegian
inorwegian
aspell-no
tetex-brev
kde-i18n-no
kde-i18n-nb
kde-i18n-nn

+ 35
- 19
tasks/po/de.po View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-08-26 14:15-0400\n"
"POT-Creation-Date: 2003-09-16 19:35-0400\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"
@@ -398,9 +398,10 @@ msgstr "Usenet-News-Server"

#. Description
#: ../po/debian-tasks.desc:237
#, fuzzy
msgid ""
"This task selects select the preferred version of the INN news server "
"software for new Debian installations."
"This task selects the preferred version of the INN news server software for "
"new Debian installations."
msgstr ""
"Dieser Task wählt die bevorzugte Version der INN Newsserver-Software für "
"neue Debiansysteme aus."
@@ -462,12 +463,12 @@ msgid "This task sets up your system to be a print server."
msgstr "Dieser Task richtet Ihr System als Drucker-Server ein."

#. Description
#: ../po/debian-tasks.desc:273
#: ../po/debian-tasks.desc:277
msgid "Python"
msgstr "Python"

#. Description
#: ../po/debian-tasks.desc:273
#: ../po/debian-tasks.desc:277
#, fuzzy
msgid ""
"Many Python tools and extensions, for developing scripts and simple or "
@@ -478,12 +479,12 @@ msgstr ""
"zu entwickeln."

#. Description
#: ../po/debian-tasks.desc:281
#: ../po/debian-tasks.desc:285
msgid "Russian environment"
msgstr "Russische Umgebung"

#. Description
#: ../po/debian-tasks.desc:281
#: ../po/debian-tasks.desc:285
#, fuzzy
msgid ""
"This task installs programs and documentation in Russian to help Russian "
@@ -493,12 +494,12 @@ msgstr ""
"sprechenden Benutzern in Debian behilflich sind."

#. Description
#: ../po/debian-tasks.desc:290
#: ../po/debian-tasks.desc:294
msgid "Spanish environment"
msgstr "spanische Umgebung"

#. Description
#: ../po/debian-tasks.desc:290
#: ../po/debian-tasks.desc:294
#, fuzzy
msgid ""
"This task installs programs, data files, and documentation that makes it "
@@ -508,12 +509,12 @@ msgstr ""
"einfacher machen, Debian für spanisch verwandte Operationen zu verwenden."

#. Description
#: ../po/debian-tasks.desc:299
#: ../po/debian-tasks.desc:303
msgid "Tcl/Tk"
msgstr "Tcl/Tk"

#. Description
#: ../po/debian-tasks.desc:299
#: ../po/debian-tasks.desc:303
#, fuzzy
msgid ""
"Packages commonly used in developing applications using the Tcl language and "
@@ -526,23 +527,23 @@ msgstr ""
" o C-Header und -Bibliotheken"

#. Description
#: ../po/debian-tasks.desc:308
#: ../po/debian-tasks.desc:312
msgid "TeX/LaTeX environment"
msgstr "TeX/LaTeX-Umgebung"

#. Description
#: ../po/debian-tasks.desc:308
#: ../po/debian-tasks.desc:312
msgid "a TeX/LaTeX environment"
msgstr "Eine TeX/LaTeX-Umgebung."

#. Description
#: ../po/debian-tasks.desc:318
#: ../po/debian-tasks.desc:322
#, fuzzy
msgid "Conventional Unix server"
msgstr "traditioneller Unix-Server"

#. Description
#: ../po/debian-tasks.desc:318
#: ../po/debian-tasks.desc:322
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 "
@@ -553,13 +554,13 @@ msgstr ""
"gewarnt, dass dies einige Daemons mit einschließt."

#. Description
#: ../po/debian-tasks.desc:325
#: ../po/debian-tasks.desc:329
#, fuzzy
msgid "Web server"
msgstr "Web-Server"

#. Description
#: ../po/debian-tasks.desc:325
#: ../po/debian-tasks.desc:329
msgid ""
"This task selects a packages useful for a general purpose web server system."
msgstr ""
@@ -567,17 +568,32 @@ msgstr ""
"Server nützlich sind."

#. Description
#: ../po/debian-tasks.desc:333
#: ../po/debian-tasks.desc:337
msgid "Custom kernel compilation"
msgstr ""

#. Description
#: ../po/debian-tasks.desc:333
#: ../po/debian-tasks.desc:337
msgid ""
"This task includes everything you should need to build your own custom "
"kernel."
msgstr ""

#. Description
#: ../po/debian-tasks.desc:346
msgid "Norwegian (Bokmaal and Nynorsk) environment"
msgstr ""

#. Description
#: ../po/debian-tasks.desc:346
#, fuzzy
msgid ""
"This task installs packages and documentation in Norwegian to help Norwegian "
"speaking people use Debian."
msgstr ""
"Dieser Task installiert Pakete und Dokumentationen in Französisch, die "
"französisch sprechende Benutzer in Debian behilflich sind."

#, fuzzy
#~ msgid "dns-server"
#~ msgstr "Drucker-Server"


+ 42
- 22
tasks/po/fr.po View File

@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tasksel 1.30\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-08-01 22:16+0200\n"
"POT-Creation-Date: 2003-09-16 19:35-0400\n"
"PO-Revision-Date: 2003-09-14 00:24+0200\n"
"Last-Translator: Denis Barbier <barbier@linuxfr.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -99,6 +99,7 @@ msgstr "Environnement chinois traditionnel (Big5)"

#. Description
#: ../po/debian-tasks.desc:52
#, fuzzy
msgid ""
"This task installs programs, data files, fonts, and documentation that makes "
"it easier for Chinese speakers to use Debian, using the traditional Chinese "
@@ -313,10 +314,11 @@ msgstr "Portable"

#. Description
#: ../po/debian-tasks.desc:195
#, fuzzy
msgid ""
"This is a collection of tools that laptop users will expect to find on a "
"system. It includes some special utilities for IBM Thinkpad, Sony Vaio, "
"Toshiba, and Dell Inspiron laptops."
"system. It includes some special utilities laptops including IBM Thinkpads, "
"Sony Vaios, Toshibas, and Dell Inspirons."
msgstr ""
"Il s'agit d'un ensemble d'outils que les possesseurs de portables "
"s'attendent à trouver sur leur système. Il comprend des utilitaires "
@@ -384,9 +386,10 @@ msgstr "Serveur de nouvelles Usenet"

#. Description
#: ../po/debian-tasks.desc:237
#, fuzzy
msgid ""
"This task selects select the preferred version of the INN news server "
"software for new Debian installations."
"This task selects the preferred version of the INN news server software for "
"new Debian installations."
msgstr ""
"Cette tâche installe le serveur de nouvelles INN, dans la version "
"recommandée pour les nouvelles installations de Debian."
@@ -434,7 +437,8 @@ msgid ""
"speaking people use Debian."
msgstr ""
"Cette tâche installe des programmes et de la documentation en polonais afin "
"de faciliter la prise en main de Debian par les utilisateurs parlant polonais."
"de faciliter la prise en main de Debian par les utilisateurs parlant "
"polonais."

#. Description
#: ../po/debian-tasks.desc:266
@@ -447,12 +451,13 @@ msgid "This task sets up your system to be a print server."
msgstr "Cette tâche configure votre système pour être un serveur d'impression."

#. Description
#: ../po/debian-tasks.desc:273
#: ../po/debian-tasks.desc:277
msgid "Python"
msgstr "Python"

#. Description
#: ../po/debian-tasks.desc:273
#: ../po/debian-tasks.desc:277
#, fuzzy
msgid ""
"Many Python tools and extensions, for developing scripts and simple or "
"complex applications in Python."
@@ -461,12 +466,12 @@ msgstr ""
"types d'applications en Python."

#. Description
#: ../po/debian-tasks.desc:281
#: ../po/debian-tasks.desc:285
msgid "Russian environment"
msgstr "Environnement russe"

#. Description
#: ../po/debian-tasks.desc:281
#: ../po/debian-tasks.desc:285
msgid ""
"This task installs programs and documentation in Russian to help Russian "
"speaking people use Debian."
@@ -475,12 +480,12 @@ msgstr ""
"faciliter la prise en main de Debian par les utilisateurs parlant russe."

#. Description
#: ../po/debian-tasks.desc:290
#: ../po/debian-tasks.desc:294
msgid "Spanish environment"
msgstr "Environnement espagnol"

#. Description
#: ../po/debian-tasks.desc:290
#: ../po/debian-tasks.desc:294
msgid ""
"This task installs programs, data files, and documentation that makes it "
"easier for Spanish speakers to use Debian."
@@ -490,12 +495,12 @@ msgstr ""
"les utilisateurs parlant espagnol."

#. Description
#: ../po/debian-tasks.desc:299
#: ../po/debian-tasks.desc:303
msgid "Tcl/Tk"
msgstr "Tcl/Tk"

#. Description
#: ../po/debian-tasks.desc:299
#: ../po/debian-tasks.desc:303
msgid ""
"Packages commonly used in developing applications using the Tcl language and "
"Tk Toolkit."
@@ -504,22 +509,22 @@ msgstr ""
"langage Tcl et la boîte à outils Tk."

#. Description
#: ../po/debian-tasks.desc:308
#: ../po/debian-tasks.desc:312
msgid "TeX/LaTeX environment"
msgstr "Environnement TeX/LaTeX"

#. Description
#: ../po/debian-tasks.desc:308
#: ../po/debian-tasks.desc:312
msgid "a TeX/LaTeX environment"
msgstr "Un environnement TeX/LaTeX"

#. Description
#: ../po/debian-tasks.desc:318
#: ../po/debian-tasks.desc:322
msgid "Conventional Unix server"
msgstr "Serveur Unix traditionnel"

#. Description
#: ../po/debian-tasks.desc:318
#: ../po/debian-tasks.desc:322
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 "
@@ -530,26 +535,41 @@ msgstr ""
"distance. Attention : bon nombre de démons vont être installés."

#. Description
#: ../po/debian-tasks.desc:325
#: ../po/debian-tasks.desc:329
msgid "Web server"
msgstr "Serveur web"

#. Description
#: ../po/debian-tasks.desc:325
#: ../po/debian-tasks.desc:329
msgid ""
"This task selects a packages useful for a general purpose web server system."
msgstr "Cette tâche choisit les paquets utiles pour un serveur web générique."

#. Description
#: ../po/debian-tasks.desc:333
#: ../po/debian-tasks.desc:337
msgid "Custom kernel compilation"
msgstr "Compilation de noyaux sur mesure"

#. Description
#: ../po/debian-tasks.desc:333
#: ../po/debian-tasks.desc:337
msgid ""
"This task includes everything you should need to build your own custom "
"kernel."
msgstr ""
"Cette tâche contient tout ce qui est nécessaire à la compilation de noyaux "
"sur mesure."

#. Description
#: ../po/debian-tasks.desc:346
msgid "Norwegian (Bokmaal and Nynorsk) environment"
msgstr ""

#. Description
#: ../po/debian-tasks.desc:346
#, fuzzy
msgid ""
"This task installs packages and documentation in Norwegian to help Norwegian "
"speaking people use Debian."
msgstr ""
"Cette tâche installe des paquets et de la documentation en français afin de "
"faciliter la prise en main de Debian par les utilisateurs francophones."

+ 31
- 21
tasks/po/no.po View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tasksel\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-08-26 14:15-0400\n"
"POT-Creation-Date: 2003-09-16 19:35-0400\n"
"PO-Revision-Date: 2003-08-15 00:22MET\n"
"Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -319,8 +319,8 @@ msgstr ""
#. Description
#: ../po/debian-tasks.desc:237
msgid ""
"This task selects select the preferred version of the INN news server "
"software for new Debian installations."
"This task selects the preferred version of the INN news server software for "
"new Debian installations."
msgstr ""

#. Description
@@ -368,70 +368,70 @@ msgid "This task sets up your system to be a print server."
msgstr ""

#. Description
#: ../po/debian-tasks.desc:273
#: ../po/debian-tasks.desc:277
msgid "Python"
msgstr ""

#. Description
#: ../po/debian-tasks.desc:273
#: ../po/debian-tasks.desc:277
msgid ""
"Many Python tools and extensions, for developing scripts and simple or "
"complex applications in Python."
msgstr ""

#. Description
#: ../po/debian-tasks.desc:281
#: ../po/debian-tasks.desc:285
msgid "Russian environment"
msgstr ""

#. Description
#: ../po/debian-tasks.desc:281
#: ../po/debian-tasks.desc:285
msgid ""
"This task installs programs and documentation in Russian to help Russian "
"speaking people use Debian."
msgstr ""

#. Description
#: ../po/debian-tasks.desc:290
#: ../po/debian-tasks.desc:294
msgid "Spanish environment"
msgstr ""

#. Description
#: ../po/debian-tasks.desc:290
#: ../po/debian-tasks.desc:294
msgid ""
"This task installs programs, data files, and documentation that makes it "
"easier for Spanish speakers to use Debian."
msgstr ""

#. Description
#: ../po/debian-tasks.desc:299
#: ../po/debian-tasks.desc:303
msgid "Tcl/Tk"
msgstr ""

#. Description
#: ../po/debian-tasks.desc:299
#: ../po/debian-tasks.desc:303
msgid ""
"Packages commonly used in developing applications using the Tcl language and "
"Tk Toolkit."
msgstr ""

#. Description
#: ../po/debian-tasks.desc:308
#: ../po/debian-tasks.desc:312
msgid "TeX/LaTeX environment"
msgstr ""

#. Description
#: ../po/debian-tasks.desc:308
#: ../po/debian-tasks.desc:312
msgid "a TeX/LaTeX environment"
msgstr ""

#. Description
#: ../po/debian-tasks.desc:318
#: ../po/debian-tasks.desc:322
msgid "Conventional Unix server"
msgstr ""

#. Description
#: ../po/debian-tasks.desc:318
#: ../po/debian-tasks.desc:322
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 "
@@ -439,27 +439,37 @@ msgid ""
msgstr ""

#. Description
#: ../po/debian-tasks.desc:325
#: ../po/debian-tasks.desc:329
msgid "Web server"
msgstr ""

#. Description
#: ../po/debian-tasks.desc:325
#: ../po/debian-tasks.desc:329
msgid ""
"This task selects a packages useful for a general purpose web server system."
msgstr ""

#. Description
#: ../po/debian-tasks.desc:333
#: ../po/debian-tasks.desc:337
msgid "Custom kernel compilation"
msgstr ""

#. Description
#: ../po/debian-tasks.desc:333
#: ../po/debian-tasks.desc:337
msgid ""
"This task includes everything you should need to build your own custom "
"kernel."
msgstr ""

#~ msgid "Norwegian (Bokmål and Nynorsk) environment"
#~ msgstr "Norsk (bokmål og nynorsk) omgivelse"
#. Description
#: ../po/debian-tasks.desc:346
#, fuzzy
msgid "Norwegian (Bokmaal and Nynorsk) environment"
msgstr "Norsk (bokmål og nynorsk) omgivelse"

#. Description
#: ../po/debian-tasks.desc:346
msgid ""
"This task installs packages and documentation in Norwegian to help Norwegian "
"speaking people use Debian."
msgstr ""

+ 8
- 3
tasks/print-server View File

@@ -3,12 +3,17 @@ Section: server
Description: Print server
This task sets up your system to be a print server.
Key:
lpr
cupsys
cupsys-pstoraster
cupsomatic-ppd
cupsys-client
cupsys-bsd
Packages:
cupsys-driver-gimpprint
kdelibs3-cups
qtcups
samba
samba-doc
smbclient
swat
smbfs
magicfilter
gs

+ 1
- 1
tasks/python-dev View File

@@ -2,7 +2,7 @@ Task: python-dev
Section: devel
Maintainer: Matthias Urlichs <smurf@smurf.noris.de>
Description: Python
Many Python tools and extensions, for developing scripts and simple or
Many Python tools and extensions, for developing scripts and simple or
complex applications in Python.
Key:
python


+ 2
- 2
tasksel.c View File

@@ -1,4 +1,4 @@
/* $Id: tasksel.c,v 1.17 2003/07/25 23:55:57 joeyh Rel $ */
/* $Id: tasksel.c,v 1.18 2003/09/16 23:38:46 joeyh Rel $ */
#include "tasksel.h"

#include <stdio.h>
@@ -189,7 +189,7 @@ int main(int argc, char * const argv[])
tasks_crop(&tasks);
if (tasks.count == 0) {
fprintf(stderr, _("No tasks found on this system.\nDid you update your available file? Try running dselect update.\n"));
fprintf(stderr, _("No tasks found on this system.\n"));
return 255;
}


+ 0
- 1
tasksel.pod View File

@@ -55,7 +55,6 @@ dpkg(8), apt-get(8)
=head1 FILES

F</usr/share/tasksel/debian-tasks.desc>
F</var/lib/dpkg/available>

=head1 AUTHOR



+ 2
- 1
util.c View File

@@ -1,8 +1,9 @@
/* $Id: util.c,v 1.4 2001/11/22 17:53:48 tausq Rel $ */
/* $Id: util.c,v 1.5 2003/09/16 23:38:46 joeyh Rel $ */
#include "util.h"

#include <string.h>
#include <stdlib.h>
#include <libintl.h>

#include "slangui.h"
#include "macros.h"


Loading…
Cancel
Save