From: Frank Lichtenheld Date: Wed, 17 Oct 2007 22:14:53 +0000 (+0000) Subject: Merge commit 'c82c758c851618e8bd68b858c432151f63ba6e0f' into debian-master X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=a9cf75feb9496ca4b5dd5848060fbf4422eb3eee;hp=e66c68760ee1d36e50d52cd4d81d7d9e4f059dd3;p=deb%2Fpackages.git Merge commit 'c82c758c851618e8bd68b858c432151f63ba6e0f' into debian-master --- diff --git a/README b/README new file mode 100644 index 0000000..f55856e --- /dev/null +++ b/README @@ -0,0 +1,69 @@ +README +====== + +This README provides an overview over the source code. +For installation instructions see INSTALL. + +Request +------- + +What code gets executed for a request and in which order? +Perl modules referenced can be found under lib/ + + HTTP request + | + | + Apache rewrites -- serves static files + (conf/apache.conf.sed.in) (generated by cron script, + | or installed from static) + | + CGI/mod_perl wrapper + (cgi-bin/dispatcher.pl) + | + | + Request parsing + (Packages::Dispatcher) + | + | + Execute Action + (Packages::Do*::do_*, + uses data from files/) + | + | + generate Output + (Packages::Template, + uses templates under templates//) + +Cron +---- + +./bin/daily executes scripts from cron.d/ with run-parts: +(these are mostly just wrappers for scripts from bin/) + +010git -- pull changes from git +050checkinst -- check if all needed packages are installed +100syncarchive -- retrieve data from main Debian archive +100syncarchive_amd64 -- retrieve data from sarge amd64 archive +100syncarchive_backports -- retrieve data from backports.org +100syncarchive_gnuab -- retrieve data from gnuab (kfreebsd-*, armel) +100syncarchive_installer -- retrieve d-i data +100syncarchive_m68k -- retrieve data for etch-m68k +100syncarchive_maintainers -- retrieve maintainer index +100syncarchive_volatile -- retrieve data from volatile.d.o +110debtags -- retrieve debtags vocabular +120synctrans -- retrieve DDTP translations +200process_archive -- convert all retrieved data to databases + (see BACKEND) +300maintainerdb -- create data for @packages.d.o aliases +400changelogs_map -- create changelogs map (for changelog: shortcut) +500update_mo -- update .pot and .po files and generate .gmo +600index_pages -- create static index pages + /, /, and + allpackages +600prepare_newpkg -- prepare data for newpkg sites +700install_static -- install data from static/ to www/ + +After that ./bin/daily runs ./bin/extract_changelogs to update +the changelogs in www/changelogs. + +logs can be found in files/logs/{cron,changelogs,git}.log diff --git a/bin/create_index_pages b/bin/create_index_pages index 8586671..72498e9 100755 --- a/bin/create_index_pages +++ b/bin/create_index_pages @@ -67,7 +67,7 @@ foreach my $s (@SUITES) { mkpath ( "$wwwdir/source/$key" ); foreach my $lang (@LANGUAGES) { my $locale = get_locale( $lang ); - my $charset = get_locale( $lang ); + my $charset = get_charset( $lang ); setlocale ( LC_ALL, $locale ) or do { warn "couldn't set locale ($lang/$locale)\n"; next; diff --git a/bin/parse-contents b/bin/parse-contents index 414dc8a..ef5c09c 100755 --- a/bin/parse-contents +++ b/bin/parse-contents @@ -82,13 +82,16 @@ for my $suite (@suites) { open CONT, "zcat $filename|$what" or die $!; - while () {last if /^FILE/mo;} - open CONT, "zcat $filename|$what" if eof(CONT); + while () { last if /^FILE/mo; } + if (eof(CONT)) { # no header found + close CONT; # explicit close to reset $. + open CONT, "zcat $filename|$what"; + } while () { my $data = ""; my %data = (); chomp; - print "Doing line ".($./1000)."k (out of approx 1.5M)\n" if $. % 250000 == 0; + print "Doing line ".($./1000)."k (out of approx 2.0M)\n" if $. % 250000 == 0; /^(.+?)\s+(\S+)$/o; my ($file, $value) = ($1, $2); $value =~ s#[^,/]+/##og; @@ -159,7 +162,7 @@ for my $suite (@suites) { my $lastpath = my $lastcasepath = my $lastfile = ""; my %matches = (); while () { - print "Doing line ".($./1000000)."M (out of approx. 16M)\n" + print "Doing line ".($./1000000)."M (out of approx. 20M)\n" if $. % 1000000 == 0; chomp; my @line = split /\0/o, $_; diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in index 20067de..5f316e2 100644 --- a/conf/apache.conf.sed.in +++ b/conf/apache.conf.sed.in @@ -22,49 +22,34 @@ AddLanguage bg .bg AddLanguage ca .ca AddLanguage cs .cs - AddCharset ISO-8859-2 .cs AddLanguage da .da - AddCharset ISO-8859-1 .da AddLanguage de .de AddLanguage el .el AddLanguage eo .eo AddLanguage es .es - AddCharset ISO-8859-1 .es AddLanguage fi .fi - AddCharset ISO-8859-1 .fi AddLanguage fr .fr AddLanguage hr .hr AddLanguage hu .hu - AddCharset ISO-8859-2 .hu AddLanguage id .id AddLanguage it .it - AddCharset ISO-8859-1 .it AddLanguage ja .ja - AddCharset EUC_JP .ja AddLanguage ko .ko AddLanguage lt .lt AddLanguage nl .nl - AddCharset ISO-8859-1 .nl AddLanguage no .no AddLanguage nb .nb AddLanguage pl .pl - AddCharset ISO-8859-2 .pl AddLanguage pt .pt - AddCharset ISO-8859-1 .pt AddLanguage pt-pt .pt_PT - AddCharset ISO-8859-1 .pt_PT AddLanguage pt-br .pt_BR - AddCharset ISO-8859-1 .pt_BR AddLanguage ro .ro AddLanguage ru .ru AddLanguage sk .sk - AddCharset ISO-8859-2 .sk AddLanguage sl .sl AddLanguage sv .sv_SE - AddCharset ISO-8859-1 .sv_SE AddLanguage tr .tr AddLanguage uk .uk - AddCharset KOI8-U .uk AddLanguage zh-CN .zh-cn AddLanguage zh-HK .zh-hk AddLanguage zh-TW .zh-tw diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm index bc439b9..903c777 100755 --- a/lib/Packages/Dispatcher.pm +++ b/lib/Packages/Dispatcher.pm @@ -237,9 +237,9 @@ sub do_dispatch { array => '\s+', match => '^([-+\@\w\/.:]+)$', }, - package => { default => undef, - match => '^([\w.+-]+)$', - var => \$pkg }, + 'package' => { default => undef, + match => '^([\w.+-]+)$', + var => \$pkg }, suite => { default => 'default', match => '^([\w-]+)$', array => ',', var => \@suites, replace => { all => \@SUITES, @@ -269,13 +269,13 @@ sub do_dispatch { arch => { default => 'any', match => '^([\w-]+)$', array => ',', var => \@archs, replace => { any => \@ARCHITECTURES } }, - format => { default => 'html', match => '^([\w.]+)$', }, - mode => { default => '', match => '^(\w+)$', }, - sort_by => { default => 'file', match => '^(\w+)$', }, - ); + 'format' => { default => 'html', match => '^([\w.]+)$', }, + mode => { default => '', match => '^(\w+)$', }, + sort_by => { default => 'file', match => '^(\w+)$', }, + ); my %opts; my %params = Packages::CGI::parse_params( $input, \%params_def, \%opts ); -Packages::CGI::init_url( $input, \%params, \%opts ); + Packages::CGI::init_url( $input, \%params, \%opts ); my $locale = get_locale($opts{lang}); my $charset = get_charset($opts{lang}); @@ -317,8 +317,8 @@ Packages::CGI::init_url( $input, \%params, \%opts ); #FIXME: ugly hack unless (($what_to_do eq 'allpackages' and $opts{format} =~ /^(html|txt\.gz)/) - || -e "$TEMPLATEDIR/$opts{format}/${what_to_do}.tmpl") { - fatal_error( "requested format not available for this document", + || -e "$TEMPLATEDIR/$opts{format}/${what_to_do}.tmpl") { + fatal_error( _g("requested format not available for this document"), "406 requested format not available"); } @@ -334,10 +334,10 @@ Packages::CGI::init_url( $input, \%params, \%opts ); $page_content{make_search_url} = sub { return &Packages::CGI::make_search_url(@_) }; $page_content{make_url} = sub { return &Packages::CGI::make_url(@_) }; $page_content{extract_host} = sub { my $uri = URI->new($_[0]); - my $host = $uri->host; - $host .= ':'.$uri->port if $uri->port != $uri->default_port; - return $host; - }; + my $host = $uri->host; + $host .= ':'.$uri->port if $uri->port != $uri->default_port; + return $host; + }; # needed to work around the limitations of the the FILTER syntax $page_content{html_encode} = sub { return HTML::Entities::encode_entities(@_,'<>&"') }; $page_content{uri_escape} = sub { return URI::Escape::uri_escape(@_) }; diff --git a/po/sections.de.po b/po/sections.de.po index 062c486..d5ec035 100644 --- a/po/sections.de.po +++ b/po/sections.de.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: packages.git 2cd81017ac27717adcda738074294c4f5cd9e4cd\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-18 20:42+0200\n" +"POT-Creation-Date: 2007-10-07 06:18+0200\n" "PO-Revision-Date: 2007-09-18 19:48+0200\n" "Last-Translator: Frank Lichtenheld \n" "Language-Team: debian-l10n-german \n" diff --git a/po/sections.fi.po b/po/sections.fi.po index 2e5edf9..9b58116 100644 --- a/po/sections.fi.po +++ b/po/sections.fi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sections\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-28 18:04+0100\n" +"POT-Creation-Date: 2007-10-07 06:18+0200\n" "PO-Revision-Date: 2005-10-17 21:52+0300\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" @@ -209,24 +209,10 @@ msgstr "" "ohjelmistot" #: lib/Packages/Sections.pm:54 -msgid "Software restricted in the U.S." -msgstr "Yhdysvalloissa rajoitetut ohjelmistot" - -#: lib/Packages/Sections.pm:55 -msgid "" -"These packages probably may not be used in or distributed from the U.S. due " -"to software patents. You should check the regulations in your country before " -"using this software." -msgstr "" -"Näitä paketteja ei todennäköisesti saa käyttää tai levittää Yhdysvalloissa " -"ohjelmistopatenttien vuoksi. Kannattaa tarkistaa oman maasi säännökset ennen " -"näiden ohjelmistojen käyttämistä." - -#: lib/Packages/Sections.pm:56 msgid "Old Libraries" msgstr "Vanhat kirjastot" -#: lib/Packages/Sections.pm:57 +#: lib/Packages/Sections.pm:55 msgid "" "Old versions of libraries, kept for backward compatibility with old " "applications." @@ -234,11 +220,11 @@ msgstr "" "Vanhat versiot kirjastoista, joita pidetään vanhojen sovellusten takautuvan " "yhteensopivuuden vuoksi" -#: lib/Packages/Sections.pm:58 +#: lib/Packages/Sections.pm:56 msgid "Other OS's and file systems" msgstr "Muut käyttö- ja tiedostojärjestelmät" -#: lib/Packages/Sections.pm:59 +#: lib/Packages/Sections.pm:57 msgid "" "Software to run programs compiled for other operating system, and to use " "their filesystems." @@ -246,67 +232,75 @@ msgstr "" "Ohjelmistot, joilla voidaan ajaa muille käyttöjärjestelmille käännettyjä " "ohjelmia ja käyttää niiden tiedostojärjestelmiä" -#: lib/Packages/Sections.pm:60 +#: lib/Packages/Sections.pm:58 msgid "Perl" msgstr "Perl" -#: lib/Packages/Sections.pm:61 +#: lib/Packages/Sections.pm:59 msgid "Everything about Perl, an interpreted scripting language." msgstr "Kaikki Perlistä, tulkattavasta skriptikielestä" -#: lib/Packages/Sections.pm:62 +#: lib/Packages/Sections.pm:60 msgid "Python" msgstr "Python" -#: lib/Packages/Sections.pm:63 +#: lib/Packages/Sections.pm:61 msgid "" "Everything about Python, an interpreted, interactive object oriented " "language." msgstr "" "Kaikki Pythonista, tulkattavasta interaktiivisesta olio-ohjelmointikielestä" -#: lib/Packages/Sections.pm:64 +#: lib/Packages/Sections.pm:62 msgid "Science" msgstr "Tiede" -#: lib/Packages/Sections.pm:65 +#: lib/Packages/Sections.pm:63 msgid "Basic tools for scientific work" msgstr "Perustyökalut tieteelliseen työhön" -#: lib/Packages/Sections.pm:66 +#: lib/Packages/Sections.pm:64 msgid "Shells" msgstr "Kuoret" -#: lib/Packages/Sections.pm:67 +#: lib/Packages/Sections.pm:65 msgid "Command shells. Friendly user interfaces for beginners." msgstr "Komentokuoret, ystävällisiä käyttöliittymiä aloittelijoille" -#: lib/Packages/Sections.pm:68 +#: lib/Packages/Sections.pm:66 msgid "Sound" msgstr "Ääni" -#: lib/Packages/Sections.pm:69 +#: lib/Packages/Sections.pm:67 msgid "" "Utilities to deal with sound: mixers, players, recorders, CD players, etc." msgstr "" "Ohjelmat äänen käyttöön: mikserit, soittimet, nauhoittimet, CD-soittimet jne." -#: lib/Packages/Sections.pm:70 +#: lib/Packages/Sections.pm:68 msgid "TeX" msgstr "TeX" -#: lib/Packages/Sections.pm:71 +#: lib/Packages/Sections.pm:69 msgid "The famous typesetting software and related programs." msgstr "Kuuluisa ladontaohjelmisto ja siihen liittyvät ohjelmat" -#: lib/Packages/Sections.pm:72 +#: lib/Packages/Sections.pm:70 msgid "Text Processing" msgstr "Tekstinkäsittely" -#: lib/Packages/Sections.pm:73 +#: lib/Packages/Sections.pm:71 msgid "Utilities to format and print text documents." msgstr "Työkaluja tekstiasiakirjojen muotoiluun ja tulostamiseen" +#: lib/Packages/Sections.pm:72 +msgid "Translations" +msgstr "" + +#: lib/Packages/Sections.pm:73 +msgid "Translation packages and language support meta packages." +msgstr "" + #: lib/Packages/Sections.pm:74 msgid "Utilities" msgstr "Työkaluohjelmat" @@ -368,3 +362,15 @@ msgstr "" #~ msgstr "" #~ "Jokaisen Debian-järjestelmän runkoon tarvittavat ohjelmat (Näitä ei " #~ "tarvitse asentaa, ne tarjotaan vain päivitystä varten.)" + +#~ msgid "" +#~ "These packages probably may not be used in or distributed from the U.S. " +#~ "due to software patents. You should check the regulations in your country " +#~ "before using this software." +#~ msgstr "" +#~ "Näitä paketteja ei todennäköisesti saa käyttää tai levittää " +#~ "Yhdysvalloissa ohjelmistopatenttien vuoksi. Kannattaa tarkistaa oman " +#~ "maasi säännökset ennen näiden ohjelmistojen käyttämistä." + +#~ msgid "Software restricted in the U.S." +#~ msgstr "Yhdysvalloissa rajoitetut ohjelmistot" diff --git a/po/sections.fr.po b/po/sections.fr.po index a8ff941..4ccc75d 100644 --- a/po/sections.fr.po +++ b/po/sections.fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-28 18:04+0100\n" +"POT-Creation-Date: 2007-10-07 06:18+0200\n" "PO-Revision-Date: 2005-04-11 20:32+0200\n" "Last-Translator: Guilhelm Panaget \n" "Language-Team: French \n" @@ -212,24 +212,10 @@ msgstr "" "nouvelles, etc." #: lib/Packages/Sections.pm:54 -msgid "Software restricted in the U.S." -msgstr "Logiciels soumis à restriction aux États-Unis" - -#: lib/Packages/Sections.pm:55 -msgid "" -"These packages probably may not be used in or distributed from the U.S. due " -"to software patents. You should check the regulations in your country before " -"using this software." -msgstr "" -"Ces paquets ne peuvent vraisemblablement pas être utilisés ou distribués aux " -"États-Unis du fait de brevets logiciels. Vous devriez vérifier la " -"règlementation de votre pays avant d'utiliser ces logiciels." - -#: lib/Packages/Sections.pm:56 msgid "Old Libraries" msgstr "Bibliothèques obsolètes" -#: lib/Packages/Sections.pm:57 +#: lib/Packages/Sections.pm:55 msgid "" "Old versions of libraries, kept for backward compatibility with old " "applications." @@ -237,11 +223,11 @@ msgstr "" "Versions obsolètes de bibliothèques, conservées à des fins de compatibilité " "avec d'anciennes applications." -#: lib/Packages/Sections.pm:58 +#: lib/Packages/Sections.pm:56 msgid "Other OS's and file systems" msgstr "Autres OS et systèmes de fichiers" -#: lib/Packages/Sections.pm:59 +#: lib/Packages/Sections.pm:57 msgid "" "Software to run programs compiled for other operating system, and to use " "their filesystems." @@ -249,68 +235,76 @@ msgstr "" "Logiciels permettant d'exécuter des programmes compilés pour d'autres " "systèmes d'exploitation et d'utiliser leur système de fichiers." -#: lib/Packages/Sections.pm:60 +#: lib/Packages/Sections.pm:58 msgid "Perl" msgstr "Perl" -#: lib/Packages/Sections.pm:61 +#: lib/Packages/Sections.pm:59 msgid "Everything about Perl, an interpreted scripting language." msgstr "Tout à propos de Perl, langage interprété pour scripts." -#: lib/Packages/Sections.pm:62 +#: lib/Packages/Sections.pm:60 msgid "Python" msgstr "Python" -#: lib/Packages/Sections.pm:63 +#: lib/Packages/Sections.pm:61 msgid "" "Everything about Python, an interpreted, interactive object oriented " "language." msgstr "" "Tout à propos de Python, langage interprété, interactif et orienté objet." -#: lib/Packages/Sections.pm:64 +#: lib/Packages/Sections.pm:62 msgid "Science" msgstr "Science" -#: lib/Packages/Sections.pm:65 +#: lib/Packages/Sections.pm:63 msgid "Basic tools for scientific work" msgstr "Outils de base pour les travaux scientifiques." -#: lib/Packages/Sections.pm:66 +#: lib/Packages/Sections.pm:64 msgid "Shells" msgstr "Shells" -#: lib/Packages/Sections.pm:67 +#: lib/Packages/Sections.pm:65 msgid "Command shells. Friendly user interfaces for beginners." msgstr "Shells de commandes. Interfaces abordables par le débutant." -#: lib/Packages/Sections.pm:68 +#: lib/Packages/Sections.pm:66 msgid "Sound" msgstr "Son" -#: lib/Packages/Sections.pm:69 +#: lib/Packages/Sections.pm:67 msgid "" "Utilities to deal with sound: mixers, players, recorders, CD players, etc." msgstr "" "Outils pour travailler avec le son : tables de mixage, lecteurs, " "enregistreurs, lecteurs de CD, etc." -#: lib/Packages/Sections.pm:70 +#: lib/Packages/Sections.pm:68 msgid "TeX" msgstr "TeX" -#: lib/Packages/Sections.pm:71 +#: lib/Packages/Sections.pm:69 msgid "The famous typesetting software and related programs." msgstr "Le célèbre logiciel de composition et les programmes associés." -#: lib/Packages/Sections.pm:72 +#: lib/Packages/Sections.pm:70 msgid "Text Processing" msgstr "Traitement de texte" -#: lib/Packages/Sections.pm:73 +#: lib/Packages/Sections.pm:71 msgid "Utilities to format and print text documents." msgstr "Outils pour la mise en forme et l'impression de documents texte." +#: lib/Packages/Sections.pm:72 +msgid "Translations" +msgstr "" + +#: lib/Packages/Sections.pm:73 +msgid "Translation packages and language support meta packages." +msgstr "" + #: lib/Packages/Sections.pm:74 msgid "Utilities" msgstr "Outils système" @@ -372,3 +366,15 @@ msgstr "" #~ "Outils de base utilisés par tout système Debian (vous ne devriez pas " #~ "avoir besoin de les installer, ils sont fournis ici pour les mises à " #~ "niveaux)." + +#~ msgid "" +#~ "These packages probably may not be used in or distributed from the U.S. " +#~ "due to software patents. You should check the regulations in your country " +#~ "before using this software." +#~ msgstr "" +#~ "Ces paquets ne peuvent vraisemblablement pas être utilisés ou distribués " +#~ "aux États-Unis du fait de brevets logiciels. Vous devriez vérifier la " +#~ "règlementation de votre pays avant d'utiliser ces logiciels." + +#~ msgid "Software restricted in the U.S." +#~ msgstr "Logiciels soumis à restriction aux États-Unis" diff --git a/po/sections.nl.po b/po/sections.nl.po index 7c6a729..9b028ef 100644 --- a/po/sections.nl.po +++ b/po/sections.nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: packages.debian.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-28 18:04+0100\n" +"POT-Creation-Date: 2007-10-07 06:18+0200\n" "PO-Revision-Date: 2005-01-03 00:59+0100\n" "Last-Translator: Bas Zoetekouw \n" "Language-Team: Dutch \n" @@ -217,25 +217,10 @@ msgstr "" "zetten, etc." #: lib/Packages/Sections.pm:54 -msgid "Software restricted in the U.S." -msgstr "Software waar in de Verenigde Staten beperkingen op van kracht zijn." - -#: lib/Packages/Sections.pm:55 -msgid "" -"These packages probably may not be used in or distributed from the U.S. due " -"to software patents. You should check the regulations in your country before " -"using this software." -msgstr "" -"Deze pakketten mogen waarschijnlijk niet worden gebruikt in of " -"gedistribueerd vanuit de Verenigde Staten vanwege softwarepatenten. U kunt " -"het beste de regels in uw eigen land checken alvorens deze software te " -"gebruiken." - -#: lib/Packages/Sections.pm:56 msgid "Old Libraries" msgstr "Oude bibliotheken" -#: lib/Packages/Sections.pm:57 +#: lib/Packages/Sections.pm:55 msgid "" "Old versions of libraries, kept for backward compatibility with old " "applications." @@ -243,11 +228,11 @@ msgstr "" "Oude versies van bibliotheken, die worden bewaard omdat oudere programmatuur " "hen nog nodig kan hebben." -#: lib/Packages/Sections.pm:58 +#: lib/Packages/Sections.pm:56 msgid "Other OS's and file systems" msgstr "Andere besturings- en bestandssystemen" -#: lib/Packages/Sections.pm:59 +#: lib/Packages/Sections.pm:57 msgid "" "Software to run programs compiled for other operating system, and to use " "their filesystems." @@ -255,19 +240,19 @@ msgstr "" "Programmatuur om programma's te kunnen draaien die voor andere " "besturingssystemen zijn gebouwd, en om hun bestandssystemen te gebruiken." -#: lib/Packages/Sections.pm:60 +#: lib/Packages/Sections.pm:58 msgid "Perl" msgstr "Perl" -#: lib/Packages/Sections.pm:61 +#: lib/Packages/Sections.pm:59 msgid "Everything about Perl, an interpreted scripting language." msgstr "Alles wat te maken heeft met Perl, een geïnterpreteerde script taal." -#: lib/Packages/Sections.pm:62 +#: lib/Packages/Sections.pm:60 msgid "Python" msgstr "Python" -#: lib/Packages/Sections.pm:63 +#: lib/Packages/Sections.pm:61 msgid "" "Everything about Python, an interpreted, interactive object oriented " "language." @@ -275,49 +260,57 @@ msgstr "" "Alles wat te maken heeft met Python, een geïnterpreteerde, interactieve, " "object-georiënteerde taal." -#: lib/Packages/Sections.pm:64 +#: lib/Packages/Sections.pm:62 msgid "Science" msgstr "Wetenschap" -#: lib/Packages/Sections.pm:65 +#: lib/Packages/Sections.pm:63 msgid "Basic tools for scientific work" msgstr "Basisgereedschappen voor wetenschappelijk werk." -#: lib/Packages/Sections.pm:66 +#: lib/Packages/Sections.pm:64 msgid "Shells" msgstr "Shells" -#: lib/Packages/Sections.pm:67 +#: lib/Packages/Sections.pm:65 msgid "Command shells. Friendly user interfaces for beginners." msgstr "Commando shells. Vriendelijke gebruikersinterfaces voor beginners." -#: lib/Packages/Sections.pm:68 +#: lib/Packages/Sections.pm:66 msgid "Sound" msgstr "Geluid" -#: lib/Packages/Sections.pm:69 +#: lib/Packages/Sections.pm:67 msgid "" "Utilities to deal with sound: mixers, players, recorders, CD players, etc." msgstr "" "Gereedschappen om om te gaan met geluid: mixers, afspeel- en " "opnameprogramma's, CD-spelers, etc." -#: lib/Packages/Sections.pm:70 +#: lib/Packages/Sections.pm:68 msgid "TeX" msgstr "TeX" -#: lib/Packages/Sections.pm:71 +#: lib/Packages/Sections.pm:69 msgid "The famous typesetting software and related programs." msgstr "De beroemde tekst-zet programmatuur en gerelateerde programma's." -#: lib/Packages/Sections.pm:72 +#: lib/Packages/Sections.pm:70 msgid "Text Processing" msgstr "Tekstverwerking" -#: lib/Packages/Sections.pm:73 +#: lib/Packages/Sections.pm:71 msgid "Utilities to format and print text documents." msgstr "Gereedschappen om tekstdocumenten op te maken en te printen." +#: lib/Packages/Sections.pm:72 +msgid "Translations" +msgstr "" + +#: lib/Packages/Sections.pm:73 +msgid "Translation packages and language support meta packages." +msgstr "" + #: lib/Packages/Sections.pm:74 msgid "Utilities" msgstr "Gereedschappen" @@ -378,3 +371,17 @@ msgstr "" #~ "Basisgereedschappen die elk Debian systeem nodig heeft (u hoeft dit niet " #~ "te installeren; ze zijn alleen beschikbaar om het upgraden makkelijker te " #~ "maken)" + +#~ msgid "" +#~ "These packages probably may not be used in or distributed from the U.S. " +#~ "due to software patents. You should check the regulations in your country " +#~ "before using this software." +#~ msgstr "" +#~ "Deze pakketten mogen waarschijnlijk niet worden gebruikt in of " +#~ "gedistribueerd vanuit de Verenigde Staten vanwege softwarepatenten. U " +#~ "kunt het beste de regels in uw eigen land checken alvorens deze software " +#~ "te gebruiken." + +#~ msgid "Software restricted in the U.S." +#~ msgstr "" +#~ "Software waar in de Verenigde Staten beperkingen op van kracht zijn." diff --git a/po/sections.pot b/po/sections.pot index 27bfecb..d353685 100644 --- a/po/sections.pot +++ b/po/sections.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-18 19:01+0200\n" +"POT-Creation-Date: 2007-10-07 06:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/sections.uk.po b/po/sections.uk.po index c0c9cb3..2d5a79e 100644 --- a/po/sections.uk.po +++ b/po/sections.uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sections\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-28 18:04+0100\n" +"POT-Creation-Date: 2007-10-07 06:18+0200\n" "PO-Revision-Date: 2005-11-28 15:41+0200\n" "Last-Translator: Eugeniy Meshcheryakov \n" "Language-Team: Ukrainian\n" @@ -212,24 +212,10 @@ msgid "Software to access Usenet, to set up news servers, etc." msgstr "Програми для доступу до Usenet, встановлення серверів новин і т.ін." #: lib/Packages/Sections.pm:54 -msgid "Software restricted in the U.S." -msgstr "Програми з обмеженнями в США" - -#: lib/Packages/Sections.pm:55 -msgid "" -"These packages probably may not be used in or distributed from the U.S. due " -"to software patents. You should check the regulations in your country before " -"using this software." -msgstr "" -"Ці пакунки, мабуть, не можна використовувати в або експортувати зі США через " -"патенти на програмне забезпечення. Вам потрібно перевірити законодавство " -"вашої країни перед використанням цих програм." - -#: lib/Packages/Sections.pm:56 msgid "Old Libraries" msgstr "Старі бібліотеки" -#: lib/Packages/Sections.pm:57 +#: lib/Packages/Sections.pm:55 msgid "" "Old versions of libraries, kept for backward compatibility with old " "applications." @@ -237,11 +223,11 @@ msgstr "" "Старі версії бібліотек, що зберігаються для зворотної сумісності зі старими " "програмами." -#: lib/Packages/Sections.pm:58 +#: lib/Packages/Sections.pm:56 msgid "Other OS's and file systems" msgstr "Інші ОС та файлові системи" -#: lib/Packages/Sections.pm:59 +#: lib/Packages/Sections.pm:57 msgid "" "Software to run programs compiled for other operating system, and to use " "their filesystems." @@ -249,67 +235,75 @@ msgstr "" "Програмне забезпечення для запуску програм скомпільованих для інших " "операційних систем та для використання їхніх файлових систем." -#: lib/Packages/Sections.pm:60 +#: lib/Packages/Sections.pm:58 msgid "Perl" msgstr "Perl" -#: lib/Packages/Sections.pm:61 +#: lib/Packages/Sections.pm:59 msgid "Everything about Perl, an interpreted scripting language." msgstr "Все, що стосується Perl, скриптової мови." -#: lib/Packages/Sections.pm:62 +#: lib/Packages/Sections.pm:60 msgid "Python" msgstr "Python" -#: lib/Packages/Sections.pm:63 +#: lib/Packages/Sections.pm:61 msgid "" "Everything about Python, an interpreted, interactive object oriented " "language." msgstr "Все, що стосується Python, інтерактивної об'єктно-орієнтованої мови." -#: lib/Packages/Sections.pm:64 +#: lib/Packages/Sections.pm:62 msgid "Science" msgstr "Наука" -#: lib/Packages/Sections.pm:65 +#: lib/Packages/Sections.pm:63 msgid "Basic tools for scientific work" msgstr "Основні інструменти для наукової роботи." -#: lib/Packages/Sections.pm:66 +#: lib/Packages/Sections.pm:64 msgid "Shells" msgstr "Оболонки" -#: lib/Packages/Sections.pm:67 +#: lib/Packages/Sections.pm:65 msgid "Command shells. Friendly user interfaces for beginners." msgstr "Командні оболонки. Дружні інтерфейси користувача для початківців." -#: lib/Packages/Sections.pm:68 +#: lib/Packages/Sections.pm:66 msgid "Sound" msgstr "Звук" -#: lib/Packages/Sections.pm:69 +#: lib/Packages/Sections.pm:67 msgid "" "Utilities to deal with sound: mixers, players, recorders, CD players, etc." msgstr "" "Програми для роботи зі звуком: мікшери, програвачі, записувачі, програвачі " "компакт-дисків та ін." -#: lib/Packages/Sections.pm:70 +#: lib/Packages/Sections.pm:68 msgid "TeX" msgstr "TeX" -#: lib/Packages/Sections.pm:71 +#: lib/Packages/Sections.pm:69 msgid "The famous typesetting software and related programs." msgstr "Знамените програмне забезпечення для набору та пов'язані програми." -#: lib/Packages/Sections.pm:72 +#: lib/Packages/Sections.pm:70 msgid "Text Processing" msgstr "Обробка текстів" -#: lib/Packages/Sections.pm:73 +#: lib/Packages/Sections.pm:71 msgid "Utilities to format and print text documents." msgstr "Програми для форматування та друку текстових документів." +#: lib/Packages/Sections.pm:72 +msgid "Translations" +msgstr "" + +#: lib/Packages/Sections.pm:73 +msgid "Translation packages and language support meta packages." +msgstr "" + #: lib/Packages/Sections.pm:74 msgid "Utilities" msgstr "Допоміжні програми" @@ -369,3 +363,15 @@ msgstr "" #~ msgstr "" #~ "Основні програми кожної системи Debian (вам не потрібно їх встановлювати, " #~ "вони тут тільки для потреб оновлення)." + +#~ msgid "" +#~ "These packages probably may not be used in or distributed from the U.S. " +#~ "due to software patents. You should check the regulations in your country " +#~ "before using this software." +#~ msgstr "" +#~ "Ці пакунки, мабуть, не можна використовувати в або експортувати зі США " +#~ "через патенти на програмне забезпечення. Вам потрібно перевірити " +#~ "законодавство вашої країни перед використанням цих програм." + +#~ msgid "Software restricted in the U.S." +#~ msgstr "Програми з обмеженнями в США"