From: Simon Paillard <simon.paillard@resel.enst-bretagne.fr>
Date: Fri, 29 Feb 2008 09:53:39 +0000 (+0100)
Subject: Merge branch 'master' of ssh://spaillar-guest@git.debian.org/git/webwml/packages
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=4fec9449ddf3d2a6162c05387367746f3e17e329;hp=89b7e4f99e2adc07f7cbaf6fadb67d75842224d2;p=deb%2Fpackages.git

Merge branch 'master' of ssh://spaillar-guest@git.debian.org/git/webwml/packages

Conflicts:

	po/pdo.fr.po
	po/templates.fr.po
---

diff --git a/INSTALL b/INSTALL
index 641cee2..3168c84 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,26 +12,35 @@ case, you might have to adjust some of the steps.
    instead of etch's version.
 2) Download the code from git://source.djpig.de/git/packages.git
    (Something like `git clone git://source.djpig.de/git/packages.git')
-3) Install the needed dependencies. A list can be found in cron.d/050checkinst.
+3) Install the needed dependencies. A list can be found in debian/control.
    One dependency can't be fulfilled directly from etch and is therefor not listed
    there: the Search::Xapian perl module. You can either compile that yourself against
-   libxapian from etch, backport all of xapian and libsearch-xapian-perl from
-   lenny, or install the 0.9.9-1 deb from snapshots.debian.net.
+   libxapian from etch, use the backport on backports.org, or install the 0.9.9-1 deb
+   from snapshots.debian.net.
 4) Install apache2 (apache2-mpm-worker) and mod_perl (libapache2-mod-perl2)
 5) Adjust the configuration to your needs. You should at least edit the following
-   files before starting to test:
+   files before starting to test (don't touch %TOPDIR% and %SITE%, as you will 
+   specify it later):
    - ./config.sh.sed.in
+     (especially : admin_email, and localdir and/or ftproot if you have local caches)
    - ./templates/config.tmpl
+     (especially : packages_homepage)
    - ./templates/config/*
+     (especially if you have your own repositories)
    - ./conf/apache.conf.sed.in
 6) run `./bin/setup-site <topdir> <site>'
    (e.g. `./bin/setup-site /org/packages.debian.org packages.debian.org')
 7) create a cache directory for the compiled templates, it needs to be writable by
    apache (i.e. on default etch by www-data). Default location is
-   <topdir>/cache
+   <topdir>/cache. So
+   chown www-data <topdir>/cache
+   chmod 2770 <topdir>/cache
 7) Include ./conf/apache.conf in apache's configuration, e.g. by symlinking it from
    /etc/apache2/sites-available/ and then using a2ensite
 8) Run ./bin/daily
-9) Setup ./bin/daily to be run regulary. In ./conf/crontab you can find an example crontab
+   (this takes a while, especially the first time, as it downloads a lot of data,
+   [at the time of this writing approx. 900 MB], creates databases, pre-builds heavy
+   pages, etc.)
+9) Set up ./bin/daily to be run regulary. In ./conf/crontab you can find an example crontab
    to do this. Actually preferable is to trigger the script by archive updates, but you
    will know best if and how to implement that in your setup.
diff --git a/bin/create_index_pages b/bin/create_index_pages
index 4e09430..8072fa4 100755
--- a/bin/create_index_pages
+++ b/bin/create_index_pages
@@ -13,6 +13,7 @@ use Compress::Zlib;
 
 use lib './lib';
 
+use Packages::CommonCode qw(:all);
 use Packages::Config qw( $TOPDIR $DBDIR @ARCHIVES @SUITES @LANGUAGES );
 use Packages::Template;
 use Packages::I18N::Locale;
@@ -21,6 +22,8 @@ use Packages::SrcPage;
 use Packages::Sections;
 &Packages::Config::init( './' );
 
+use constant DEBUG => 0;
+
 my $wwwdir = "$TOPDIR/www";
 
 tie my %packages, 'DB_File', "$DBDIR/packages_small.db",
@@ -40,59 +43,188 @@ my $sections = retrieve "$DBDIR/sections.info";
 my $subsections = retrieve "$DBDIR/subsections.info";
 my $priorities = retrieve "$DBDIR/priorities.info";
 
-#use Data::Dumper;
+use Data::Dumper;
 #print STDERR Dumper($sections, $subsections, $priorities);
 
-my (%pages);
+my @PACKAGES = sort keys %packages;
+my @SRC_PACKAGES = sort keys %src_packages;
+
+print "Found ".scalar(@PACKAGES)." packages\n";
+print "Found ".scalar(@SRC_PACKAGES)." source packages\n";
 
 my $template = new Packages::Template( "$TOPDIR/templates", 'html');
 my $txt_template = new Packages::Template( "$TOPDIR/templates", 'txt');
 
-print "write suite index files ...\n";
-foreach my $s (@SUITES) {
-    my $key = $s;
-    mkpath ( "$wwwdir/$key" );
-    mkpath ( "$wwwdir/source/$key" );
+my $charset = 'UTF-8';
+my (%cat, %lang_vars, $prov_string, %s, %fh);
+foreach my $lang (@LANGUAGES) {
+    $cat{$lang} = Packages::I18N::Locale->get_handle($lang)
+	or die "get_handle failed for $lang";
+    $lang_vars{$lang} = { po_lang => $lang, ddtp_lang => $lang,
+			  charset => $charset,
+			  cat => $cat{$lang}, used_langs => \@LANGUAGES };
+    $s{begin}{$lang} = '['.uc($lang).':';
+    $s{end}{$lang} = ':'.uc($lang).']';
+    $prov_string .= $s{begin}{$lang}.$cat{$lang}->g('virtual package provided by').$s{end}{$lang};
+}
+
+sub open_file {
+    my ($key, $vars, $file) = @_;
+
+    $file ||= 'index';
+
+    print "opening $key\n";
+    mkdirp ( "$wwwdir/$key" );
+    open($fh{$key}, '>',
+	 "$wwwdir/$key/$file.slices.new")
+	or die "Cannot open file $wwwdir/$key/$file.slices.new: $!";
+
     foreach my $lang (@LANGUAGES) {
-	my $charset = 'UTF-8';
-	my $cat = Packages::I18N::Locale->get_handle($lang)
-	    or die "get_handle failed for $lang";
-	print "writing $key/index (lang=$lang)...\n";
-
-	my %content = ( subsections => [], suite => $s,
-			lang => $lang, charset => $charset, cat => $cat,
-			used_langs => \@LANGUAGES, suites => \@SUITES );
-	foreach my $ssec (sort (keys %{$subsections->{$s}}, 'virtual')) {
+	print {$fh{$key}} "$s{begin}{$lang}\n";
+	$template->page( 'index_head',
+			 { %{$lang_vars{$lang}},
+			   %$vars },
+			 $fh{$key});
+	print {$fh{$key}} "\n$s{end}{$lang}\n";
+    }
+}
+
+sub close_file {
+    my ($key, $vars, $file) = @_;
+
+    $file ||= 'index';
+
+    print "closing $key\n";
+
+    foreach my $lang (@LANGUAGES) {
+	print {$fh{$key}} "\n$s{begin}{$lang}\n";
+	$template->page( 'index_foot',
+			 { %{$lang_vars{$lang}},
+			   %$vars },
+			 $fh{$key});
+	print {$fh{$key}} "\n$s{end}{$lang}\n";
+    }
+    close($fh{$key})
+	or die "Cannot close file $wwwdir/$key/$file.slices.new: $!";
+
+    activate("$wwwdir/$key/$file.slices");
+}
+
+
+sub open_txt_file {
+    my ($key, $vars, $file) = @_;
+
+    $file ||= 'allpackages';
+    my $lang = 'en';
+
+    print "opening $key (txt,lang=$lang)\n";
+    mkdirp ( "$wwwdir/$key" );
+    $fh{"$key/$lang/txt"} = gzopen("$wwwdir/$key/$file.$lang.txt.gz.new", 'wb9')
+	or die "Cannot open file $wwwdir/$key/$file.$lang.txt.gz.new: $!";
+
+    my $gztxt = $txt_template->page( 'index_head',
+				     { %{$lang_vars{$lang}},
+				       %$vars });
+    $fh{"$key/$lang/txt"}->gzwrite($gztxt);
+}
+
+sub close_txt_file {
+    my ($key, $vars, $file) = @_;
+
+    $file ||= 'allpackages';
+    my $lang = 'en';
+
+    print "closing $key (txt,lang=$lang)\n";
+    my $gztxt = $txt_template->page( 'index_foot',
+				     { %{$lang_vars{$lang}},
+				       %$vars });
+    $fh{"$key/$lang/txt"}->gzwrite($gztxt);
+    ($fh{"$key/$lang/txt"}->gzclose == Z_OK) or
+	warn("can't close text index file $wwwdir/$key/$file.$lang.txt.gz.new: "
+	     . $fh{"$key/$lang/txt"}->gzerror);
+    activate("$wwwdir/$key/$file.$lang.txt.gz");
+}
+
+
+foreach my $source (("", "source/")) {
+    print "write headers ...\n";
+    foreach my $s (@SUITES) {
+	mkdirp ( "$wwwdir/$source$s" );
+	my %common_vars = ( suite => $s,
+			    is_source => $source );
+
+	open_file("$source$s", \%common_vars, 'allpackages');
+	open_txt_file("$source$s", \%common_vars, 'allpackages');
+
+	foreach my $sec (keys %{$sections->{$s}}) {
+	    open_file("$source$s/$sec",
+		      { %common_vars,
+			category => { id => N_('Section'),
+				      name => $sec }});
+	}
+	foreach my $ssec ((keys %{$subsections->{$s}}, 'virtual')) {
 	    next if $ssec eq '-';
-	    if ($sections_descs{$ssec}) {
-		push @{$content{subsections}}, {
-		    id => $ssec,
-		    name => $cat->g($sections_descs{$ssec}[0]),
-		    desc => $cat->g($sections_descs{$ssec}[1]),
-		};
-	    }
+	    open_file("$source$s/$ssec",
+		      { %common_vars,
+			category => { id => N_('Subsection'),
+				      name => $ssec }});
 	}
+	foreach my $prio (keys %{$priorities->{$s}}) {
+	    next if $prio eq '-';
+	    open_file("$source$s/$prio",
+		      { %common_vars,
+			category => { id => N_('Priority'),
+				      name => $prio }});
+	}
+    }
 
-	$template->page( 'suite_index', \%content,
-			 "$wwwdir/$key/index.$lang.html.new");
-	rename( "$wwwdir/$key/index.$lang.html.new",
-		"$wwwdir/$key/index.$lang.html" );
-
-	$content{source} = 'source';
-	$template->page( 'suite_index', \%content,
-			 "$wwwdir/source/$key/index.$lang.html.new");
-	rename( "$wwwdir/source/$key/index.$lang.html.new",
-		"$wwwdir/source/$key/index.$lang.html" );
+    if ($source) {
+	process_source_packages();
+    } else {
+	process_packages();
+    }
 
+    print "write footers ...\n";
+    foreach my $s (@SUITES) {
+	my %common_vars = ( suite => $s,
+			    is_source => $source );
+	close_file("$source$s", \%common_vars, 'allpackages');
+	close_txt_file("$source$s", \%common_vars, 'allpackages');
+
+	foreach my $sec (keys %{$sections->{$s}}) {
+	    close_file("$source$s/$sec",
+		       { %common_vars,
+			 category => { id => N_('Section'),
+				       name => $sec }});
+	}
+	foreach my $ssec ((keys %{$subsections->{$s}}, 'virtual')) {
+	    next if $ssec eq '-';
+	    close_file("$source$s/$ssec",
+		       { %common_vars,
+			 category => { id => N_('Subsection'),
+				       name => $ssec }});
+	}
+	foreach my $prio (keys %{$priorities->{$s}}) {
+	    next if $prio eq '-';
+	    close_file("$source$s/$prio",
+		       { %common_vars,
+			 category => { id => N_('Priority'),
+				       name => $prio }});
+	}
     }
 }
 
-print "collecting package info ...\n";
-my %allpkgs;
-while (my ($pkg, $data) = each %packages) {
+sub process_packages {
+
+print "processing package info ...\n";
+my $count = 0;
+foreach my $pkg (@PACKAGES) {
+    warn "pkg=$pkg\n" if DEBUG;
+    print "$count\n" unless ++$count % 1000;
+
     my (%pkg,%virt);
-    my ($virt, $p_data) = split /\000/o, $data, 2;
-    %virt = split /\01/o, $virt; 
+    my ($virt, $p_data) = split /\000/o, $packages{$pkg}, 2;
+    %virt = split /\01/o, $virt;
     foreach (split /\000/o, $p_data||'') {
 	my @data = split ( /\s/o, $_, 9 );
 	$pkg{$data[1]} ||= new Packages::Page( $pkg );
@@ -113,15 +245,16 @@ while (my ($pkg, $data) = each %packages) {
 	$pkg{$_}->add_provided_by([split /\s+/, $virt{$_}]);
     }
 
-    while (my ($key, $entry) = each %pkg) {
-	$allpkgs{$key} ||= [];
+    while (my ($suite, $entry) = each %pkg) {
 
+	warn "\tsuite=$suite\n" if DEBUG;
 	my %p = ( name => $pkg, providers => [], versions => '' );
 	if (my $provided_by = $entry->{provided_by}) {
 	    $p{providers} = $provided_by;
- 	}
-	$p{subsection} = $p{section} = $p{archive} = $p{desc} = $p{priority} = '';
- 	unless ($entry->is_virtual) {
+	}
+	$p{subsection} = $p{section} = $p{archive} =
+	    $p{desc} = $p{priority} = '';
+	unless ($entry->is_virtual) {
 	    (undef, $p{versions}) = $entry->get_version_string;
 	    $p{subsection} = $entry->get_newest( 'subsection' );
 	    $p{section} = $entry->get_newest( 'section' );
@@ -133,25 +266,94 @@ while (my ($pkg, $data) = each %packages) {
 		my %sdescs;
 		my %trans_desc = split /\000|\001/, $trans_desc;
 		while (my ($l, $d) = each %trans_desc) {
-		    $d =~ s/\n.*//os;
+		    # filter out non-po languages
+		    next unless exists $lang_vars{$l};
 
+		    $d =~ s/\n.*//os;
 		    $sdescs{$l} = $d;
 		}
-		$p{trans_desc} = \%sdescs;
+		$p{trans_desc} = \%sdescs if %sdescs;
 	    }
 	    $p{priority} = $entry->get_newest( 'priority' );
 	}
-	push @{$allpkgs{$key}}, \%p;
+
+	my $html = my $txt = "";
+	my $id = " id='$p{name}'";
+	if ($p{versions}) {
+	    warn "\tversions=$p{versions}\n" if DEBUG;
+
+	    $html .= "\n<dt><a href='$p{name}'$id>$p{name}</a> ($p{versions})";
+	    $id = "";
+	    $html .= " [<strong class='pmarker'>$p{section}</strong>]"
+		if $p{section} ne 'main';
+	    $html .= " [<strong class='pmarker'>$p{archive}</strong>]"
+		if $p{archive} ne 'us';
+	    $html .= "</dt>\n<dd";
+
+	    $txt .= "\n$p{name} ($p{versions})";
+	    $txt .= " [$p{section}]" if $p{section} ne 'main';
+	    $txt .= " [$p{archive}]" if $p{archive} ne 'us';
+	    $txt .= " ";
+
+	    if ($p{trans_desc}) {
+		foreach my $lang (@LANGUAGES) {
+		    my ($sdesc, $sdesc_html, $desclang) = ($p{desc},
+							   encode_entities($p{desc}, '<>&"\''),
+							   'en');
+		    if ($p{trans_desc}{$lang}) {
+			$sdesc = $p{trans_desc}{$lang};
+			$sdesc_html = encode_entities($sdesc, '<>&"\'');
+			$desclang = $lang;
+		    }
+
+		    $html .= $s{begin}{$lang};
+		    $html .= " lang='$desclang'" if $desclang ne $lang;
+		    $html .= ">$sdesc_html$s{end}{$lang}";
+		}
+	    } else {
+		$html .= " lang='en'>".encode_entities($p{desc}, '<>&"\'');
+	    }
+	    $html .= "</dd>";
+	    $txt .= $p{desc};
+	}
+
+	if (@{$p{providers}}) {
+	    warn "\tproviders=@{$p{providers}}\n" if DEBUG;
+	    $html .= "\n<dt><a href='$p{name}'$id>$p{name}</a></dt><dd>$prov_string ";
+	    my @prov;
+	    foreach my $prov (@{$p{providers}}) {
+		my $prov_uri = uri_escape($prov);
+		push @prov, "<a href='../$prov_uri'>$prov</a>";
+	    }
+	    $html .= join(', ', @prov)."</dd>";
+	    $txt .= "\n$p{name} virtual package provided by ".
+		join(', ', @{$p{providers}});
+	}
+	warn "HTML=$html\n" if DEBUG > 1;
+	warn "TXT=$txt\n" if DEBUG > 1;
+
+	print {$fh{$suite}} $html;
+	$fh{"$suite/en/txt"}->gzwrite($txt);
+	foreach my $key (qw(section subsection priority)) {
+	    next unless $fh{"$suite/$p{$key}"};
+	    warn "\t\t$suite/$p{$key}\n" if DEBUG;
+	    print {$fh{"$suite/$p{$key}"}} $html;
+	}
     }
 }
 
-write_files(\%allpkgs);
+}
+
+sub process_source_packages {
 
 print "collecting source package info ...\n";
-my %allsrcpkgs;
-while (my ($pkg, $data) = each %src_packages) {
-    my %pkg;    
-    foreach (split /\000/o, $data||'') {
+my $count = 0;
+foreach my $pkg (@SRC_PACKAGES) {
+    warn "pkg=$pkg\n" if DEBUG;
+    print "$count\n" unless ++$count % 1000;
+
+    my %pkg;
+    foreach (split /\000/o, $src_packages{$pkg}||'') {
 	my @data = split ( /\s/o, $_ );
 	$pkg{$data[1]} ||= new Packages::SrcPage( $pkg );
 	$pkg{$data[1]}->merge_package( { package => $pkg,
@@ -164,100 +366,48 @@ while (my ($pkg, $data) = each %src_packages) {
 					 } );
     }
 
-    while (my ($key, $entry) = each %pkg) {
-	$allsrcpkgs{$key} ||= [];
-
+    while (my ($suite, $entry) = each %pkg) {
 	my %p = ( name => $pkg, providers => [], versions => '' );
 	$p{versions} = $entry->{version};
 	$p{subsection} = $entry->get_newest( 'subsection' );
 	$p{section} = $entry->get_newest( 'section' );
 	$p{archive} = $entry->get_newest( 'archive' );
 	$p{priority} = $entry->get_newest( 'priority' );
-	
-	$p{desc} = '';
- 	$p{binaries} = [];
-# 	my $binaries = find_binaries( $pkg, $p{archive}, $p{suite}, \%src2bin );
-# 	if ($binaries && @$binaries) {
-# 	    pkg_list( \%packages, $opts, $binaries, 'en', $contents{binaries} );
-# 	}
 
-	push @{$allsrcpkgs{$key}}, \%p;
+	$p{desc} = '';
+	$p{binaries} = [];
+#	my $binaries = find_binaries( $pkg, $p{archive}, $p{suite}, \%src2bin );
+#	if ($binaries && @$binaries) {
+#	    pkg_list( \%packages, $opts, $binaries, 'en', $contents{binaries} );
+#	}
+
+	my $html = my $txt = "";
+	warn "\tversions=$p{versions}\n" if DEBUG;
+
+	$html .= "\n<dt><a href='$p{name}' id='$p{name}'>$p{name}</a> ($p{versions})";
+	$html .= " [<strong class='pmarker'>$p{section}</strong>]"
+	    if $p{section} ne 'main';
+	$html .= " [<strong class='pmarker'>$p{archive}</strong>]"
+	    if $p{archive} ne 'us';
+	$html .= "</dt>";
+
+	$txt .= "\n$p{name} ($p{versions})";
+	$txt .= " [$p{section}]" if $p{section} ne 'main';
+	$txt .= " [$p{archive}]" if $p{archive} ne 'us';
+
+	warn "HTML=$html\n" if DEBUG > 1;
+	warn "TXT=$txt\n" if DEBUG > 1;
+
+	print {$fh{"source/$suite"}} $html;
+	$fh{"source/$suite/en/txt"}->gzwrite($txt);
+	foreach my $key (qw(section subsection priority)) {
+	    next unless $fh{"source/$suite/$p{$key}"};
+	    warn "\t\tsource/$suite/$p{$key}\n" if DEBUG;
+	    print {$fh{"source/$suite/$p{$key}"}} $html;
+	}
     }
 }
 
-write_files(\%allsrcpkgs, 1);
-
-sub write_files {
-    my ($pkgs, $source) = @_;
-
-    $source = $source ? 'source/' : '';
-    print "writing files ...\n";
-    foreach my $s (@SUITES) {
-	my $key = $s;
-	mkpath ( "$wwwdir/$source$key" );
-	foreach my $lang (@LANGUAGES) {
-	    my $charset = 'UTF-8';
-	    my $cat = Packages::I18N::Locale->get_handle($lang)
-		or die "get_handle failed for $lang";
-
-	    my %lang_vars = ( lang => $lang, charset => $charset,
-			      cat => $cat, used_langs => \@LANGUAGES );
-	    print "writing $source$s/allpackages (lang=$lang)...\n";
-	    $template->page( 'index', { %lang_vars, packages => $pkgs->{$key},
-					suite => $s, is_source => $source  },
-			     "$wwwdir/$source$key/allpackages.$lang.html.new" );
-	    print "writing $source$s/allpackages (txt,lang=$lang)...\n";
-	    my $gzfh = gzopen("$wwwdir/$source$key/allpackages.$lang.txt.gz.new",
-			      'wb9')
-		or die "can't open text index file for output: $!";
-	    my $gztxt;
-	    $gztxt = $txt_template->page( 'index', { %lang_vars, packages => $pkgs->{$key},
-						     suite => $s, is_source => $source  },
-					  );
-	    $gzfh->gzwrite($gztxt);
-	    ($gzfh->gzclose == Z_OK) or
-		warn "can't close text index file $wwwdir/$source$key/allpackages.$lang.txt.gz.new: ".$gzfh->gzerror;
-
-	    rename( "$wwwdir/$source$key/allpackages.$lang.html.new",
-		    "$wwwdir/$source$key/allpackages.$lang.html" );
-	    rename( "$wwwdir/$source$key/allpackages.$lang.txt.gz.new",
-		    "$wwwdir/$source$key/allpackages.$lang.txt.gz" );
-
-	    foreach my $sec (keys %{$sections->{$s}}) {
-		mkpath ( "$wwwdir/$source$key/$sec" );
-
-		print "writing $source$s/$sec/index (lang=$lang)...\n";
-		$template->page( 'index', { packages => [ grep { $_->{section} eq $sec } @{$pkgs->{$key}} ],
-					    %lang_vars, suite => $s, is_source => $source,
-					    category => { id => $cat->g('Section'), name => $sec } },
-				 "$wwwdir/$source$key/$sec/index.$lang.html.new" );
-		rename( "$wwwdir/$source$key/$sec/index.$lang.html.new",
-			"$wwwdir/$source$key/$sec/index.$lang.html" );
-	    }
-	    foreach my $ssec ((keys %{$subsections->{$s}}, 'virtual')) {
-		next if $ssec eq '-';
-		mkpath ( "$wwwdir/$source$key/$ssec" );
-
-		print "writing $source$s/$ssec/index (lang=$lang)...\n";
-		$template->page( 'index', { packages => [ grep { $_->{subsection} eq $ssec } @{$pkgs->{$key}} ],
-					    %lang_vars, suite => $s, is_source => $source,
-					    category => { id => $cat->g('Subsection'), name => $ssec } },
-				 "$wwwdir/$source$key/$ssec/index.$lang.html.new" );
-		rename( "$wwwdir/$source$key/$ssec/index.$lang.html.new",
-			"$wwwdir/$source$key/$ssec/index.$lang.html" );
-	    }
-	    foreach my $prio (keys %{$priorities->{$s}}) {
-		next if $prio eq '-';
-		mkpath ( "$wwwdir/$source$key/$prio" );
-
-		print "writing $source$s/$prio/index (lang=$lang)...\n";
-		$template->page( 'index', { packages => [ grep { $_->{priority} eq $prio } @{$pkgs->{$key}} ],
-					    %lang_vars, suite => $s, is_source => $source,
-					    category => { id => $cat->g('Priority'), name => $prio } },
-				 "$wwwdir/$source$key/$prio/index.$lang.html.new" );
-		rename( "$wwwdir/$source$key/$prio/index.$lang.html.new",
-			"$wwwdir/$source$key/$prio/index.$lang.html" );
-	    }
-	}
-    }
 }
+
+__END__
diff --git a/bin/create_suite_index_pages b/bin/create_suite_index_pages
new file mode 100755
index 0000000..a14cfda
--- /dev/null
+++ b/bin/create_suite_index_pages
@@ -0,0 +1,65 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use POSIX;
+use Storable;
+
+use lib './lib';
+
+use Packages::CommonCode qw(:all);
+use Packages::Config qw( $TOPDIR $DBDIR @ARCHIVES @SUITES @LANGUAGES );
+use Packages::Template;
+use Packages::I18N::Locale;
+use Packages::Sections;
+&Packages::Config::init( './' );
+
+my $wwwdir = "$TOPDIR/www";
+
+my $subsections = retrieve "$DBDIR/subsections.info";
+
+#use Data::Dumper;
+#print STDERR Dumper($sections, $subsections, $priorities);
+
+my (%pages);
+
+my $template = new Packages::Template( "$TOPDIR/templates", 'html');
+
+print "write suite index files ...\n";
+foreach my $s (@SUITES) {
+    my $key = $s;
+    mkdirp ( "$wwwdir/$key" );
+    mkdirp ( "$wwwdir/source/$key" );
+    foreach my $lang (@LANGUAGES) {
+	my $charset = 'UTF-8';
+	my $cat = Packages::I18N::Locale->get_handle($lang)
+	    or die "get_handle failed for $lang";
+	print "writing $key/index (lang=$lang)...\n";
+
+	my %content = ( subsections => [], suite => $s,
+			po_lang => $lang, ddtp_lang => $lang,
+			charset => $charset, cat => $cat,
+			used_langs => \@LANGUAGES, suites => \@SUITES );
+	foreach my $ssec (sort (keys %{$subsections->{$s}}, 'virtual')) {
+	    next if $ssec eq '-';
+	    if ($sections_descs{$ssec}) {
+		push @{$content{subsections}}, {
+		    id => $ssec,
+		    name => $cat->g($sections_descs{$ssec}[0]),
+		    desc => $cat->g($sections_descs{$ssec}[1]),
+		};
+	    }
+	}
+
+	$template->page( 'suite_index', \%content,
+			 "$wwwdir/$key/index.$lang.html.new");
+	activate( "$wwwdir/$key/index.$lang.html" );
+
+	$content{source} = 'source';
+	$template->page( 'suite_index', \%content,
+			 "$wwwdir/source/$key/index.$lang.html.new");
+	activate( "$wwwdir/source/$key/index.$lang.html" );
+
+    }
+}
diff --git a/bin/parse-contents b/bin/parse-contents
index 2ee39d7..82df0b8 100755
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@ -38,6 +38,7 @@ use English;
 use DB_File;
 use Storable;
 use File::Path;
+use File::Basename;
 use Packages::CommonCode qw(:all);
 use Packages::Config qw( $TOPDIR $DBDIR @ARCHIVES @SUITES @ARCHITECTURES );
 &Packages::Config::init( './' );
@@ -140,9 +141,9 @@ for my $suite (@suites) {
 	    rename("$DBDIR/reverse.tmp", "$DBDIR/reverse_${suite}_${arch}.txt");
 
 	    activate($filelist_db);
-	    #FIXME: hardcoded archs. (gnuab has no contrib/non-free)
-	    if ($arch !~ m/^(armel|kfreebsd-.*)$/) {
-		system("ln", "-sf", $filelist_db,
+	    #FIXME: hardcoded archs. (debports has no contrib/non-free)
+	    if ($arch !~ m/^kfreebsd-.*$/) {
+		system("ln", "-sf", basename($filelist_db),
 		       "$DBDIR/filelists_${suite}_all.db") == 0
 			   or die "Oops";
 	    }
diff --git a/bin/parse-packages b/bin/parse-packages
index 2e713c6..97edffc 100755
--- a/bin/parse-packages
+++ b/bin/parse-packages
@@ -336,11 +336,10 @@ tie %package_postfixes_db, "DB_File", "$DBDIR/package_postfixes.db.new",
 	or die "Error creating DB: $!";
 while (my ($k, $v) = each(%package_postfixes)) {
 	$v =~ s/.$//s;
-	my $nr = $v;
-	$nr =~ s/[^\000]//g;
-	$nr = length($nr) + 1; # < number of hits
+	my $nr = ($v =~ tr/\000/\000/) + 1;
 	if ($nr > $MAX_PACKAGE_POSTFIXES) {
-		$v = "\001" . $nr;
+	    $v = ($v =~ /\^/) ? "^\001" . $nr
+		: "\001" . $nr;
 	}
 	$package_postfixes_db{$k} = $v;
 }
diff --git a/bin/parse-sources b/bin/parse-sources
index da49d6a..658e2c1 100755
--- a/bin/parse-sources
+++ b/bin/parse-sources
@@ -128,11 +128,10 @@ tie %source_postfixes_db, "DB_File", "$DBDIR/source_postfixes.db.new",
 	or die "Error creating DB: $!";
 while (my ($k, $v) = each(%source_postfixes)) {
 	$v =~ s/.$//s;
-	my $nr = $v;
-	$nr =~ s/[^\000]//g;
-	$nr = length($nr) + 1; # < number of hits
+	my $nr = ($v =~ tr/\000/\000/) + 1;
 	if ($nr > $MAX_SOURCE_POSTFIXES) {
-		$v = "\001" . $nr;
+	    $v = ($v =~ /\^/) ? "^\001" . $nr
+		: "\001" . $nr;
 	}
 	$source_postfixes_db{$k} = $v;
 }
diff --git a/bin/trivial_slice b/bin/trivial_slice
new file mode 100755
index 0000000..80e44a8
--- /dev/null
+++ b/bin/trivial_slice
@@ -0,0 +1,104 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use File::Basename;
+
+use lib './lib';
+
+use Packages::CommonCode qw(:all);
+
+my @langs;
+my @files;
+
+my $lrx = qr/[a-z]{2}(-[a-z]{2})?/;
+my $ulrx = qr/[A-Z]{2}(-[A-Z]{2})?/;
+
+while ($_ = shift @ARGV) {
+    last if $_ eq '--';
+
+    /^$lrx$/
+	or die "Invalid lang $_\n";
+
+    push @langs, $_;
+}
+
+while ($_ = shift @ARGV) {
+    /\.slices$/ or die "Invalid file $_\n";
+
+    push @files, $_;
+}
+
+if (!@langs || !@files) {
+    die "No langs or no files\n";
+}
+
+warn "langs=@langs\nfiles=@files\n";
+
+foreach my $file (@files) {
+    my ($name, $path, undef) = fileparse($file,qw(.slices));
+
+    warn "name=$name path=$path out=$path$name.LANG.html.new\n";
+
+    my %out;
+    foreach my $lang (@langs) {
+	my $ulang = uc($lang);
+	open($out{$ulang}, '>',
+	     "$path$name.$lang.html.new")
+	    or die "Couldn't open $path$name.$lang.html.new\n";
+    }
+
+    open my $in, '<', $file
+	or die "Couldn't open $file\n";
+
+    my $active_lang;
+    while (<$in>) {
+	/^\s*$/o && next;
+
+	/^\[($ulrx):$/o && do {
+#	    warn "open slice $1";
+	    die "Nested slices" if $active_lang;
+	    die "Unknown lang $1" unless exists $out{$1};
+	    $active_lang = $1;
+	    next;
+	};
+	/^:($ulrx)\]$/o && do {
+#	    warn "close slice $1";
+	    die "No open slice" unless $active_lang;
+	    die "Overlapping slices" unless $1 eq $active_lang;
+	    $active_lang = undef;
+	    next;
+	};
+
+	!$active_lang && /\[($ulrx):.*?:($ulrx)\]/o && do {
+#	    warn "slices found";
+
+	    foreach my $l (keys %out) {
+		my $tmp = $_;
+
+		$tmp =~ s/\[\Q$l\E:(.*?):\Q$l\E\]/$1/g;
+		$tmp =~ s/\[($ulrx):.*?:($ulrx)\]//g;
+
+		print {$out{$l}} $tmp;
+	    }
+	    next;
+	};
+
+	if ($active_lang) {
+	    print {$out{$active_lang}} $_;
+	} else {
+	    foreach my $l (keys %out) {
+		print {$out{$l}} $_;
+	    }
+	}
+    }
+
+    foreach my $lang (@langs) {
+	my $ulang = uc($lang);
+	close($out{$ulang})
+	    or die "Couldn't close $path$name.$lang.html.new\n";
+	activate("$path$name.$lang.html");
+    }
+
+}
diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 5ed7453..eba6664 100644
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -9,8 +9,9 @@
   # Nice caching..
   ExpiresActive On
   ExpiresDefault "access plus 1 day"
-  ExpiresByType image/gif "access plus 1 week"
-  ExpiresByType image/jpeg "access plus 1 week"
+  ExpiresByType image/gif  "modification plus 1 year"
+  ExpiresByType image/jpeg "modification plus 1 year"
+  ExpiresByType image/png  "modification plus 1 year"
 
   # language stuff
   # you need to keep this in sync with lib/Packages/I18N/Locale.pm
@@ -109,6 +110,7 @@
    RewriteRule ^/about/ - [L]
    RewriteRule ^/[^/]+\.css - [L]
    RewriteRule ^/[^/]+\.js - [L]
+   RewriteRule ^/favicon.ico$ - [L]
 
 #   RewriteRule ^/$ http://www.debian.org/distrib/packages
    RewriteRule ^/$ /index.html [L]
@@ -120,8 +122,7 @@
    RewriteCond %{QUERY_STRING} =""
    RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]
    RewriteCond %TOPDIR%/www%{REQUEST_FILENAME}.en.html -f [OR]
-   RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -l [OR]
-   RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -d
+   RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -l
    RewriteRule . - [L]
 
    RewriteRule ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [L,PT]
diff --git a/config.sh.sed.in b/config.sh.sed.in
index afc9987..576ba3f 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -49,7 +49,7 @@ dists="$suites"
 architectures="alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc"
 arch_sarge="alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
 arch_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
-arch_lenny="${arch_etch}"
+arch_lenny="${arch_etch} armel"
 arch_sid="${arch_sarge} armel hurd-i386 kfreebsd-i386 kfreebsd-amd64"
 arch_experimental="${arch_sid}"
 arch_lenny_proposed_updates="${arch_lenny}"
diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index a6b0e83..01a2c43 100755
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -23,7 +23,6 @@ then
 	do
 	    test ! "$arch" = "kfreebsd-i386" || continue
 	    test ! "$arch" = "kfreebsd-amd64" || continue
-	    test ! "$arch" = "armel" || continue
 	    for part in ${parts}
 	    do
 	        echo retrieve Packages $dist/$part/$arch
@@ -59,7 +58,6 @@ else
 	do
 	    test ! "$arch" = "kfreebsd-i386" || continue
 	    test ! "$arch" = "kfreebsd-amd64" || continue
-	    test ! "$arch" = "armel" || continue
 	    for part in ${parts}
 	    do
 	        echo retrieve Packages $dist/$part/$arch
diff --git a/cron.d/100syncarchive_debports b/cron.d/100syncarchive_debports
index 05b967f..6fb224d 100755
--- a/cron.d/100syncarchive_debports
+++ b/cron.d/100syncarchive_debports
@@ -7,7 +7,7 @@ cd ${archivedir}
 
 # Main archive
 #
-architectures="armel kfreebsd-i386 kfreebsd-amd64"
+architectures="kfreebsd-i386 kfreebsd-amd64"
 
 for dist in sid experimental
   do
diff --git a/cron.d/100syncarchive_installer b/cron.d/100syncarchive_installer
index 6e07052..ea95989 100755
--- a/cron.d/100syncarchive_installer
+++ b/cron.d/100syncarchive_installer
@@ -20,8 +20,9 @@ then
 	foo=\$arch_${dist//-/_}
 	for arch in `eval echo $foo`
 	do
-	    for part in "main/debian-installer"
+	    for part in $parts
 	    do
+		part="$part/debian-installer"
 	        echo retrieve Packages $dist/$part/$arch
 		test -d us/${dist}/${part}/binary-${arch} || mkdir -p us/${dist}/${part}/binary-${arch}
 		(cd us/${dist}/${part}/binary-${arch} &&
@@ -41,8 +42,9 @@ else
 	foo=\$arch_${dist//-/_}
 	for arch in `eval echo $foo`
 	do
-	    for part in "main/debian-installer"
+	    for part in $parts
 	    do
+		part="$part/debian-installer"
 	        echo retrieve Sources $dist/$part/$arch
 		test -d us/${dist}/${part}/binary-${arch} || mkdir -p us/${dist}/${part}/binary-${arch}
 		rsync -t ${localdir}/dists/${dist}/${part}/binary-${arch}/Packages.gz \
diff --git a/cron.d/300maintainerdb b/cron.d/300maintainerdb
index 898a4c0..7d1bde8 100755
--- a/cron.d/300maintainerdb
+++ b/cron.d/300maintainerdb
@@ -2,5 +2,11 @@
 
 . `dirname $0`/../config.sh
 
+echo >&2 This script is disabled by default, since it is not useful without
+echo >&2 further setup and also some advertising of the actual addresses.
+echo >&2 Before you enable this you should have the consent of the people that
+echo >&2 this will send mail to!
+exit 1
+
 cd ${bindir}
 ${bindir}/build-maintainerdb
diff --git a/cron.d/500update_po b/cron.d/500update_po
index 89f5452..754951d 100755
--- a/cron.d/500update_po
+++ b/cron.d/500update_po
@@ -31,8 +31,8 @@ templates/html/error.tmpl
 templates/html/filelist.tmpl
 templates/html/foot.tmpl
 templates/html/head.tmpl
-templates/html/index.tmpl
-templates/html/menu.inc
+templates/html/index_head.tmpl
+templates/html/index_foot.tmpl
 templates/html/messages.tmpl
 templates/html/newpkg.tmpl
 templates/html/search.tmpl
@@ -40,9 +40,11 @@ templates/html/search_contents.tmpl
 templates/html/show.tmpl
 templates/html/suite_index.tmpl
 templates/html/tag_index.tmpl
+templates/html/util.inc
 templates/rfc822/search.tmpl
 templates/rss/newpkg.tmpl
-templates/txt/index.tmpl
+templates/txt/index_head.tmpl
+templates/txt/index_foot.tmpl
 "
 podomains="pdo templates sections langs debtags"
 
@@ -96,3 +98,15 @@ do
       done
   fi
 done
+
+# print statistics
+for lang in ${polangs}
+do
+  echo
+  echo "Statistics about $lang:"
+  for po in *.${lang}.po
+  do
+    echo $po:
+    LANG=C msgfmt --statistics --check-format -o- $po >/dev/null
+  done
+done
diff --git a/cron.d/900index_pages b/cron.d/900index_pages
index 5829d0b..e22586d 100755
--- a/cron.d/900index_pages
+++ b/cron.d/900index_pages
@@ -4,6 +4,14 @@
 
 cd "$topdir"
 
+set -e
+
+date
+./bin/create_suite_index_pages
 date
 ./bin/create_index_pages
 date
+
+./bin/trivial_slice en $polangs -- $(find "$htmldir" -maxdepth 4 -name "*.slices")
+
+date
diff --git a/lib/Packages/CommonCode.pm b/lib/Packages/CommonCode.pm
index b33f7b4..2968785 100644
--- a/lib/Packages/CommonCode.pm
+++ b/lib/Packages/CommonCode.pm
@@ -49,7 +49,8 @@ sub parse_control_par {
 sub activate {
     my ($file) = @_;
 
-    rename("${file}.new", $file);
+    rename("${file}.new", $file)
+    	or die "rename ${file}.new $file failed: $!\n";
 }
 
 sub activate_dir {
diff --git a/lib/Packages/Config.pm b/lib/Packages/Config.pm
index b4ab332..1b9dbf5 100644
--- a/lib/Packages/Config.pm
+++ b/lib/Packages/Config.pm
@@ -54,6 +54,7 @@ sub init {
     }
     $DBDIR = "$TOPDIR/files/db";
     unshift @LANGUAGES, 'en';
+    unshift @DDTP_LANGUAGES, 'en';
 }
 
 1;
diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index e6a9d52..75264a0 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -T
 # Packages::Dispatcher -- CGI interface for packages.debian.org
 #
-# Copyright (C) 2004-2007 Frank Lichtenheld
+# Copyright (C) 2004-2008 Frank Lichtenheld
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -92,14 +92,16 @@ sub do_dispatch {
     &Packages::Config::init( $homedir );
     &Packages::DB::init();
 
-    my $acc = I18N::AcceptLanguage->new();
-    my %all_langs = map { $_ => 1 } (@LANGUAGES, @DDTP_LANGUAGES);
-    my @all_langs = sort keys %all_langs;
-    my $http_lang = $acc->accepts( $input->http("Accept-Language"),
-				   \@all_langs ) || 'en';
-    debug( "LANGUAGES=@all_langs header=".
+    my %PO_LANGUAGES = map { $_ => 1 } @LANGUAGES;
+    my %DDTP_LANGUAGES = map { $_ => 1 } @DDTP_LANGUAGES;
+    my $acc = I18N::AcceptLanguage->new(defaultLanguage => 'en');
+    my $ddtp_lang = $acc->accepts( $input->http("Accept-Language"),
+				   \@DDTP_LANGUAGES );
+    my $po_lang = $acc->accepts( $input->http("Accept-Language"),
+				 \@LANGUAGES );
+    debug( "LANGS=@LANGUAGES DDTP_LANGS=@DDTP_LANGUAGES header=".
 	   ($input->http("Accept-Language")||'').
-	   " http_lang=$http_lang", 1 ) if DEBUG;
+	   " po_lang=$po_lang ddtp_lang=$ddtp_lang", 1 ) if DEBUG;
 
     # backwards compatibility stuff
     debug( "SCRIPT_URL=$ENV{SCRIPT_URL} SCRIPT_URI=$ENV{SCRIPT_URI}" ) if DEBUG;
@@ -141,7 +143,7 @@ sub do_dispatch {
 
 	push @components, 'index' if @components && $path =~ m,/$,;
 
-	my %LANGUAGES = map { $_ => 1 } @all_langs;
+	my %LANGUAGES = map { $_ => 1 } (@LANGUAGES, @DDTP_LANGUAGES);
 	if (@components > 1 and $LANGUAGES{$components[0]}
 	    and !$input->param('lang')) {
 	    $input->param( 'lang', shift(@components) );
@@ -247,7 +249,7 @@ sub do_dispatch {
 					replace => { all => \@ARCHIVES,
 						     default => \@ARCHIVES} },
 		       exact => { default => 0, match => '^(\w+)$',  },
-		       lang => { default => $http_lang, match => '^([\w-]+)$',  },
+		       lang => { default => undef, match => '^([\w-]+)$',  },
 		       source => { default => 0, match => '^(\d+)$',  },
 		       debug => { default => 0, match => '^(\d+)$',  },
 		       searchon => { default => 'names', match => '^(\w+)$', },
@@ -272,9 +274,16 @@ sub do_dispatch {
     my %params = Packages::CGI::parse_params( $input, \%params_def, \%opts );
     Packages::CGI::init_url( $input, \%params, \%opts );
 
+    if (defined($opts{lang})) {
+	$opts{po_lang} = $PO_LANGUAGES{$opts{lang}} ? $opts{lang} : 'en';
+	$opts{ddtp_lang} = $DDTP_LANGUAGES{$opts{lang}} ? $opts{lang} : 'en';
+    } else {
+	$opts{po_lang} = $po_lang;
+	$opts{ddtp_lang} = $ddtp_lang;
+    }
     my $charset = "UTF-8";
-    my $cat = Packages::I18N::Locale->get_handle( $opts{lang}, "en" )
-	or die "get_handle failed for $opts{lang}";
+    my $cat = Packages::I18N::Locale->get_handle( $opts{po_lang}, 'en' )
+	or die "get_handle failed for $opts{po_lang}";
     $opts{cat} = $cat;
 
     $opts{h_suites} = { map { $_ => 1 } @suites };
@@ -299,13 +308,14 @@ sub do_dispatch {
     debug( "Parameter evaluation took ".timestr($petd) ) if DEBUG;
 
     my $template = new Packages::Template( $TEMPLATEDIR, $opts{format},
-					   { lang => $opts{lang}, charset => $charset,
-					     cat => $cat,
+					   { po_lang => $opts{po_lang}, ddtp_lang => $opts{ddtp_lang},
+					     charset => $charset, cat => $cat,
 					     debug => ( DEBUG ? $opts{debug} : 0 ) },
 					   ( $CACHEDIR ? { COMPILE_DIR => $CACHEDIR } : {} ) );
 
     #FIXME: ugly hack
     unless (($what_to_do eq 'allpackages' and $opts{format} =~ /^(html|txt\.gz)/)
+	    || ($what_to_do eq 'index' and $opts{format} eq 'html')
 	    || -e "$TEMPLATEDIR/$opts{format}/${what_to_do}.tmpl") {
 	fatal_error( $cat->g("requested format not available for this document"),
 		     "406 requested format not available");
diff --git a/lib/Packages/DoIndex.pm b/lib/Packages/DoIndex.pm
index a0cae2b..e1c5b6d 100644
--- a/lib/Packages/DoIndex.pm
+++ b/lib/Packages/DoIndex.pm
@@ -39,6 +39,9 @@ sub send_file {
 			      "@{$opts->{suite}}" ) );
     }
 
+    if ($opts->{format} eq 'txt.gz') {
+	$opts->{po_lang} = 'en';
+    }
     my $wwwdir = "$TOPDIR/www";
     my $path = "";
     $path .= "source/" if $opts->{source};
@@ -46,12 +49,7 @@ sub send_file {
     $path .= "$opts->{archive}[0]/" if @{$opts->{archive}} == 1;
     $path .= "$opts->{subsection}[0]/" if @{$opts->{subsection}};
     $path .= "$opts->{priority}[0]/" if @{$opts->{priority}};
-
-    #FIXME: ugly hack
-    if ($opts->{lang} ne 'en' and !-f "$wwwdir/$path$file.$opts->{lang}.$opts->{format}") {
-	$opts->{lang} = 'en';
-    }
-    $path .= "$file.$opts->{lang}.$opts->{format}";
+    $path .= "$file.$opts->{po_lang}.$opts->{format}";
 
     unless (@Packages::CGI::fatal_errors) {
 	my $buffer;
diff --git a/lib/Packages/DoSearch.pm b/lib/Packages/DoSearch.pm
index 9fa8d3d..4d86d51 100644
--- a/lib/Packages/DoSearch.pm
+++ b/lib/Packages/DoSearch.pm
@@ -13,7 +13,7 @@ use Deb::Versions;
 use Packages::Search qw( :all );
 use Packages::CGI qw( :DEFAULT );
 use Packages::DB;
-use Packages::Config qw( $DBDIR @SUITES @ARCHIVES $ROOT );
+use Packages::Config qw( $DBDIR @SUITES @ARCHIVES @ARCHITECTURES $ROOT );
 
 sub do_search {
     my ($params, $opts, $page_content) = @_;
@@ -30,7 +30,12 @@ sub do_search {
 
     my @keywords = @{$opts->{keywords}};
     my $searchon = $opts->{searchon};
-    $page_content->{search_keywords} = \@keywords;
+    $page_content->{search_keywords} = $opts->{keywords};
+    $page_content->{all_architectures} = \@ARCHITECTURES;
+    $page_content->{all_suites} = \@SUITES;
+    $page_content->{search_architectures} = $opts->{arch};
+    $page_content->{search_suites} = $opts->{suite};
+    $page_content->{sections} = $opts->{section};
 
     my $st0 = new Benchmark;
     my (@results, @non_results);
diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 0159065..f40d1a2 100644
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -201,7 +201,7 @@ sub do_show {
 
 			my $provided_by = $page->{provided_by};
 			$contents{providers} = [];
-			pkg_list( \%packages, $opts, $provided_by, 'en', $contents{providers} ) if $provided_by;
+			pkg_list( \%packages, $opts, $provided_by, $contents{providers} ) if $provided_by;
 
 			#
 			# display dependencies
@@ -254,7 +254,7 @@ sub do_show {
 
 			my $provided_by = $page->{provided_by};
 			$contents{providers} = [];
-			pkg_list( \%packages, $opts, $provided_by, 'en', $contents{providers} );
+			pkg_list( \%packages, $opts, $provided_by, $contents{providers} );
 
 		    } # else (unless $page->is_virtual)
 		} else { # unless $opts->{source}
@@ -286,7 +286,7 @@ sub do_show {
 		    my $binaries = find_binaries( $pkg, $archive, $suite, \%src2bin );
 		    if ($binaries && @$binaries) {
 			$contents{binaries} = [];
-			pkg_list( \%packages, $opts, $binaries, 'en', $contents{binaries} );
+			pkg_list( \%packages, $opts, $binaries, $contents{binaries} );
 		    }
 
 		    #
@@ -490,7 +490,7 @@ sub build_deps {
 } # end print_deps
 
 sub pkg_list {
-    my ( $packages, $opts, $pkgs, $lang, $list ) = @_;
+    my ( $packages, $opts, $pkgs, $list ) = @_;
     my $suite = $opts->{suite}[0];
 
     foreach my $p ( sort @$pkgs ) {
diff --git a/lib/Packages/I18N/Languages.pm b/lib/Packages/I18N/Languages.pm
index ce5e774..f33516b 100644
--- a/lib/Packages/I18N/Languages.pm
+++ b/lib/Packages/I18N/Languages.pm
@@ -105,10 +105,10 @@ my %translit = (
 		ko => "Hangul", # Not sure. "Hanguk-Mal" (=Spoken Korean)?
 		ru => "Russkij",
 		uk => "ukrajins'ka",
-		zh => "Zhongzu",
-		'zh-cn'=> "Zhongzu,&#31616;",
-		'zh-hk'=> "Zhongzu,HK",
-		'zh-tw'=> "Zhongzu,&#32321;",
+		zh => "Zhongwen",
+		'zh-cn'=> "Zhongwen,&#31616;",
+		'zh-hk'=> "Zhongwen,HK",
+		'zh-tw'=> "Zhongwen,&#32321;",
 		);
 
 # second transliteration table, used for languages starting with a latin
diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm
index 92242f3..b9c41ee 100644
--- a/lib/Packages/Page.pm
+++ b/lib/Packages/Page.pm
@@ -95,7 +95,7 @@ sub is_virtual {
 }
 
 our @TAKE_NEWEST = qw( description description-md5 essential priority section subsection tag
-		       archive source source-version url homepage );
+		       archive source source-version homepage );
 our @STORE_ALL = qw( version source source-version installed-size size
 		     filename md5sum sha1 sha256 task
 		     origin bugs suite archive section );
diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index 04270f2..c33f142 100644
--- a/lib/Packages/Search.pm
+++ b/lib/Packages/Search.pm
@@ -164,14 +164,22 @@ sub do_names_search {
 
     my $first_keyword = lc shift @$keywords;
     @$keywords = map { lc $_ } @$keywords;
-        
+
     my ($key, $prefixes) = ($first_keyword, '');
-    my %pkgs;
+    my (%pkgs, %pkgs_min);
     $postfixes->seq( $key, $prefixes, R_CURSOR );
     while (index($key, $first_keyword) >= 0) {
-	if ($prefixes =~ /^\001(\d+)/o) {
-	    debug( "$key has too many hits", 2 ) if DEBUG;
-	    $too_many_hits += $1;
+	if ($prefixes =~ /^(\^)?\001(\d+)/o) {
+	    debug("$key has too many hits", 2 ) if DEBUG;
+	    $too_many_hits += $2;
+	    if ($1) { # use the empty prefix
+		foreach my $k (@$keywords) {
+		    next unless $key =~ /\Q$k\E/;
+		}
+		debug("add key $key", 2) if DEBUG;
+		$pkgs{$key}++;
+		$pkgs_min{$key}++;
+	    }
 	} else {
 	  PREFIX:
 	    foreach (split /\000/o, $prefixes) {
@@ -180,18 +188,21 @@ sub do_names_search {
 		foreach my $k (@$keywords) {
 		    next PREFIX unless $word =~ /\Q$k\E/;
 		}
-		debug( "add word $word", 2) if DEBUG;
+		debug("add word $word", 2) if DEBUG;
 		$pkgs{$word}++;
+		$pkgs_min{$word}++ if $_ eq '';
 	    }
 	}
 	last if $postfixes->seq( $key, $prefixes, R_NEXT ) != 0;
-	last if $too_many_hits or keys %pkgs >= 100;
+	last if keys %pkgs_min >= 100;
     }
-    
-    my $no_results = keys %pkgs;
-    if ($too_many_hits || ($no_results >= 100)) {
-	$too_many_hits += $no_results;
-	%pkgs = ( $first_keyword => 1 ) unless @$keywords;
+
+    my $nr = keys %pkgs;
+    my $min_nr = keys %pkgs_min;
+    debug("nr=$nr min_nr=$min_nr too_many_hits=$too_many_hits", 1) if DEBUG;
+    if ($nr >= 100) {
+	$too_many_hits += $nr - $min_nr + 1;
+	%pkgs = %pkgs_min;
     }
     foreach my $pkg (sort keys %pkgs) {
 	&$read_entry( $packages, $pkg, $results, $non_results, $opts );
diff --git a/lib/Packages/Template.pm b/lib/Packages/Template.pm
index a3268a3..c2919f1 100644
--- a/lib/Packages/Template.pm
+++ b/lib/Packages/Template.pm
@@ -85,8 +85,10 @@ sub page {
 	    sub { return Packages::I18N::Locale::g($page_content->{cat}, @_) };
     }
     $page_content->{used_langs} ||= \@LANGUAGES;
-    $page_content->{langs} = languages( $page_content->{lang}
-					|| $self->{vars}{lang} || 'en',
+    $page_content->{langs} = languages( $page_content->{po_lang}
+					|| $self->{vars}{po_lang} || 'en',
+					$page_content->{ddtp_lang}
+					|| $self->{vars}{ddtp_lang} || 'en',
 					@{$page_content->{used_langs}} );
 
     my $txt;
@@ -114,17 +116,17 @@ sub error_page {
 }
 
 sub languages {
-    my ( $lang, @used_langs ) = @_;
-    my $cat = Packages::I18N::Locale->get_handle($lang)
-	|| Packages::I18N::Locale->get_handle('en');
+    my ( $po_lang, $ddtp_lang, @used_langs ) = @_;
+    my $cat = Packages::I18N::Locale->get_handle($po_lang, 'en');
 
     my @langs;
+    my $skip_lang = ($po_lang eq $ddtp_lang) ? $po_lang : '';
 
     if (@used_langs) {
 
 	my @printed_langs = ();
 	foreach (@used_langs) {
-	    next if $_ eq $lang; # Never print the current language
+	    next if $_ eq $skip_lang; # Don't print the current language
 	    unless (get_selfname($_)) { warn "missing language $_"; next } #DEBUG
 	    push @printed_langs, $_;
 	}
diff --git a/po/debtags.de.po b/po/debtags.de.po
index bda1300..ccb3845 100644
--- a/po/debtags.de.po
+++ b/po/debtags.de.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: debtags.git c82c758c8\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-10-13 19:05+0200\n"
-"PO-Revision-Date: 2007-12-16 12:44+0100\n"
+"PO-Revision-Date: 2008-02-15 17:30+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: debian-l10n-german <debian-l10n-german@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr "  GPE Palmtop-Umgebung"
 #. Tag: suite::gforge, long desc
 #: files/debtags/vocabulary
 msgid " A collaborative development platform."
-msgstr ""
+msgstr " Eine gemeinschaftliche Entwicklungsplattform."
 
 #. Tag: scope::utility, long desc
 #: files/debtags/vocabulary
@@ -95,6 +95,14 @@ msgid ""
 " .\n"
 " Link: http://en.wikipedia.org/wiki/Asynchronous_Transfer_Mode"
 msgstr ""
+" »Asynchronous Transfer Mode«, ein Hochgeschwindigkeitsprotokoll zur\n"
+" Kommunikation zwischen Computern in einem Netz.\n"
+" .\n"
+" Obwohl ATM zur Realisierung von *DSL-Netzen verwendet wird, hat es nie einen\n"
+" umfangreichen Einsatz als Technik zum Aufbau lokaler Netze (LANs) gefunden,\n"
+" wofür es ursprünglich gedacht war.\n"
+" .\n"
+" Link: http://de.wikipedia.org/wiki/Asynchronous_Transfer_Mode"
 
 #. Tag: admin::automation, long desc
 #: files/debtags/vocabulary
@@ -104,7 +112,7 @@ msgstr " Automatisierung der Ausführung von Software im System."
 #. Tag: works-with-format::bib, long desc
 #: files/debtags/vocabulary
 msgid " BibTeX list of references"
-msgstr ""
+msgstr " Quellangaben für BibTeX"
 
 #. Tag: protocol::bittorrent, long desc
 #: files/debtags/vocabulary
@@ -128,16 +136,19 @@ msgid ""
 " for 80-90% of use cases. The pieces that remain are usually to be\n"
 " found as utilities."
 msgstr ""
+" Programm mit breiter Zielgruppe für den allgemeinen Einsatz. Für 80-90% "
+" der Anwendungsfälle hat es Funktionalität. Die restlichen Teile werden "
+" typischerweise als Hilfswerkzeuge verteilt."
 
 #. Tag: field::electronics, long desc
 #: files/debtags/vocabulary
 msgid " Circuit editors and other electronics-related software"
-msgstr ""
+msgstr " Schaltkreis-Editoren und andere Software mit Bezug zur Elektronik"
 
 #. Tag: devel::prettyprint, long desc
 #: files/debtags/vocabulary
 msgid " Code pretty-printing and indentation/reformatting."
-msgstr ""
+msgstr " Schöndruck von Code und Einrückung/Neuformatierung."
 
 #. Tag: protocol::corba, long desc
 #: files/debtags/vocabulary
@@ -155,6 +166,17 @@ msgid ""
 " .\n"
 " Link: http://www.corba.org/"
 msgstr ""
+" »Common Object Request Broker Architecture« ist ein Standard für\n"
+" Interoperabilität zwischen in verschiedenen Programmiersprachen\n"
+" geschriebenen und auf verschiedenen Hardware-Plattformen laufenden\n"
+" Programmen. CORBA enthält ein Client-Server-Netzprotokoll für\n"
+" verteiltes Rechnen.\n"
+" .\n"
+" Mit diesem Netzprotokoll können CORBA-Clients aus verschiedenen\n"
+" Programmiersprachen und auf verschiedenen Computern Objekte über einen\n"
+" CORBA-Server wie Orbit2 oder OmniORB austauschen.\n"
+" .\n"
+" Link: http://www.corba.org/"
 
 #. Tag: hardware::storage:cd, long desc
 #: files/debtags/vocabulary
@@ -167,6 +189,8 @@ msgid ""
 " Comprehensive suite of applications and utilities on the scale of\n"
 " desktop environment or base operating system."
 msgstr ""
+" Umfangreiche Suite an Anwendungen und Hilfswerkzeugen in der Größenordnung\n"
+" einer Desktop-Umgebung oder eines Basis-Betriebssystems."
 
 #. Tag: admin::filesystem, long desc
 #: files/debtags/vocabulary
@@ -184,11 +208,13 @@ msgid ""
 " DeVice Independent page description file, usually generated\n"
 " by TeX or LaTeX."
 msgstr ""
+" Geräteunabhängige (»DeVice Independent«) Seitenbeschreibungsdatei,\n"
+" normalerweise von TeX oder LaTeX erstellt."
 
 #. Tag: role::debug-symbols, long desc
 #: files/debtags/vocabulary
 msgid " Debugging symbols."
-msgstr ""
+msgstr " Debugging-Symbole."
 
 #. Tag: hardware::storage:dvd, long desc
 #: files/debtags/vocabulary
@@ -199,11 +225,12 @@ msgstr " Digital Versatile Disc"
 #: files/debtags/vocabulary
 msgid " Direct Client to Client protocol used by Internet Relay Chat clients."
 msgstr ""
+" Direktes Client-zu-Client-Protokoll, verwendet von Clients für Internet Relay Chat"
 
 #. Tag: x11::display-manager, long desc
 #: files/debtags/vocabulary
 msgid " Display managers (graphical login screens)"
-msgstr ""
+msgstr " Display-Manager (graphische Anmeldebildschirme)"
 
 #. Tag: protocol::dns, long desc
 #: files/debtags/vocabulary
@@ -222,6 +249,16 @@ msgid ""
 " .\n"
 " Link: http://en.wikipedia.org/wiki/Domain_Name_System"
 msgstr ""
+" »Domain Name System«, ein Protokoll, um Informationen im Zusammenhang mit\n"
+" Domainnamen (wie »www.debian.org«) anzufordern, am berühmtesten die IP-\n"
+" Adresse. Das Protokoll wird zur Kommunikation mit einem DNS-Server (wie\n"
+" BIND) verwandt.\n"
+" .\n"
+" Für das Internet gibt es 13 Wurzel-DNS-Server rund um die Welt, die die\n"
+" Adressen aller registrierten Domainnamen behalten und diese Informationen\n"
+" an die DNS-Server der Internet-Diensteanbieter bereitstellen.\n"
+" .\n"
+" Link: http://de.wikipedia.org/wiki/Domain_Name_System"
 
 #. Tag: protocol::dhcp, long desc
 #: files/debtags/vocabulary
@@ -238,7 +275,7 @@ msgstr ""
 #. Tag: suite::eclipse, long desc
 #: files/debtags/vocabulary
 msgid " Eclipse tool platform and plugins."
-msgstr ""
+msgstr " Eclipse-Werkzeug-Plattform und Erweiterungen."
 
 #. Tag: protocol::ethernet, long desc
 #: files/debtags/vocabulary
@@ -254,6 +291,15 @@ msgid ""
 " .\n"
 " Link: http://en.wikipedia.org/wiki/Ethernet"
 msgstr ""
+" Ethernet ist die beliebteste Technik zum Aufbau lokaler Netze (LANs).\n"
+" .\n"
+" Die Rechner in einem Ethernet-Netz kommunizieren über verdrillte (»twisted-\n"
+" pair«) Kabel und werden über ihre MAC-Adresse identifiziert. Mehrere Arten\n"
+" von Ethernet existieren, die durch die maximale Verbindungsgeschwindigkeit\n"
+" unterschieden werden können. Am verbreitesten sind heuzutage 100MBit/s\n"
+" (100BASE-*) oder 1GBit/s (1000BASE-*).\n"
+" .\n"
+" Link: http://de.wikipedia.org/wiki/Ethernet"
 
 #. Tag: role::program, long desc
 #: files/debtags/vocabulary
@@ -3946,7 +3992,7 @@ msgstr "XMMS 2"
 #. Tag: works-with-format::xml:xslt, short desc
 #: files/debtags/vocabulary
 msgid "XSL Transformations (XSLT)"
-msgstr ""
+msgstr "XSL-Transformationen (XSLT)"
 
 #. Tag: protocol::yahoo-messenger, short desc
 #: files/debtags/vocabulary
diff --git a/po/pdo.de.po b/po/pdo.de.po
index aab406a..b805537 100644
--- a/po/pdo.de.po
+++ b/po/pdo.de.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: packages.git 944e9ffd2b\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-17 21:01+0100\n"
+"POT-Creation-Date: 2008-02-08 17:22+0100\n"
 "PO-Revision-Date: 2007-10-28 17:07+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: debian-l10n-german <debian-l10n-german@lists.debian.org>\n"
@@ -10,19 +10,23 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: bin/create_index_pages:233
+#: bin/create_index_pages:68
+msgid "virtual package provided by"
+msgstr "virtuelles Paket, bereitgestellt durch"
+
+#: bin/create_index_pages:162 bin/create_index_pages:383
 msgid "Section"
 msgstr "Bereich"
 
-#: bin/create_index_pages:245
+#: bin/create_index_pages:169 bin/create_index_pages:390
 msgid "Subsection"
 msgstr "Unterbereich"
 
-#: bin/create_index_pages:257
+#: bin/create_index_pages:176 bin/create_index_pages:397
 msgid "Priority"
 msgstr "Priorität"
 
-#: lib/Packages/Dispatcher.pm:312
+#: lib/Packages/Dispatcher.pm:319
 msgid "requested format not available for this document"
 msgstr "angefordertes Format für dieses Dokument nicht verfügbar"
 
@@ -69,7 +73,7 @@ msgstr "mehr als eine Suite für show_static angegeben (%s)"
 msgid "more than one subsection specified for show_static (%s)"
 msgstr "mehr als ein Unterbereich für show_static angegeben (%s)"
 
-#: lib/Packages/DoIndex.pm:75
+#: lib/Packages/DoIndex.pm:70
 #, perl-format
 msgid "couldn't read index file %s: %s"
 msgstr "konnte Indexdatei %s nicht lesen: %s"
@@ -93,15 +97,15 @@ msgid "keyword too short (keywords need to have at least two characters)"
 msgstr ""
 "Suchbegriff zu kurz (Suchbegriffe müssen mindestens zwei Zeichen lang sein)"
 
-#: lib/Packages/DoSearch.pm:165
+#: lib/Packages/DoSearch.pm:170
 msgid "Exact hits"
 msgstr "Genaue Treffer"
 
-#: lib/Packages/DoSearch.pm:175
+#: lib/Packages/DoSearch.pm:180
 msgid "Other hits"
 msgstr "Andere Treffer"
 
-#: lib/Packages/DoSearch.pm:234
+#: lib/Packages/DoSearch.pm:239
 msgid "Virtual package"
 msgstr "Virtuelles Paket"
 
@@ -150,11 +154,8 @@ msgstr "Nicht verfügbar"
 msgid "package has bad maintainer field"
 msgstr "Paket hat ungültiges Betreuer-Feld"
 
-#~ msgid "two or more packages specified (%s)"
-#~ msgstr "zwei oder mehr Pakete angegeben (%s)"
-
-#~ msgid "%s set more than once in path"
-#~ msgstr "%s mehr als einmal im Pfad angegeben"
+#~ msgid "search doesn't take any more path elements"
+#~ msgstr "Suche nimmt keine Pfadelemente mehr an"
 
 #~ msgid ""
 #~ "We're supposed to display the homepage here, instead of getting dispatch."
@@ -162,5 +163,8 @@ msgstr "Paket hat ungültiges Betreuer-Feld"
 #~ msgstr ""
 #~ "Wir sollten die Homepage hier anzeigen statt dispatch.pl zu erhalten"
 
-#~ msgid "search doesn't take any more path elements"
-#~ msgstr "Suche nimmt keine Pfadelemente mehr an"
+#~ msgid "%s set more than once in path"
+#~ msgstr "%s mehr als einmal im Pfad angegeben"
+
+#~ msgid "two or more packages specified (%s)"
+#~ msgstr "zwei oder mehr Pakete angegeben (%s)"
diff --git a/po/pdo.fi.po b/po/pdo.fi.po
index 3126916..e32e198 100644
--- a/po/pdo.fi.po
+++ b/po/pdo.fi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pdo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-17 21:01+0100\n"
+"POT-Creation-Date: 2008-02-08 17:22+0100\n"
 "PO-Revision-Date: 2007-11-26 08:04+0200\n"
 "Last-Translator: Tommi Vainikainen <thv+debian@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -15,19 +15,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bin/create_index_pages:233
+#: bin/create_index_pages:68
+msgid "virtual package provided by"
+msgstr "näennäispaketti, jonka toteuttaa"
+
+#: bin/create_index_pages:162 bin/create_index_pages:383
 msgid "Section"
 msgstr "Osasto"
 
-#: bin/create_index_pages:245
+#: bin/create_index_pages:169 bin/create_index_pages:390
 msgid "Subsection"
 msgstr "Alaosasto"
 
-#: bin/create_index_pages:257
+#: bin/create_index_pages:176 bin/create_index_pages:397
 msgid "Priority"
 msgstr "Tärkeys"
 
-#: lib/Packages/Dispatcher.pm:312
+#: lib/Packages/Dispatcher.pm:319
 msgid "requested format not available for this document"
 msgstr "pyydetty muoto ei ole käytettävissä tälle asiakirjalle"
 
@@ -71,24 +75,21 @@ msgstr "useampi kuin yksi jakelu määritetty show_static-metodille (%s)"
 
 #: lib/Packages/DoIndex.pm:38
 #, perl-format
-#| msgid "more than one suite specified for show_static (%s)"
 msgid "more than one subsection specified for show_static (%s)"
 msgstr "useampi kuin yksi alaosasto määritetty show_static-metodille (%s)"
 
-#: lib/Packages/DoIndex.pm:75
+#: lib/Packages/DoIndex.pm:70
 #, perl-format
 msgid "couldn't read index file %s: %s"
 msgstr "hakemistotiedostoa %s ei voitu lukea: %s"
 
 #: lib/Packages/DoNewPkg.pm:25
 #, perl-format
-#| msgid "more than one suite specified for show (%s)"
 msgid "more than one suite specified for newpkg (%s)"
 msgstr "useampi kuin yksi jakelu määritetty newpkg-metodille (%s)"
 
 #: lib/Packages/DoNewPkg.pm:43
 #, perl-format
-#| msgid "More Information on %s"
 msgid "no newpkg information found for suite %s"
 msgstr "newpkg-tietoa ei löytynyt jakelulle %s"
 
@@ -100,15 +101,15 @@ msgstr "hakusana ei kelpaa tai puuttuu"
 msgid "keyword too short (keywords need to have at least two characters)"
 msgstr "hakusana liian lyhyt (hakusanassa täytyy olla vähintään kaksi merkkiä)"
 
-#: lib/Packages/DoSearch.pm:165
+#: lib/Packages/DoSearch.pm:170
 msgid "Exact hits"
 msgstr "Tarkat hakutulokset"
 
-#: lib/Packages/DoSearch.pm:175
+#: lib/Packages/DoSearch.pm:180
 msgid "Other hits"
 msgstr "Muut hakutulokset"
 
-#: lib/Packages/DoSearch.pm:234
+#: lib/Packages/DoSearch.pm:239
 msgid "Virtual package"
 msgstr "Näennäispaketti"
 
@@ -140,7 +141,6 @@ msgstr " ja muut"
 
 #: lib/Packages/DoShow.pm:429
 #, perl-format
-#| msgid "not"
 msgid "not %s"
 msgstr "ei %s"
 
@@ -156,322 +156,319 @@ msgstr "Ei saatavilla"
 msgid "package has bad maintainer field"
 msgstr "paketin ylläpitäjätietue on virheellinen"
 
-#~ msgid "List of sections in \"%s\""
-#~ msgstr "Osastoluettelo jakelussa \"%s\""
+#~ msgid "search doesn't take any more path elements"
+#~ msgstr "haku ei ota enempää polkuelementtejä"
 
-#~ msgid "List of all packages"
-#~ msgstr "Luettelo kaikista paketeista"
+#~ msgid ""
+#~ "We're supposed to display the homepage here, instead of getting dispatch."
+#~ "pl"
+#~ msgstr "Meidän pitäisi näyttää kotisivu tässä dispatch.pl:n sijaan."
 
-#~ msgid "All packages"
-#~ msgstr "Kaikki paketit"
+#~ msgid "%s set more than once in path"
+#~ msgstr "%s asetettu useammin kuin kerran polussa"
 
-#~ msgid "compact compressed textlist"
-#~ msgstr "pieni tiivistetty tekstiluettelo"
+#~ msgid "two or more packages specified (%s)"
+#~ msgstr "kaksi tai useampi pakettia määritetty (%s)"
 
-#~ msgid "Software Packages in \"%s\""
-#~ msgstr "Ohjelmistopaketit jakelussa \"%s\""
+#~ msgid "Initialization of Template Engine failed: %s"
+#~ msgstr "Mallinemoottorin alustus epäonnistui: %s"
 
-#~ msgid "Software Packages in \"%s\", priority %s"
-#~ msgstr "Ohjelmistopaketit jakelussa \"%s\" tärkeysasteella %s"
+#~ msgid ""
+#~ "Warning: The <span class=\"pred\">experimental</span> distribution "
+#~ "contains software that is likely unstable or buggy and may even cause "
+#~ "data loss. If you ignore this warning and install it nevertheless, you do "
+#~ "it on your own risk."
+#~ msgstr ""
+#~ "Varoitus: <span clas=\"pred\">kokeellinen</span> jakelu sisältää "
+#~ "ohjelmistoja, jotka ovat luultavasti epävakaita sekä bugisia, ja voi "
+#~ "aiheuttaa jopa tiedonhäviötä. Mikäli ohitat tämän varoituksen ja asennat "
+#~ "paketin kaikesta huolimatta, otat vastuun itsellesi."
 
-#~ msgid "Error"
-#~ msgstr "Virhe"
+#~ msgid ""
+#~ "Packages that were added to the unstable Debian archive during the last 7 "
+#~ "days."
+#~ msgstr ""
+#~ "Paketit, jotka on lisätty epävakaaseen Debian-arkistoon viimeisen "
+#~ "seitsemän (7) päivän aikana."
 
-#~ msgid "<a href=\"%s\">Search for the package</a>"
-#~ msgstr "<a href=\"%s\">Hae pakettia</a>"
+#~ msgid ""
+#~ "The following packages were added to the \"%s\" component next to the "
+#~ "Debian archive during the last 7 days."
+#~ msgstr ""
+#~ "Seuraavat paketit on lisätty komponenttiin \"%s\" Debian-arkistoon "
+#~ "viimeisen seitsemän (7) päivän aikana."
 
-#~ msgid "New Packages in \"%s\""
-#~ msgstr "Uudet paketit komponentissa \"%s\""
+#~ msgid ""
+#~ "Packages that were added to the \"%s\" component next to the unstable "
+#~ "Debian archive during the last 7 days."
+#~ msgstr ""
+#~ "Paketit, jotka on lisätty komponenttiin \"%s\" epävakaaseen Debian-"
+#~ "arkistoon viimeisen seitsemän (7) päivän aikana."
 
-#~ msgid "File"
-#~ msgstr "Tiedosto"
+#~ msgid ""
+#~ "Users of experimental packages are encouraged to contact the package "
+#~ "maintainers directly in case of problems."
+#~ msgstr ""
+#~ "Kokeellisten pakettien käyttäjiä kehotetaan ottamaan ongelmatapauksissa "
+#~ "yhteyttä suoraan paketin ylläpitäjiin."
 
-#~ msgid "Distribution:"
-#~ msgstr "Jakelu:"
+#~ msgid "Size is measured in kBytes."
+#~ msgstr "Koko mitataan kilotavuissa."
 
-#~ msgid "All packages in this section"
-#~ msgstr "Kaikki tämän osaston paketit"
+#~ msgid "Maintainer"
+#~ msgstr "Ylläpitäjä"
 
-#~ msgid "Package: %s (%s)"
-#~ msgstr "Paketti: %s (%s)"
+#~ msgid "Uploaders"
+#~ msgstr "Uploadaajat"
 
-#~ msgid "Experimental package"
-#~ msgstr "Kokeellinen paketti"
+#~ msgid "Essential"
+#~ msgstr "Välttämätön"
 
-#~ msgid "debian-installer udeb package"
-#~ msgstr "debian-asentimen udeb-paketti"
+#~ msgid "yes"
+#~ msgstr "kyllä"
 
 #~ msgid ""
-#~ "Warning: This package is intended for the use in building <a href="
-#~ "\"http://www.debian.org/devel/debian-installer\">debian-installer</a> "
-#~ "images only. Do not install it on a normal Debian system."
+#~ "Warning: These packages are intended for the use in building <a href="
+#~ "\"http://www.debian.org/devel/debian-installer/\">debian-installer</a> "
+#~ "images only. Do not install them on a normal Debian system."
 #~ msgstr ""
-#~ "Varoitus: Tämä paketti on tarkoitettu käytettäväksi vain rakennettaessa "
+#~ "Varoitus: Nämä paketit on tarkoitettu käytettäväksi vain rakennettaessa "
 #~ "<a href=\"http://www.debian.org/devel/debian-installer\">debian-"
 #~ "asentimen</a> vedoksia. Älä asenna normaaliin Debian-järjestelmään."
 
-#~ msgid "Other Packages Related to %s"
-#~ msgstr "Muut pakettiin %s liittyvät paketit"
+#~ msgid "No packages with this priority in this suite"
+#~ msgstr "Kokoelmassa ei ole paketteja tällä tärkeysasteella"
 
-#~ msgid "Download %s\n"
-#~ msgstr "Imuroi %s\n"
+#~ msgid "Software Packages in \"%s\", essential packages"
+#~ msgstr "Ohjelmistopaketit jakelussa \"%s\", välttämättömät paketit"
+
+#~ msgid "No essential packages in this suite"
+#~ msgstr "Kokoelmassa ei ole välttämättömiä paketteja"
 
 #~ msgid ""
-#~ "The download table links to the download of the package and a file "
-#~ "overview. In addition it gives information about the package size and the "
-#~ "installed size."
+#~ "Copyright (C) 1997-2005 SPI;\n"
+#~ "See <URL:http://www.debian.org/license> for the license terms.\n"
+#~ "\n"
 #~ msgstr ""
-#~ "Imurointitaulukko linkittää paketin imurointiin ja tiedostokatsaukseen. "
-#~ "Lisäksi se antaa tietoa paketin koosta sekä asennukseen tarvittavasta "
-#~ "levytilasta."
-
-#~ msgid "Download for all available architectures"
-#~ msgstr "Imurointi kaikille saataville arkkitehtuureille"
-
-#~ msgid "Architecture"
-#~ msgstr "Arkkitehtuuri"
-
-#~ msgid "Version"
-#~ msgstr "Versio"
-
-#~ msgid "Files"
-#~ msgstr "Tiedostot"
+#~ "Copyright © 1997-2005 SPI;\n"
+#~ "Katso lisenssiehdot sivulta <URL:http://www.debian.org/license>.\n"
+#~ "\n"
 
-#~ msgid "Installed Size"
-#~ msgstr "Koko asennettuna"
+#~ msgid "Versions:"
+#~ msgstr "Versiot:"
 
-#~ msgid "Package Size"
-#~ msgstr "Paketin koko"
+#~ msgid "This page is also available in the following languages:\n"
+#~ msgstr "Tämä sivu on saatavilla myös seuraavilla kielillä:\n"
 
-#~ msgid "list of files"
-#~ msgstr "tiedostoluettelo"
+#~ msgid ""
+#~ "Debian is a registered trademark of Software in the Public Interest, Inc."
+#~ msgstr ""
+#~ "Debian on Software in the Public Interest, Inc.'in rekisteröimä "
+#~ "tavaramerkki."
 
-#~ msgid "virtual package"
-#~ msgstr "näennäispaketti"
+#~ msgid ""
+#~ "Copyright &copy; 1997-2005 <a href=\"http://www.spi-inc.org\">SPI</a>; "
+#~ "See <a href=\"%s/license\">license terms</a>."
+#~ msgstr ""
+#~ "Copyright © 1997-2005 <a href=\"http://www.spi-inc.org\">SPI</a>. Lue <a "
+#~ "href=\"%s/license\">lisenssiehdot</a>."
 
-#~ msgid "Overview over this distribution"
-#~ msgstr "Tämän jakelun yleiskuva"
+#~ msgid "Last Modified: "
+#~ msgstr "Viimeksi muutettu: "
 
-#~ msgid "Virtual Package: %s"
-#~ msgstr "Näennäispaketti: %s"
+#~ msgid ""
+#~ "To report a problem with the web site, e-mail <a href=\"mailto:%s\">%s</"
+#~ "a>. For other contact information, see the Debian <a href=\"%s/contact"
+#~ "\">contact page</a>."
+#~ msgstr ""
+#~ "Tällä www-sivulla olevista ongelmista voi ilmoittaa lähettämällä "
+#~ "sähköpostia englanniksi osoitteeseen <a href=\"mailto:%s\">%s</a>. Muut "
+#~ "yhteystiedot löytyvät Debianin <a href=\"%s/contact\">yhteystietosivulta</"
+#~ "a>."
 
 #~ msgid ""
-#~ "This is a <em>virtual package</em>. See the <a href=\"%s\">Debian policy</"
-#~ "a> for a <a href=\"%sch-binary.html#s-virtual_pkg\">definition of virtual "
-#~ "packages</a>."
+#~ "Back to: <a href=\"%s/\">Debian Project homepage</a> || <a href=\"%s/"
+#~ "\">Packages search page</a>"
 #~ msgstr ""
-#~ "Tämä on <em>näennäispaketti</em>. Katso <a href=\"%s\">Debianin linjan "
-#~ "kuvaksesta</a> <a href=\"%sch-binary.html#s-virtual_pkg\">näennäispaketin "
-#~ "määritelmä</a>."
+#~ "Takaisin: <a href=\"%s/\">Debian-projektin kotisivulle</a> || <a href=\"%"
+#~ "s/\">Pakettien hakusivulle</a>"
 
-#~ msgid "Packages providing %s"
-#~ msgstr "Paketit, jotka tarjoavat paketin %s"
+#~ msgid "Site map"
+#~ msgstr "Sivustokartta"
 
-#~ msgid "The following binary packages are built from this source package:"
-#~ msgstr "Seuraavat binääripaketit on käännetty tästä lähdepaketista:"
+#~ msgid "Development"
+#~ msgstr "Kehitys"
 
-#~ msgid "Download %s"
-#~ msgstr "Imuroi %s"
+#~ msgid "Support"
+#~ msgstr "Tuki"
 
-#~ msgid "Size (in kB)"
-#~ msgstr "Koko (kt)"
+#~ msgid "Getting&nbsp;Debian"
+#~ msgstr "Debianin&nbsp;hankkiminen"
 
-#~ msgid "md5sum"
-#~ msgstr "MD5-summa"
+#~ msgid "News"
+#~ msgstr "Uutiset"
 
-#~ msgid "Check for <a href=\"%s\">Bug Reports</a> about %s."
-#~ msgstr "Tarkista paketin %s <a href=\"%s\">vikailmoitukset</a>."
+#~ msgid "About&nbsp;Debian"
+#~ msgstr "Tietoja&nbsp;Debianista"
 
-#~ msgid "Source Package:"
-#~ msgstr "Lähdepaketti:"
+#~ msgid "Skip Site Navigation"
+#~ msgstr "Ohita sivustonavigointi"
 
-#~ msgid "Download"
-#~ msgstr "Imuroi"
+#~ msgid "Debian Project"
+#~ msgstr "Debian-projekti"
 
-#~ msgid "Not found"
-#~ msgstr "Ei löytynyt"
+#~ msgid "Search"
+#~ msgstr "Hae"
 
-#~ msgid "View the <a href=\"%s\">Debian changelog</a>"
-#~ msgstr "Katso <a href=\"%s\">Debian-muutoslokia</a>"
+#~ msgid "or"
+#~ msgstr "tai"
 
-#~ msgid "View the <a href=\"%s\">copyright file</a>"
-#~ msgstr "Katso <a href=\"%s\">copyright-tiedostoa</a>"
+#~ msgid "Search for <a href=\"%s\">other versions of %s</a>"
+#~ msgstr "Hae <a href=\"%s\">paketin %s muita versioita</a>"
 
-#~ msgid "%s is responsible for this Debian package."
-#~ msgstr "%s on vastuussa tästä Debian-paketista."
+#~ msgid "See the <a href=\"%s\">developer information for %s</a>."
+#~ msgstr "Katso <a href=\"%s\">paketin %s kehittäjätietoja</a>."
 
 #~ msgid " and %s are responsible for this Debian package."
 #~ msgstr " ja %s ovat vastuussa tästä Debian-paketista."
 
-#~ msgid "See the <a href=\"%s\">developer information for %s</a>."
-#~ msgstr "Katso <a href=\"%s\">paketin %s kehittäjätietoja</a>."
+#~ msgid "%s is responsible for this Debian package."
+#~ msgstr "%s on vastuussa tästä Debian-paketista."
 
-#~ msgid "Search for <a href=\"%s\">other versions of %s</a>"
-#~ msgstr "Hae <a href=\"%s\">paketin %s muita versioita</a>"
+#~ msgid "View the <a href=\"%s\">copyright file</a>"
+#~ msgstr "Katso <a href=\"%s\">copyright-tiedostoa</a>"
 
-#~ msgid "or"
-#~ msgstr "tai"
+#~ msgid "View the <a href=\"%s\">Debian changelog</a>"
+#~ msgstr "Katso <a href=\"%s\">Debian-muutoslokia</a>"
 
-#~ msgid "Search"
-#~ msgstr "Hae"
+#~ msgid "Not found"
+#~ msgstr "Ei löytynyt"
 
-#~ msgid "Debian Project"
-#~ msgstr "Debian-projekti"
+#~ msgid "Download"
+#~ msgstr "Imuroi"
 
-#~ msgid "Skip Site Navigation"
-#~ msgstr "Ohita sivustonavigointi"
+#~ msgid "Source Package:"
+#~ msgstr "Lähdepaketti:"
 
-#~ msgid "About&nbsp;Debian"
-#~ msgstr "Tietoja&nbsp;Debianista"
+#~ msgid "Check for <a href=\"%s\">Bug Reports</a> about %s."
+#~ msgstr "Tarkista paketin %s <a href=\"%s\">vikailmoitukset</a>."
 
-#~ msgid "News"
-#~ msgstr "Uutiset"
+#~ msgid "md5sum"
+#~ msgstr "MD5-summa"
 
-#~ msgid "Getting&nbsp;Debian"
-#~ msgstr "Debianin&nbsp;hankkiminen"
+#~ msgid "Size (in kB)"
+#~ msgstr "Koko (kt)"
 
-#~ msgid "Support"
-#~ msgstr "Tuki"
+#~ msgid "Download %s"
+#~ msgstr "Imuroi %s"
 
-#~ msgid "Development"
-#~ msgstr "Kehitys"
+#~ msgid "The following binary packages are built from this source package:"
+#~ msgstr "Seuraavat binääripaketit on käännetty tästä lähdepaketista:"
 
-#~ msgid "Site map"
-#~ msgstr "Sivustokartta"
+#~ msgid "Packages providing %s"
+#~ msgstr "Paketit, jotka tarjoavat paketin %s"
 
 #~ msgid ""
-#~ "Back to: <a href=\"%s/\">Debian Project homepage</a> || <a href=\"%s/"
-#~ "\">Packages search page</a>"
+#~ "This is a <em>virtual package</em>. See the <a href=\"%s\">Debian policy</"
+#~ "a> for a <a href=\"%sch-binary.html#s-virtual_pkg\">definition of virtual "
+#~ "packages</a>."
 #~ msgstr ""
-#~ "Takaisin: <a href=\"%s/\">Debian-projektin kotisivulle</a> || <a href=\"%"
-#~ "s/\">Pakettien hakusivulle</a>"
+#~ "Tämä on <em>näennäispaketti</em>. Katso <a href=\"%s\">Debianin linjan "
+#~ "kuvaksesta</a> <a href=\"%sch-binary.html#s-virtual_pkg\">näennäispaketin "
+#~ "määritelmä</a>."
 
-#~ msgid ""
-#~ "To report a problem with the web site, e-mail <a href=\"mailto:%s\">%s</"
-#~ "a>. For other contact information, see the Debian <a href=\"%s/contact"
-#~ "\">contact page</a>."
-#~ msgstr ""
-#~ "Tällä www-sivulla olevista ongelmista voi ilmoittaa lähettämällä "
-#~ "sähköpostia englanniksi osoitteeseen <a href=\"mailto:%s\">%s</a>. Muut "
-#~ "yhteystiedot löytyvät Debianin <a href=\"%s/contact\">yhteystietosivulta</"
-#~ "a>."
+#~ msgid "Virtual Package: %s"
+#~ msgstr "Näennäispaketti: %s"
 
-#~ msgid "Last Modified: "
-#~ msgstr "Viimeksi muutettu: "
+#~ msgid "Overview over this distribution"
+#~ msgstr "Tämän jakelun yleiskuva"
 
-#~ msgid ""
-#~ "Copyright &copy; 1997-2005 <a href=\"http://www.spi-inc.org\">SPI</a>; "
-#~ "See <a href=\"%s/license\">license terms</a>."
-#~ msgstr ""
-#~ "Copyright © 1997-2005 <a href=\"http://www.spi-inc.org\">SPI</a>. Lue <a "
-#~ "href=\"%s/license\">lisenssiehdot</a>."
+#~ msgid "list of files"
+#~ msgstr "tiedostoluettelo"
 
-#~ msgid ""
-#~ "Debian is a registered trademark of Software in the Public Interest, Inc."
-#~ msgstr ""
-#~ "Debian on Software in the Public Interest, Inc.'in rekisteröimä "
-#~ "tavaramerkki."
+#~ msgid "Package Size"
+#~ msgstr "Paketin koko"
 
-#~ msgid "This page is also available in the following languages:\n"
-#~ msgstr "Tämä sivu on saatavilla myös seuraavilla kielillä:\n"
+#~ msgid "Installed Size"
+#~ msgstr "Koko asennettuna"
 
-#~ msgid "Versions:"
-#~ msgstr "Versiot:"
+#~ msgid "Files"
+#~ msgstr "Tiedostot"
+
+#~ msgid "Version"
+#~ msgstr "Versio"
+
+#~ msgid "Architecture"
+#~ msgstr "Arkkitehtuuri"
+
+#~ msgid "Download for all available architectures"
+#~ msgstr "Imurointi kaikille saataville arkkitehtuureille"
 
 #~ msgid ""
-#~ "Copyright (C) 1997-2005 SPI;\n"
-#~ "See <URL:http://www.debian.org/license> for the license terms.\n"
-#~ "\n"
+#~ "The download table links to the download of the package and a file "
+#~ "overview. In addition it gives information about the package size and the "
+#~ "installed size."
 #~ msgstr ""
-#~ "Copyright © 1997-2005 SPI;\n"
-#~ "Katso lisenssiehdot sivulta <URL:http://www.debian.org/license>.\n"
-#~ "\n"
-
-#~ msgid "No essential packages in this suite"
-#~ msgstr "Kokoelmassa ei ole välttämättömiä paketteja"
+#~ "Imurointitaulukko linkittää paketin imurointiin ja tiedostokatsaukseen. "
+#~ "Lisäksi se antaa tietoa paketin koosta sekä asennukseen tarvittavasta "
+#~ "levytilasta."
 
-#~ msgid "Software Packages in \"%s\", essential packages"
-#~ msgstr "Ohjelmistopaketit jakelussa \"%s\", välttämättömät paketit"
+#~ msgid "Download %s\n"
+#~ msgstr "Imuroi %s\n"
 
-#~ msgid "No packages with this priority in this suite"
-#~ msgstr "Kokoelmassa ei ole paketteja tällä tärkeysasteella"
+#~ msgid "Other Packages Related to %s"
+#~ msgstr "Muut pakettiin %s liittyvät paketit"
 
 #~ msgid ""
-#~ "Warning: These packages are intended for the use in building <a href="
-#~ "\"http://www.debian.org/devel/debian-installer/\">debian-installer</a> "
-#~ "images only. Do not install them on a normal Debian system."
+#~ "Warning: This package is intended for the use in building <a href="
+#~ "\"http://www.debian.org/devel/debian-installer\">debian-installer</a> "
+#~ "images only. Do not install it on a normal Debian system."
 #~ msgstr ""
-#~ "Varoitus: Nämä paketit on tarkoitettu käytettäväksi vain rakennettaessa "
+#~ "Varoitus: Tämä paketti on tarkoitettu käytettäväksi vain rakennettaessa "
 #~ "<a href=\"http://www.debian.org/devel/debian-installer\">debian-"
 #~ "asentimen</a> vedoksia. Älä asenna normaaliin Debian-järjestelmään."
 
-#~ msgid "yes"
-#~ msgstr "kyllä"
+#~ msgid "debian-installer udeb package"
+#~ msgstr "debian-asentimen udeb-paketti"
 
-#~ msgid "Essential"
-#~ msgstr "Välttämätön"
+#~ msgid "Experimental package"
+#~ msgstr "Kokeellinen paketti"
 
-#~ msgid "Uploaders"
-#~ msgstr "Uploadaajat"
+#~ msgid "Package: %s (%s)"
+#~ msgstr "Paketti: %s (%s)"
 
-#~ msgid "Maintainer"
-#~ msgstr "Ylläpitäjä"
+#~ msgid "All packages in this section"
+#~ msgstr "Kaikki tämän osaston paketit"
 
-#~ msgid "Size is measured in kBytes."
-#~ msgstr "Koko mitataan kilotavuissa."
+#~ msgid "Distribution:"
+#~ msgstr "Jakelu:"
 
-#~ msgid ""
-#~ "Users of experimental packages are encouraged to contact the package "
-#~ "maintainers directly in case of problems."
-#~ msgstr ""
-#~ "Kokeellisten pakettien käyttäjiä kehotetaan ottamaan ongelmatapauksissa "
-#~ "yhteyttä suoraan paketin ylläpitäjiin."
+#~ msgid "File"
+#~ msgstr "Tiedosto"
 
-#~ msgid ""
-#~ "Packages that were added to the \"%s\" component next to the unstable "
-#~ "Debian archive during the last 7 days."
-#~ msgstr ""
-#~ "Paketit, jotka on lisätty komponenttiin \"%s\" epävakaaseen Debian-"
-#~ "arkistoon viimeisen seitsemän (7) päivän aikana."
+#~ msgid "New Packages in \"%s\""
+#~ msgstr "Uudet paketit komponentissa \"%s\""
 
-#~ msgid ""
-#~ "The following packages were added to the \"%s\" component next to the "
-#~ "Debian archive during the last 7 days."
-#~ msgstr ""
-#~ "Seuraavat paketit on lisätty komponenttiin \"%s\" Debian-arkistoon "
-#~ "viimeisen seitsemän (7) päivän aikana."
+#~ msgid "<a href=\"%s\">Search for the package</a>"
+#~ msgstr "<a href=\"%s\">Hae pakettia</a>"
 
-#~ msgid ""
-#~ "Packages that were added to the unstable Debian archive during the last 7 "
-#~ "days."
-#~ msgstr ""
-#~ "Paketit, jotka on lisätty epävakaaseen Debian-arkistoon viimeisen "
-#~ "seitsemän (7) päivän aikana."
+#~ msgid "Error"
+#~ msgstr "Virhe"
 
-#~ msgid ""
-#~ "Warning: The <span class=\"pred\">experimental</span> distribution "
-#~ "contains software that is likely unstable or buggy and may even cause "
-#~ "data loss. If you ignore this warning and install it nevertheless, you do "
-#~ "it on your own risk."
-#~ msgstr ""
-#~ "Varoitus: <span clas=\"pred\">kokeellinen</span> jakelu sisältää "
-#~ "ohjelmistoja, jotka ovat luultavasti epävakaita sekä bugisia, ja voi "
-#~ "aiheuttaa jopa tiedonhäviötä. Mikäli ohitat tämän varoituksen ja asennat "
-#~ "paketin kaikesta huolimatta, otat vastuun itsellesi."
+#~ msgid "Software Packages in \"%s\", priority %s"
+#~ msgstr "Ohjelmistopaketit jakelussa \"%s\" tärkeysasteella %s"
 
-#~ msgid "Initialization of Template Engine failed: %s"
-#~ msgstr "Mallinemoottorin alustus epäonnistui: %s"
+#~ msgid "Software Packages in \"%s\""
+#~ msgstr "Ohjelmistopaketit jakelussa \"%s\""
 
-#~ msgid "two or more packages specified (%s)"
-#~ msgstr "kaksi tai useampi pakettia määritetty (%s)"
+#~ msgid "compact compressed textlist"
+#~ msgstr "pieni tiivistetty tekstiluettelo"
 
-#~ msgid "%s set more than once in path"
-#~ msgstr "%s asetettu useammin kuin kerran polussa"
+#~ msgid "All packages"
+#~ msgstr "Kaikki paketit"
 
-#~ msgid ""
-#~ "We're supposed to display the homepage here, instead of getting dispatch."
-#~ "pl"
-#~ msgstr "Meidän pitäisi näyttää kotisivu tässä dispatch.pl:n sijaan."
+#~ msgid "List of all packages"
+#~ msgstr "Luettelo kaikista paketeista"
 
-#~ msgid "search doesn't take any more path elements"
-#~ msgstr "haku ei ota enempää polkuelementtejä"
+#~ msgid "List of sections in \"%s\""
+#~ msgstr "Osastoluettelo jakelussa \"%s\""
diff --git a/po/pdo.fr.po b/po/pdo.fr.po
index 69058e2..2b9a801 100644
--- a/po/pdo.fr.po
+++ b/po/pdo.fr.po
@@ -6,31 +6,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-17 21:01+0100\n"
-"PO-Revision-Date: 2008-02-26 18:56+0100\n"
+"POT-Creation-Date: 2008-02-08 17:22+0100\n"
+"PO-Revision-Date: 2008-02-29 10:39+0100\n"
 "Last-Translator: Guilhelm Panaget <guilhelm.panaget@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: bin/create_index_pages:233
+#: bin/create_index_pages:68
+#, fuzzy
+msgid "virtual package provided by"
+msgstr "paquet virtuel"
+
+#: bin/create_index_pages:162 bin/create_index_pages:383
 #, fuzzy
 #| msgid "Section:"
 msgid "Section"
 msgstr "Section&nbsp;:"
 
-#: bin/create_index_pages:245
+#: bin/create_index_pages:169 bin/create_index_pages:390
 #, fuzzy
 #| msgid "Section:"
 msgid "Subsection"
 msgstr "Section&nbsp;:"
 
-#: bin/create_index_pages:257
+#: bin/create_index_pages:176 bin/create_index_pages:397
 msgid "Priority"
 msgstr "Priorité"
 
-#: lib/Packages/Dispatcher.pm:312
+#: lib/Packages/Dispatcher.pm:319
 msgid "requested format not available for this document"
 msgstr ""
 
@@ -78,7 +83,7 @@ msgstr ""
 msgid "more than one subsection specified for show_static (%s)"
 msgstr ""
 
-#: lib/Packages/DoIndex.pm:75
+#: lib/Packages/DoIndex.pm:70
 #, perl-format
 msgid "couldn't read index file %s: %s"
 msgstr "impossible de lire le fichier d'index %s&nbsp;: %s"
@@ -102,15 +107,15 @@ msgstr ""
 msgid "keyword too short (keywords need to have at least two characters)"
 msgstr ""
 
-#: lib/Packages/DoSearch.pm:165
+#: lib/Packages/DoSearch.pm:170
 msgid "Exact hits"
 msgstr "Résultats exacts"
 
-#: lib/Packages/DoSearch.pm:175
+#: lib/Packages/DoSearch.pm:180
 msgid "Other hits"
 msgstr "Autres résultats"
 
-#: lib/Packages/DoSearch.pm:234
+#: lib/Packages/DoSearch.pm:239
 msgid "Virtual package"
 msgstr "Paquet virtuel"
 
@@ -161,251 +166,263 @@ msgid "package has bad maintainer field"
 msgstr "paquet doté d'un champ de responsable incorrect"
 
 #, fuzzy
-#~ msgid "Source Packages in \"%s\", %s %s"
-#~ msgstr "Paquets de «&nbsp;%s&nbsp;», section %s"
-
-#, fuzzy
-#~| msgid "Software Packages in \"%s\""
-#~ msgid "Source Packages in \"%s\""
-#~ msgstr "Paquets inclus dans «&nbsp;%s&nbsp;»"
+#~ msgid "two or more packages specified (%s)"
+#~ msgstr "Paquet source&nbsp;: %s (%s)"
 
 #, fuzzy
-#~ msgid "Software Packages in \"%s\", %s %s"
-#~ msgstr "Paquets de «&nbsp;%s&nbsp;», section %s"
-
-#~ msgid "Software Packages in \"%s\""
-#~ msgstr "Paquets inclus dans «&nbsp;%s&nbsp;»"
+#~ msgid ""
+#~ "Note that the <strong>experimental</strong> distribution is not self-"
+#~ "contained; missing dependencies are likely found in the <a href=\"%s"
+#~ "\">unstable</a> distribution."
+#~ msgstr ""
+#~ "Veuillez noter que la distribution «&nbsp;\"<span class=\"pred"
+#~ "\">experimental</span>\"&nbsp;» n'est pas autosuffisante&nbsp;; certaines "
+#~ "dépendances peuvent se trouver dans la distribution «&nbsp;\"<a href="
+#~ "\"../../unstable/\">unstable</a>\"&nbsp;»."
 
-#~ msgid "Distribution:"
-#~ msgstr "Distribution&nbsp;:"
+#~ msgid "Versions:"
+#~ msgstr "Versions&nbsp;:"
 
-#, fuzzy
-#~ msgid "Overview over this suite"
-#~ msgstr "Vue d'ensemble de cette distribution"
+#~ msgid ""
+#~ "Copyright (C) 1997-2005 SPI;\n"
+#~ "See <URL:http://www.debian.org/license> for the license terms.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Copyright © 1997-2005 SPI&nbsp;;voir <URL:http://www.debian.org/license> "
+#~ "les termes de la licence.\n"
 
-#, fuzzy
-#~| msgid "All packages"
-#~ msgid "All Packages"
-#~ msgstr "Tous les paquets"
+#~ msgid "No essential packages in this suite"
+#~ msgstr "Aucun paquet essentiel dans cette distribution"
 
-#, fuzzy
-#~ msgid "Source"
-#~ msgstr "Paquet source&nbsp;:"
+#~ msgid "Software Packages in \"%s\", essential packages"
+#~ msgstr "Paquets de «&nbsp;%s&nbsp;», paquets essentiels"
 
-#, fuzzy
-#~ msgid "Source packages"
-#~ msgstr "Paquet source"
+#~ msgid "No packages with this priority in this suite"
+#~ msgstr "Aucun paquet de cette priorité et cette distribution"
 
-#~ msgid "All packages in this section"
-#~ msgstr "Tous les paquets de cette section"
+#~ msgid ""
+#~ "Warning: These packages are intended for the use in building <a href="
+#~ "\"http://www.debian.org/devel/debian-installer/\">debian-installer</a> "
+#~ "images only. Do not install them on a normal Debian system."
+#~ msgstr ""
+#~ "Avertissement&nbsp;: ces paquets sont réservés à la construction des "
+#~ "images de l'<a href=\"http://www.debian.org/devel/debian-installer"
+#~ "\">installateur Debian</a>. Ils ne doivent pas être installés sur un "
+#~ "système Debian classique."
 
-#, fuzzy
-#~ msgid "Package:"
-#~ msgstr "Taille du paquet"
+#~ msgid "yes"
+#~ msgstr "oui"
 
-#, fuzzy
-#~ msgid "List of sections in \"%s\""
-#~ msgstr "Liste des sections de %s"
+#~ msgid "Essential"
+#~ msgstr "Essentiel"
 
-#, fuzzy
-#~| msgid "List of all packages"
-#~ msgid "List of all source packages"
-#~ msgstr "Liste de tous les paquets"
+#~ msgid "Uploaders"
+#~ msgstr "Expéditeurs"
 
-#~ msgid "List of all packages"
-#~ msgstr "Liste de tous les paquets"
+#~ msgid "Maintainer"
+#~ msgstr "Responsable"
 
-#, fuzzy
-#~ msgid "All source packages"
-#~ msgstr "Paquet source"
+#~ msgid "Size is measured in kBytes."
+#~ msgstr "La taille est indiquée en kOctets"
 
-#, fuzzy
-#~| msgid "All packages"
-#~ msgid "All packages"
-#~ msgstr "Tous les paquets"
+#~ msgid ""
+#~ "Users of experimental packages are encouraged to contact the package "
+#~ "maintainers directly in case of problems."
+#~ msgstr ""
+#~ "Nous encourageons les utilisateurs de paquets d'«&nbsp;experimental&nbsp;» "
+#~ "rencontrant des problèmes à contacter directement le responsable du "
+#~ "paquet."
 
-#~ msgid "compact compressed textlist"
-#~ msgstr "liste au format texte compressée"
+#~ msgid ""
+#~ "Packages that were added to the \"%s\" component next to the unstable "
+#~ "Debian archive during the last 7 days."
+#~ msgstr ""
+#~ "Paquets ayant été ajoutés à la section «&nbsp;%s&nbsp;» de l'archive "
+#~ "Debian «&nbsp;unstable&nbsp;» au cours des 7&nbsp;derniers jours."
 
-#, fuzzy
-#~ msgid "Software Packages in \"%s\", subsection %s"
-#~ msgstr "Paquets de «&nbsp;%s&nbsp;», section %s"
+#~ msgid ""
+#~ "The following packages were added to the \"%s\" component next to the "
+#~ "Debian archive during the last 7 days."
+#~ msgstr ""
+#~ "Les paquets suivants ont été ajoutés à la section «&nbsp;%s&nbsp;» de "
+#~ "l'archive Debian au cours des 7&nbsp;derniers jours."
 
-#~ msgid "Software Packages in \"%s\", priority %s"
-#~ msgstr "Paquets de «&nbsp;%s&nbsp;», priorité %s"
+#~ msgid ""
+#~ "Packages that were added to the unstable Debian archive during the last 7 "
+#~ "days."
+#~ msgstr ""
+#~ "Paquets ayant été ajoutés à l'archive Debian «&nbsp;unstable&nbsp;» au "
+#~ "cours des 7&nbsp;derniers jours."
 
-#, fuzzy
-#~ msgid "search for a package"
-#~ msgstr "Liste de tous les paquets"
+#~ msgid ""
+#~ "Warning: The <span class=\"pred\">experimental</span> distribution "
+#~ "contains software that is likely unstable or buggy and may even cause "
+#~ "data loss. If you ignore this warning and install it nevertheless, you do "
+#~ "it on your own risk."
+#~ msgstr ""
+#~ "Avertissement&nbsp;: la distribution «&nbsp;<span class=\"pred"
+#~ "\">experimental</span>&nbsp;» contient des logiciels qui peuvent être "
+#~ "instables ou bogués et peuvent éventuellement corrompre vos données. Leur "
+#~ "installation s'effectue donc à vos risques et périls."
 
 #, fuzzy
-#~ msgid "Filelist of of package %s/%s/%s"
-#~ msgstr "Liste de tous les paquets"
+#~ msgid "How to set <a href=\"%s\">the default document language</a>"
+#~ msgstr ""
+#~ "Comment configurer la <a href=\"%s\">langue par défaut du document</a></p>"
 
-#~ msgid "New Packages in \"%s\""
-#~ msgstr "Nouveaux Paquets dans «&nbsp;%s&nbsp;»"
+#~ msgid "This page is also available in the following languages:\n"
+#~ msgstr "Cette page est aussi disponible dans les langues suivantes&nbsp;:\n"
 
-#, fuzzy
-#~ msgid "new packages"
-#~ msgstr "Taille du paquet"
+#~ msgid ""
+#~ "Debian is a registered trademark of Software in the Public Interest, Inc."
+#~ msgstr ""
+#~ "Debian est une marque déposée de Software in the Public Interest, Inc."
 
-#, fuzzy
 #~ msgid ""
-#~ "The following packages were added to suite <em>%s</em>%s in the Debian "
-#~ "archive during the last 7 days."
+#~ "Copyright &copy; 1997-2005 <a href=\"http://www.spi-inc.org\">SPI</a>; "
+#~ "See <a href=\"%s/license\">license terms</a>."
 #~ msgstr ""
-#~ "Les paquets suivants ont été ajoutés à l'archive Debian «&nbsp;"
-#~ "unstable&nbsp;» au cours des 7&nbsp;derniers jours."
+#~ "Copyright &copy; 1997-2005 <a href=\"http://www.spi-inc.org\">SPI</"
+#~ "a>&nbsp;; voir <a href=\"%s/license\">les termes de la licence</a>."
 
-#, fuzzy
-#~ msgid " (section %s)"
-#~ msgstr "Section"
+#~ msgid "Last Modified: "
+#~ msgstr "Dernière modification&nbsp;: "
 
-#, fuzzy
 #~ msgid ""
-#~ "This information is also available as an <a href=\"%s\">RSS feed</a>."
+#~ "To report a problem with the web site, e-mail <a href=\"mailto:%s\">%s</"
+#~ "a>. For other contact information, see the Debian <a href=\"%s/contact"
+#~ "\">contact page</a>."
 #~ msgstr ""
-#~ "Cette information est aussi disponible via le <a href=\"newpkg_%s.%s.rdf"
-#~ "\">fil RSS</a>."
-
-#, fuzzy
-#~ msgid "New packages in %s"
-#~ msgstr "Nouveaux Paquets dans «&nbsp;%s&nbsp;»"
+#~ "Pour signaler un problème sur le site web, envoyez un courriel en anglais "
+#~ "à <a href=\"mailto:%s\">%s</a> ou en français à <a href=\"mailto:debian-"
+#~ "l10n-french@lists.debian.org\">debian-l10n-french@lists.debian.org</a>. "
+#~ "Pour obtenir d'autres informations, référez-vous à la <a href=\"%s/contact"
+#~ "\">page contact</a> de Debian."
 
-#, fuzzy
 #~ msgid ""
-#~ "The following packages were added to suite %s%s in the Debian archive "
-#~ "during the last 7 days."
+#~ "Back to: <a href=\"%s/\">Debian Project homepage</a> || <a href=\"%s/"
+#~ "\">Packages search page</a>"
 #~ msgstr ""
-#~ "Les paquets suivants ont été ajoutés à l'archive Debian «&nbsp;"
-#~ "unstable&nbsp;» au cours des 7&nbsp;derniers jours."
+#~ "Retour à la&nbsp;: <a href=\"%s/\">Page d'accueil du Projet Debian</a> || "
+#~ "<a href=\"%s/\">Page de recherche de paquets</a>"
 
-#, fuzzy
-#~ msgid "New Debian Packages"
-#~ msgstr "Tous les paquets Debian dans «&nbsp;%s&nbsp;»"
+#~ msgid "Site map"
+#~ msgstr "Plan&nbsp;du&nbsp;site"
 
-#, fuzzy
-#~ msgid "all sections"
-#~ msgstr "Section"
+#~ msgid "Development"
+#~ msgstr "Le&nbsp;coin&nbsp;du&nbsp;développeur"
 
-#, fuzzy
-#~ msgid "all architectures"
-#~ msgstr "Architecture"
+#~ msgid "Support"
+#~ msgstr "Assistance"
+
+#~ msgid "Getting&nbsp;Debian"
+#~ msgstr "Obtenir&nbsp;Debian"
+
+#~ msgid "News"
+#~ msgstr "Actualités"
+
+#~ msgid "About&nbsp;Debian"
+#~ msgstr "À&nbsp;propos&nbsp;de&nbsp;Debian"
+
+#~ msgid "Skip Site Navigation"
+#~ msgstr "Sauter la navigation du site"
+
+#~ msgid "Debian Project"
+#~ msgstr "Projet Debian"
 
 #, fuzzy
-#~ msgid "packages"
+#~ msgid "Package contents"
 #~ msgstr "Taille du paquet"
 
 #, fuzzy
-#~ msgid ""
-#~ "You can try a different search on the <a href=\"%s\">Packages search "
-#~ "page</a>."
-#~ msgstr ""
-#~ "Retour à la&nbsp;: <a href=\"%s/\">Page d'accueil du Projet Debian</a> || "
-#~ "<a href=\"%s/\">Page de recherche de paquets</a>"
+#~ msgid "Source package names"
+#~ msgstr "Paquet source"
 
 #, fuzzy
-#~ msgid "Debian Package Search Results"
-#~ msgstr "Tous les paquets Debian dans «&nbsp;%s&nbsp;»"
+#~ msgid "Descriptions"
+#~ msgstr "Distribution&nbsp;:"
 
 #, fuzzy
-#~ msgid "Package %s"
-#~ msgstr "Paquet&nbsp;: %s (%s)"
+#~ msgid "Package Names"
+#~ msgstr "Taille du paquet"
 
 #, fuzzy
-#~ msgid "Binary packages: "
-#~ msgstr "paquet virtuel"
+#~ msgid "Search on:"
+#~ msgstr "Recherche"
 
-#, fuzzy
-#~ msgid "Nothing found"
-#~ msgstr "Introuvable"
+#~ msgid "Search"
+#~ msgstr "Recherche"
 
-#~ msgid "File"
-#~ msgstr "Fichier"
+#~ msgid "or"
+#~ msgstr "ou"
 
 #, fuzzy
-#~ msgid "Source package building this package"
-#~ msgstr "Paquet source"
-
-#~ msgid "Package: %s (%s)"
-#~ msgstr "Paquet&nbsp;: %s (%s)"
-
-#~ msgid "Experimental package"
-#~ msgstr "Paquet «&nbsp;experimental&nbsp;»"
+#~ msgid "%s packages"
+#~ msgstr "Taille du paquet"
 
 #, fuzzy
-#~ msgid ""
-#~ "Warning: This package is from the <strong>experimental</strong> "
-#~ "distribution. That means it is likely unstable or buggy, and it may even "
-#~ "cause data loss. If you ignore this warning and install it nevertheless, "
-#~ "you do it on your own risk."
-#~ msgstr ""
-#~ "Avertissement&nbsp;: ce paquet appartient à la distribution «&nbsp;<span "
-#~ "class=\"pred\">experimental</span>&nbsp;». Cela signifie qu'il peut être "
-#~ "instable ou bogué et peut éventuellement corrompre vos données. Son "
-#~ "installation s'effectue donc à vos risques et périls."
+#~ msgid "also a virtual package provided by "
+#~ msgstr "paquet virtuel"
 
-#~ msgid "debian-installer udeb package"
-#~ msgstr "paquet de l'installateur Debian udeb"
+#~ msgid "Search for <a href=\"%s\">other versions of %s</a>"
+#~ msgstr "Chercher d'<a href=\"%s\">autres versions de %s</a>"
 
-#~ msgid ""
-#~ "Warning: This package is intended for the use in building <a href="
-#~ "\"http://www.debian.org/devel/debian-installer\">debian-installer</a> "
-#~ "images only. Do not install it on a normal Debian system."
+#~ msgid "See the <a href=\"%s\">developer information for %s</a>."
 #~ msgstr ""
-#~ "Avertissement&nbsp;: ce paquet est réservé à la construction des images "
-#~ "de l'<a href=\"http://www.debian.org/devel/debian-installer"
-#~ "\">installateur Debian</a>. Il ne doit pas être installé sur un système "
-#~ "Debian classique."
+#~ "Consulter les <a href=\"%s\">informations de développement de %s</a>."
 
-#~ msgid "Other Packages Related to %s"
-#~ msgstr "Autres paquets associés à %s"
+#~ msgid " and %s are responsible for this Debian package."
+#~ msgstr " et %s sont responsables de ce paquet Debian."
 
-#~ msgid "Download %s\n"
-#~ msgstr "Télécharger %s\n"
+#~ msgid "%s is responsible for this Debian package."
+#~ msgstr "%s est responsable de ce paquet Debian."
 
-#~ msgid ""
-#~ "The download table links to the download of the package and a file "
-#~ "overview. In addition it gives information about the package size and the "
-#~ "installed size."
-#~ msgstr ""
-#~ "Le tableau de téléchargement pointe sur le téléchargement du paquet et "
-#~ "sur un aperçu du fichier. Il indique par ailleurs la taille du paquet et "
-#~ "l'espace occupé une fois installé."
+#~ msgid "View the <a href=\"%s\">copyright file</a>"
+#~ msgstr "Consulter le <a href=\"%s\">fichier de licence</a>"
 
-#~ msgid "Download for all available architectures"
-#~ msgstr "Télécharger pour toutes les architectures proposées"
+#~ msgid "View the <a href=\"%s\">Debian changelog</a>"
+#~ msgstr "Consulter le <a href=\"%s\">journal des modifications Debian</a>"
 
-#~ msgid "Architecture"
-#~ msgstr "Architecture"
+#~ msgid "Not found"
+#~ msgstr "Introuvable"
 
-#~ msgid "Version"
-#~ msgstr "Version"
-
-#~ msgid "Files"
-#~ msgstr "Fichiers"
+#~ msgid "Download"
+#~ msgstr "Télécharger"
 
-#~ msgid "Installed Size"
-#~ msgstr "Espace occupé"
+#~ msgid "Source Package:"
+#~ msgstr "Paquet source&nbsp;:"
 
-#~ msgid "Package Size"
-#~ msgstr "Taille du paquet"
+#~ msgid "Check for <a href=\"%s\">Bug Reports</a> about %s."
+#~ msgstr "Consulter les <a href=\"%s\">rapports de bogues</a> de %s."
 
-#~ msgid "list of files"
-#~ msgstr "liste des fichiers"
+#, fuzzy
+#~ msgid "Details of package %s in %s"
+#~ msgstr "Nouveaux paquets dans «&nbsp;%s&nbsp;»"
 
 #, fuzzy
-#~ msgid "no current information"
-#~ msgstr "Plus d'informations sur %s"
+#~ msgid "Details of source package %s in %s"
+#~ msgstr "Paquets source dans «&nbsp;%s&nbsp;»"
 
-#~ msgid "virtual package"
-#~ msgstr "paquet virtuel"
+#~ msgid "md5sum"
+#~ msgstr "code de contrôle MD5"
 
-#~ msgid "Overview over this distribution"
-#~ msgstr "Vue d'ensemble de cette distribution"
+#~ msgid "Size (in kB)"
+#~ msgstr "Taille (en kOctets)"
 
-#~ msgid "Virtual Package: %s"
-#~ msgstr "Paquet virtuel&nbsp;: %s"
+#~ msgid "Download %s"
+#~ msgstr "Télécharger %s"
+
+#~ msgid "The following binary packages are built from this source package:"
+#~ msgstr ""
+#~ "Les paquets binaires suivants sont compilés à partir de ce paquet "
+#~ "source&nbsp;:"
+
+#, fuzzy
+#~ msgid "Source Package: %s (%s)"
+#~ msgstr "Paquet source&nbsp;: %s (%s)"
+
+#~ msgid "Packages providing %s"
+#~ msgstr "Paquets fournissant %s"
 
 #~ msgid ""
 #~ "This is a <em>virtual package</em>. See the <a href=\"%s\">Debian policy</"
@@ -416,265 +433,249 @@ msgstr "paquet doté d'un champ de responsable incorrect"
 #~ "Debian</a> pour une <a href=\"%sch-binary.html#s-virtual_pkg\">définition "
 #~ "des paquets virtuels</a>."
 
-#~ msgid "Packages providing %s"
-#~ msgstr "Paquets fournissant %s"
-
-#, fuzzy
-#~ msgid "Source Package: %s (%s)"
-#~ msgstr "Paquet source&nbsp;: %s (%s)"
-
-#~ msgid "The following binary packages are built from this source package:"
-#~ msgstr ""
-#~ "Les paquets binaires suivants sont compilés à partir de ce paquet "
-#~ "source&nbsp;:"
-
-#~ msgid "Download %s"
-#~ msgstr "Télécharger %s"
+#~ msgid "Virtual Package: %s"
+#~ msgstr "Paquet virtuel&nbsp;: %s"
 
-#~ msgid "Size (in kB)"
-#~ msgstr "Taille (en kOctets)"
+#~ msgid "Overview over this distribution"
+#~ msgstr "Vue d'ensemble de cette distribution"
 
-#~ msgid "md5sum"
-#~ msgstr "code de contrôle MD5"
+#~ msgid "virtual package"
+#~ msgstr "paquet virtuel"
 
 #, fuzzy
-#~ msgid "Details of source package %s in %s"
-#~ msgstr "Paquets source dans «&nbsp;%s&nbsp;»"
+#~ msgid "no current information"
+#~ msgstr "Plus d'informations sur %s"
 
-#, fuzzy
-#~ msgid "Details of package %s in %s"
-#~ msgstr "Nouveaux paquets dans «&nbsp;%s&nbsp;»"
+#~ msgid "list of files"
+#~ msgstr "liste des fichiers"
 
-#~ msgid "Check for <a href=\"%s\">Bug Reports</a> about %s."
-#~ msgstr "Consulter les <a href=\"%s\">rapports de bogues</a> de %s."
+#~ msgid "Package Size"
+#~ msgstr "Taille du paquet"
 
-#~ msgid "Source Package:"
-#~ msgstr "Paquet source&nbsp;:"
+#~ msgid "Installed Size"
+#~ msgstr "Espace occupé"
 
-#~ msgid "Download"
-#~ msgstr "Télécharger"
+#~ msgid "Files"
+#~ msgstr "Fichiers"
 
-#~ msgid "Not found"
-#~ msgstr "Introuvable"
+#~ msgid "Version"
+#~ msgstr "Version"
 
-#~ msgid "View the <a href=\"%s\">Debian changelog</a>"
-#~ msgstr "Consulter le <a href=\"%s\">journal des modifications Debian</a>"
+#~ msgid "Architecture"
+#~ msgstr "Architecture"
 
-#~ msgid "View the <a href=\"%s\">copyright file</a>"
-#~ msgstr "Consulter le <a href=\"%s\">fichier de licence</a>"
+#~ msgid "Download for all available architectures"
+#~ msgstr "Télécharger pour toutes les architectures proposées"
 
-#~ msgid "%s is responsible for this Debian package."
-#~ msgstr "%s est responsable de ce paquet Debian."
+#~ msgid ""
+#~ "The download table links to the download of the package and a file "
+#~ "overview. In addition it gives information about the package size and the "
+#~ "installed size."
+#~ msgstr ""
+#~ "Le tableau de téléchargement pointe sur le téléchargement du paquet et "
+#~ "sur un aperçu du fichier. Il indique par ailleurs la taille du paquet et "
+#~ "l'espace occupé une fois installé."
 
-#~ msgid " and %s are responsible for this Debian package."
-#~ msgstr " et %s sont responsables de ce paquet Debian."
+#~ msgid "Download %s\n"
+#~ msgstr "Télécharger %s\n"
 
-#~ msgid "See the <a href=\"%s\">developer information for %s</a>."
+#~ msgid "Other Packages Related to %s"
+#~ msgstr "Autres paquets associés à %s"
+
+#~ msgid ""
+#~ "Warning: This package is intended for the use in building <a href="
+#~ "\"http://www.debian.org/devel/debian-installer\">debian-installer</a> "
+#~ "images only. Do not install it on a normal Debian system."
 #~ msgstr ""
-#~ "Consulter les <a href=\"%s\">informations de développement de %s</a>."
+#~ "Avertissement&nbsp;: ce paquet est réservé à la construction des images "
+#~ "de l'<a href=\"http://www.debian.org/devel/debian-installer"
+#~ "\">installateur Debian</a>. Il ne doit pas être installé sur un système "
+#~ "Debian classique."
 
-#~ msgid "Search for <a href=\"%s\">other versions of %s</a>"
-#~ msgstr "Chercher d'<a href=\"%s\">autres versions de %s</a>"
+#~ msgid "debian-installer udeb package"
+#~ msgstr "paquet de l'installateur Debian udeb"
 
 #, fuzzy
-#~ msgid "also a virtual package provided by "
-#~ msgstr "paquet virtuel"
+#~ msgid ""
+#~ "Warning: This package is from the <strong>experimental</strong> "
+#~ "distribution. That means it is likely unstable or buggy, and it may even "
+#~ "cause data loss. If you ignore this warning and install it nevertheless, "
+#~ "you do it on your own risk."
+#~ msgstr ""
+#~ "Avertissement&nbsp;: ce paquet appartient à la distribution «&nbsp;<span "
+#~ "class=\"pred\">experimental</span>&nbsp;». Cela signifie qu'il peut être "
+#~ "instable ou bogué et peut éventuellement corrompre vos données. Son "
+#~ "installation s'effectue donc à vos risques et périls."
 
-#, fuzzy
-#~ msgid "virtual package provided by "
-#~ msgstr "paquet virtuel"
+#~ msgid "Experimental package"
+#~ msgstr "Paquet «&nbsp;experimental&nbsp;»"
+
+#~ msgid "Package: %s (%s)"
+#~ msgstr "Paquet&nbsp;: %s (%s)"
 
 #, fuzzy
-#~ msgid "%s packages"
-#~ msgstr "Taille du paquet"
+#~ msgid "Source package building this package"
+#~ msgstr "Paquet source"
 
-#~ msgid "or"
-#~ msgstr "ou"
+#~ msgid "File"
+#~ msgstr "Fichier"
 
-#~ msgid "Search"
-#~ msgstr "Recherche"
+#, fuzzy
+#~ msgid "Nothing found"
+#~ msgstr "Introuvable"
 
 #, fuzzy
-#~ msgid "Search on:"
-#~ msgstr "Recherche"
+#~ msgid "Binary packages: "
+#~ msgstr "paquet virtuel"
 
 #, fuzzy
-#~ msgid "Package Names"
-#~ msgstr "Taille du paquet"
+#~ msgid "Package %s"
+#~ msgstr "Paquet&nbsp;: %s (%s)"
 
 #, fuzzy
-#~ msgid "Descriptions"
-#~ msgstr "Distribution&nbsp;:"
+#~ msgid "Debian Package Search Results"
+#~ msgstr "Tous les paquets Debian dans «&nbsp;%s&nbsp;»"
 
 #, fuzzy
-#~ msgid "Source package names"
-#~ msgstr "Paquet source"
+#~ msgid ""
+#~ "You can try a different search on the <a href=\"%s\">Packages search "
+#~ "page</a>."
+#~ msgstr ""
+#~ "Retour à la&nbsp;: <a href=\"%s/\">Page d'accueil du Projet Debian</a> || "
+#~ "<a href=\"%s/\">Page de recherche de paquets</a>"
 
 #, fuzzy
-#~ msgid "Package contents"
+#~ msgid "packages"
 #~ msgstr "Taille du paquet"
 
-#~ msgid "Debian Project"
-#~ msgstr "Projet Debian"
-
-#~ msgid "Skip Site Navigation"
-#~ msgstr "Sauter la navigation du site"
-
-#~ msgid "About&nbsp;Debian"
-#~ msgstr "À&nbsp;propos&nbsp;de&nbsp;Debian"
-
-#~ msgid "News"
-#~ msgstr "Actualités"
-
-#~ msgid "Getting&nbsp;Debian"
-#~ msgstr "Obtenir&nbsp;Debian"
-
-#~ msgid "Support"
-#~ msgstr "Assistance"
+#, fuzzy
+#~ msgid "all architectures"
+#~ msgstr "Architecture"
 
-#~ msgid "Development"
-#~ msgstr "Le&nbsp;coin&nbsp;du&nbsp;développeur"
+#, fuzzy
+#~ msgid "all sections"
+#~ msgstr "Section"
 
-#~ msgid "Site map"
-#~ msgstr "Plan&nbsp;du&nbsp;site"
+#, fuzzy
+#~ msgid "New Debian Packages"
+#~ msgstr "Tous les paquets Debian dans «&nbsp;%s&nbsp;»"
 
+#, fuzzy
 #~ msgid ""
-#~ "Back to: <a href=\"%s/\">Debian Project homepage</a> || <a href=\"%s/"
-#~ "\">Packages search page</a>"
+#~ "The following packages were added to suite %s%s in the Debian archive "
+#~ "during the last 7 days."
 #~ msgstr ""
-#~ "Retour à la&nbsp;: <a href=\"%s/\">Page d'accueil du Projet Debian</a> || "
-#~ "<a href=\"%s/\">Page de recherche de paquets</a>"
+#~ "Les paquets suivants ont été ajoutés à l'archive Debian «&nbsp;"
+#~ "unstable&nbsp;» au cours des 7&nbsp;derniers jours."
+
+#, fuzzy
+#~ msgid "New packages in %s"
+#~ msgstr "Nouveaux Paquets dans «&nbsp;%s&nbsp;»"
 
+#, fuzzy
 #~ msgid ""
-#~ "To report a problem with the web site, e-mail <a href=\"mailto:%s\">%s</"
-#~ "a>. For other contact information, see the Debian <a href=\"%s/contact"
-#~ "\">contact page</a>."
+#~ "This information is also available as an <a href=\"%s\">RSS feed</a>."
 #~ msgstr ""
-#~ "Pour signaler un problème sur le site web, envoyez un courriel en anglais "
-#~ "à <a href=\"mailto:%s\">%s</a> ou en français à <a href=\"mailto:debian-"
-#~ "l10n-french@lists.debian.org\">debian-l10n-french@lists.debian.org</a>. "
-#~ "Pour obtenir d'autres informations, référez-vous à la <a href=\"%s/contact"
-#~ "\">page contact</a> de Debian."
+#~ "Cette information est aussi disponible via le <a href=\"newpkg_%s.%s.rdf"
+#~ "\">fil RSS</a>."
 
-#~ msgid "Last Modified: "
-#~ msgstr "Dernière modification&nbsp;: "
+#, fuzzy
+#~ msgid " (section %s)"
+#~ msgstr "Section"
 
+#, fuzzy
 #~ msgid ""
-#~ "Copyright &copy; 1997-2005 <a href=\"http://www.spi-inc.org\">SPI</a>; "
-#~ "See <a href=\"%s/license\">license terms</a>."
+#~ "The following packages were added to suite <em>%s</em>%s in the Debian "
+#~ "archive during the last 7 days."
 #~ msgstr ""
-#~ "Copyright &copy; 1997-2005 <a href=\"http://www.spi-inc.org\">SPI</"
-#~ "a>&nbsp;; voir <a href=\"%s/license\">les termes de la licence</a>."
+#~ "Les paquets suivants ont été ajoutés à l'archive Debian «&nbsp;"
+#~ "unstable&nbsp;» au cours des 7&nbsp;derniers jours."
 
-#~ msgid ""
-#~ "Debian is a registered trademark of Software in the Public Interest, Inc."
-#~ msgstr ""
-#~ "Debian est une marque déposée de Software in the Public Interest, Inc."
+#, fuzzy
+#~ msgid "new packages"
+#~ msgstr "Taille du paquet"
 
-#~ msgid "This page is also available in the following languages:\n"
-#~ msgstr "Cette page est aussi disponible dans les langues suivantes&nbsp;:\n"
+#~ msgid "New Packages in \"%s\""
+#~ msgstr "Nouveaux Paquets dans «&nbsp;%s&nbsp;»"
 
 #, fuzzy
-#~ msgid "How to set <a href=\"%s\">the default document language</a>"
-#~ msgstr ""
-#~ "Comment configurer la <a href=\"%s\">langue par défaut du document</a></p>"
+#~ msgid "Filelist of of package %s/%s/%s"
+#~ msgstr "Liste de tous les paquets"
 
-#~ msgid ""
-#~ "Warning: The <span class=\"pred\">experimental</span> distribution "
-#~ "contains software that is likely unstable or buggy and may even cause "
-#~ "data loss. If you ignore this warning and install it nevertheless, you do "
-#~ "it on your own risk."
-#~ msgstr ""
-#~ "Avertissement&nbsp;: la distribution «&nbsp;<span class=\"pred"
-#~ "\">experimental</span>&nbsp;» contient des logiciels qui peuvent être "
-#~ "instables ou bogués et peuvent éventuellement corrompre vos données. Leur "
-#~ "installation s'effectue donc à vos risques et périls."
+#, fuzzy
+#~ msgid "search for a package"
+#~ msgstr "Liste de tous les paquets"
 
-#~ msgid ""
-#~ "Packages that were added to the unstable Debian archive during the last 7 "
-#~ "days."
-#~ msgstr ""
-#~ "Paquets ayant été ajoutés à l'archive Debian «&nbsp;unstable&nbsp;» au "
-#~ "cours des 7&nbsp;derniers jours."
+#~ msgid "Software Packages in \"%s\", priority %s"
+#~ msgstr "Paquets de «&nbsp;%s&nbsp;», priorité %s"
 
-#~ msgid ""
-#~ "The following packages were added to the \"%s\" component next to the "
-#~ "Debian archive during the last 7 days."
-#~ msgstr ""
-#~ "Les paquets suivants ont été ajoutés à la section «&nbsp;%s&nbsp;» de "
-#~ "l'archive Debian au cours des 7&nbsp;derniers jours."
+#, fuzzy
+#~ msgid "Software Packages in \"%s\", subsection %s"
+#~ msgstr "Paquets de «&nbsp;%s&nbsp;», section %s"
 
-#~ msgid ""
-#~ "Packages that were added to the \"%s\" component next to the unstable "
-#~ "Debian archive during the last 7 days."
-#~ msgstr ""
-#~ "Paquets ayant été ajoutés à la section «&nbsp;%s&nbsp;» de l'archive "
-#~ "Debian «&nbsp;unstable&nbsp;» au cours des 7&nbsp;derniers jours."
+#~ msgid "compact compressed textlist"
+#~ msgstr "liste au format texte compressée"
 
-#~ msgid ""
-#~ "Users of experimental packages are encouraged to contact the package "
-#~ "maintainers directly in case of problems."
-#~ msgstr ""
-#~ "Nous encourageons les utilisateurs de paquets d'«&nbsp;"
-#~ "experimental&nbsp;» rencontrant des problèmes à contacter directement le "
-#~ "responsable du paquet."
+#, fuzzy
+#~| msgid "All packages"
+#~ msgid "All packages"
+#~ msgstr "Tous les paquets"
 
-#~ msgid "Size is measured in kBytes."
-#~ msgstr "La taille est indiquée en kOctets"
+#, fuzzy
+#~ msgid "All source packages"
+#~ msgstr "Paquet source"
 
-#~ msgid "Maintainer"
-#~ msgstr "Responsable"
+#~ msgid "List of all packages"
+#~ msgstr "Liste de tous les paquets"
 
-#~ msgid "Uploaders"
-#~ msgstr "Expéditeurs"
+#, fuzzy
+#~| msgid "List of all packages"
+#~ msgid "List of all source packages"
+#~ msgstr "Liste de tous les paquets"
 
-#~ msgid "Essential"
-#~ msgstr "Essentiel"
+#, fuzzy
+#~ msgid "List of sections in \"%s\""
+#~ msgstr "Liste des sections de %s"
 
-#~ msgid "yes"
-#~ msgstr "oui"
+#, fuzzy
+#~ msgid "Package:"
+#~ msgstr "Taille du paquet"
 
-#~ msgid ""
-#~ "Warning: These packages are intended for the use in building <a href="
-#~ "\"http://www.debian.org/devel/debian-installer/\">debian-installer</a> "
-#~ "images only. Do not install them on a normal Debian system."
-#~ msgstr ""
-#~ "Avertissement&nbsp;: ces paquets sont réservés à la construction des "
-#~ "images de l'<a href=\"http://www.debian.org/devel/debian-installer"
-#~ "\">installateur Debian</a>. Ils ne doivent pas être installés sur un "
-#~ "système Debian classique."
+#~ msgid "All packages in this section"
+#~ msgstr "Tous les paquets de cette section"
 
-#~ msgid "No packages with this priority in this suite"
-#~ msgstr "Aucun paquet de cette priorité et cette distribution"
+#, fuzzy
+#~ msgid "Source packages"
+#~ msgstr "Paquet source"
 
-#~ msgid "Software Packages in \"%s\", essential packages"
-#~ msgstr "Paquets de «&nbsp;%s&nbsp;», paquets essentiels"
+#, fuzzy
+#~ msgid "Source"
+#~ msgstr "Paquet source&nbsp;:"
 
-#~ msgid "No essential packages in this suite"
-#~ msgstr "Aucun paquet essentiel dans cette distribution"
+#, fuzzy
+#~| msgid "All packages"
+#~ msgid "All Packages"
+#~ msgstr "Tous les paquets"
 
-#~ msgid ""
-#~ "Copyright (C) 1997-2005 SPI;\n"
-#~ "See <URL:http://www.debian.org/license> for the license terms.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Copyright © 1997-2005 SPI&nbsp;;voir <URL:http://www.debian.org/license> "
-#~ "les termes de la licence.\n"
+#, fuzzy
+#~ msgid "Overview over this suite"
+#~ msgstr "Vue d'ensemble de cette distribution"
 
-#~ msgid "Versions:"
-#~ msgstr "Versions&nbsp;:"
+#~ msgid "Distribution:"
+#~ msgstr "Distribution&nbsp;:"
+
+#~ msgid "Software Packages in \"%s\""
+#~ msgstr "Paquets inclus dans «&nbsp;%s&nbsp;»"
 
 #, fuzzy
-#~ msgid ""
-#~ "Note that the <strong>experimental</strong> distribution is not self-"
-#~ "contained; missing dependencies are likely found in the <a href=\"%s"
-#~ "\">unstable</a> distribution."
-#~ msgstr ""
-#~ "Veuillez noter que la distribution «&nbsp;\"<span class=\"pred"
-#~ "\">experimental</span>\"&nbsp;» n'est pas autosuffisante&nbsp;; certaines "
-#~ "dépendances peuvent se trouver dans la distribution «&nbsp;\"<a href="
-#~ "\"../../unstable/\">unstable</a>\"&nbsp;»."
+#~ msgid "Software Packages in \"%s\", %s %s"
+#~ msgstr "Paquets de «&nbsp;%s&nbsp;», section %s"
 
 #, fuzzy
-#~ msgid "two or more packages specified (%s)"
-#~ msgstr "Paquet source&nbsp;: %s (%s)"
+#~| msgid "Software Packages in \"%s\""
+#~ msgid "Source Packages in \"%s\""
+#~ msgstr "Paquets inclus dans «&nbsp;%s&nbsp;»"
+
+#, fuzzy
+#~ msgid "Source Packages in \"%s\", %s %s"
+#~ msgstr "Paquets de «&nbsp;%s&nbsp;», section %s"
diff --git a/po/pdo.hu.po b/po/pdo.hu.po
index f87e467..d7d1187 100644
--- a/po/pdo.hu.po
+++ b/po/pdo.hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-17 21:01+0100\n"
+"POT-Creation-Date: 2008-02-08 17:22+0100\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"
@@ -15,19 +15,23 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: bin/create_index_pages:233
+#: bin/create_index_pages:68
+msgid "virtual package provided by"
+msgstr ""
+
+#: bin/create_index_pages:162 bin/create_index_pages:383
 msgid "Section"
 msgstr ""
 
-#: bin/create_index_pages:245
+#: bin/create_index_pages:169 bin/create_index_pages:390
 msgid "Subsection"
 msgstr ""
 
-#: bin/create_index_pages:257
+#: bin/create_index_pages:176 bin/create_index_pages:397
 msgid "Priority"
 msgstr ""
 
-#: lib/Packages/Dispatcher.pm:312
+#: lib/Packages/Dispatcher.pm:319
 msgid "requested format not available for this document"
 msgstr ""
 
@@ -74,7 +78,7 @@ msgstr ""
 msgid "more than one subsection specified for show_static (%s)"
 msgstr ""
 
-#: lib/Packages/DoIndex.pm:75
+#: lib/Packages/DoIndex.pm:70
 #, perl-format
 msgid "couldn't read index file %s: %s"
 msgstr ""
@@ -97,15 +101,15 @@ msgstr ""
 msgid "keyword too short (keywords need to have at least two characters)"
 msgstr ""
 
-#: lib/Packages/DoSearch.pm:165
+#: lib/Packages/DoSearch.pm:170
 msgid "Exact hits"
 msgstr ""
 
-#: lib/Packages/DoSearch.pm:175
+#: lib/Packages/DoSearch.pm:180
 msgid "Other hits"
 msgstr ""
 
-#: lib/Packages/DoSearch.pm:234
+#: lib/Packages/DoSearch.pm:239
 msgid "Virtual package"
 msgstr ""
 
diff --git a/po/pdo.ja.po b/po/pdo.ja.po
index a175cf2..b89cda6 100644
--- a/po/pdo.ja.po
+++ b/po/pdo.ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: packages.debian.org trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-17 21:01+0100\n"
+"POT-Creation-Date: 2008-02-08 17:22+0100\n"
 "PO-Revision-Date: 2007-10-22 14:48+0900\n"
 "Last-Translator: Noritada Kobayashi <nori1@dolphin.c.u-tokyo.ac.jp>\n"
 "Language-Team: Japanese <debian-www@debian.or.jp>\n"
@@ -14,19 +14,23 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: bin/create_index_pages:233
+#: bin/create_index_pages:68
+msgid "virtual package provided by"
+msgstr "以下のパッケージによって提供される仮想パッケージです: "
+
+#: bin/create_index_pages:162 bin/create_index_pages:383
 msgid "Section"
 msgstr "セクション"
 
-#: bin/create_index_pages:245
+#: bin/create_index_pages:169 bin/create_index_pages:390
 msgid "Subsection"
 msgstr "サブセクション"
 
-#: bin/create_index_pages:257
+#: bin/create_index_pages:176 bin/create_index_pages:397
 msgid "Priority"
 msgstr "優先度"
 
-#: lib/Packages/Dispatcher.pm:312
+#: lib/Packages/Dispatcher.pm:319
 msgid "requested format not available for this document"
 msgstr "この文書は要求された形式では利用できません"
 
@@ -73,7 +77,7 @@ msgstr "show_static に複数のスイートが指定されています (%s)"
 msgid "more than one subsection specified for show_static (%s)"
 msgstr "show_static に複数のサブセクションが指定されています (%s)"
 
-#: lib/Packages/DoIndex.pm:75
+#: lib/Packages/DoIndex.pm:70
 #, perl-format
 msgid "couldn't read index file %s: %s"
 msgstr "索引ファイル %s を読み込めませんでした: %s"
@@ -96,15 +100,15 @@ msgstr "キーワードが不正か、または指定されていません"
 msgid "keyword too short (keywords need to have at least two characters)"
 msgstr "キーワードが短すぎます (キーワードは 2 文字以上である必要があります)"
 
-#: lib/Packages/DoSearch.pm:165
+#: lib/Packages/DoSearch.pm:170
 msgid "Exact hits"
 msgstr "完全なヒット"
 
-#: lib/Packages/DoSearch.pm:175
+#: lib/Packages/DoSearch.pm:180
 msgid "Other hits"
 msgstr "その他のヒット"
 
-#: lib/Packages/DoSearch.pm:234
+#: lib/Packages/DoSearch.pm:239
 msgid "Virtual package"
 msgstr "仮想パッケージ"
 
@@ -151,14 +155,8 @@ msgstr "入手不能"
 msgid "package has bad maintainer field"
 msgstr "パッケージのメンテナ (Maintainer) フィールドが不正です"
 
-#~ msgid "Initialization of Template Engine failed: %s"
-#~ msgstr "テンプレートエンジンの初期化に失敗しました: %s"
-
-#~ msgid "two or more packages specified (%s)"
-#~ msgstr "2 つ以上のパッケージが指定されています (%s)"
-
-#~ msgid "%s set more than once in path"
-#~ msgstr "%s がパスに複数入っています"
+#~ msgid "search doesn't take any more path elements"
+#~ msgstr "search の場合は後ろにパスを追加できません"
 
 #~ msgid ""
 #~ "We're supposed to display the homepage here, instead of getting dispatch."
@@ -167,5 +165,11 @@ msgstr "パッケージのメンテナ (Maintainer) フィールドが不正で
 #~ "ここには、dispatch.pl を取得するのではなくホームページを表示することになっ"
 #~ "ています。"
 
-#~ msgid "search doesn't take any more path elements"
-#~ msgstr "search の場合は後ろにパスを追加できません"
+#~ msgid "%s set more than once in path"
+#~ msgstr "%s がパスに複数入っています"
+
+#~ msgid "two or more packages specified (%s)"
+#~ msgstr "2 つ以上のパッケージが指定されています (%s)"
+
+#~ msgid "Initialization of Template Engine failed: %s"
+#~ msgstr "テンプレートエンジンの初期化に失敗しました: %s"
diff --git a/po/pdo.nl.po b/po/pdo.nl.po
index 7819f55..a547276 100644
--- a/po/pdo.nl.po
+++ b/po/pdo.nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pdo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-17 21:01+0100\n"
+"POT-Creation-Date: 2008-02-08 17:22+0100\n"
 "PO-Revision-Date: 2007-12-10 22:42+0100\n"
 "Last-Translator: Frans Pop <elendil@planet.nl>\n"
 "Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -17,21 +17,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: bin/create_index_pages:233
-#| msgid "Section:"
+#: bin/create_index_pages:68
+msgid "virtual package provided by"
+msgstr "virtueel pakket geboden door"
+
+#: bin/create_index_pages:162 bin/create_index_pages:383
 msgid "Section"
 msgstr "Sectie"
 
-#: bin/create_index_pages:245
-#| msgid "Section:"
+#: bin/create_index_pages:169 bin/create_index_pages:390
 msgid "Subsection"
 msgstr "Subsectie"
 
-#: bin/create_index_pages:257
+#: bin/create_index_pages:176 bin/create_index_pages:397
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: lib/Packages/Dispatcher.pm:312
+#: lib/Packages/Dispatcher.pm:319
 msgid "requested format not available for this document"
 msgstr ""
 
@@ -78,7 +80,7 @@ msgstr ""
 msgid "more than one subsection specified for show_static (%s)"
 msgstr ""
 
-#: lib/Packages/DoIndex.pm:75
+#: lib/Packages/DoIndex.pm:70
 #, perl-format
 msgid "couldn't read index file %s: %s"
 msgstr ""
@@ -90,7 +92,6 @@ msgstr ""
 
 #: lib/Packages/DoNewPkg.pm:43
 #, perl-format
-#| msgid "More Information on %s"
 msgid "no newpkg information found for suite %s"
 msgstr ""
 
@@ -102,15 +103,15 @@ msgstr ""
 msgid "keyword too short (keywords need to have at least two characters)"
 msgstr ""
 
-#: lib/Packages/DoSearch.pm:165
+#: lib/Packages/DoSearch.pm:170
 msgid "Exact hits"
 msgstr "Exacte resultaten"
 
-#: lib/Packages/DoSearch.pm:175
+#: lib/Packages/DoSearch.pm:180
 msgid "Other hits"
 msgstr "Overige resultaten"
 
-#: lib/Packages/DoSearch.pm:234
+#: lib/Packages/DoSearch.pm:239
 msgid "Virtual package"
 msgstr "Virtueel pakket"
 
@@ -142,7 +143,6 @@ msgstr " en anderen"
 
 #: lib/Packages/DoShow.pm:429
 #, perl-format
-#| msgid "not"
 msgid "not %s"
 msgstr "niet %s"
 
@@ -157,4 +157,3 @@ msgstr "Niet beschikbaar"
 #: lib/Packages/Page.pm:47
 msgid "package has bad maintainer field"
 msgstr "pakket heeft onjuist veld \"maintainer\""
-
diff --git a/po/pdo.pot b/po/pdo.pot
index d202104..970685a 100644
--- a/po/pdo.pot
+++ b/po/pdo.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-17 21:01+0100\n"
+"POT-Creation-Date: 2008-02-08 17:22+0100\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"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "more than one subsection specified for show_static (%s)"
 msgstr ""
 
-#: lib/Packages/DoIndex.pm:75
+#: lib/Packages/DoIndex.pm:70
 #, perl-format
 msgid "couldn't read index file %s: %s"
 msgstr ""
@@ -81,15 +81,15 @@ msgstr ""
 msgid "keyword too short (keywords need to have at least two characters)"
 msgstr ""
 
-#: lib/Packages/DoSearch.pm:165
+#: lib/Packages/DoSearch.pm:170
 msgid "Exact hits"
 msgstr ""
 
-#: lib/Packages/DoSearch.pm:175
+#: lib/Packages/DoSearch.pm:180
 msgid "Other hits"
 msgstr ""
 
-#: lib/Packages/DoSearch.pm:234
+#: lib/Packages/DoSearch.pm:239
 msgid "Virtual package"
 msgstr ""
 
@@ -136,18 +136,22 @@ msgstr ""
 msgid "package has bad maintainer field"
 msgstr ""
 
-#: lib/Packages/Dispatcher.pm:312
+#: lib/Packages/Dispatcher.pm:319
 msgid "requested format not available for this document"
 msgstr ""
 
-#: bin/create_index_pages:233
+#: bin/create_index_pages:68
+msgid "virtual package provided by"
+msgstr ""
+
+#: bin/create_index_pages:162 bin/create_index_pages:383
 msgid "Section"
 msgstr ""
 
-#: bin/create_index_pages:245
+#: bin/create_index_pages:169 bin/create_index_pages:390
 msgid "Subsection"
 msgstr ""
 
-#: bin/create_index_pages:257
+#: bin/create_index_pages:176 bin/create_index_pages:397
 msgid "Priority"
 msgstr ""
diff --git a/po/pdo.ru.po b/po/pdo.ru.po
index 2b6cfff..cde5b90 100644
--- a/po/pdo.ru.po
+++ b/po/pdo.ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pdo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-17 21:01+0100\n"
+"POT-Creation-Date: 2008-02-08 17:22+0100\n"
 "PO-Revision-Date: 2007-11-25 21:31+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -14,7 +14,28 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: bin/create_index_pages:68
+msgid "virtual package provided by"
+msgstr "виртуальный пакет, предоставляемый"
+
+#: bin/create_index_pages:162 bin/create_index_pages:383
+msgid "Section"
+msgstr "Секция"
+
+#: bin/create_index_pages:169 bin/create_index_pages:390
+msgid "Subsection"
+msgstr "Подсекция"
+
+#: bin/create_index_pages:176 bin/create_index_pages:397
+msgid "Priority"
+msgstr "Приоритет"
+
+#: lib/Packages/Dispatcher.pm:319
+msgid "requested format not available for this document"
+msgstr "запрошенный формат недоступен для этого документа"
 
 #: lib/Packages/DoDownload.pm:27 lib/Packages/DoFilelist.pm:27
 #: lib/Packages/DoShow.pm:31
@@ -59,7 +80,7 @@ msgstr "более одного комплекта указано для show_st
 msgid "more than one subsection specified for show_static (%s)"
 msgstr "более одной подсекции указано для show_static (%s)"
 
-#: lib/Packages/DoIndex.pm:75
+#: lib/Packages/DoIndex.pm:70
 #, perl-format
 msgid "couldn't read index file %s: %s"
 msgstr "невозможно прочитать индексный файл %s: %s"
@@ -81,18 +102,18 @@ msgstr "неверное или отсутствующее ключевое сл
 #: lib/Packages/DoSearch.pm:28 lib/Packages/DoSearchContents.pm:27
 msgid "keyword too short (keywords need to have at least two characters)"
 msgstr ""
-"слишком короткое ключевое слово (ключевые слова должны быть длиной "
-"не менее двух символов)"
+"слишком короткое ключевое слово (ключевые слова должны быть длиной не менее "
+"двух символов)"
 
-#: lib/Packages/DoSearch.pm:165
+#: lib/Packages/DoSearch.pm:170
 msgid "Exact hits"
 msgstr "Точные совпадения"
 
-#: lib/Packages/DoSearch.pm:175
+#: lib/Packages/DoSearch.pm:180
 msgid "Other hits"
 msgstr "Другие совпадения"
 
-#: lib/Packages/DoSearch.pm:234
+#: lib/Packages/DoSearch.pm:239
 msgid "Virtual package"
 msgstr "Виртуальный пакет"
 
@@ -103,7 +124,8 @@ msgstr "более одного комплекта указано для пои
 
 #: lib/Packages/DoSearchContents.pm:82
 msgid "The search mode you selected doesn't support more than one keyword."
-msgstr "Выбранный вами режим поиска не поддерживает более одного ключевого слова."
+msgstr ""
+"Выбранный вами режим поиска не поддерживает более одного ключевого слова."
 
 #: lib/Packages/DoShow.pm:37
 #, perl-format
@@ -138,20 +160,3 @@ msgstr "Не доступен"
 #: lib/Packages/Page.pm:47
 msgid "package has bad maintainer field"
 msgstr "пакет имеет неправильно заполненное поле сопровождающего"
-
-#: lib/Packages/Dispatcher.pm:312
-msgid "requested format not available for this document"
-msgstr "запрошенный формат недоступен для этого документа"
-
-#: bin/create_index_pages:233
-msgid "Section"
-msgstr "Секция"
-
-#: bin/create_index_pages:245
-msgid "Subsection"
-msgstr "Подсекция"
-
-#: bin/create_index_pages:257
-msgid "Priority"
-msgstr "Приоритет"
-
diff --git a/po/pdo.sv.po b/po/pdo.sv.po
index e7c4a1f..33f5551 100644
--- a/po/pdo.sv.po
+++ b/po/pdo.sv.po
@@ -1,7 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: packages.git\n"
-"POT-Creation-Date: 2007-10-21 21:31+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-08 17:22+0100\n"
 "PO-Revision-Date: 2007-10-26 22:09+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -9,6 +10,26 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: bin/create_index_pages:68
+msgid "virtual package provided by"
+msgstr "virtuellt paket som tillhandahålls av"
+
+#: bin/create_index_pages:162 bin/create_index_pages:383
+msgid "Section"
+msgstr "Sektion"
+
+#: bin/create_index_pages:169 bin/create_index_pages:390
+msgid "Subsection"
+msgstr "Undersektion"
+
+#: bin/create_index_pages:176 bin/create_index_pages:397
+msgid "Priority"
+msgstr "Prioritet"
+
+#: lib/Packages/Dispatcher.pm:319
+msgid "requested format not available for this document"
+msgstr "angivet format inte tillgängligt för dokumentet"
+
 #: lib/Packages/DoDownload.pm:27 lib/Packages/DoFilelist.pm:27
 #: lib/Packages/DoShow.pm:31
 msgid "package not valid or not specified"
@@ -16,7 +37,7 @@ msgstr "paketet inte giltigt eller inte angivet"
 
 #: lib/Packages/DoDownload.pm:30 lib/Packages/DoFilelist.pm:30
 #: lib/Packages/DoIndex.pm:31 lib/Packages/DoNewPkg.pm:22
-#: lib/Packages/DoSearchContents.pm:29 lib/Packages/DoShow.pm:34
+#: lib/Packages/DoSearchContents.pm:30 lib/Packages/DoShow.pm:34
 msgid "suite not valid or not specified"
 msgstr "sviten inte giltig eller inte angiven"
 
@@ -29,7 +50,7 @@ msgstr "arkitekturen inte giltig eller inte angiven"
 msgid "more than one suite specified for download (%s)"
 msgstr "mer än en svit angiven för hämtningen (%s)"
 
-#: lib/Packages/DoDownload.pm:39
+#: lib/Packages/DoDownload.pm:40
 #, perl-format
 msgid "more than one architecture specified for download (%s)"
 msgstr "mer än en arkitektur angiven för hämtningen (%s)"
@@ -47,12 +68,12 @@ msgstr "Ogiltig kombination av svit och arkitektur"
 msgid "more than one suite specified for show_static (%s)"
 msgstr "mer än en svit angavs för show_static (%s)"
 
-#: lib/Packages/DoIndex.pm:37
+#: lib/Packages/DoIndex.pm:38
 #, perl-format
 msgid "more than one subsection specified for show_static (%s)"
 msgstr "mer än en undersektion angavs för show_static (%s)"
 
-#: lib/Packages/DoIndex.pm:73
+#: lib/Packages/DoIndex.pm:70
 #, perl-format
 msgid "couldn't read index file %s: %s"
 msgstr "kunde inte läsa indexfilen %s: %s"
@@ -62,37 +83,37 @@ msgstr "kunde inte läsa indexfilen %s: %s"
 msgid "more than one suite specified for newpkg (%s)"
 msgstr "mer än en svit angiven för newpkg (%s)"
 
-#: lib/Packages/DoNewPkg.pm:42
+#: lib/Packages/DoNewPkg.pm:43
 #, perl-format
 msgid "no newpkg information found for suite %s"
 msgstr "ingen newpkg-information hittades för sviten %s"
 
-#: lib/Packages/DoSearch.pm:25 lib/Packages/DoSearchContents.pm:23
+#: lib/Packages/DoSearch.pm:25 lib/Packages/DoSearchContents.pm:24
 msgid "keyword not valid or missing"
 msgstr "nyckelordet inte giltigt eller saknas"
 
-#: lib/Packages/DoSearch.pm:28 lib/Packages/DoSearchContents.pm:26
+#: lib/Packages/DoSearch.pm:28 lib/Packages/DoSearchContents.pm:27
 msgid "keyword too short (keywords need to have at least two characters)"
 msgstr "nyckelordet för kort (nyckelord måste bestå av minst två tecken)"
 
-#: lib/Packages/DoSearch.pm:163
+#: lib/Packages/DoSearch.pm:170
 msgid "Exact hits"
 msgstr "Exakta träffar"
 
-#: lib/Packages/DoSearch.pm:172
+#: lib/Packages/DoSearch.pm:180
 msgid "Other hits"
 msgstr "Andra träffar"
 
-#: lib/Packages/DoSearch.pm:217
+#: lib/Packages/DoSearch.pm:239
 msgid "Virtual package"
 msgstr "Virtuellt paket"
 
-#: lib/Packages/DoSearchContents.pm:39
+#: lib/Packages/DoSearchContents.pm:40
 #, perl-format
 msgid "more than one suite specified for contents search (%s)"
 msgstr "mer än en svit angavs i innehållssökningen (%s)"
 
-#: lib/Packages/DoSearchContents.pm:80
+#: lib/Packages/DoSearchContents.pm:82
 msgid "The search mode you selected doesn't support more than one keyword."
 msgstr "Sökläget du valde stöder inte mer än ett nyckelord."
 
@@ -101,28 +122,28 @@ msgstr "Sökläget du valde stöder inte mer än ett nyckelord."
 msgid "more than one suite specified for show (%s)"
 msgstr "mer är en svit angavs för show (%s)"
 
-#: lib/Packages/DoShow.pm:72
+#: lib/Packages/DoShow.pm:73
 msgid "No such package."
 msgstr "Paketet finns inte."
 
-#: lib/Packages/DoShow.pm:84
+#: lib/Packages/DoShow.pm:85
 msgid "Package not available in this suite."
 msgstr "Paketet är inte tillgängligt i sviten."
 
-#: lib/Packages/DoShow.pm:197
+#: lib/Packages/DoShow.pm:198
 msgid " and others"
 msgstr " och andra"
 
-#: lib/Packages/DoShow.pm:427
+#: lib/Packages/DoShow.pm:429
 #, perl-format
 msgid "not %s"
 msgstr "inte %s"
 
-#: lib/Packages/DoShow.pm:465
+#: lib/Packages/DoShow.pm:479
 msgid "Package not available"
 msgstr "Paketet inte tillgängligt"
 
-#: lib/Packages/DoShow.pm:491
+#: lib/Packages/DoShow.pm:518
 msgid "Not available"
 msgstr "Inte tillgängligt"
 
@@ -130,39 +151,17 @@ msgstr "Inte tillgängligt"
 msgid "package has bad maintainer field"
 msgstr "paketet har felaktigt ansvarigfält"
 
-#. Done
-#: lib/Packages/Dispatcher.pm:162
-msgid "search doesn't take any more path elements"
-msgstr "search tar inte fler sökvägselement"
+#~ msgid "two or more packages specified (%s)"
+#~ msgstr "två eller flera paket angavs (%s)"
 
-#: lib/Packages/Dispatcher.pm:165
-msgid ""
-"We're supposed to display the homepage here, instead of getting dispatch.pl"
-msgstr ""
-"Det är meningen att vi ska visa hemsidan här, inte hämta dispatch.pl"
+#~ msgid "%s set more than once in path"
+#~ msgstr "%s satt fler än en gång i sökvägen"
 
-#: lib/Packages/Dispatcher.pm:188
-#, perl-format
-msgid "%s set more than once in path"
-msgstr "%s satt fler än en gång i sökvägen"
-
-#: lib/Packages/Dispatcher.pm:223
-#, perl-format
-msgid "two or more packages specified (%s)"
-msgstr "två eller flera paket angavs (%s)"
-
-#: lib/Packages/Dispatcher.pm:321
-msgid "requested format not available for this document"
-msgstr "angivet format inte tillgängligt för dokumentet"
-
-#: bin/create_index_pages:234
-msgid "Section"
-msgstr "Sektion"
+#~ msgid ""
+#~ "We're supposed to display the homepage here, instead of getting dispatch."
+#~ "pl"
+#~ msgstr ""
+#~ "Det är meningen att vi ska visa hemsidan här, inte hämta dispatch.pl"
 
-#: bin/create_index_pages:246
-msgid "Subsection"
-msgstr "Undersektion"
-
-#: bin/create_index_pages:258
-msgid "Priority"
-msgstr "Prioritet"
+#~ msgid "search doesn't take any more path elements"
+#~ msgstr "search tar inte fler sökvägselement"
diff --git a/po/pdo.uk.po b/po/pdo.uk.po
index fe73448..b7b83a1 100644
--- a/po/pdo.uk.po
+++ b/po/pdo.uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pdo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-17 21:01+0100\n"
+"POT-Creation-Date: 2008-02-08 17:22+0100\n"
 "PO-Revision-Date: 2005-11-02 14:08+0200\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen@univ.kiev.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -17,23 +17,28 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: bin/create_index_pages:233
+#: bin/create_index_pages:68
+#, fuzzy
+msgid "virtual package provided by"
+msgstr "віртуальний пакунок"
+
+#: bin/create_index_pages:162 bin/create_index_pages:383
 #, fuzzy
 #| msgid "Section:"
 msgid "Section"
 msgstr "Розділ:"
 
-#: bin/create_index_pages:245
+#: bin/create_index_pages:169 bin/create_index_pages:390
 #, fuzzy
 #| msgid "Section:"
 msgid "Subsection"
 msgstr "Розділ:"
 
-#: bin/create_index_pages:257
+#: bin/create_index_pages:176 bin/create_index_pages:397
 msgid "Priority"
 msgstr "Приоритет"
 
-#: lib/Packages/Dispatcher.pm:312
+#: lib/Packages/Dispatcher.pm:319
 msgid "requested format not available for this document"
 msgstr ""
 
@@ -81,7 +86,7 @@ msgstr ""
 msgid "more than one subsection specified for show_static (%s)"
 msgstr ""
 
-#: lib/Packages/DoIndex.pm:75
+#: lib/Packages/DoIndex.pm:70
 #, perl-format
 msgid "couldn't read index file %s: %s"
 msgstr ""
@@ -105,15 +110,15 @@ msgstr ""
 msgid "keyword too short (keywords need to have at least two characters)"
 msgstr ""
 
-#: lib/Packages/DoSearch.pm:165
+#: lib/Packages/DoSearch.pm:170
 msgid "Exact hits"
 msgstr ""
 
-#: lib/Packages/DoSearch.pm:175
+#: lib/Packages/DoSearch.pm:180
 msgid "Other hits"
 msgstr ""
 
-#: lib/Packages/DoSearch.pm:234
+#: lib/Packages/DoSearch.pm:239
 msgid "Virtual package"
 msgstr "Віртуальний пакунок"
 
@@ -164,251 +169,254 @@ msgid "package has bad maintainer field"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Source Packages in \"%s\", %s %s"
-#~ msgstr "Пакунки в дистрибутиві „%s“, розділі %s"
-
-#, fuzzy
-#~| msgid "Software Packages in \"%s\""
-#~ msgid "Source Packages in \"%s\""
-#~ msgstr "Пакунки в дистрибутиві „%s“"
+#~ msgid "two or more packages specified (%s)"
+#~ msgstr "Джерельний пакунок: %s (%s)"
 
 #, fuzzy
-#~ msgid "Software Packages in \"%s\", %s %s"
-#~ msgstr "Пакунки в дистрибутиві „%s“, розділі %s"
-
-#~ msgid "Software Packages in \"%s\""
-#~ msgstr "Пакунки в дистрибутиві „%s“"
+#~ msgid ""
+#~ "Note that the <strong>experimental</strong> distribution is not self-"
+#~ "contained; missing dependencies are likely found in the <a href=\"%s"
+#~ "\">unstable</a> distribution."
+#~ msgstr ""
+#~ "Майте на увазі, що „<span class=\"pred\">експериментальний</span>“ "
+#~ "дистрибутив не є самодостатнім; відсутні залежності скоріше за все є „<a "
+#~ "href=\"../../unstable/\">нестабільному</a>“ дистрибутиві."
 
-#~ msgid "Distribution:"
-#~ msgstr "Дистрибутив"
+#~ msgid "Versions:"
+#~ msgstr "Версії:"
 
-#, fuzzy
-#~ msgid "Overview over this suite"
-#~ msgstr "Огляд цього дистрибутива"
+#~ msgid ""
+#~ "Copyright (C) 1997-2005 SPI;\n"
+#~ "See <URL:http://www.debian.org/license> for the license terms.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Copyright (C) 1997-2005 SPI;\n"
+#~ "Перегляньте <URL:http://www.debian.org/license> щодо умов ліцензії.\n"
+#~ "\n"
 
-#, fuzzy
-#~| msgid "All packages"
-#~ msgid "All Packages"
-#~ msgstr "Всі пакунки"
+#~ msgid "No essential packages in this suite"
+#~ msgstr "Немає необхідних пакунків в цьому дистрибутиві"
 
-#, fuzzy
-#~ msgid "Source"
-#~ msgstr "Джерельний пакунок:"
+#~ msgid "Software Packages in \"%s\", essential packages"
+#~ msgstr "Пакунки в дистрибутиві „%s“, необхідні пакунки"
 
-#, fuzzy
-#~ msgid "Source packages"
-#~ msgstr "Джерельний пакунок"
+#~ msgid "No packages with this priority in this suite"
+#~ msgstr "Немає пакунків з цим пріоритетом в цьому розділі"
 
-#~ msgid "All packages in this section"
-#~ msgstr "Всі пакунки в цьому розділі"
+#~ msgid ""
+#~ "Warning: These packages are intended for the use in building <a href="
+#~ "\"http://www.debian.org/devel/debian-installer/\">debian-installer</a> "
+#~ "images only. Do not install them on a normal Debian system."
+#~ msgstr ""
+#~ "Увага: Ці пакунки призначені для використання тільки при побудові образів "
+#~ "<a href=\"http://www.debian.org/devel/debian-installer/\">встановлювача "
+#~ "Debian</a>. Не встановлюйте їх на нормальній системі Debian."
 
-#, fuzzy
-#~ msgid "Package:"
-#~ msgstr "Розмір пакунка"
+#~ msgid "yes"
+#~ msgstr "так"
 
-#, fuzzy
-#~ msgid "List of sections in \"%s\""
-#~ msgstr "Список розділів в дистрибутиві %s"
+#~ msgid "Essential"
+#~ msgstr "Необхідний"
 
-#, fuzzy
-#~| msgid "List of all packages"
-#~ msgid "List of all source packages"
-#~ msgstr "Список всіх пакунків"
+#~ msgid "Uploaders"
+#~ msgstr "Завантажувачі"
 
-#~ msgid "List of all packages"
-#~ msgstr "Список всіх пакунків"
+#~ msgid "Maintainer"
+#~ msgstr "Супроводжуючий"
 
-#, fuzzy
-#~ msgid "All source packages"
-#~ msgstr "Джерельний пакунок"
+#~ msgid "Size is measured in kBytes."
+#~ msgstr "Розмір даний в кілобайтах."
 
-#, fuzzy
-#~| msgid "All packages"
-#~ msgid "All packages"
-#~ msgstr "Всі пакунки"
+#~ msgid ""
+#~ "Users of experimental packages are encouraged to contact the package "
+#~ "maintainers directly in case of problems."
+#~ msgstr ""
+#~ "Користувачам експериментальних пакунків у випадку виникнення проблем "
+#~ "рекомендується зв'язуватись зі супроводжуючими пакунків напряму."
 
-#~ msgid "compact compressed textlist"
-#~ msgstr "компактний стислий список"
+#~ msgid ""
+#~ "Packages that were added to the \"%s\" component next to the unstable "
+#~ "Debian archive during the last 7 days."
+#~ msgstr ""
+#~ "Пакунки які було додано до компоненту „%s“ впродовж останніх 7 днів."
 
-#, fuzzy
-#~ msgid "Software Packages in \"%s\", subsection %s"
-#~ msgstr "Пакунки в дистрибутиві „%s“, розділі %s"
+#~ msgid ""
+#~ "The following packages were added to the \"%s\" component next to the "
+#~ "Debian archive during the last 7 days."
+#~ msgstr ""
+#~ "Наступні пакунки було додано до компоненту „%s“ впродовж останніх 7 днів."
 
-#~ msgid "Software Packages in \"%s\", priority %s"
-#~ msgstr "Пакунки в дистрибутиві „%s“, пріоритет %s"
+#~ msgid ""
+#~ "Packages that were added to the unstable Debian archive during the last 7 "
+#~ "days."
+#~ msgstr ""
+#~ "Пакунки які біли додані до нестабільного архіву Debian впродовж останніх "
+#~ "7 днів."
 
-#, fuzzy
-#~ msgid "search for a package"
-#~ msgstr "Список всіх пакунків"
+#~ msgid ""
+#~ "Warning: The <span class=\"pred\">experimental</span> distribution "
+#~ "contains software that is likely unstable or buggy and may even cause "
+#~ "data loss. If you ignore this warning and install it nevertheless, you do "
+#~ "it on your own risk."
+#~ msgstr ""
+#~ "Увага: „<span class=\"pred\">Експериментальний</span>“ містить програмне "
+#~ "забезпечення, яке напевне є нестабільним або містить помилки і навіть "
+#~ "може спричинити втрату даних. Якщо ви проігноруєте це попередження і "
+#~ "встановите його, то робіть це на ваш ризик."
 
 #, fuzzy
-#~ msgid "Filelist of of package %s/%s/%s"
-#~ msgstr "Список всіх пакунків"
+#~ msgid "How to set <a href=\"%s\">the default document language</a>"
+#~ msgstr "Як встановити <a href=\"%s\">мову документа за замовчанням</a></p>"
 
-#~ msgid "New Packages in \"%s\""
-#~ msgstr "Нові пакунки в дистрибутиві „%s“"
+#~ msgid "This page is also available in the following languages:\n"
+#~ msgstr "Ця сторінка також доступна наступними мовами:\n"
 
-#, fuzzy
-#~ msgid "new packages"
-#~ msgstr "Розмір пакунка"
+#~ msgid ""
+#~ "Debian is a registered trademark of Software in the Public Interest, Inc."
+#~ msgstr ""
+#~ "Debian є зареєстрованою торговою маркою Software in the Public Interest, "
+#~ "Inc."
 
-#, fuzzy
 #~ msgid ""
-#~ "The following packages were added to suite <em>%s</em>%s in the Debian "
-#~ "archive during the last 7 days."
+#~ "Copyright &copy; 1997-2005 <a href=\"http://www.spi-inc.org\">SPI</a>; "
+#~ "See <a href=\"%s/license\">license terms</a>."
 #~ msgstr ""
-#~ "Наступні пакунки було додано до нестабільного архіву Debian протягом "
-#~ "останніх семи днів."
+#~ "Авторські права &copy; 1997-2005 <a href=\"http://www.spi-inc.org\">SPI</"
+#~ "a>; Дивіться <a href=\"%s/license\">умови ліцензії</a>."
 
-#, fuzzy
-#~ msgid " (section %s)"
-#~ msgstr "Розділ"
+#~ msgid "Last Modified: "
+#~ msgstr "Остання зміна:"
 
-#, fuzzy
 #~ msgid ""
-#~ "This information is also available as an <a href=\"%s\">RSS feed</a>."
+#~ "To report a problem with the web site, e-mail <a href=\"mailto:%s\">%s</"
+#~ "a>. For other contact information, see the Debian <a href=\"%s/contact"
+#~ "\">contact page</a>."
 #~ msgstr ""
-#~ "Ця інформація також доступна як <a href=\"newpkg_%s.%s.rdf\">лента RSS</"
-#~ "a>."
-
-#, fuzzy
-#~ msgid "New packages in %s"
-#~ msgstr "Нові пакунки в дистрибутиві „%s“"
+#~ "Щоб повідомити про проблему із web-сайтом, надішліть лист на адресу <a "
+#~ "href=\"mailto:%s\">%s</a>. Додаткову інформацію дивиться на <a href=\"%s/"
+#~ "contact\">сторінці з контактною інформацією</a>."
 
-#, fuzzy
 #~ msgid ""
-#~ "The following packages were added to suite %s%s in the Debian archive "
-#~ "during the last 7 days."
+#~ "Back to: <a href=\"%s/\">Debian Project homepage</a> || <a href=\"%s/"
+#~ "\">Packages search page</a>"
 #~ msgstr ""
-#~ "Наступні пакунки було додано до нестабільного архіву Debian протягом "
-#~ "останніх семи днів."
+#~ "Повернутися до: <a href=\"%s/\">головної сторінки проекту Debian</a> || "
+#~ "<a href=\"%s/\">сторінки пошуку пакунків</a>"
 
-#, fuzzy
-#~ msgid "New Debian Packages"
-#~ msgstr "Всі пакунки Debian в дистрибутиві „%s“"
+#~ msgid "Site map"
+#~ msgstr "Карта сайту"
 
-#, fuzzy
-#~ msgid "all sections"
-#~ msgstr "Розділ"
+#~ msgid "Development"
+#~ msgstr "Розробка"
 
-#, fuzzy
-#~ msgid "all architectures"
-#~ msgstr "Архітектура"
+#~ msgid "Support"
+#~ msgstr "Підтримка"
+
+#~ msgid "Getting&nbsp;Debian"
+#~ msgstr "Отримання&nbsp;Debian"
+
+#~ msgid "News"
+#~ msgstr "Новини"
+
+#~ msgid "About&nbsp;Debian"
+#~ msgstr "Про&nbsp;Debian"
+
+#~ msgid "Skip Site Navigation"
+#~ msgstr "Пропустити меню"
+
+#~ msgid "Debian Project"
+#~ msgstr "Проект Debian"
 
 #, fuzzy
-#~ msgid "packages"
+#~ msgid "Package contents"
 #~ msgstr "Розмір пакунка"
 
 #, fuzzy
-#~ msgid ""
-#~ "You can try a different search on the <a href=\"%s\">Packages search "
-#~ "page</a>."
-#~ msgstr ""
-#~ "Повернутися до: <a href=\"%s/\">головної сторінки проекту Debian</a> || "
-#~ "<a href=\"%s/\">сторінки пошуку пакунків</a>"
+#~ msgid "Source package names"
+#~ msgstr "Джерельний пакунок"
 
 #, fuzzy
-#~ msgid "Debian Package Search Results"
-#~ msgstr "Всі пакунки Debian в дистрибутиві „%s“"
+#~ msgid "Descriptions"
+#~ msgstr "Дистрибутив"
 
 #, fuzzy
-#~ msgid "Package %s"
-#~ msgstr "Пакунок: %s (%s)"
+#~ msgid "Package Names"
+#~ msgstr "Розмір пакунка"
 
 #, fuzzy
-#~ msgid "Binary packages: "
-#~ msgstr "віртуальний пакунок"
+#~ msgid "Search on:"
+#~ msgstr "Пошук"
 
-#, fuzzy
-#~ msgid "Nothing found"
-#~ msgstr "Не знайдено"
+#~ msgid "Search"
+#~ msgstr "Пошук"
 
-#~ msgid "File"
-#~ msgstr "Файл"
+#~ msgid "or"
+#~ msgstr "або"
 
 #, fuzzy
-#~ msgid "Source package building this package"
-#~ msgstr "Джерельний пакунок"
+#~ msgid "%s packages"
+#~ msgstr "Розмір пакунка"
 
-#~ msgid "Package: %s (%s)"
-#~ msgstr "Пакунок: %s (%s)"
+#, fuzzy
+#~ msgid "also a virtual package provided by "
+#~ msgstr "віртуальний пакунок"
 
-#~ msgid "Experimental package"
-#~ msgstr "Експериментальний пакунок"
+#~ msgid "Search for <a href=\"%s\">other versions of %s</a>"
+#~ msgstr "Шукати на <a href=\"%s\">інші версії %s</a>"
 
-#, fuzzy
-#~ msgid ""
-#~ "Warning: This package is from the <strong>experimental</strong> "
-#~ "distribution. That means it is likely unstable or buggy, and it may even "
-#~ "cause data loss. If you ignore this warning and install it nevertheless, "
-#~ "you do it on your own risk."
-#~ msgstr ""
-#~ "Увага: Це пакунок <span class=\"pred\">експериментального</span> "
-#~ "дистрибутиву. Це означає, що він напевне нестабільний або в ньому є "
-#~ "помилки, і він навіть може призвести до втрати даних. Якщо ви "
-#~ "проігноруєте це попередження і встановите його, то робіть це на ваш ризик."
+#~ msgid "See the <a href=\"%s\">developer information for %s</a>."
+#~ msgstr "Перегляньте <a href=\"%s\">інформацію для розробників про %s</a>."
 
-#~ msgid "debian-installer udeb package"
-#~ msgstr "udeb-пакунок встановлювача"
+#~ msgid " and %s are responsible for this Debian package."
+#~ msgstr " і %s відповідають з цей пакунок Debian."
 
-#~ msgid ""
-#~ "Warning: This package is intended for the use in building <a href="
-#~ "\"http://www.debian.org/devel/debian-installer\">debian-installer</a> "
-#~ "images only. Do not install it on a normal Debian system."
-#~ msgstr ""
-#~ "Увага: цей пакунок призначений для використання тільки при створенні "
-#~ "образів <a href=\"http://www.debian.org/devel/debian-installer"
-#~ "\">встановлювача Debian</a>. Не встановлюйте його на звичайній системі "
-#~ "Debian."
+#~ msgid "%s is responsible for this Debian package."
+#~ msgstr "%s відповідає за цей пакунок Debian"
 
-#~ msgid "Other Packages Related to %s"
-#~ msgstr "Інші пакунки пов'язані з %s"
+#~ msgid "View the <a href=\"%s\">copyright file</a>"
+#~ msgstr "Переглянути <a href=\"%s\">файл з авторськими правами</a>"
 
-#~ msgid "Download %s\n"
-#~ msgstr "Завантажити %s\n"
+#~ msgid "View the <a href=\"%s\">Debian changelog</a>"
+#~ msgstr "Переглянути <a href=\"%s\">журнал змін Debian</a>"
 
-#~ msgid ""
-#~ "The download table links to the download of the package and a file "
-#~ "overview. In addition it gives information about the package size and the "
-#~ "installed size."
-#~ msgstr ""
-#~ "Таблиця завантаження містить посилання для завантаження пакунків та огляд "
-#~ "файлів. Додатково, вона містить інформацію про розмір пакунка та розмір "
-#~ "після встановлення."
+#~ msgid "Not found"
+#~ msgstr "Не знайдено"
 
-#~ msgid "Download for all available architectures"
-#~ msgstr "Завантаження для всіх доступних архітектур"
+#~ msgid "Download"
+#~ msgstr "Завантажити"
 
-#~ msgid "Architecture"
-#~ msgstr "Архітектура"
+#~ msgid "Source Package:"
+#~ msgstr "Джерельний пакунок:"
 
-#~ msgid "Version"
-#~ msgstr "Версія"
+#~ msgid "Check for <a href=\"%s\">Bug Reports</a> about %s."
+#~ msgstr "Перегляньте <a href=\"%s\">повідомлення про помилки</a> про %s."
 
-#~ msgid "Files"
-#~ msgstr "Файли"
+#, fuzzy
+#~ msgid "Details of package %s in %s"
+#~ msgstr "Нові пакунки в дистрибутиві %s"
 
-#~ msgid "Installed Size"
-#~ msgstr "Розмір після встановлення"
+#, fuzzy
+#~ msgid "Details of source package %s in %s"
+#~ msgstr "Джерельні пакунки в дистрибутиві „%s“"
 
-#~ msgid "Package Size"
-#~ msgstr "Розмір пакунка"
+#~ msgid "md5sum"
+#~ msgstr "сума MD5"
 
-#~ msgid "list of files"
-#~ msgstr "список файлів"
+#~ msgid "Size (in kB)"
+#~ msgstr "Розмір (в кБ)"
 
-#, fuzzy
-#~ msgid "no current information"
-#~ msgstr "Додаткова інформація про %s"
+#~ msgid "Download %s"
+#~ msgstr "Завантажити %s"
 
-#~ msgid "virtual package"
-#~ msgstr "віртуальний пакунок"
+#~ msgid "The following binary packages are built from this source package:"
+#~ msgstr "Наступні двійкові пакунки побудовано з цього джерельного пакунка:"
 
-#~ msgid "Overview over this distribution"
-#~ msgstr "Огляд цього дистрибутива"
+#, fuzzy
+#~ msgid "Source Package: %s (%s)"
+#~ msgstr "Джерельний пакунок: %s (%s)"
 
-#~ msgid "Virtual Package: %s"
-#~ msgstr "Віртуальний пакунок: %s"
+#~ msgid "Packages providing %s"
+#~ msgstr "Пакунки що надають %s"
 
 #~ msgid ""
 #~ "This is a <em>virtual package</em>. See the <a href=\"%s\">Debian policy</"
@@ -419,256 +427,249 @@ msgstr ""
 #~ "\">Політику Debian</a> щоб дізнатись про <a href=\"%sch-binary.html#s-"
 #~ "virtual_pkg\">визначення віртуальних пакунків</a>."
 
-#~ msgid "Packages providing %s"
-#~ msgstr "Пакунки що надають %s"
+#~ msgid "Virtual Package: %s"
+#~ msgstr "Віртуальний пакунок: %s"
+
+#~ msgid "Overview over this distribution"
+#~ msgstr "Огляд цього дистрибутива"
+
+#~ msgid "virtual package"
+#~ msgstr "віртуальний пакунок"
 
 #, fuzzy
-#~ msgid "Source Package: %s (%s)"
-#~ msgstr "Джерельний пакунок: %s (%s)"
+#~ msgid "no current information"
+#~ msgstr "Додаткова інформація про %s"
 
-#~ msgid "The following binary packages are built from this source package:"
-#~ msgstr "Наступні двійкові пакунки побудовано з цього джерельного пакунка:"
+#~ msgid "list of files"
+#~ msgstr "список файлів"
 
-#~ msgid "Download %s"
-#~ msgstr "Завантажити %s"
+#~ msgid "Package Size"
+#~ msgstr "Розмір пакунка"
 
-#~ msgid "Size (in kB)"
-#~ msgstr "Розмір (в кБ)"
+#~ msgid "Installed Size"
+#~ msgstr "Розмір після встановлення"
 
-#~ msgid "md5sum"
-#~ msgstr "сума MD5"
+#~ msgid "Files"
+#~ msgstr "Файли"
 
-#, fuzzy
-#~ msgid "Details of source package %s in %s"
-#~ msgstr "Джерельні пакунки в дистрибутиві „%s“"
+#~ msgid "Version"
+#~ msgstr "Версія"
 
-#, fuzzy
-#~ msgid "Details of package %s in %s"
-#~ msgstr "Нові пакунки в дистрибутиві %s"
+#~ msgid "Architecture"
+#~ msgstr "Архітектура"
 
-#~ msgid "Check for <a href=\"%s\">Bug Reports</a> about %s."
-#~ msgstr "Перегляньте <a href=\"%s\">повідомлення про помилки</a> про %s."
+#~ msgid "Download for all available architectures"
+#~ msgstr "Завантаження для всіх доступних архітектур"
 
-#~ msgid "Source Package:"
-#~ msgstr "Джерельний пакунок:"
+#~ msgid ""
+#~ "The download table links to the download of the package and a file "
+#~ "overview. In addition it gives information about the package size and the "
+#~ "installed size."
+#~ msgstr ""
+#~ "Таблиця завантаження містить посилання для завантаження пакунків та огляд "
+#~ "файлів. Додатково, вона містить інформацію про розмір пакунка та розмір "
+#~ "після встановлення."
 
-#~ msgid "Download"
-#~ msgstr "Завантажити"
+#~ msgid "Download %s\n"
+#~ msgstr "Завантажити %s\n"
 
-#~ msgid "Not found"
-#~ msgstr "Не знайдено"
+#~ msgid "Other Packages Related to %s"
+#~ msgstr "Інші пакунки пов'язані з %s"
 
-#~ msgid "View the <a href=\"%s\">Debian changelog</a>"
-#~ msgstr "Переглянути <a href=\"%s\">журнал змін Debian</a>"
+#~ msgid ""
+#~ "Warning: This package is intended for the use in building <a href="
+#~ "\"http://www.debian.org/devel/debian-installer\">debian-installer</a> "
+#~ "images only. Do not install it on a normal Debian system."
+#~ msgstr ""
+#~ "Увага: цей пакунок призначений для використання тільки при створенні "
+#~ "образів <a href=\"http://www.debian.org/devel/debian-installer"
+#~ "\">встановлювача Debian</a>. Не встановлюйте його на звичайній системі "
+#~ "Debian."
 
-#~ msgid "View the <a href=\"%s\">copyright file</a>"
-#~ msgstr "Переглянути <a href=\"%s\">файл з авторськими правами</a>"
+#~ msgid "debian-installer udeb package"
+#~ msgstr "udeb-пакунок встановлювача"
 
-#~ msgid "%s is responsible for this Debian package."
-#~ msgstr "%s відповідає за цей пакунок Debian"
+#, fuzzy
+#~ msgid ""
+#~ "Warning: This package is from the <strong>experimental</strong> "
+#~ "distribution. That means it is likely unstable or buggy, and it may even "
+#~ "cause data loss. If you ignore this warning and install it nevertheless, "
+#~ "you do it on your own risk."
+#~ msgstr ""
+#~ "Увага: Це пакунок <span class=\"pred\">експериментального</span> "
+#~ "дистрибутиву. Це означає, що він напевне нестабільний або в ньому є "
+#~ "помилки, і він навіть може призвести до втрати даних. Якщо ви "
+#~ "проігноруєте це попередження і встановите його, то робіть це на ваш ризик."
 
-#~ msgid " and %s are responsible for this Debian package."
-#~ msgstr " і %s відповідають з цей пакунок Debian."
+#~ msgid "Experimental package"
+#~ msgstr "Експериментальний пакунок"
 
-#~ msgid "See the <a href=\"%s\">developer information for %s</a>."
-#~ msgstr "Перегляньте <a href=\"%s\">інформацію для розробників про %s</a>."
+#~ msgid "Package: %s (%s)"
+#~ msgstr "Пакунок: %s (%s)"
 
-#~ msgid "Search for <a href=\"%s\">other versions of %s</a>"
-#~ msgstr "Шукати на <a href=\"%s\">інші версії %s</a>"
+#, fuzzy
+#~ msgid "Source package building this package"
+#~ msgstr "Джерельний пакунок"
+
+#~ msgid "File"
+#~ msgstr "Файл"
 
 #, fuzzy
-#~ msgid "also a virtual package provided by "
-#~ msgstr "віртуальний пакунок"
+#~ msgid "Nothing found"
+#~ msgstr "Не знайдено"
 
 #, fuzzy
-#~ msgid "virtual package provided by "
+#~ msgid "Binary packages: "
 #~ msgstr "віртуальний пакунок"
 
 #, fuzzy
-#~ msgid "%s packages"
-#~ msgstr "Розмір пакунка"
-
-#~ msgid "or"
-#~ msgstr "або"
+#~ msgid "Package %s"
+#~ msgstr "Пакунок: %s (%s)"
 
-#~ msgid "Search"
-#~ msgstr "Пошук"
+#, fuzzy
+#~ msgid "Debian Package Search Results"
+#~ msgstr "Всі пакунки Debian в дистрибутиві „%s“"
 
 #, fuzzy
-#~ msgid "Search on:"
-#~ msgstr "Пошук"
+#~ msgid ""
+#~ "You can try a different search on the <a href=\"%s\">Packages search "
+#~ "page</a>."
+#~ msgstr ""
+#~ "Повернутися до: <a href=\"%s/\">головної сторінки проекту Debian</a> || "
+#~ "<a href=\"%s/\">сторінки пошуку пакунків</a>"
 
 #, fuzzy
-#~ msgid "Package Names"
+#~ msgid "packages"
 #~ msgstr "Розмір пакунка"
 
 #, fuzzy
-#~ msgid "Descriptions"
-#~ msgstr "Дистрибутив"
+#~ msgid "all architectures"
+#~ msgstr "Архітектура"
 
 #, fuzzy
-#~ msgid "Source package names"
-#~ msgstr "Джерельний пакунок"
+#~ msgid "all sections"
+#~ msgstr "Розділ"
 
 #, fuzzy
-#~ msgid "Package contents"
-#~ msgstr "Розмір пакунка"
-
-#~ msgid "Debian Project"
-#~ msgstr "Проект Debian"
-
-#~ msgid "Skip Site Navigation"
-#~ msgstr "Пропустити меню"
-
-#~ msgid "About&nbsp;Debian"
-#~ msgstr "Про&nbsp;Debian"
-
-#~ msgid "News"
-#~ msgstr "Новини"
-
-#~ msgid "Getting&nbsp;Debian"
-#~ msgstr "Отримання&nbsp;Debian"
-
-#~ msgid "Support"
-#~ msgstr "Підтримка"
-
-#~ msgid "Development"
-#~ msgstr "Розробка"
-
-#~ msgid "Site map"
-#~ msgstr "Карта сайту"
+#~ msgid "New Debian Packages"
+#~ msgstr "Всі пакунки Debian в дистрибутиві „%s“"
 
+#, fuzzy
 #~ msgid ""
-#~ "Back to: <a href=\"%s/\">Debian Project homepage</a> || <a href=\"%s/"
-#~ "\">Packages search page</a>"
+#~ "The following packages were added to suite %s%s in the Debian archive "
+#~ "during the last 7 days."
 #~ msgstr ""
-#~ "Повернутися до: <a href=\"%s/\">головної сторінки проекту Debian</a> || "
-#~ "<a href=\"%s/\">сторінки пошуку пакунків</a>"
+#~ "Наступні пакунки було додано до нестабільного архіву Debian протягом "
+#~ "останніх семи днів."
 
+#, fuzzy
+#~ msgid "New packages in %s"
+#~ msgstr "Нові пакунки в дистрибутиві „%s“"
+
+#, fuzzy
 #~ msgid ""
-#~ "To report a problem with the web site, e-mail <a href=\"mailto:%s\">%s</"
-#~ "a>. For other contact information, see the Debian <a href=\"%s/contact"
-#~ "\">contact page</a>."
+#~ "This information is also available as an <a href=\"%s\">RSS feed</a>."
 #~ msgstr ""
-#~ "Щоб повідомити про проблему із web-сайтом, надішліть лист на адресу <a "
-#~ "href=\"mailto:%s\">%s</a>. Додаткову інформацію дивиться на <a href=\"%s/"
-#~ "contact\">сторінці з контактною інформацією</a>."
+#~ "Ця інформація також доступна як <a href=\"newpkg_%s.%s.rdf\">лента RSS</"
+#~ "a>."
 
-#~ msgid "Last Modified: "
-#~ msgstr "Остання зміна:"
+#, fuzzy
+#~ msgid " (section %s)"
+#~ msgstr "Розділ"
 
+#, fuzzy
 #~ msgid ""
-#~ "Copyright &copy; 1997-2005 <a href=\"http://www.spi-inc.org\">SPI</a>; "
-#~ "See <a href=\"%s/license\">license terms</a>."
+#~ "The following packages were added to suite <em>%s</em>%s in the Debian "
+#~ "archive during the last 7 days."
 #~ msgstr ""
-#~ "Авторські права &copy; 1997-2005 <a href=\"http://www.spi-inc.org\">SPI</"
-#~ "a>; Дивіться <a href=\"%s/license\">умови ліцензії</a>."
+#~ "Наступні пакунки було додано до нестабільного архіву Debian протягом "
+#~ "останніх семи днів."
 
-#~ msgid ""
-#~ "Debian is a registered trademark of Software in the Public Interest, Inc."
-#~ msgstr ""
-#~ "Debian є зареєстрованою торговою маркою Software in the Public Interest, "
-#~ "Inc."
+#, fuzzy
+#~ msgid "new packages"
+#~ msgstr "Розмір пакунка"
 
-#~ msgid "This page is also available in the following languages:\n"
-#~ msgstr "Ця сторінка також доступна наступними мовами:\n"
+#~ msgid "New Packages in \"%s\""
+#~ msgstr "Нові пакунки в дистрибутиві „%s“"
 
 #, fuzzy
-#~ msgid "How to set <a href=\"%s\">the default document language</a>"
-#~ msgstr "Як встановити <a href=\"%s\">мову документа за замовчанням</a></p>"
+#~ msgid "Filelist of of package %s/%s/%s"
+#~ msgstr "Список всіх пакунків"
 
-#~ msgid ""
-#~ "Warning: The <span class=\"pred\">experimental</span> distribution "
-#~ "contains software that is likely unstable or buggy and may even cause "
-#~ "data loss. If you ignore this warning and install it nevertheless, you do "
-#~ "it on your own risk."
-#~ msgstr ""
-#~ "Увага: „<span class=\"pred\">Експериментальний</span>“ містить програмне "
-#~ "забезпечення, яке напевне є нестабільним або містить помилки і навіть "
-#~ "може спричинити втрату даних. Якщо ви проігноруєте це попередження і "
-#~ "встановите його, то робіть це на ваш ризик."
+#, fuzzy
+#~ msgid "search for a package"
+#~ msgstr "Список всіх пакунків"
 
-#~ msgid ""
-#~ "Packages that were added to the unstable Debian archive during the last 7 "
-#~ "days."
-#~ msgstr ""
-#~ "Пакунки які біли додані до нестабільного архіву Debian впродовж останніх "
-#~ "7 днів."
+#~ msgid "Software Packages in \"%s\", priority %s"
+#~ msgstr "Пакунки в дистрибутиві „%s“, пріоритет %s"
 
-#~ msgid ""
-#~ "The following packages were added to the \"%s\" component next to the "
-#~ "Debian archive during the last 7 days."
-#~ msgstr ""
-#~ "Наступні пакунки було додано до компоненту „%s“ впродовж останніх 7 днів."
+#, fuzzy
+#~ msgid "Software Packages in \"%s\", subsection %s"
+#~ msgstr "Пакунки в дистрибутиві „%s“, розділі %s"
 
-#~ msgid ""
-#~ "Packages that were added to the \"%s\" component next to the unstable "
-#~ "Debian archive during the last 7 days."
-#~ msgstr ""
-#~ "Пакунки які було додано до компоненту „%s“ впродовж останніх 7 днів."
+#~ msgid "compact compressed textlist"
+#~ msgstr "компактний стислий список"
 
-#~ msgid ""
-#~ "Users of experimental packages are encouraged to contact the package "
-#~ "maintainers directly in case of problems."
-#~ msgstr ""
-#~ "Користувачам експериментальних пакунків у випадку виникнення проблем "
-#~ "рекомендується зв'язуватись зі супроводжуючими пакунків напряму."
+#, fuzzy
+#~| msgid "All packages"
+#~ msgid "All packages"
+#~ msgstr "Всі пакунки"
 
-#~ msgid "Size is measured in kBytes."
-#~ msgstr "Розмір даний в кілобайтах."
+#, fuzzy
+#~ msgid "All source packages"
+#~ msgstr "Джерельний пакунок"
 
-#~ msgid "Maintainer"
-#~ msgstr "Супроводжуючий"
+#~ msgid "List of all packages"
+#~ msgstr "Список всіх пакунків"
 
-#~ msgid "Uploaders"
-#~ msgstr "Завантажувачі"
+#, fuzzy
+#~| msgid "List of all packages"
+#~ msgid "List of all source packages"
+#~ msgstr "Список всіх пакунків"
 
-#~ msgid "Essential"
-#~ msgstr "Необхідний"
+#, fuzzy
+#~ msgid "List of sections in \"%s\""
+#~ msgstr "Список розділів в дистрибутиві %s"
 
-#~ msgid "yes"
-#~ msgstr "так"
+#, fuzzy
+#~ msgid "Package:"
+#~ msgstr "Розмір пакунка"
 
-#~ msgid ""
-#~ "Warning: These packages are intended for the use in building <a href="
-#~ "\"http://www.debian.org/devel/debian-installer/\">debian-installer</a> "
-#~ "images only. Do not install them on a normal Debian system."
-#~ msgstr ""
-#~ "Увага: Ці пакунки призначені для використання тільки при побудові образів "
-#~ "<a href=\"http://www.debian.org/devel/debian-installer/\">встановлювача "
-#~ "Debian</a>. Не встановлюйте їх на нормальній системі Debian."
+#~ msgid "All packages in this section"
+#~ msgstr "Всі пакунки в цьому розділі"
 
-#~ msgid "No packages with this priority in this suite"
-#~ msgstr "Немає пакунків з цим пріоритетом в цьому розділі"
+#, fuzzy
+#~ msgid "Source packages"
+#~ msgstr "Джерельний пакунок"
 
-#~ msgid "Software Packages in \"%s\", essential packages"
-#~ msgstr "Пакунки в дистрибутиві „%s“, необхідні пакунки"
+#, fuzzy
+#~ msgid "Source"
+#~ msgstr "Джерельний пакунок:"
 
-#~ msgid "No essential packages in this suite"
-#~ msgstr "Немає необхідних пакунків в цьому дистрибутиві"
+#, fuzzy
+#~| msgid "All packages"
+#~ msgid "All Packages"
+#~ msgstr "Всі пакунки"
 
-#~ msgid ""
-#~ "Copyright (C) 1997-2005 SPI;\n"
-#~ "See <URL:http://www.debian.org/license> for the license terms.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Copyright (C) 1997-2005 SPI;\n"
-#~ "Перегляньте <URL:http://www.debian.org/license> щодо умов ліцензії.\n"
-#~ "\n"
+#, fuzzy
+#~ msgid "Overview over this suite"
+#~ msgstr "Огляд цього дистрибутива"
 
-#~ msgid "Versions:"
-#~ msgstr "Версії:"
+#~ msgid "Distribution:"
+#~ msgstr "Дистрибутив"
+
+#~ msgid "Software Packages in \"%s\""
+#~ msgstr "Пакунки в дистрибутиві „%s“"
 
 #, fuzzy
-#~ msgid ""
-#~ "Note that the <strong>experimental</strong> distribution is not self-"
-#~ "contained; missing dependencies are likely found in the <a href=\"%s"
-#~ "\">unstable</a> distribution."
-#~ msgstr ""
-#~ "Майте на увазі, що „<span class=\"pred\">експериментальний</span>“ "
-#~ "дистрибутив не є самодостатнім; відсутні залежності скоріше за все є „<a "
-#~ "href=\"../../unstable/\">нестабільному</a>“ дистрибутиві."
+#~ msgid "Software Packages in \"%s\", %s %s"
+#~ msgstr "Пакунки в дистрибутиві „%s“, розділі %s"
 
 #, fuzzy
-#~ msgid "two or more packages specified (%s)"
-#~ msgstr "Джерельний пакунок: %s (%s)"
+#~| msgid "Software Packages in \"%s\""
+#~ msgid "Source Packages in \"%s\""
+#~ msgstr "Пакунки в дистрибутиві „%s“"
+
+#, fuzzy
+#~ msgid "Source Packages in \"%s\", %s %s"
+#~ msgstr "Пакунки в дистрибутиві „%s“, розділі %s"
diff --git a/po/pdo.zh-cn.po b/po/pdo.zh-cn.po
index c7c5106..91534b3 100644
--- a/po/pdo.zh-cn.po
+++ b/po/pdo.zh-cn.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pdo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-17 21:01+0100\n"
+"POT-Creation-Date: 2008-02-08 17:22+0100\n"
 "PO-Revision-Date: 2007-10-26 19:48+0800\n"
 "Last-Translator: Vern Sun <s5unty@gmail.com>\n"
 "Language-Team: Chinese\n"
@@ -10,6 +10,26 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: bin/create_index_pages:68
+msgid "virtual package provided by"
+msgstr "本虚包由这些包填实:"
+
+#: bin/create_index_pages:162 bin/create_index_pages:383
+msgid "Section"
+msgstr "版面"
+
+#: bin/create_index_pages:169 bin/create_index_pages:390
+msgid "Subsection"
+msgstr "子版面"
+
+#: bin/create_index_pages:176 bin/create_index_pages:397
+msgid "Priority"
+msgstr "优先级"
+
+#: lib/Packages/Dispatcher.pm:319
+msgid "requested format not available for this document"
+msgstr "要求的格式在此文档中暂时不可用"
+
 #: lib/Packages/DoDownload.pm:27 lib/Packages/DoFilelist.pm:27
 #: lib/Packages/DoShow.pm:31
 msgid "package not valid or not specified"
@@ -53,7 +73,7 @@ msgstr "不止一套发行版被指定 show_static(%s)"
 msgid "more than one subsection specified for show_static (%s)"
 msgstr "不止一套子版面被指定 show_static(%s)"
 
-#: lib/Packages/DoIndex.pm:75
+#: lib/Packages/DoIndex.pm:70
 #, perl-format
 msgid "couldn't read index file %s: %s"
 msgstr "未能读取索引文件 %s: %s"
@@ -76,15 +96,15 @@ msgstr "关键字不合法或不存在"
 msgid "keyword too short (keywords need to have at least two characters)"
 msgstr "关键字太短(关键字需要至少包含两个字符)"
 
-#: lib/Packages/DoSearch.pm:165
+#: lib/Packages/DoSearch.pm:170
 msgid "Exact hits"
 msgstr "完整匹配"
 
-#: lib/Packages/DoSearch.pm:175
+#: lib/Packages/DoSearch.pm:180
 msgid "Other hits"
 msgstr "部分匹配"
 
-#: lib/Packages/DoSearch.pm:234
+#: lib/Packages/DoSearch.pm:239
 msgid "Virtual package"
 msgstr "虚包"
 
@@ -130,19 +150,3 @@ msgstr "暂时不可用"
 #: lib/Packages/Page.pm:47
 msgid "package has bad maintainer field"
 msgstr "软件包存在错误的维护者字段"
-
-#: lib/Packages/Dispatcher.pm:312
-msgid "requested format not available for this document"
-msgstr "要求的格式在此文档中暂时不可用"
-
-#: bin/create_index_pages:233
-msgid "Section"
-msgstr "版面"
-
-#: bin/create_index_pages:245
-msgid "Subsection"
-msgstr "子版面"
-
-#: bin/create_index_pages:257
-msgid "Priority"
-msgstr "优先级"
diff --git a/po/templates.de.po b/po/templates.de.po
index 0c7bc98..be01383 100644
--- a/po/templates.de.po
+++ b/po/templates.de.po
@@ -3,41 +3,40 @@ msgstr ""
 "Project-Id-Version: packages.git c82c758c8\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-10-13 19:05+0200\n"
-"PO-Revision-Date: 2007-12-16 10:14+0100\n"
+"PO-Revision-Date: 2008-02-04 21:50+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: debian-l10n-german <debian-l10n-german@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: templates/config.tmpl:40
+#: templates/config.tmpl:41
 msgid "Debian Web Mailinglist"
 msgstr "Debian Webseiten-Mailingliste"
 
-#: templates/config.tmpl:45
+#: templates/config.tmpl:46
 msgid "%s Webmaster"
 msgstr "%s-Webmaster"
 
-#: templates/config.tmpl:48
+#: templates/config.tmpl:49
 msgid "%s is a <a href=\"%s\">trademark</a> of %s"
 msgstr "%s ist ein eingetragenes <a href=\"%s\">Warenzeichen</a> von %s"
 
-#: templates/config.tmpl:53
+#: templates/config.tmpl:54
 msgid ""
-"Please note that this is an experimental version of <a href=\"http://"
-"packages.debian.org/\">packages.debian.org</a>. Errors and obsolete "
-"information should be expected"
+"Please note that this is an experimental version of <a href=\"http://%s/\">%"
+"s</a>. Errors and obsolete information should be expected"
 msgstr ""
 "Bitte beachten Sie, dass es sich bei dieser Seite um eine experimentelle "
-"Version von <a href=\"http://packages.debian.org/\">packages.debian.org</a> "
-"handelt. Mit Fehlern und veralteten Informationen muss gerechnet werden"
+"Version von <a href=\"http://%s/\">%s</a> handelt. Mit Fehlern und "
+"veralteten Informationen muss gerechnet werden"
 
 #. @translators: . = decimal_point , = thousands_sep, see Number::Format 
-#: templates/config.tmpl:56
+#: templates/config.tmpl:57
 msgid "."
 msgstr ","
 
-#: templates/config.tmpl:57
+#: templates/config.tmpl:58
 msgid ","
 msgstr " "
 
@@ -105,27 +104,27 @@ msgstr "GNU/kFreeBSD (i386)"
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 
-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:178
 msgid "North America"
 msgstr "Nordamerika"
 
-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:179
 msgid "South America"
 msgstr "Südamerika"
 
-#: templates/config/mirrors.tmpl:184
+#: templates/config/mirrors.tmpl:180
 msgid "Asia"
 msgstr "Asien"
 
-#: templates/config/mirrors.tmpl:185
+#: templates/config/mirrors.tmpl:181
 msgid "Australia and New Zealand"
 msgstr "Australien und Neuseeland"
 
-#: templates/config/mirrors.tmpl:186
+#: templates/config/mirrors.tmpl:182
 msgid "Europe"
 msgstr "Europa"
 
-#: templates/config/mirrors.tmpl:187
+#: templates/config/mirrors.tmpl:183
 msgid "Africa"
 msgstr "Afrika"
 
@@ -134,12 +133,12 @@ msgid "Package Download Selection -- %s"
 msgstr "Paket-Download-Auswahl -- %s"
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 msgid "Distribution:"
 msgstr "Distribution:"
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 msgid "Overview over this suite"
 msgstr "Übersicht über diese Suite"
 
@@ -183,7 +182,7 @@ msgstr ""
 msgid "Replacing <em>%s</em> with the mirror in question."
 msgstr "Ersetzen Sie dabei <em>%s</em> mit dem gewünschten Spiegel-Server."
 
-#: templates/html/download.tmpl:37 templates/html/show.tmpl:152
+#: templates/html/download.tmpl:37 templates/html/show.tmpl:155
 msgid "Experimental package"
 msgstr "Experimentelles Paket"
 
@@ -200,11 +199,11 @@ msgstr ""
 "Changelog und andere möglicherweise verfügbare Dokumentation, bevor Sie es "
 "benutzen."
 
-#: templates/html/download.tmpl:41 templates/html/show.tmpl:157
+#: templates/html/download.tmpl:41 templates/html/show.tmpl:160
 msgid "debian-installer udeb package"
 msgstr "udeb-Paket des Debian-Installers"
 
-#: templates/html/download.tmpl:42 templates/html/show.tmpl:158
+#: templates/html/download.tmpl:42 templates/html/show.tmpl:161
 msgid ""
 "Warning: This package is intended for the use in building <a href=\"http://"
 "www.debian.org/devel/debian-installer\">debian-installer</a> images only. Do "
@@ -277,7 +276,7 @@ msgstr "%s Byte (%s %s)"
 msgid "Exact Size"
 msgstr "Genaue Größe"
 
-#: templates/html/download.tmpl:103 templates/html/show.tmpl:327
+#: templates/html/download.tmpl:103 templates/html/show.tmpl:331
 msgid "MD5 checksum"
 msgstr "MD5-Prüfsumme"
 
@@ -338,7 +337,7 @@ msgstr ""
 "Kontaktinformationen sollten Sie auf die %s-<a href=\"%s\">Kontakt-Seite</a> "
 "schauen."
 
-#: templates/html/foot.tmpl:33 templates/txt/index.tmpl:4
+#: templates/html/foot.tmpl:33 templates/txt/index_head.tmpl:3
 msgid "Generated:"
 msgstr "Erzeugt:"
 
@@ -391,36 +390,31 @@ msgstr "%s-Pakete-Homepage"
 msgid "Packages"
 msgstr "Pakete"
 
-#: templates/html/index.tmpl:3
+#: templates/html/index_head.tmpl:2
 msgid "Source Packages in \"%s\", %s %s"
 msgstr "Quellcode-Pakete in »%s«, %s %s"
 
-#: templates/html/index.tmpl:4
+#: templates/html/index_head.tmpl:3
 msgid "Source Packages in \"%s\""
 msgstr "Quellcode-Pakete in »%s«"
 
-#: templates/html/index.tmpl:6
+#: templates/html/index_head.tmpl:5
 msgid "Software Packages in \"%s\", %s %s"
 msgstr "Software-Pakete in »%s«, %s %s"
 
-#: templates/html/index.tmpl:7
+#: templates/html/index_head.tmpl:6
 msgid "Software Packages in \"%s\""
 msgstr "Software-Pakete in »%s«"
 
-#: templates/html/index.tmpl:14
+#: templates/html/index_head.tmpl:13
 msgid "All Packages"
 msgstr "Alle Pakete"
 
-#: templates/html/index.tmpl:16 templates/html/show.tmpl:15
+#: templates/html/index_head.tmpl:15 templates/html/show.tmpl:15
 #: templates/html/suite_index.tmpl:2
 msgid "Source"
 msgstr "Quellcode"
 
-#: templates/html/index.tmpl:43 templates/html/show.tmpl:254
-#: templates/txt/index.tmpl:15
-msgid "virtual package provided by"
-msgstr "virtuelles Paket, bereitgestellt durch"
-
 #: templates/html/newpkg.tmpl:2 templates/html/newpkg.tmpl:7
 msgid "New Packages in \"%s\""
 msgstr "Neue Pakete in »%s«"
@@ -493,15 +487,7 @@ msgstr "Ergebnisse der Debian-Paketsuche -- %s"
 msgid "Package Search Results"
 msgstr "Ergebnisse der Debian-Paketsuche"
 
-#: templates/html/search.tmpl:33
-msgid ""
-"You can try a different search on the <a href=\"%s#search_packages"
-"\">Packages search page</a>."
-msgstr ""
-"Sie können auf der <a href=\"%s#search_packages\">Paketsuchseite</a> eine "
-"andere Suche durchführen."
-
-#: templates/html/search.tmpl:37
+#: templates/html/search.tmpl:35
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
@@ -509,59 +495,75 @@ msgstr ""
 "Sie haben nur nach Wörtern gesucht, die exakt auf die Schlüsselwörter "
 "passen. Sie können eine <a href=\"%s\">Teilwortsuche</a> ausprobieren."
 
-#: templates/html/search.tmpl:42
+#: templates/html/search.tmpl:40
+msgid "Search in specific suite:"
+msgstr "Suche in bestimmter Suite:"
+
+#: templates/html/search.tmpl:49
+msgid "Search in <a href=\"%s\">all suites</a>"
+msgstr "Suche in <a href=\"%s\">allen Suites</a>"
+
+#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+msgid "Limit search to a specific architecture:"
+msgstr "Schränke Suche auf bestimmte Architekturen ein:"
+
+#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+msgid "Search in <a href=\"%s\">all architectures</a>"
+msgstr "Suche in <a href=\"%s\">allen Architekturen</a>"
+
+#: templates/html/search.tmpl:69
 msgid ""
-"<a href=\"%s\">%u</a> results have not been displayed due to the search "
+"<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
-"<a href=\"%s\">%u</a> Ergebnisse wurden aufgrund der Suchparameter nicht "
+"<a href=\"%s\">Einige</a> Ergebnisse wurden aufgrund der Suchparameter nicht "
 "angezeigt."
 
-#: templates/html/search.tmpl:51
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr "allen Suites"
 
-#: templates/html/search.tmpl:51
-msgid "suite(s) <em>$suite_enc</em>"
-msgstr "Suite(s) <em>$suite_enc</em>"
+#: templates/html/search.tmpl:78
+msgid "suite(s) <em>%s</em>"
+msgstr "Suite(s) <em>%s</em>"
 
-#: templates/html/search.tmpl:52 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
 msgid "all sections"
 msgstr "allen Bereichen"
 
-#: templates/html/search.tmpl:52
-msgid "section(s) <em>$section_enc</em>"
-msgstr "Bereich(e) <em>$section_enc</em>"
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+msgid "section(s) <em>%s</em>"
+msgstr "Bereich(e) <em>%s</em>"
 
-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
 msgid "all architectures"
 msgstr "auf allen Architekturen"
 
-#: templates/html/search.tmpl:53
-msgid "architecture(s) <em>$architectures_enc</em>"
-msgstr "auf Architektur(en) <em>$architectures_enc</em>"
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+msgid "architecture(s) <em>%s</em>"
+msgstr "Architektur(en) <em>%s</em>"
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 msgid "packages"
 msgstr "Paketen"
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 msgid "source packages"
 msgstr "Quellcode-Paketen"
 
-#: templates/html/search.tmpl:56
+#: templates/html/search.tmpl:83
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 "Sie haben nach %s gesucht, deren Namen <em>%s</em> enthält, in %s, %s, und %"
 "s."
 
-#: templates/html/search.tmpl:59
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr " (enthält Teilwortabgleich)"
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:61
+#: templates/html/search.tmpl:88
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
@@ -569,11 +571,11 @@ msgstr ""
 "Sie haben nach <em>%s</em> in Paketnamen und -beschreibungen gesucht, in %s, "
 "%s, und %s%s."
 
-#: templates/html/search.tmpl:67
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr "<strong>%u</strong> passende Pakete gefunden."
 
-#: templates/html/search.tmpl:72
+#: templates/html/search.tmpl:99
 msgid ""
 "Note that this only shows the best matches, sorted by relevance. If the "
 "first few packages don't match what you searched for, try using more "
@@ -583,45 +585,56 @@ msgstr ""
 "Relevanz. Falls die ersten paar Pakete nicht auf Ihre Suche passen, "
 "versuchen Sie, mehr oder andere Suchbegriffe zu verwenden."
 
-#: templates/html/search.tmpl:74
+#: templates/html/search.tmpl:103
+msgid ""
+"Your keyword was too generic, for optimizing reasons some results might have "
+"been suppressed.<br>Please consider using a longer keyword or more keywords."
+msgstr ""
+"Ihr Schlüsselwort war zu allgemein. Daher könnten aufgrund von Optimierungen "
+"einige Ergebnisse unterdrückt sein.<br />Bitte verwenden Sie ein längeres "
+"oder weitere Suchbegriffe."
+
+#: templates/html/search.tmpl:105
 msgid ""
-"Your search was too wide so we will only display exact matches. At least <em>"
-"%u</em> results have been omitted and will not be displayed. Please consider "
-"using a longer keyword or more keywords."
+"Your keyword was too generic.<br>Please consider using a longer keyword or "
+"more keywords."
 msgstr ""
-"Ihre Suche ergab zu viele Ergebnisse, nur exakte Treffer werden angezeigt. "
-"Mindestens <em>%u</em> weitere Treffer wurden ausgelassen und nicht "
-"angezeigt. Bitte benutzen Sie längere oder mehr Suchbegriffe."
+"Ihr Schlüsselwort war zu allgemein.<br />Bitte verwenden Sie ein längeres "
+"oder weitere Suchbegriffe."
 
-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
 msgid "Sorry, your search gave no results"
 msgstr "Leider ergab Ihre Suche kein Ergebnis"
 
-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:118
 msgid "Package %s"
 msgstr "Paket %s"
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "also provided by:"
 msgstr "auch bereitgestellt durch:"
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr "bereitgestellt durch:"
 
-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:139
 msgid "Source Package %s"
 msgstr "Quellcode-Paket %s"
 
-#: templates/html/search.tmpl:113
+#: templates/html/search.tmpl:146
 msgid "Binary packages:"
 msgstr "Binär-Pakete:"
 
-#: templates/html/search.tmpl:115
-msgid "%u binary packages"
-msgstr "%u binäre Pakete"
+#: templates/html/search.tmpl:148
+msgid "hide %u binary packages"
+msgstr "verberge %u binäre Pakete"
 
-#: templates/html/search.tmpl:125
+#: templates/html/search.tmpl:148
+msgid "show %u binary packages"
+msgstr "zeige %u binäre Pakete"
+
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -653,22 +666,6 @@ msgstr "Suche nach Pfaden, die auf <em>%s</em> enden"
 msgid "Search in other suite:"
 msgstr "Suche in anderer Suite:"
 
-#: templates/html/search_contents.tmpl:58
-msgid "Limit search to a specific architecture:"
-msgstr "Schränke Suche auf bestimmte Architekturen ein:"
-
-#: templates/html/search_contents.tmpl:63
-msgid "Search in <a href=\"%s\">all architectures</a>"
-msgstr "Suche in <a href=\"%s\">allen Architekturen</a>"
-
-#: templates/html/search_contents.tmpl:72
-msgid "section(s) <em>%s</em>"
-msgstr "Bereich(e) <em>%s</em>"
-
-#: templates/html/search_contents.tmpl:73
-msgid "architecture(s) <em>%s</em>"
-msgstr "Architektur(en) <em>%s</em>"
-
 #: templates/html/search_contents.tmpl:74
 msgid "paths that end with"
 msgstr "Pfade die wie folgt enden:"
@@ -705,7 +702,7 @@ msgid "Sort results by filename"
 msgstr "Sortiere Ergebnisse nach Dateinamen"
 
 #: templates/html/search_contents.tmpl:98
-#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:327
+#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:331
 msgid "File"
 msgstr "Datei"
 
@@ -729,111 +726,111 @@ msgstr "Alle Pakete in diesem Bereich"
 msgid "Section:"
 msgstr "Bereiche:"
 
-#: templates/html/show.tmpl:21
+#: templates/html/show.tmpl:22
 msgid "Details of source package %s in %s"
 msgstr "Informationen über Quellcode-Paket %s in %s"
 
-#: templates/html/show.tmpl:22
+#: templates/html/show.tmpl:23
 msgid "Details of package %s in %s"
 msgstr "Informationen über Paket %s in %s"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 msgid "Source package building this package"
 msgstr "Quellcode-Paket, aus dem dieses Paket gebaut wird"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 msgid "Source:"
 msgstr "Quellcode:"
 
-#: templates/html/show.tmpl:52
+#: templates/html/show.tmpl:53
 msgid "Virtual Package: %s"
 msgstr "Virtuelles Paket: %s"
 
-#: templates/html/show.tmpl:54
+#: templates/html/show.tmpl:55
 msgid "Source Package: %s (%s)"
 msgstr "Quellcode-Paket: %s (%s)"
 
-#: templates/html/show.tmpl:56
+#: templates/html/show.tmpl:57
 msgid "Package: %s (%s)"
 msgstr "Paket: %s (%s)"
 
-#: templates/html/show.tmpl:60
+#: templates/html/show.tmpl:61
 msgid "essential"
 msgstr "Essenziell"
 
-#: templates/html/show.tmpl:64
+#: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "Links für %s"
 
-#: templates/html/show.tmpl:65
-msgid "Debian Resources:"
-msgstr "Debian-Ressourcen:"
+#: templates/html/show.tmpl:66
+msgid "%s Resources:"
+msgstr "%s-Ressourcen:"
 
-#: templates/html/show.tmpl:67
+#: templates/html/show.tmpl:68
 msgid "Bug Reports"
 msgstr "Fehlerberichte"
 
-#: templates/html/show.tmpl:70 templates/html/show.tmpl:72
+#: templates/html/show.tmpl:71 templates/html/show.tmpl:73
 msgid "Developer Information (PTS)"
 msgstr "Entwicklerinformationen (PTS)"
 
-#: templates/html/show.tmpl:76
+#: templates/html/show.tmpl:77
 msgid "%s Changelog"
 msgstr "%s-Changelog"
 
-#: templates/html/show.tmpl:77
+#: templates/html/show.tmpl:78
 msgid "Copyright File"
 msgstr "Copyright-Datei"
 
-#: templates/html/show.tmpl:81
+#: templates/html/show.tmpl:82
 msgid "Debian Source Repository"
 msgstr "Debian-Quellcode-Depot"
 
-#: templates/html/show.tmpl:95
+#: templates/html/show.tmpl:96
 msgid "Download Source Package <a href=\"%s\">%s</a>:"
 msgstr "Quellcode-Paket <a href=\"%s\">%s</a> herunterladen:"
 
-#: templates/html/show.tmpl:102
+#: templates/html/show.tmpl:103
 msgid "Not found"
 msgstr "Nicht gefunden"
 
-#: templates/html/show.tmpl:107
+#: templates/html/show.tmpl:108
 msgid "Maintainer:"
 msgstr "Betreuer:"
 
-#: templates/html/show.tmpl:109
+#: templates/html/show.tmpl:110
 msgid "Maintainers:"
 msgstr "Betreuer:"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "An overview over the maintainer's packages and uploads"
 msgstr "Eine Übersicht über die Pakete und Uploads des Betreuers"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "QA Page"
 msgstr "QS-Seite"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Archive of the Maintainer Mailinglist"
 msgstr "Archiv der Betreuer-Mailingliste"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Mail Archive"
 msgstr "E-Mail-Archiv"
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:132
 msgid "External Resources:"
 msgstr "Externe Ressourcen:"
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:134
 msgid "Homepage"
 msgstr "Homepage"
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:140
 msgid "Similar packages:"
 msgstr "Ähnliche Pakete: "
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:156
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
 "distribution. That means it is likely unstable or buggy, and it may even "
@@ -846,7 +843,7 @@ msgstr ""
 "<a href=\"%s\">Changelog</a> und andere möglicherweise verfügbare "
 "Dokumentation, bevor Sie es benutzen."
 
-#: templates/html/show.tmpl:176
+#: templates/html/show.tmpl:180
 msgid ""
 "This is a <em>virtual package</em>. See the <a href=\"%s\">Debian policy</a> "
 "for a <a href=\"%sch-binary.html#s-virtual_pkg\">definition of virtual "
@@ -856,63 +853,71 @@ msgstr ""
 "\">Debian-Richtlinien</a> für eine <a href=\"%sch-binary.html#s-virtual_pkg"
 "\">Definition von virtuellen Paketen</a>."
 
-#: templates/html/show.tmpl:184
+#: templates/html/show.tmpl:188
 msgid "Tags"
 msgstr "Markierungen"
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:211
 msgid "Packages providing %s"
 msgstr "Pakete, die %s bereitstellen"
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:220
 msgid "The following binary packages are built from this source package:"
 msgstr "Die folgenden Binärpakete werden aus diesem Quellcode-Paket gebaut:"
 
-#: templates/html/show.tmpl:225
+#: templates/html/show.tmpl:229
 msgid "Other Packages Related to %s"
 msgstr "Andere Pakete mit Bezug zu %s"
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:231
 msgid "legend"
 msgstr "Legende"
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:233
 msgid "build-depends"
 msgstr "build-depends"
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:234
 msgid "build-depends-indep"
 msgstr "build-depends-indep"
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:236
 msgid "depends"
 msgstr "hängt ab von"
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:237
 msgid "recommends"
 msgstr "empfiehlt"
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:238
 msgid "suggests"
 msgstr "schlägt vor"
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:248
 msgid "or "
 msgstr "oder "
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:256
 msgid "also a virtual package provided by"
 msgstr "auch ein virtuelles Paket, bereitgestellt durch"
 
-#: templates/html/show.tmpl:259
-msgid "%u providing packages"
-msgstr "%u bereitstellende Pakete"
+#: templates/html/show.tmpl:258
+msgid "virtual package provided by"
+msgstr "virtuelles Paket, bereitgestellt durch"
+
+#: templates/html/show.tmpl:263
+msgid "hide %u providing packages"
+msgstr "verberge %u bereitstellende Pakete"
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:263
+msgid "show %u providing packages"
+msgstr "zeige %u bereitstellende Pakete"
+
+#: templates/html/show.tmpl:281
 msgid "Download %s"
 msgstr "%s herunterladen"
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:283
 msgid ""
 "The download table links to the download of the package and a file overview. "
 "In addition it gives information about the package size and the installed "
@@ -922,55 +927,55 @@ msgstr ""
 "Dateiliste. Zusätzlich enthält sie Informationen zur Größe der Paketdatei "
 "und der Größe im installierten Zustand."
 
-#: templates/html/show.tmpl:280
+#: templates/html/show.tmpl:284
 msgid "Download for all available architectures"
 msgstr "Download für alle verfügbaren Architekturen"
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:285
 msgid "Architecture"
 msgstr "Architektur"
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:286
 msgid "Version"
 msgstr "Version"
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:287
 msgid "Package Size"
 msgstr "Paketgröße"
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:288
 msgid "Installed Size"
 msgstr "Größe (installiert)"
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:289
 msgid "Files"
 msgstr "Dateien"
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:297
 msgid "(unofficial port)"
 msgstr "(inoffizielle Portierung)"
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:308 templates/html/show.tmpl:336
 msgid "%s&nbsp;kB"
 msgstr "%s&nbsp;kB"
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:311
 msgid "list of files"
 msgstr "Liste der Dateien"
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:313
 msgid "no current information"
 msgstr "keine aktuellen Informationen"
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:330
 msgid "Download information for the files of this source package"
 msgstr "Download-Informationen für die Dateien dieses Quellcode-Pakets"
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:331
 msgid "Size (in kB)"
 msgstr "Größe (in kB)"
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:349
 msgid ""
 "Debian Package Source Repository (<acronym title=\"Version Control System"
 "\">VCS</acronym>: <a href=\"%s\">%s</a>)"
@@ -978,7 +983,7 @@ msgstr ""
 "Quellcode-Depot des Debian-Pakets (<acronym lang=\"en\" title=\"Version "
 "Control System\">VCS</acronym>: <a href=\"%s\">%s</a>)"
 
-#: templates/html/show.tmpl:349
+#: templates/html/show.tmpl:353
 msgid "Debian Package Source Repository (Browsable)"
 msgstr "Quellcode-Depot des Debian-Pakets (browsable)"
 
@@ -1034,14 +1039,30 @@ msgstr ""
 "Die folgenden Pakete wurden der Suite %s im %s-Archiv während der letzten 7 "
 "Tage hinzugefügt."
 
-#: templates/rss/newpkg.tmpl:28 templates/txt/index.tmpl:5
+#: templates/rss/newpkg.tmpl:28 templates/txt/index_head.tmpl:4
 msgid "Copyright ©"
 msgstr "Copyright ©"
 
-#: templates/txt/index.tmpl:2
+#: templates/txt/index_head.tmpl:1
 msgid "All %s Packages in \"%s\""
 msgstr "Alle %s-Pakete in »%s«"
 
-#: templates/txt/index.tmpl:6
+#: templates/txt/index_head.tmpl:5
 msgid "See <URL:%s> for the license terms."
 msgstr "Siehe <URL:%s> für die Lizenz-Bestimmungen."
+
+#~ msgid "suite(s) <em>$suite_enc</em>"
+#~ msgstr "Suite(s) <em>$suite_enc</em>"
+
+#~ msgid "section(s) <em>$section_enc</em>"
+#~ msgstr "Bereich(e) <em>$section_enc</em>"
+
+#~ msgid "architecture(s) <em>$architectures_enc</em>"
+#~ msgstr "auf Architektur(en) <em>$architectures_enc</em>"
+
+#~ msgid ""
+#~ "You can try a different search on the <a href=\"%s#search_packages"
+#~ "\">Packages search page</a>."
+#~ msgstr ""
+#~ "Sie können auf der <a href=\"%s#search_packages\">Paketsuchseite</a> eine "
+#~ "andere Suche durchführen."
diff --git a/po/templates.fi.po b/po/templates.fi.po
index 95752ac..2d9e74c 100644
--- a/po/templates.fi.po
+++ b/po/templates.fi.po
@@ -15,34 +15,32 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/config.tmpl:40
+#: templates/config.tmpl:41
 msgid "Debian Web Mailinglist"
 msgstr ""
 
-#: templates/config.tmpl:45
+#: templates/config.tmpl:46
 msgid "%s Webmaster"
 msgstr "%s-seittimestari"
 
-#: templates/config.tmpl:48
+#: templates/config.tmpl:49
 msgid "%s is a <a href=\"%s\">trademark</a> of %s"
 msgstr "%1 on %3'n <a href=\"%2\">tavaramerkki</a>"
 
-#: templates/config.tmpl:53
+#: templates/config.tmpl:54
 msgid ""
-"Please note that this is an experimental version of <a href=\"http://"
-"packages.debian.org/\">packages.debian.org</a>. Errors and obsolete "
-"information should be expected"
+"Please note that this is an experimental version of <a href=\"http://%s/\">%"
+"s</a>. Errors and obsolete information should be expected"
 msgstr ""
-"Huomaattehan, että tämä on kokeellinen versio <a href=\"http://packages."
-"debian.org/\">packages.debian.org</a>-palvelusta. Varauduttehan virheisiin "
-"ja vanhentuneeseen tietoon"
+"Huomaattehan, että tämä on kokeellinen versio <a href=\"http://%s/\">%s</a>-"
+"palvelusta. Varauduttehan virheisiin ja vanhentuneeseen tietoon"
 
 #. @translators: . = decimal_point , = thousands_sep, see Number::Format 
-#: templates/config.tmpl:56
+#: templates/config.tmpl:57
 msgid "."
 msgstr ""
 
-#: templates/config.tmpl:57
+#: templates/config.tmpl:58
 msgid ","
 msgstr ""
 
@@ -110,27 +108,27 @@ msgstr "GNU/kFreeBSD (i386)"
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 
-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:178
 msgid "North America"
 msgstr "Pohjois-Amerikka"
 
-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:179
 msgid "South America"
 msgstr "Etelä-Amerikka"
 
-#: templates/config/mirrors.tmpl:184
+#: templates/config/mirrors.tmpl:180
 msgid "Asia"
 msgstr "Aasia"
 
-#: templates/config/mirrors.tmpl:185
+#: templates/config/mirrors.tmpl:181
 msgid "Australia and New Zealand"
 msgstr "Australia ja Uusi-Seelanti"
 
-#: templates/config/mirrors.tmpl:186
+#: templates/config/mirrors.tmpl:182
 msgid "Europe"
 msgstr "Eurooppa"
 
-#: templates/config/mirrors.tmpl:187
+#: templates/config/mirrors.tmpl:183
 msgid "Africa"
 msgstr "Afrikka"
 
@@ -139,12 +137,12 @@ msgid "Package Download Selection -- %s"
 msgstr ""
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 msgid "Distribution:"
 msgstr "Jakelu:"
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 msgid "Overview over this suite"
 msgstr "Tämän jakelun yleiskuva"
 
@@ -182,7 +180,7 @@ msgstr ""
 msgid "Replacing <em>%s</em> with the mirror in question."
 msgstr ""
 
-#: templates/html/download.tmpl:37 templates/html/show.tmpl:152
+#: templates/html/download.tmpl:37 templates/html/show.tmpl:155
 msgid "Experimental package"
 msgstr "Kokeellinen paketti"
 
@@ -198,11 +196,11 @@ msgstr ""
 "jopa tiedonhäviötä. Kannattaa ehdottomasti tutustua muutoslokiin ja muuhun "
 "mahdolliseen dokumenaatioon ennen käyttöönottoa."
 
-#: templates/html/download.tmpl:41 templates/html/show.tmpl:157
+#: templates/html/download.tmpl:41 templates/html/show.tmpl:160
 msgid "debian-installer udeb package"
 msgstr "debian-asentimen udeb-paketti"
 
-#: templates/html/download.tmpl:42 templates/html/show.tmpl:158
+#: templates/html/download.tmpl:42 templates/html/show.tmpl:161
 #, fuzzy
 msgid ""
 "Warning: This package is intended for the use in building <a href=\"http://"
@@ -268,7 +266,7 @@ msgstr "%s tavua (%s %s)"
 msgid "Exact Size"
 msgstr "Tarkka koko"
 
-#: templates/html/download.tmpl:103 templates/html/show.tmpl:327
+#: templates/html/download.tmpl:103 templates/html/show.tmpl:331
 msgid "MD5 checksum"
 msgstr "MD5-tarkiste"
 
@@ -330,7 +328,7 @@ msgstr ""
 "englanniksi osoitteeseen <a href=\"mailto:%s\">%s</a>. Muut yhteystiedot "
 "löytyvät Debianin <a href=\"%s/contact\">yhteystietosivulta</a>."
 
-#: templates/html/foot.tmpl:33 templates/txt/index.tmpl:4
+#: templates/html/foot.tmpl:33 templates/txt/index_head.tmpl:3
 msgid "Generated:"
 msgstr "Muodostettu:"
 
@@ -383,39 +381,34 @@ msgstr "%s-pakettien kotisivu"
 msgid "Packages"
 msgstr "Paketit"
 
-#: templates/html/index.tmpl:3
+#: templates/html/index_head.tmpl:2
 #, fuzzy
 msgid "Source Packages in \"%s\", %s %s"
 msgstr "Ohjelmistopaketit jakelun \"%s\" osastossa %s"
 
-#: templates/html/index.tmpl:4
+#: templates/html/index_head.tmpl:3
 #, fuzzy
 msgid "Source Packages in \"%s\""
 msgstr "Ohjelmistopaketit jakelussa \"%s\""
 
-#: templates/html/index.tmpl:6
+#: templates/html/index_head.tmpl:5
 #, fuzzy
 msgid "Software Packages in \"%s\", %s %s"
 msgstr "Ohjelmistopaketit jakelun \"%s\" osastossa %s"
 
-#: templates/html/index.tmpl:7
+#: templates/html/index_head.tmpl:6
 msgid "Software Packages in \"%s\""
 msgstr "Ohjelmistopaketit jakelussa \"%s\""
 
-#: templates/html/index.tmpl:14
+#: templates/html/index_head.tmpl:13
 msgid "All Packages"
 msgstr "Kaikki paketit"
 
-#: templates/html/index.tmpl:16 templates/html/show.tmpl:15
+#: templates/html/index_head.tmpl:15 templates/html/show.tmpl:15
 #: templates/html/suite_index.tmpl:2
 msgid "Source"
 msgstr "Lähdepaketti"
 
-#: templates/html/index.tmpl:43 templates/html/show.tmpl:254
-#: templates/txt/index.tmpl:15
-msgid "virtual package provided by"
-msgstr "näennäispaketti, jonka toteuttaa"
-
 #: templates/html/newpkg.tmpl:2 templates/html/newpkg.tmpl:7
 msgid "New Packages in \"%s\""
 msgstr "Uudet paketit jakelussa \"%s\""
@@ -489,125 +482,144 @@ msgstr "Pakettihaun tulokset -- %s"
 msgid "Package Search Results"
 msgstr "Pakettihaun tulokset"
 
-#: templates/html/search.tmpl:33
-#, fuzzy
-msgid ""
-"You can try a different search on the <a href=\"%s#search_packages"
-"\">Packages search page</a>."
-msgstr ""
-"Takaisin: <a href=\"%s/\">Debian-projektin kotisivulle</a> || <a href=\"%s/"
-"\">Pakettien hakusivulle</a>"
-
-#: templates/html/search.tmpl:37
+#: templates/html/search.tmpl:35
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgstr ""
 
-#: templates/html/search.tmpl:42
+#: templates/html/search.tmpl:40
+msgid "Search in specific suite:"
+msgstr ""
+
+#: templates/html/search.tmpl:49
+#, fuzzy
+msgid "Search in <a href=\"%s\">all suites</a>"
+msgstr "Hae <a href=\"%s\">paketin %s muita versioita</a>"
+
+#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+msgid "Limit search to a specific architecture:"
+msgstr ""
+
+#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+#, fuzzy
+msgid "Search in <a href=\"%s\">all architectures</a>"
+msgstr "Hae <a href=\"%s\">paketin %s muita versioita</a>"
+
+#: templates/html/search.tmpl:69
 msgid ""
-"<a href=\"%s\">%u</a> results have not been displayed due to the search "
+"<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
 
-#: templates/html/search.tmpl:51
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr "kaikki jakelut"
 
-#: templates/html/search.tmpl:51
-msgid "suite(s) <em>$suite_enc</em>"
+#: templates/html/search.tmpl:78
+msgid "suite(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:52 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
 msgid "all sections"
 msgstr "kaikki osastot"
 
-#: templates/html/search.tmpl:52
-msgid "section(s) <em>$section_enc</em>"
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+msgid "section(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
 msgid "all architectures"
 msgstr "kaikki arkkitehtuurit"
 
-#: templates/html/search.tmpl:53
-msgid "architecture(s) <em>$architectures_enc</em>"
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+msgid "architecture(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 msgid "packages"
 msgstr "paketit"
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 msgid "source packages"
 msgstr "lähdepaketit"
 
-#: templates/html/search.tmpl:56
+#: templates/html/search.tmpl:83
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 
-#: templates/html/search.tmpl:59
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:61
+#: templates/html/search.tmpl:88
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgstr ""
 
-#: templates/html/search.tmpl:67
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 
-#: templates/html/search.tmpl:72
+#: templates/html/search.tmpl:99
 msgid ""
 "Note that this only shows the best matches, sorted by relevance. If the "
 "first few packages don't match what you searched for, try using more "
 "keywords or alternative keywords."
 msgstr ""
 
-#: templates/html/search.tmpl:74
+#: templates/html/search.tmpl:103
+msgid ""
+"Your keyword was too generic, for optimizing reasons some results might have "
+"been suppressed.<br>Please consider using a longer keyword or more keywords."
+msgstr ""
+
+#: templates/html/search.tmpl:105
 msgid ""
-"Your search was too wide so we will only display exact matches. At least <em>"
-"%u</em> results have been omitted and will not be displayed. Please consider "
-"using a longer keyword or more keywords."
+"Your keyword was too generic.<br>Please consider using a longer keyword or "
+"more keywords."
 msgstr ""
 
-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
 msgid "Sorry, your search gave no results"
 msgstr "Haullasi ei löytynyt yhtään tulosta"
 
-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:118
 msgid "Package %s"
 msgstr "Paketti %s"
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "also provided by:"
 msgstr "jonka toteuttaa myös:"
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr "jonka toteuttaa:"
 
-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:139
 #, fuzzy
 msgid "Source Package %s"
 msgstr "Lähdepaketti"
 
-#: templates/html/search.tmpl:113
+#: templates/html/search.tmpl:146
 #, fuzzy
 msgid "Binary packages:"
 msgstr "näennäispaketti"
 
-#: templates/html/search.tmpl:115
+#: templates/html/search.tmpl:148
 #, fuzzy
-msgid "%u binary packages"
+msgid "hide %u binary packages"
 msgstr "Paketin koko"
 
-#: templates/html/search.tmpl:125
+#: templates/html/search.tmpl:148
+#, fuzzy
+msgid "show %u binary packages"
+msgstr "Paketin koko"
+
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -638,23 +650,6 @@ msgstr ""
 msgid "Search in other suite:"
 msgstr ""
 
-#: templates/html/search_contents.tmpl:58
-msgid "Limit search to a specific architecture:"
-msgstr ""
-
-#: templates/html/search_contents.tmpl:63
-#, fuzzy
-msgid "Search in <a href=\"%s\">all architectures</a>"
-msgstr "Hae <a href=\"%s\">paketin %s muita versioita</a>"
-
-#: templates/html/search_contents.tmpl:72
-msgid "section(s) <em>%s</em>"
-msgstr ""
-
-#: templates/html/search_contents.tmpl:73
-msgid "architecture(s) <em>%s</em>"
-msgstr ""
-
 #: templates/html/search_contents.tmpl:74
 msgid "paths that end with"
 msgstr ""
@@ -687,7 +682,7 @@ msgid "Sort results by filename"
 msgstr ""
 
 #: templates/html/search_contents.tmpl:98
-#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:327
+#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:331
 msgid "File"
 msgstr "Tiedosto"
 
@@ -712,117 +707,117 @@ msgstr "Kaikki tämän osaston paketit"
 msgid "Section:"
 msgstr "Osasto:"
 
-#: templates/html/show.tmpl:21
+#: templates/html/show.tmpl:22
 #, fuzzy
 msgid "Details of source package %s in %s"
 msgstr "Lähdepaketit jakelussa \"%s\""
 
-#: templates/html/show.tmpl:22
+#: templates/html/show.tmpl:23
 #, fuzzy
 msgid "Details of package %s in %s"
 msgstr "Uudet paketit komponentissa %s"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 #, fuzzy
 msgid "Source package building this package"
 msgstr "Lähdepaketti"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 #, fuzzy
 msgid "Source:"
 msgstr "Lähdepaketti:"
 
-#: templates/html/show.tmpl:52
+#: templates/html/show.tmpl:53
 msgid "Virtual Package: %s"
 msgstr "Näennäispaketti: %s"
 
-#: templates/html/show.tmpl:54
+#: templates/html/show.tmpl:55
 #, fuzzy
 msgid "Source Package: %s (%s)"
 msgstr "Lähdepaketti: %s (%s)"
 
-#: templates/html/show.tmpl:56
+#: templates/html/show.tmpl:57
 msgid "Package: %s (%s)"
 msgstr "Paketti: %s (%s)"
 
-#: templates/html/show.tmpl:60
+#: templates/html/show.tmpl:61
 #, fuzzy
 msgid "essential"
 msgstr "Välttämätön"
 
-#: templates/html/show.tmpl:64
+#: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr ""
 
-#: templates/html/show.tmpl:65
-msgid "Debian Resources:"
-msgstr "Debian-palvelut:"
+#: templates/html/show.tmpl:66
+msgid "%s Resources:"
+msgstr "%s-palvelut:"
 
-#: templates/html/show.tmpl:67
+#: templates/html/show.tmpl:68
 msgid "Bug Reports"
 msgstr "Vikailmoitukset"
 
-#: templates/html/show.tmpl:70 templates/html/show.tmpl:72
+#: templates/html/show.tmpl:71 templates/html/show.tmpl:73
 msgid "Developer Information (PTS)"
 msgstr "Kehittäjätiedot (PTS)"
 
-#: templates/html/show.tmpl:76
+#: templates/html/show.tmpl:77
 msgid "%s Changelog"
 msgstr "%s-muutosloki"
 
-#: templates/html/show.tmpl:77
+#: templates/html/show.tmpl:78
 msgid "Copyright File"
 msgstr "Tekijänoikeustiedosto"
 
-#: templates/html/show.tmpl:81
+#: templates/html/show.tmpl:82
 msgid "Debian Source Repository"
 msgstr ""
 
-#: templates/html/show.tmpl:95
+#: templates/html/show.tmpl:96
 msgid "Download Source Package <a href=\"%s\">%s</a>:"
 msgstr "Imuroi lähdekoodipaketti <a href=\"%s\">%s</a>:"
 
-#: templates/html/show.tmpl:102
+#: templates/html/show.tmpl:103
 msgid "Not found"
 msgstr "Ei löytynyt"
 
-#: templates/html/show.tmpl:107
+#: templates/html/show.tmpl:108
 msgid "Maintainer:"
 msgstr "Ylläpitäjä:"
 
-#: templates/html/show.tmpl:109
+#: templates/html/show.tmpl:110
 msgid "Maintainers:"
 msgstr "Ylläpitäjät:"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "An overview over the maintainer's packages and uploads"
 msgstr ""
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "QA Page"
 msgstr "Laadunvalvontasivu"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Archive of the Maintainer Mailinglist"
 msgstr ""
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Mail Archive"
 msgstr ""
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:132
 msgid "External Resources:"
 msgstr ""
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:134
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:140
 msgid "Similar packages:"
 msgstr "Samankaltaisia paketteja:"
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:156
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
 "distribution. That means it is likely unstable or buggy, and it may even "
@@ -834,7 +829,7 @@ msgstr ""
 "jopa tiedonhäviötä. Kannattaa ehdottomasti tutustua <a href=\"%s"
 "\">muutoslokiin</a> ja muihin mahdollisiin ohjeisiin ennen käyttöönottoa."
 
-#: templates/html/show.tmpl:176
+#: templates/html/show.tmpl:180
 msgid ""
 "This is a <em>virtual package</em>. See the <a href=\"%s\">Debian policy</a> "
 "for a <a href=\"%sch-binary.html#s-virtual_pkg\">definition of virtual "
@@ -844,64 +839,73 @@ msgstr ""
 "kuvaksesta</a> <a href=\"%sch-binary.html#s-virtual_pkg\">näennäispaketin "
 "määritelmä</a>."
 
-#: templates/html/show.tmpl:184
+#: templates/html/show.tmpl:188
 msgid "Tags"
 msgstr "Tagit"
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:211
 msgid "Packages providing %s"
 msgstr "Paketit, jotka toteuttavat paketin %s"
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:220
 msgid "The following binary packages are built from this source package:"
 msgstr "Seuraavat binääripaketit on käännetty tästä lähdepaketista:"
 
-#: templates/html/show.tmpl:225
+#: templates/html/show.tmpl:229
 msgid "Other Packages Related to %s"
 msgstr "Muut pakettiin %s liittyvät paketit"
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:231
 msgid "legend"
 msgstr ""
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:233
 msgid "build-depends"
 msgstr ""
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:234
 msgid "build-depends-indep"
 msgstr ""
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:236
 msgid "depends"
 msgstr ""
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:237
 msgid "recommends"
 msgstr ""
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:238
 msgid "suggests"
 msgstr ""
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:248
 msgid "or "
 msgstr "tai "
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:256
 msgid "also a virtual package provided by"
 msgstr "myös näennäispaketti, jonka toteuttaa"
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:258
+msgid "virtual package provided by"
+msgstr "näennäispaketti, jonka toteuttaa"
+
+#: templates/html/show.tmpl:263
 #, fuzzy
-msgid "%u providing packages"
+msgid "hide %u providing packages"
 msgstr "Paketin koko"
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:263
+#, fuzzy
+msgid "show %u providing packages"
+msgstr "Paketin koko"
+
+#: templates/html/show.tmpl:281
 msgid "Download %s"
 msgstr "Imuroi %s"
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:283
 msgid ""
 "The download table links to the download of the package and a file overview. "
 "In addition it gives information about the package size and the installed "
@@ -911,62 +915,62 @@ msgstr ""
 "Lisäksi se antaa tietoa paketin koosta sekä asennukseen tarvittavasta "
 "levytilasta."
 
-#: templates/html/show.tmpl:280
+#: templates/html/show.tmpl:284
 msgid "Download for all available architectures"
 msgstr "Imurointi kaikille saataville arkkitehtuureille"
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:285
 msgid "Architecture"
 msgstr "Arkkitehtuuri"
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:286
 msgid "Version"
 msgstr "Versio"
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:287
 msgid "Package Size"
 msgstr "Paketin koko"
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:288
 msgid "Installed Size"
 msgstr "Koko asennettuna"
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:289
 msgid "Files"
 msgstr "Tiedostot"
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:297
 msgid "(unofficial port)"
 msgstr "(epävirallinen siirros)"
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:308 templates/html/show.tmpl:336
 msgid "%s&nbsp;kB"
 msgstr "%s&nbsp;kt"
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:311
 msgid "list of files"
 msgstr "tiedostoluettelo"
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:313
 #, fuzzy
 msgid "no current information"
 msgstr "Lisätietoa paketista %s"
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:330
 msgid "Download information for the files of this source package"
 msgstr ""
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:331
 msgid "Size (in kB)"
 msgstr "Koko (kt)"
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:349
 msgid ""
 "Debian Package Source Repository (<acronym title=\"Version Control System"
 "\">VCS</acronym>: <a href=\"%s\">%s</a>)"
 msgstr ""
 
-#: templates/html/show.tmpl:349
+#: templates/html/show.tmpl:353
 #, fuzzy
 msgid "Debian Package Source Repository (Browsable)"
 msgstr "Kaikki jakelun \"%s\" Debian-paketit"
@@ -1028,96 +1032,80 @@ msgstr ""
 "Seuraavat paketit on lisätty epävakaaseen Debian-arkistoon viimeisen "
 "seitsemän (7) päivän aikana."
 
-#: templates/rss/newpkg.tmpl:28 templates/txt/index.tmpl:5
+#: templates/rss/newpkg.tmpl:28 templates/txt/index_head.tmpl:4
 msgid "Copyright ©"
 msgstr "Tekijänoikeus ©"
 
-#: templates/txt/index.tmpl:2
+#: templates/txt/index_head.tmpl:1
 msgid "All %s Packages in \"%s\""
 msgstr "Kaikki %s-paketit jakelussa \"%s\""
 
-#: templates/txt/index.tmpl:6
+#: templates/txt/index_head.tmpl:5
 msgid "See <URL:%s> for the license terms."
 msgstr "Lisenssiehdot sivulla <URL:%s>."
 
-#~ msgid "Virtual package"
-#~ msgstr "Näennäispaketti"
-
-#~ msgid "Package not available"
-#~ msgstr "Paketti ei saatavilla"
-
-#~ msgid "Software Packages in \"%s\", priority %s"
-#~ msgstr "Ohjelmistopaketit jakelussa \"%s\" tärkeysasteella %s"
-
-#~ msgid "Download %s\n"
-#~ msgstr "Imuroi %s\n"
-
-#~ msgid "virtual package"
-#~ msgstr "näennäispaketti"
-
-#~ msgid "Overview over this distribution"
-#~ msgstr "Tämän jakelun yleiskuva"
-
-#~ msgid "md5sum"
-#~ msgstr "MD5-summa"
-
-#~ msgid "Check for <a href=\"%s\">Bug Reports</a> about %s."
-#~ msgstr "Tarkista paketin %s <a href=\"%s\">vikailmoitukset</a>."
-
-#~ msgid "Source Package:"
-#~ msgstr "Lähdepaketti:"
-
-#~ msgid "View the <a href=\"%s\">Debian changelog</a>"
-#~ msgstr "Katso <a href=\"%s\">Debian-muutoslokia</a>"
-
-#~ msgid "View the <a href=\"%s\">copyright file</a>"
-#~ msgstr "Katso <a href=\"%s\">copyright-tiedostoa</a>"
-
-#~ msgid "%s is responsible for this Debian package."
-#~ msgstr "%s on vastuussa tästä Debian-paketista."
+#~ msgid "Versions:"
+#~ msgstr "Versiot:"
 
-#~ msgid " and %s are responsible for this Debian package."
-#~ msgstr " ja %s ovat vastuussa tästä Debian-paketista."
+#~ msgid ""
+#~ "Copyright (C) 1997-2005 SPI;\n"
+#~ "See <URL:http://www.debian.org/license> for the license terms.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Copyright © 1997-2005 SPI;\n"
+#~ "Katso lisenssiehdot sivulta <URL:http://www.debian.org/license>.\n"
+#~ "\n"
 
-#~ msgid "See the <a href=\"%s\">developer information for %s</a>."
-#~ msgstr "Katso <a href=\"%s\">paketin %s kehittäjätietoja</a>."
+#~ msgid "No essential packages in this suite"
+#~ msgstr "Kokoelmassa ei ole välttämättömiä paketteja"
 
-#~ msgid "Debian Project"
-#~ msgstr "Debian-projekti"
+#~ msgid "Software Packages in \"%s\", essential packages"
+#~ msgstr "Ohjelmistopaketit jakelussa \"%s\", välttämättömät paketit"
 
-#~ msgid "About&nbsp;Debian"
-#~ msgstr "Tietoja&nbsp;Debianista"
+#~ msgid "No packages with this priority in this suite"
+#~ msgstr "Kokoelmassa ei ole paketteja tällä tärkeysasteella"
 
-#~ msgid "News"
-#~ msgstr "Uutiset"
+#~ msgid ""
+#~ "Warning: These packages are intended for the use in building <a href="
+#~ "\"http://www.debian.org/devel/debian-installer/\">debian-installer</a> "
+#~ "images only. Do not install them on a normal Debian system."
+#~ msgstr ""
+#~ "Varoitus: Nämä paketit on tarkoitettu käytettäväksi vain rakennettaessa "
+#~ "<a href=\"http://www.debian.org/devel/debian-installer\">debian-"
+#~ "asentimen</a> vedoksia. Älä asenna normaaliin Debian-järjestelmään."
 
-#~ msgid "Getting&nbsp;Debian"
-#~ msgstr "Debianin&nbsp;hankkiminen"
+#~ msgid "yes"
+#~ msgstr "kyllä"
 
-#~ msgid "Support"
-#~ msgstr "Tuki"
+#~ msgid "Priority"
+#~ msgstr "Tärkeys"
 
-#~ msgid "Development"
-#~ msgstr "Kehitys"
+#~ msgid "Uploaders"
+#~ msgstr "Uploadaajat"
 
-#~ msgid "Site map"
-#~ msgstr "Sivustokartta"
+#~ msgid "Size is measured in kBytes."
+#~ msgstr "Koko mitataan kilotavuissa."
 
 #~ msgid ""
-#~ "Back to: <a href=\"%s/\">Debian Project homepage</a> || <a href=\"%s/"
-#~ "\">Packages search page</a>"
+#~ "Users of experimental packages are encouraged to contact the package "
+#~ "maintainers directly in case of problems."
 #~ msgstr ""
-#~ "Takaisin: <a href=\"%s/\">Debian-projektin kotisivulle</a> || <a href=\"%"
-#~ "s/\">Pakettien hakusivulle</a>"
+#~ "Kokeellisten pakettien käyttäjiä kehotetaan ottamaan ongelmatapauksissa "
+#~ "yhteyttä suoraan paketin ylläpitäjiin."
 
-#~ msgid "Last Modified: "
-#~ msgstr "Viimeksi muutettu: "
+#~ msgid ""
+#~ "Packages that were added to the \"%s\" component next to the unstable "
+#~ "Debian archive during the last 7 days."
+#~ msgstr ""
+#~ "Paketit, jotka on lisätty komponenttiin \"%s\" epävakaaseen Debian-"
+#~ "arkistoon viimeisen seitsemän (7) päivän aikana."
 
 #~ msgid ""
-#~ "Debian is a registered trademark of Software in the Public Interest, Inc."
+#~ "The following packages were added to the \"%s\" component next to the "
+#~ "Debian archive during the last 7 days."
 #~ msgstr ""
-#~ "Debian on Software in the Public Interest, Inc.'in rekisteröimä "
-#~ "tavaramerkki."
+#~ "Seuraavat paketit on lisätty komponenttiin \"%s\" Debian-arkistoon "
+#~ "viimeisen seitsemän (7) päivän aikana."
 
 #~ msgid ""
 #~ "Warning: The <span class=\"pred\">experimental</span> distribution "
@@ -1131,64 +1119,88 @@ msgstr "Lisenssiehdot sivulla <URL:%s>."
 #~ "paketin kaikesta huolimatta, otat vastuun itsellesi."
 
 #~ msgid ""
-#~ "The following packages were added to the \"%s\" component next to the "
-#~ "Debian archive during the last 7 days."
+#~ "Debian is a registered trademark of Software in the Public Interest, Inc."
 #~ msgstr ""
-#~ "Seuraavat paketit on lisätty komponenttiin \"%s\" Debian-arkistoon "
-#~ "viimeisen seitsemän (7) päivän aikana."
+#~ "Debian on Software in the Public Interest, Inc.'in rekisteröimä "
+#~ "tavaramerkki."
 
-#~ msgid ""
-#~ "Packages that were added to the \"%s\" component next to the unstable "
-#~ "Debian archive during the last 7 days."
-#~ msgstr ""
-#~ "Paketit, jotka on lisätty komponenttiin \"%s\" epävakaaseen Debian-"
-#~ "arkistoon viimeisen seitsemän (7) päivän aikana."
+#~ msgid "Last Modified: "
+#~ msgstr "Viimeksi muutettu: "
 
 #~ msgid ""
-#~ "Users of experimental packages are encouraged to contact the package "
-#~ "maintainers directly in case of problems."
+#~ "Back to: <a href=\"%s/\">Debian Project homepage</a> || <a href=\"%s/"
+#~ "\">Packages search page</a>"
 #~ msgstr ""
-#~ "Kokeellisten pakettien käyttäjiä kehotetaan ottamaan ongelmatapauksissa "
-#~ "yhteyttä suoraan paketin ylläpitäjiin."
+#~ "Takaisin: <a href=\"%s/\">Debian-projektin kotisivulle</a> || <a href=\"%"
+#~ "s/\">Pakettien hakusivulle</a>"
 
-#~ msgid "Size is measured in kBytes."
-#~ msgstr "Koko mitataan kilotavuissa."
+#~ msgid "Site map"
+#~ msgstr "Sivustokartta"
 
-#~ msgid "Uploaders"
-#~ msgstr "Uploadaajat"
+#~ msgid "Development"
+#~ msgstr "Kehitys"
 
-#~ msgid "Priority"
-#~ msgstr "Tärkeys"
+#~ msgid "Support"
+#~ msgstr "Tuki"
 
-#~ msgid "yes"
-#~ msgstr "kyllä"
+#~ msgid "Getting&nbsp;Debian"
+#~ msgstr "Debianin&nbsp;hankkiminen"
 
-#~ msgid ""
-#~ "Warning: These packages are intended for the use in building <a href="
-#~ "\"http://www.debian.org/devel/debian-installer/\">debian-installer</a> "
-#~ "images only. Do not install them on a normal Debian system."
-#~ msgstr ""
-#~ "Varoitus: Nämä paketit on tarkoitettu käytettäväksi vain rakennettaessa "
-#~ "<a href=\"http://www.debian.org/devel/debian-installer\">debian-"
-#~ "asentimen</a> vedoksia. Älä asenna normaaliin Debian-järjestelmään."
+#~ msgid "News"
+#~ msgstr "Uutiset"
 
-#~ msgid "No packages with this priority in this suite"
-#~ msgstr "Kokoelmassa ei ole paketteja tällä tärkeysasteella"
+#~ msgid "About&nbsp;Debian"
+#~ msgstr "Tietoja&nbsp;Debianista"
 
-#~ msgid "Software Packages in \"%s\", essential packages"
-#~ msgstr "Ohjelmistopaketit jakelussa \"%s\", välttämättömät paketit"
+#~ msgid "Debian Project"
+#~ msgstr "Debian-projekti"
 
-#~ msgid "No essential packages in this suite"
-#~ msgstr "Kokoelmassa ei ole välttämättömiä paketteja"
+#~ msgid "See the <a href=\"%s\">developer information for %s</a>."
+#~ msgstr "Katso <a href=\"%s\">paketin %s kehittäjätietoja</a>."
 
+#~ msgid " and %s are responsible for this Debian package."
+#~ msgstr " ja %s ovat vastuussa tästä Debian-paketista."
+
+#~ msgid "%s is responsible for this Debian package."
+#~ msgstr "%s on vastuussa tästä Debian-paketista."
+
+#~ msgid "View the <a href=\"%s\">copyright file</a>"
+#~ msgstr "Katso <a href=\"%s\">copyright-tiedostoa</a>"
+
+#~ msgid "View the <a href=\"%s\">Debian changelog</a>"
+#~ msgstr "Katso <a href=\"%s\">Debian-muutoslokia</a>"
+
+#~ msgid "Source Package:"
+#~ msgstr "Lähdepaketti:"
+
+#~ msgid "Check for <a href=\"%s\">Bug Reports</a> about %s."
+#~ msgstr "Tarkista paketin %s <a href=\"%s\">vikailmoitukset</a>."
+
+#~ msgid "md5sum"
+#~ msgstr "MD5-summa"
+
+#~ msgid "Overview over this distribution"
+#~ msgstr "Tämän jakelun yleiskuva"
+
+#~ msgid "virtual package"
+#~ msgstr "näennäispaketti"
+
+#~ msgid "Download %s\n"
+#~ msgstr "Imuroi %s\n"
+
+#~ msgid "Software Packages in \"%s\", priority %s"
+#~ msgstr "Ohjelmistopaketit jakelussa \"%s\" tärkeysasteella %s"
+
+#~ msgid "Package not available"
+#~ msgstr "Paketti ei saatavilla"
+
+#~ msgid "Virtual package"
+#~ msgstr "Näennäispaketti"
+
+#, fuzzy
 #~ msgid ""
-#~ "Copyright (C) 1997-2005 SPI;\n"
-#~ "See <URL:http://www.debian.org/license> for the license terms.\n"
-#~ "\n"
+#~ "You can try a different search on the <a href=\"%s#search_packages"
+#~ "\">Packages search page</a>."
 #~ msgstr ""
-#~ "Copyright © 1997-2005 SPI;\n"
-#~ "Katso lisenssiehdot sivulta <URL:http://www.debian.org/license>.\n"
-#~ "\n"
-
-#~ msgid "Versions:"
-#~ msgstr "Versiot:"
+#~ "Takaisin: <a href=\"%s/\">Debian-projektin kotisivulle</a> || <a href=\"%"
+#~ "s/\">Pakettien hakusivulle</a>"
diff --git a/po/templates.fr.po b/po/templates.fr.po
index de9e909..e2ee0f9 100644
--- a/po/templates.fr.po
+++ b/po/templates.fr.po
@@ -7,41 +7,40 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-10-14 00:02+0200\n"
-"PO-Revision-Date: 2008-02-28 18:21+0100\n"
+"PO-Revision-Date: 2008-02-29 10:52+0100\n"
 "Last-Translator: Guilhelm Panaget <guilhelm.panaget@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: templates/config.tmpl:40
+#: templates/config.tmpl:41
 msgid "Debian Web Mailinglist"
 msgstr "Liste de diffusion du site Debian"
 
-#: templates/config.tmpl:45
+#: templates/config.tmpl:46
 msgid "%s Webmaster"
 msgstr "Responsable du site %s"
 
-#: templates/config.tmpl:48
+#: templates/config.tmpl:49
 msgid "%s is a <a href=\"%s\">trademark</a> of %s"
 msgstr "%s est une <a href=\"%s\">marque</a> de %s"
 
-#: templates/config.tmpl:53
+#: templates/config.tmpl:54
 msgid ""
-"Please note that this is an experimental version of <a href=\"http://"
-"packages.debian.org/\">packages.debian.org</a>. Errors and obsolete "
-"information should be expected"
+"Please note that this is an experimental version of <a href=\"http://%s/\">%"
+"s</a>. Errors and obsolete information should be expected"
 msgstr ""
 "Veuillez noter que ceci est une version expérimentale de <a href=\"http://"
 "packages.debian.org/\">packages.debian.org</a>. Attendez-vous à des erreurs "
 "et des informations obsolètes."
 
 #. @translators: . = decimal_point , = thousands_sep, see Number::Format 
-#: templates/config.tmpl:56
+#: templates/config.tmpl:57
 msgid "."
 msgstr "."
 
-#: templates/config.tmpl:57
+#: templates/config.tmpl:58
 msgid ","
 msgstr ","
 
@@ -109,27 +108,27 @@ msgstr "GNU/kFreeBSD (i386)"
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 
-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:178
 msgid "North America"
 msgstr "Amérique du nord"
 
-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:179
 msgid "South America"
 msgstr "Amérique du sud"
 
-#: templates/config/mirrors.tmpl:184
+#: templates/config/mirrors.tmpl:180
 msgid "Asia"
 msgstr "Asie"
 
-#: templates/config/mirrors.tmpl:185
+#: templates/config/mirrors.tmpl:181
 msgid "Australia and New Zealand"
 msgstr "Australie et Nouvelle-Zélande"
 
-#: templates/config/mirrors.tmpl:186
+#: templates/config/mirrors.tmpl:182
 msgid "Europe"
 msgstr "Europe"
 
-#: templates/config/mirrors.tmpl:187
+#: templates/config/mirrors.tmpl:183
 msgid "Africa"
 msgstr "Afrique"
 
@@ -138,12 +137,12 @@ msgid "Package Download Selection -- %s"
 msgstr "Page de téléchargement du paquet &mdash; %s"
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 msgid "Distribution:"
 msgstr "Distribution :"
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 #, fuzzy
 msgid "Overview over this suite"
 msgstr "Vue d'ensemble de cette distribution"
@@ -188,7 +187,7 @@ msgstr ""
 msgid "Replacing <em>%s</em> with the mirror in question."
 msgstr "En remplaçant <em>%s</em> par le miroir en question."
 
-#: templates/html/download.tmpl:37 templates/html/show.tmpl:152
+#: templates/html/download.tmpl:37 templates/html/show.tmpl:155
 msgid "Experimental package"
 msgstr "Paquet «&nbsp;experimental&nbsp;»"
 
@@ -205,11 +204,12 @@ msgstr ""
 "consulter le journal des modifications (<q>changelog</q>) et les autres "
 "documentations possibles avant toute utilisation."
 
-#: templates/html/download.tmpl:41 templates/html/show.tmpl:157
+#: templates/html/download.tmpl:41 templates/html/show.tmpl:160
 msgid "debian-installer udeb package"
 msgstr "paquet de l'installateur Debian udeb"
 
-#: templates/html/download.tmpl:42 templates/html/show.tmpl:158
+#: templates/html/download.tmpl:42 templates/html/show.tmpl:161
+#, fuzzy
 #| msgid ""
 #| "Warning: This package is intended for the use in building <a href="
 #| "\"http://www.debian.org/devel/debian-installer\">debian-installer</a> "
@@ -288,7 +288,7 @@ msgstr "%s octets (%s %s)"
 msgid "Exact Size"
 msgstr "Taille exacte"
 
-#: templates/html/download.tmpl:103 templates/html/show.tmpl:327
+#: templates/html/download.tmpl:103 templates/html/show.tmpl:331
 msgid "MD5 checksum"
 msgstr "Somme MD5"
 
@@ -359,7 +359,7 @@ msgstr ""
 "obtenir d'autres informations, référez-vous à la <a href=\"%s/contact\">page "
 "contact</a> de %s."
 
-#: templates/html/foot.tmpl:33 templates/txt/index.tmpl:4
+#: templates/html/foot.tmpl:33 templates/txt/index_head.tmpl:3
 msgid "Generated:"
 msgstr "Généré le :"
 
@@ -423,41 +423,37 @@ msgstr "Taille du paquet"
 msgid "Packages"
 msgstr "Paquet : %s (%s)"
 
-#: templates/html/index.tmpl:3
+#: templates/html/index_head.tmpl:2
 #, fuzzy
 msgid "Source Packages in \"%s\", %s %s"
 msgstr "Paquets de «&nbsp;%s&nbsp;», section %s"
 
-#: templates/html/index.tmpl:4
+#: templates/html/index_head.tmpl:3
 #, fuzzy
 msgid "Source Packages in \"%s\""
 msgstr "Paquets inclus dans «&nbsp;%s&nbsp;»"
 
-#: templates/html/index.tmpl:6
+#: templates/html/index_head.tmpl:5
 #, fuzzy
 msgid "Software Packages in \"%s\", %s %s"
 msgstr "Paquets de «&nbsp;%s&nbsp;», section %s"
 
-#: templates/html/index.tmpl:7
+#: templates/html/index_head.tmpl:6
 msgid "Software Packages in \"%s\""
 msgstr "Paquets inclus dans «&nbsp;%s&nbsp;»"
 
-#: templates/html/index.tmpl:14
+#: templates/html/index_head.tmpl:13
+#, fuzzy
+#| msgid "All packages"
 msgid "All Packages"
 msgstr "Tous les paquets"
 
-#: templates/html/index.tmpl:16 templates/html/show.tmpl:15
+#: templates/html/index_head.tmpl:15 templates/html/show.tmpl:15
 #: templates/html/suite_index.tmpl:2
 #, fuzzy
 msgid "Source"
 msgstr "Paquet source&nbsp;:"
 
-#: templates/html/index.tmpl:43 templates/html/show.tmpl:254
-#: templates/txt/index.tmpl:15
-#, fuzzy
-msgid "virtual package provided by"
-msgstr "paquet virtuel"
-
 #: templates/html/newpkg.tmpl:2 templates/html/newpkg.tmpl:7
 #, fuzzy
 msgid "New Packages in \"%s\""
@@ -532,127 +528,150 @@ msgstr "Tous les paquets Debian dans «&nbsp;%s&nbsp;»"
 msgid "Package Search Results"
 msgstr "Tous les paquets Debian dans «&nbsp;%s&nbsp;»"
 
-#: templates/html/search.tmpl:33
-#, fuzzy
-msgid ""
-"You can try a different search on the <a href=\"%s#search_packages"
-"\">Packages search page</a>."
-msgstr ""
-"Retour à la&nbsp;: <a href=\"%s/\">Page d'accueil du Projet Debian</a> || <a "
-"href=\"%s/\">Page de recherche de paquets</a>"
-
-#: templates/html/search.tmpl:37
+#: templates/html/search.tmpl:35
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgstr ""
 
-#: templates/html/search.tmpl:42
+#: templates/html/search.tmpl:40
+msgid "Search in specific suite:"
+msgstr ""
+
+#: templates/html/search.tmpl:49
+#, fuzzy
+#| msgid "Search for <a href=\"%s\">other versions of %s</a>"
+msgid "Search in <a href=\"%s\">all suites</a>"
+msgstr "Chercher d'<a href=\"%s\">autres versions de %s</a>"
+
+#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+msgid "Limit search to a specific architecture:"
+msgstr "Limiter la recherche à une architecture particulière :"
+
+#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+msgid "Search in <a href=\"%s\">all architectures</a>"
+msgstr "Chercher dans <a href=\"%s\">toutes les architectures</a>"
+
+#: templates/html/search.tmpl:69
 msgid ""
-"<a href=\"%s\">%u</a> results have not been displayed due to the search "
+"<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
 
-#: templates/html/search.tmpl:51
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr ""
 
-#: templates/html/search.tmpl:51
-msgid "suite(s) <em>$suite_enc</em>"
+#: templates/html/search.tmpl:78
+msgid "suite(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:52 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
 #, fuzzy
 msgid "all sections"
 msgstr "Section"
 
-#: templates/html/search.tmpl:52
-msgid "section(s) <em>$section_enc</em>"
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+msgid "section(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
 #, fuzzy
 msgid "all architectures"
 msgstr "Architecture"
 
-#: templates/html/search.tmpl:53
-msgid "architecture(s) <em>$architectures_enc</em>"
-msgstr ""
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+msgid "architecture(s) <em>%s</em>"
+msgstr "architecture(s) <em>%s</em>"
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 #, fuzzy
 msgid "packages"
 msgstr "Taille du paquet"
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
+#, fuzzy
 msgid "source packages"
 msgstr "Paquets source"
 
-#: templates/html/search.tmpl:56
+#: templates/html/search.tmpl:83
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 
-#: templates/html/search.tmpl:59
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:61
+#: templates/html/search.tmpl:88
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgstr ""
 
-#: templates/html/search.tmpl:67
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 
-#: templates/html/search.tmpl:72
+#: templates/html/search.tmpl:99
 msgid ""
 "Note that this only shows the best matches, sorted by relevance. If the "
 "first few packages don't match what you searched for, try using more "
 "keywords or alternative keywords."
 msgstr ""
 
-#: templates/html/search.tmpl:74
+#: templates/html/search.tmpl:103
+msgid ""
+"Your keyword was too generic, for optimizing reasons some results might have "
+"been suppressed.<br>Please consider using a longer keyword or more keywords."
+msgstr ""
+
+#: templates/html/search.tmpl:105
 msgid ""
-"Your search was too wide so we will only display exact matches. At least <em>"
-"%u</em> results have been omitted and will not be displayed. Please consider "
-"using a longer keyword or more keywords."
+"Your keyword was too generic.<br>Please consider using a longer keyword or "
+"more keywords."
 msgstr ""
 
-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
 msgid "Sorry, your search gave no results"
 msgstr "Désolé, votre recherche n'a renvoyé aucun résultat."
 
-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:118
 #, fuzzy
 msgid "Package %s"
 msgstr "Paquet&nbsp;: %s (%s)"
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 #, fuzzy
 msgid "also provided by:"
 msgstr "paquet virtuel"
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr "fourni par :"
 
-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:139
+#, fuzzy
 msgid "Source Package %s"
 msgstr "Paquet source %s"
 
-#: templates/html/search.tmpl:113
+#: templates/html/search.tmpl:146
+#, fuzzy
 msgid "Binary packages:"
 msgstr "Paquets binaires :"
 
-#: templates/html/search.tmpl:115
-msgid "%u binary packages"
-msgstr "%u paquets binaires"
+#: templates/html/search.tmpl:148
+#, fuzzy
+msgid "hide %u binary packages"
+msgstr "Taille du paquet"
+
+#: templates/html/search.tmpl:148
+#, fuzzy
+msgid "show %u binary packages"
+msgstr "Taille du paquet"
 
-#: templates/html/search.tmpl:125
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -683,22 +702,6 @@ msgstr ""
 msgid "Search in other suite:"
 msgstr ""
 
-#: templates/html/search_contents.tmpl:58
-msgid "Limit search to a specific architecture:"
-msgstr "Limiter la recherche à une architecture particulière :"
-
-#: templates/html/search_contents.tmpl:63
-msgid "Search in <a href=\"%s\">all architectures</a>"
-msgstr "Chercher dans <a href=\"%s\">toutes les architectures</a>"
-
-#: templates/html/search_contents.tmpl:72
-msgid "section(s) <em>%s</em>"
-msgstr ""
-
-#: templates/html/search_contents.tmpl:73
-msgid "architecture(s) <em>%s</em>"
-msgstr "architecture(s) <em>%s</em>"
-
 #: templates/html/search_contents.tmpl:74
 msgid "paths that end with"
 msgstr "chemins se terminant par"
@@ -734,7 +737,7 @@ msgid "Sort results by filename"
 msgstr "Trier les résultats par nom de fichier"
 
 #: templates/html/search_contents.tmpl:98
-#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:327
+#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:331
 msgid "File"
 msgstr "Fichier"
 
@@ -757,122 +760,127 @@ msgstr "Paquet source"
 msgid "Section:"
 msgstr "Section&nbsp;:"
 
-#: templates/html/show.tmpl:16
-msgid "All packages in this section"
-msgstr "Tous les paquets de cette section"
-
-#: templates/html/show.tmpl:21
+#: templates/html/show.tmpl:22
 #, fuzzy
 msgid "Details of source package %s in %s"
 msgstr "Paquets source dans «&nbsp;%s&nbsp;»"
 
-#: templates/html/show.tmpl:22
+#: templates/html/show.tmpl:23
 #, fuzzy
 msgid "Details of package %s in %s"
 msgstr "Nouveaux paquets dans «&nbsp;%s&nbsp;»"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 #, fuzzy
 msgid "Source:"
 msgstr "Paquet source&nbsp;:"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 #, fuzzy
 msgid "Source package building this package"
 msgstr "Paquet source"
 
-#: templates/html/show.tmpl:52
+#: templates/html/show.tmpl:53
 msgid "Virtual Package: %s"
 msgstr "Paquet virtuel&nbsp;: %s"
 
-#: templates/html/show.tmpl:54
+#: templates/html/show.tmpl:55
 #, fuzzy
 msgid "Source Package: %s (%s)"
 msgstr "Paquet source&nbsp;: %s (%s)"
 
-#: templates/html/show.tmpl:56
+#: templates/html/show.tmpl:57
 msgid "Package: %s (%s)"
 msgstr "Paquet&nbsp;: %s (%s)"
 
-#: templates/html/show.tmpl:60
+#: templates/html/show.tmpl:61
 #, fuzzy
 msgid "essential"
 msgstr "Essentiel"
 
-#: templates/html/show.tmpl:64
+#: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "Liens pour %s"
 
-#: templates/html/show.tmpl:65
-msgid "Debian Resources:"
-msgstr "Resources Debian :"
+#: templates/html/show.tmpl:66
+msgid "%s Resources:"
+msgstr "Resources %s :"
 
-#: templates/html/show.tmpl:67
+#: templates/html/show.tmpl:68
 msgid "Bug Reports"
 msgstr "Rapports de bogues"
 
-#: templates/html/show.tmpl:70 templates/html/show.tmpl:72
+#: templates/html/show.tmpl:71 templates/html/show.tmpl:73
+#, fuzzy
+#| msgid "More Information on %s"
 msgid "Developer Information (PTS)"
 msgstr "Informations pour les développeurs (PTS)"
 
-#: templates/html/show.tmpl:76
+#: templates/html/show.tmpl:77
 msgid "%s Changelog"
 msgstr ""
 
-#: templates/html/show.tmpl:77
+#: templates/html/show.tmpl:78
 msgid "Copyright File"
 msgstr ""
 
-#: templates/html/show.tmpl:81
+#: templates/html/show.tmpl:82
 msgid "Debian Source Repository"
 msgstr ""
 
-#: templates/html/show.tmpl:95
+#: templates/html/show.tmpl:96
 msgid "Download Source Package <a href=\"%s\">%s</a>:"
 msgstr "Télécharger le paquet source <a href=\"%s\">%s</a>:"
 
-#: templates/html/show.tmpl:102
+#: templates/html/show.tmpl:103
 msgid "Not found"
 msgstr "Introuvable"
 
-#: templates/html/show.tmpl:107
+#: templates/html/show.tmpl:108
+#, fuzzy
+#| msgid "Maintainer"
 msgid "Maintainer:"
 msgstr "Responsable :"
 
-#: templates/html/show.tmpl:109
+#: templates/html/show.tmpl:110
+#, fuzzy
+#| msgid "Maintainer"
 msgid "Maintainers:"
 msgstr "Responsables :"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "An overview over the maintainer's packages and uploads"
 msgstr ""
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
+#, fuzzy
 #| msgid "All packages"
 msgid "QA Page"
 msgstr "Page QA"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Archive of the Maintainer Mailinglist"
 msgstr ""
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Mail Archive"
 msgstr ""
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:132
 msgid "External Resources:"
 msgstr "Ressources externes :"
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:134
 msgid "Homepage"
 msgstr "Page d'accueil"
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:140
+#, fuzzy
 msgid "Similar packages:"
 msgstr "Paquets similaires :"
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:156
+#, fuzzy
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
 "distribution. That means it is likely unstable or buggy, and it may even "
@@ -887,7 +895,7 @@ msgstr ""
 "(<q>changelog</q>)</a> et les autres documentations existantes avant de "
 "l'utiliser."
 
-#: templates/html/show.tmpl:176
+#: templates/html/show.tmpl:180
 msgid ""
 "This is a <em>virtual package</em>. See the <a href=\"%s\">Debian policy</a> "
 "for a <a href=\"%sch-binary.html#s-virtual_pkg\">definition of virtual "
@@ -897,68 +905,79 @@ msgstr ""
 "Debian</a> pour une <a href=\"%sch-binary.html#s-virtual_pkg\">définition "
 "des paquets virtuels</a>."
 
-#: templates/html/show.tmpl:184
+#: templates/html/show.tmpl:188
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:211
 msgid "Packages providing %s"
 msgstr "Paquets fournissant %s"
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:220
 msgid "The following binary packages are built from this source package:"
 msgstr ""
 "Les paquets binaires suivants sont compilés à partir de ce paquet "
 "source&nbsp;:"
 
-#: templates/html/show.tmpl:225
+#: templates/html/show.tmpl:229
 msgid "Other Packages Related to %s"
 msgstr "Autres paquets associés à %s"
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:231
 msgid "legend"
 msgstr ""
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:233
 msgid "build-depends"
 msgstr ""
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:234
 msgid "build-depends-indep"
 msgstr ""
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:236
 msgid "depends"
 msgstr ""
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:237
 msgid "recommends"
 msgstr ""
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:238
 msgid "suggests"
 msgstr ""
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:248
+#, fuzzy
 #| msgid "or"
 msgid "or "
 msgstr "ou "
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:256
 #, fuzzy
 msgid "also a virtual package provided by"
 msgstr "paquet virtuel"
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:258
+#, fuzzy
+msgid "virtual package provided by"
+msgstr "paquet virtuel"
+
+#: templates/html/show.tmpl:263
 #, fuzzy
-msgid "%u providing packages"
+msgid "hide %u providing packages"
 msgstr "Taille du paquet"
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:263
+#, fuzzy
+msgid "show %u providing packages"
+msgstr "Taille du paquet"
+
+#: templates/html/show.tmpl:281
 msgid "Download %s"
 msgstr "Télécharger %s"
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:283
 msgid ""
 "The download table links to the download of the package and a file overview. "
 "In addition it gives information about the package size and the installed "
@@ -968,62 +987,62 @@ msgstr ""
 "un aperçu du fichier. Il indique par ailleurs la taille du paquet et "
 "l'espace occupé une fois installé."
 
-#: templates/html/show.tmpl:280
+#: templates/html/show.tmpl:284
 msgid "Download for all available architectures"
 msgstr "Télécharger pour toutes les architectures proposées"
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:285
 msgid "Architecture"
 msgstr "Architecture"
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:286
 msgid "Version"
 msgstr "Version"
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:287
 msgid "Package Size"
 msgstr "Taille du paquet"
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:288
 msgid "Installed Size"
 msgstr "Espace occupé"
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:289
 msgid "Files"
 msgstr "Fichiers"
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:297
 msgid "(unofficial port)"
 msgstr "(portage non officiel)"
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:308 templates/html/show.tmpl:336
 msgid "%s&nbsp;kB"
 msgstr "%s ko"
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:311
 msgid "list of files"
 msgstr "liste des fichiers"
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:313
 #, fuzzy
 msgid "no current information"
 msgstr "Plus d'informations sur %s"
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:330
 msgid "Download information for the files of this source package"
 msgstr ""
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:331
 msgid "Size (in kB)"
 msgstr "Taille (en ko)"
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:349
 msgid ""
 "Debian Package Source Repository (<acronym title=\"Version Control System"
 "\">VCS</acronym>: <a href=\"%s\">%s</a>)"
 msgstr ""
 
-#: templates/html/show.tmpl:349
+#: templates/html/show.tmpl:353
 #, fuzzy
 msgid "Debian Package Source Repository (Browsable)"
 msgstr "Tous les paquets Debian dans «&nbsp;%s&nbsp;»"
@@ -1085,114 +1104,141 @@ msgstr ""
 "Les paquets suivants ont été ajoutés à l'archive Debian «&nbsp;"
 "unstable&nbsp;» au cours des 7&nbsp;derniers jours."
 
-#: templates/rss/newpkg.tmpl:28 templates/txt/index.tmpl:5
+#: templates/rss/newpkg.tmpl:28 templates/txt/index_head.tmpl:4
 msgid "Copyright ©"
 msgstr ""
 
-#: templates/txt/index.tmpl:2
+#: templates/txt/index_head.tmpl:1
 #, fuzzy
 msgid "All %s Packages in \"%s\""
 msgstr "Nouveaux Paquets dans «&nbsp;%s&nbsp;»"
 
-#: templates/txt/index.tmpl:6
+#: templates/txt/index_head.tmpl:5
 msgid "See <URL:%s> for the license terms."
 msgstr "Consultez <URL:%s> pour obtenir les termes de la licence."
 
 #, fuzzy
-#~| msgid ""
-#~| "Packages that were added to the unstable Debian archive during the last "
-#~| "7 days."
-#~ msgid ""
-#~ "Packages that were added to the %s %s archive (section \"%s\") during the "
-#~ "last 7 days."
-#~ msgstr ""
-#~ "Paquets ayant été ajoutés à l'archive Debian «&nbsp;unstable&nbsp;» au "
-#~ "cours des 7&nbsp;derniers jours."
+#~ msgid "two or more packages specified (%s)"
+#~ msgstr "Paquet source&nbsp;: %s (%s)"
 
 #, fuzzy
-#~| msgid ""
-#~| "Packages that were added to the unstable Debian archive during the last "
-#~| "7 days."
-#~ msgid ""
-#~ "Packages that were added to the %s %s archive during the last 7 days."
-#~ msgstr ""
-#~ "Paquets ayant été ajoutés à l'archive Debian «&nbsp;unstable&nbsp;» au "
-#~ "cours des 7&nbsp;derniers jours."
+#~ msgid "No such package in this suite on this architecture."
+#~ msgstr "Aucun paquet dans cette section et cette distribution"
+
+#~ msgid "Virtual package"
+#~ msgstr "Paquet virtuel"
 
 #, fuzzy
-#~ msgid ""
-#~ "Note that the <strong>experimental</strong> distribution is not self-"
-#~ "contained; missing dependencies are likely found in the <a href=\"%s"
-#~ "\">unstable</a> distribution."
-#~ msgstr ""
-#~ "Veuillez noter que la distribution «&nbsp;\"<span class=\"pred"
-#~ "\">experimental</span>\"&nbsp;» n'est pas autosuffisante&nbsp;; certaines "
-#~ "dépendances peuvent se trouver dans la distribution «&nbsp;\"<a href="
-#~ "\"../../unstable/\">unstable</a>\"&nbsp;»."
+#~ msgid "No such package."
+#~ msgstr "Paquet source"
 
-#~ msgid "Versions:"
-#~ msgstr "Versions&nbsp;:"
+#, fuzzy
+#~ msgid "Package not available in this suite."
+#~ msgstr "Paquet indisponible"
 
-#~ msgid ""
-#~ "Copyright (C) 1997-2005 SPI;\n"
-#~ "See <URL:http://www.debian.org/license> for the license terms.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Copyright © 1997-2005 SPI&nbsp;;voir <URL:http://www.debian.org/license> "
-#~ "les termes de la licence.\n"
+#~ msgid "Package not available"
+#~ msgstr "Paquet indisponible"
 
-#~ msgid "No essential packages in this suite"
-#~ msgstr "Aucun paquet essentiel dans cette distribution"
+#, fuzzy
+#~ msgid "Software Packages in \"%s\", subsection %s"
+#~ msgstr "Paquets de «&nbsp;%s&nbsp;», section %s"
 
-#~ msgid "Software Packages in \"%s\", essential packages"
-#~ msgstr "Paquets de «&nbsp;%s&nbsp;», paquets essentiels"
+#~ msgid "Software Packages in \"%s\", priority %s"
+#~ msgstr "Paquets de «&nbsp;%s&nbsp;», priorité %s"
 
-#~ msgid "No packages with this priority in this suite"
-#~ msgstr "Aucun paquet de cette priorité et cette distribution"
+#, fuzzy
+#~ msgid "search for a package"
+#~ msgstr "Liste de tous les paquets"
+
+#, fuzzy
+#~ msgid " (section %s)"
+#~ msgstr "Section"
 
+#, fuzzy
 #~ msgid ""
-#~ "Warning: These packages are intended for the use in building <a href="
-#~ "\"http://www.debian.org/devel/debian-installer/\">debian-installer</a> "
-#~ "images only. Do not install them on a normal Debian system."
+#~ "The following packages were added to suite %s%s in the Debian archive "
+#~ "during the last 7 days."
 #~ msgstr ""
-#~ "Avertissement&nbsp;: ces paquets sont réservés à la construction des "
-#~ "images de l'<a href=\"http://www.debian.org/devel/debian-installer"
-#~ "\">installateur Debian</a>. Ils ne doivent pas être installés sur un "
-#~ "système Debian classique."
+#~ "Les paquets suivants ont été ajoutés à l'archive Debian «&nbsp;"
+#~ "unstable&nbsp;» au cours des 7&nbsp;derniers jours."
 
-#~ msgid "yes"
-#~ msgstr "oui"
+#, fuzzy
+#~ msgid "Nothing found"
+#~ msgstr "Introuvable"
 
-#~ msgid "Priority"
-#~ msgstr "Priorité"
+#~ msgid "Download %s\n"
+#~ msgstr "Télécharger %s\n"
 
-#~ msgid "Uploaders"
-#~ msgstr "Expéditeurs"
+#~ msgid "virtual package"
+#~ msgstr "paquet virtuel"
 
-#~ msgid "Size is measured in kBytes."
-#~ msgstr "La taille est indiquée en kOctets"
+#~ msgid "Overview over this distribution"
+#~ msgstr "Vue d'ensemble de cette distribution"
 
-#~ msgid ""
-#~ "Users of experimental packages are encouraged to contact the package "
-#~ "maintainers directly in case of problems."
+#~ msgid "md5sum"
+#~ msgstr "code de contrôle MD5"
+
+#~ msgid "Check for <a href=\"%s\">Bug Reports</a> about %s."
+#~ msgstr "Consulter les <a href=\"%s\">rapports de bogues</a> de %s."
+
+#~ msgid "Source Package:"
+#~ msgstr "Paquet source&nbsp;:"
+
+#~ msgid "View the <a href=\"%s\">Debian changelog</a>"
+#~ msgstr "Consulter le <a href=\"%s\">journal des modifications Debian</a>"
+
+#~ msgid "View the <a href=\"%s\">copyright file</a>"
+#~ msgstr "Consulter le <a href=\"%s\">fichier de licence</a>"
+
+#~ msgid "%s is responsible for this Debian package."
+#~ msgstr "%s est responsable de ce paquet Debian."
+
+#~ msgid " and %s are responsible for this Debian package."
+#~ msgstr " et %s sont responsables de ce paquet Debian."
+
+#~ msgid "See the <a href=\"%s\">developer information for %s</a>."
 #~ msgstr ""
-#~ "Nous encourageons les utilisateurs de paquets d'«&nbsp;experimental&nbsp;» "
-#~ "rencontrant des problèmes à contacter directement le responsable du "
-#~ "paquet."
+#~ "Consulter les <a href=\"%s\">informations de développement de %s</a>."
+
+#, fuzzy
+#~ msgid "Search on:"
+#~ msgstr "Recherche"
+
+#~ msgid "Debian Project"
+#~ msgstr "Projet Debian"
+
+#~ msgid "About&nbsp;Debian"
+#~ msgstr "À&nbsp;propos&nbsp;de&nbsp;Debian"
+
+#~ msgid "News"
+#~ msgstr "Actualités"
+
+#~ msgid "Getting&nbsp;Debian"
+#~ msgstr "Obtenir&nbsp;Debian"
+
+#~ msgid "Support"
+#~ msgstr "Assistance"
+
+#~ msgid "Development"
+#~ msgstr "Le&nbsp;coin&nbsp;du&nbsp;développeur"
+
+#~ msgid "Site map"
+#~ msgstr "Plan&nbsp;du&nbsp;site"
 
 #~ msgid ""
-#~ "Packages that were added to the \"%s\" component next to the unstable "
-#~ "Debian archive during the last 7 days."
+#~ "Back to: <a href=\"%s/\">Debian Project homepage</a> || <a href=\"%s/"
+#~ "\">Packages search page</a>"
 #~ msgstr ""
-#~ "Paquets ayant été ajoutés à la section «&nbsp;%s&nbsp;» de l'archive "
-#~ "Debian «&nbsp;unstable&nbsp;» au cours des 7&nbsp;derniers jours."
+#~ "Retour à la&nbsp;: <a href=\"%s/\">Page d'accueil du Projet Debian</a> || "
+#~ "<a href=\"%s/\">Page de recherche de paquets</a>"
+
+#~ msgid "Last Modified: "
+#~ msgstr "Dernière modification&nbsp;: "
 
 #~ msgid ""
-#~ "The following packages were added to the \"%s\" component next to the "
-#~ "Debian archive during the last 7 days."
+#~ "Debian is a registered trademark of Software in the Public Interest, Inc."
 #~ msgstr ""
-#~ "Les paquets suivants ont été ajoutés à la section «&nbsp;%s&nbsp;» de "
-#~ "l'archive Debian au cours des 7&nbsp;derniers jours."
+#~ "Debian est une marque déposée de Software in the Public Interest, Inc."
 
 #~ msgid ""
 #~ "Warning: The <span class=\"pred\">experimental</span> distribution "
@@ -1206,124 +1252,105 @@ msgstr "Consultez <URL:%s> pour obtenir les termes de la licence."
 #~ "installation s'effectue donc à vos risques et périls."
 
 #~ msgid ""
-#~ "Debian is a registered trademark of Software in the Public Interest, Inc."
+#~ "The following packages were added to the \"%s\" component next to the "
+#~ "Debian archive during the last 7 days."
 #~ msgstr ""
-#~ "Debian est une marque déposée de Software in the Public Interest, Inc."
-
-#~ msgid "Last Modified: "
-#~ msgstr "Dernière modification&nbsp;: "
+#~ "Les paquets suivants ont été ajoutés à la section «&nbsp;%s&nbsp;» de "
+#~ "l'archive Debian au cours des 7&nbsp;derniers jours."
 
 #~ msgid ""
-#~ "Back to: <a href=\"%s/\">Debian Project homepage</a> || <a href=\"%s/"
-#~ "\">Packages search page</a>"
+#~ "Packages that were added to the \"%s\" component next to the unstable "
+#~ "Debian archive during the last 7 days."
 #~ msgstr ""
-#~ "Retour à la&nbsp;: <a href=\"%s/\">Page d'accueil du Projet Debian</a> || "
-#~ "<a href=\"%s/\">Page de recherche de paquets</a>"
-
-#~ msgid "Site map"
-#~ msgstr "Plan&nbsp;du&nbsp;site"
-
-#~ msgid "Development"
-#~ msgstr "Le&nbsp;coin&nbsp;du&nbsp;développeur"
-
-#~ msgid "Support"
-#~ msgstr "Assistance"
-
-#~ msgid "Getting&nbsp;Debian"
-#~ msgstr "Obtenir&nbsp;Debian"
-
-#~ msgid "News"
-#~ msgstr "Actualités"
-
-#~ msgid "About&nbsp;Debian"
-#~ msgstr "À&nbsp;propos&nbsp;de&nbsp;Debian"
-
-#~ msgid "Debian Project"
-#~ msgstr "Projet Debian"
-
-#, fuzzy
-#~ msgid "Search on:"
-#~ msgstr "Recherche"
+#~ "Paquets ayant été ajoutés à la section «&nbsp;%s&nbsp;» de l'archive "
+#~ "Debian «&nbsp;unstable&nbsp;» au cours des 7&nbsp;derniers jours."
 
-#~ msgid "See the <a href=\"%s\">developer information for %s</a>."
+#~ msgid ""
+#~ "Users of experimental packages are encouraged to contact the package "
+#~ "maintainers directly in case of problems."
 #~ msgstr ""
-#~ "Consulter les <a href=\"%s\">informations de développement de %s</a>."
-
-#~ msgid " and %s are responsible for this Debian package."
-#~ msgstr " et %s sont responsables de ce paquet Debian."
-
-#~ msgid "%s is responsible for this Debian package."
-#~ msgstr "%s est responsable de ce paquet Debian."
-
-#~ msgid "View the <a href=\"%s\">copyright file</a>"
-#~ msgstr "Consulter le <a href=\"%s\">fichier de licence</a>"
-
-#~ msgid "View the <a href=\"%s\">Debian changelog</a>"
-#~ msgstr "Consulter le <a href=\"%s\">journal des modifications Debian</a>"
-
-#~ msgid "Source Package:"
-#~ msgstr "Paquet source&nbsp;:"
-
-#~ msgid "Check for <a href=\"%s\">Bug Reports</a> about %s."
-#~ msgstr "Consulter les <a href=\"%s\">rapports de bogues</a> de %s."
-
-#~ msgid "md5sum"
-#~ msgstr "code de contrôle MD5"
+#~ "Nous encourageons les utilisateurs de paquets d'«&nbsp;experimental&nbsp;» "
+#~ "rencontrant des problèmes à contacter directement le responsable du "
+#~ "paquet."
 
-#~ msgid "Overview over this distribution"
-#~ msgstr "Vue d'ensemble de cette distribution"
+#~ msgid "Size is measured in kBytes."
+#~ msgstr "La taille est indiquée en kOctets"
 
-#~ msgid "virtual package"
-#~ msgstr "paquet virtuel"
+#~ msgid "Uploaders"
+#~ msgstr "Expéditeurs"
 
-#~ msgid "Download %s\n"
-#~ msgstr "Télécharger %s\n"
+#~ msgid "Priority"
+#~ msgstr "Priorité"
 
-#, fuzzy
-#~ msgid "Nothing found"
-#~ msgstr "Introuvable"
+#~ msgid "yes"
+#~ msgstr "oui"
 
-#, fuzzy
 #~ msgid ""
-#~ "The following packages were added to suite %s%s in the Debian archive "
-#~ "during the last 7 days."
+#~ "Warning: These packages are intended for the use in building <a href="
+#~ "\"http://www.debian.org/devel/debian-installer/\">debian-installer</a> "
+#~ "images only. Do not install them on a normal Debian system."
 #~ msgstr ""
-#~ "Les paquets suivants ont été ajoutés à l'archive Debian «&nbsp;"
-#~ "unstable&nbsp;» au cours des 7&nbsp;derniers jours."
+#~ "Avertissement&nbsp;: ces paquets sont réservés à la construction des "
+#~ "images de l'<a href=\"http://www.debian.org/devel/debian-installer"
+#~ "\">installateur Debian</a>. Ils ne doivent pas être installés sur un "
+#~ "système Debian classique."
 
-#, fuzzy
-#~ msgid " (section %s)"
-#~ msgstr "Section"
+#~ msgid "No packages with this priority in this suite"
+#~ msgstr "Aucun paquet de cette priorité et cette distribution"
 
-#, fuzzy
-#~ msgid "search for a package"
-#~ msgstr "Liste de tous les paquets"
+#~ msgid "Software Packages in \"%s\", essential packages"
+#~ msgstr "Paquets de «&nbsp;%s&nbsp;», paquets essentiels"
 
-#~ msgid "Software Packages in \"%s\", priority %s"
-#~ msgstr "Paquets de «&nbsp;%s&nbsp;», priorité %s"
+#~ msgid "No essential packages in this suite"
+#~ msgstr "Aucun paquet essentiel dans cette distribution"
 
-#, fuzzy
-#~ msgid "Software Packages in \"%s\", subsection %s"
-#~ msgstr "Paquets de «&nbsp;%s&nbsp;», section %s"
+#~ msgid ""
+#~ "Copyright (C) 1997-2005 SPI;\n"
+#~ "See <URL:http://www.debian.org/license> for the license terms.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Copyright © 1997-2005 SPI&nbsp;;voir <URL:http://www.debian.org/license> "
+#~ "les termes de la licence.\n"
 
-#~ msgid "Package not available"
-#~ msgstr "Paquet indisponible"
+#~ msgid "Versions:"
+#~ msgstr "Versions&nbsp;:"
 
 #, fuzzy
-#~ msgid "Package not available in this suite."
-#~ msgstr "Paquet indisponible"
+#~ msgid ""
+#~ "Note that the <strong>experimental</strong> distribution is not self-"
+#~ "contained; missing dependencies are likely found in the <a href=\"%s"
+#~ "\">unstable</a> distribution."
+#~ msgstr ""
+#~ "Veuillez noter que la distribution «&nbsp;\"<span class=\"pred"
+#~ "\">experimental</span>\"&nbsp;» n'est pas autosuffisante&nbsp;; certaines "
+#~ "dépendances peuvent se trouver dans la distribution «&nbsp;\"<a href="
+#~ "\"../../unstable/\">unstable</a>\"&nbsp;»."
 
 #, fuzzy
-#~ msgid "No such package."
-#~ msgstr "Paquet source"
-
-#~ msgid "Virtual package"
-#~ msgstr "Paquet virtuel"
+#~| msgid ""
+#~| "Packages that were added to the unstable Debian archive during the last "
+#~| "7 days."
+#~ msgid ""
+#~ "Packages that were added to the %s %s archive during the last 7 days."
+#~ msgstr ""
+#~ "Paquets ayant été ajoutés à l'archive Debian «&nbsp;unstable&nbsp;» au "
+#~ "cours des 7&nbsp;derniers jours."
 
 #, fuzzy
-#~ msgid "No such package in this suite on this architecture."
-#~ msgstr "Aucun paquet dans cette section et cette distribution"
+#~| msgid ""
+#~| "Packages that were added to the unstable Debian archive during the last "
+#~| "7 days."
+#~ msgid ""
+#~ "Packages that were added to the %s %s archive (section \"%s\") during the "
+#~ "last 7 days."
+#~ msgstr ""
+#~ "Paquets ayant été ajoutés à l'archive Debian «&nbsp;unstable&nbsp;» au "
+#~ "cours des 7&nbsp;derniers jours."
 
 #, fuzzy
-#~ msgid "two or more packages specified (%s)"
-#~ msgstr "Paquet source&nbsp;: %s (%s)"
+#~ msgid ""
+#~ "You can try a different search on the <a href=\"%s#search_packages"
+#~ "\">Packages search page</a>."
+#~ msgstr ""
+#~ "Retour à la&nbsp;: <a href=\"%s/\">Page d'accueil du Projet Debian</a> || "
+#~ "<a href=\"%s/\">Page de recherche de paquets</a>"
diff --git a/po/templates.hu.po b/po/templates.hu.po
index 6c47e3c..8f0ca62 100644
--- a/po/templates.hu.po
+++ b/po/templates.hu.po
@@ -3,31 +3,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: templates/config.tmpl:40
+#: templates/config.tmpl:41
 msgid "Debian Web Mailinglist"
 msgstr ""
 
-#: templates/config.tmpl:45
+#: templates/config.tmpl:46
 msgid "%s Webmaster"
 msgstr ""
 
-#: templates/config.tmpl:48
+#: templates/config.tmpl:49
 msgid "%s is a <a href=\"%s\">trademark</a> of %s"
 msgstr ""
 
-#: templates/config.tmpl:53
+#: templates/config.tmpl:54
 msgid ""
-"Please note that this is an experimental version of <a href=\"http://"
-"packages.debian.org/\">packages.debian.org</a>. Errors and obsolete "
-"information should be expected"
+"Please note that this is an experimental version of <a href=\"http://%s/\">%"
+"s</a>. Errors and obsolete information should be expected"
 msgstr ""
 
 #. @translators: . = decimal_point , = thousands_sep, see Number::Format 
-#: templates/config.tmpl:56
+#: templates/config.tmpl:57
 msgid "."
 msgstr ""
 
-#: templates/config.tmpl:57
+#: templates/config.tmpl:58
 msgid ","
 msgstr ""
 
@@ -95,27 +94,27 @@ msgstr ""
 msgid "GNU/kFreeBSD (amd64)"
 msgstr ""
 
-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:178
 msgid "North America"
 msgstr ""
 
-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:179
 msgid "South America"
 msgstr ""
 
-#: templates/config/mirrors.tmpl:184
+#: templates/config/mirrors.tmpl:180
 msgid "Asia"
 msgstr ""
 
-#: templates/config/mirrors.tmpl:185
+#: templates/config/mirrors.tmpl:181
 msgid "Australia and New Zealand"
 msgstr ""
 
-#: templates/config/mirrors.tmpl:186
+#: templates/config/mirrors.tmpl:182
 msgid "Europe"
 msgstr ""
 
-#: templates/config/mirrors.tmpl:187
+#: templates/config/mirrors.tmpl:183
 msgid "Africa"
 msgstr ""
 
@@ -124,12 +123,12 @@ msgid "Package Download Selection -- %s"
 msgstr ""
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 msgid "Distribution:"
 msgstr ""
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 msgid "Overview over this suite"
 msgstr ""
 
@@ -167,7 +166,7 @@ msgstr ""
 msgid "Replacing <em>%s</em> with the mirror in question."
 msgstr ""
 
-#: templates/html/download.tmpl:37 templates/html/show.tmpl:152
+#: templates/html/download.tmpl:37 templates/html/show.tmpl:155
 msgid "Experimental package"
 msgstr ""
 
@@ -179,11 +178,11 @@ msgid ""
 "documentation before using it."
 msgstr ""
 
-#: templates/html/download.tmpl:41 templates/html/show.tmpl:157
+#: templates/html/download.tmpl:41 templates/html/show.tmpl:160
 msgid "debian-installer udeb package"
 msgstr ""
 
-#: templates/html/download.tmpl:42 templates/html/show.tmpl:158
+#: templates/html/download.tmpl:42 templates/html/show.tmpl:161
 msgid ""
 "Warning: This package is intended for the use in building <a href=\"http://"
 "www.debian.org/devel/debian-installer\">debian-installer</a> images only. Do "
@@ -238,7 +237,7 @@ msgstr ""
 msgid "Exact Size"
 msgstr ""
 
-#: templates/html/download.tmpl:103 templates/html/show.tmpl:327
+#: templates/html/download.tmpl:103 templates/html/show.tmpl:331
 msgid "MD5 checksum"
 msgstr ""
 
@@ -293,7 +292,7 @@ msgid ""
 "For other contact information, see the %s <a href=\"%s\">contact page</a>."
 msgstr ""
 
-#: templates/html/foot.tmpl:33 templates/txt/index.tmpl:4
+#: templates/html/foot.tmpl:33 templates/txt/index_head.tmpl:3
 msgid "Generated:"
 msgstr ""
 
@@ -344,36 +343,31 @@ msgstr ""
 msgid "Packages"
 msgstr ""
 
-#: templates/html/index.tmpl:3
+#: templates/html/index_head.tmpl:2
 msgid "Source Packages in \"%s\", %s %s"
 msgstr ""
 
-#: templates/html/index.tmpl:4
+#: templates/html/index_head.tmpl:3
 msgid "Source Packages in \"%s\""
 msgstr ""
 
-#: templates/html/index.tmpl:6
+#: templates/html/index_head.tmpl:5
 msgid "Software Packages in \"%s\", %s %s"
 msgstr ""
 
-#: templates/html/index.tmpl:7
+#: templates/html/index_head.tmpl:6
 msgid "Software Packages in \"%s\""
 msgstr ""
 
-#: templates/html/index.tmpl:14
+#: templates/html/index_head.tmpl:13
 msgid "All Packages"
 msgstr ""
 
-#: templates/html/index.tmpl:16 templates/html/show.tmpl:15
+#: templates/html/index_head.tmpl:15 templates/html/show.tmpl:15
 #: templates/html/suite_index.tmpl:2
 msgid "Source"
 msgstr ""
 
-#: templates/html/index.tmpl:43 templates/html/show.tmpl:254
-#: templates/txt/index.tmpl:15
-msgid "virtual package provided by"
-msgstr ""
-
 #: templates/html/newpkg.tmpl:2 templates/html/newpkg.tmpl:7
 msgid "New Packages in \"%s\""
 msgstr ""
@@ -436,119 +430,138 @@ msgstr ""
 msgid "Package Search Results"
 msgstr ""
 
-#: templates/html/search.tmpl:33
-msgid ""
-"You can try a different search on the <a href=\"%s#search_packages"
-"\">Packages search page</a>."
-msgstr ""
-
-#: templates/html/search.tmpl:37
+#: templates/html/search.tmpl:35
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgstr ""
 
-#: templates/html/search.tmpl:42
+#: templates/html/search.tmpl:40
+msgid "Search in specific suite:"
+msgstr ""
+
+#: templates/html/search.tmpl:49
+msgid "Search in <a href=\"%s\">all suites</a>"
+msgstr ""
+
+#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+msgid "Limit search to a specific architecture:"
+msgstr ""
+
+#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+msgid "Search in <a href=\"%s\">all architectures</a>"
+msgstr ""
+
+#: templates/html/search.tmpl:69
 msgid ""
-"<a href=\"%s\">%u</a> results have not been displayed due to the search "
+"<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
 
-#: templates/html/search.tmpl:51
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr ""
 
-#: templates/html/search.tmpl:51
-msgid "suite(s) <em>$suite_enc</em>"
+#: templates/html/search.tmpl:78
+msgid "suite(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:52 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
 msgid "all sections"
 msgstr ""
 
-#: templates/html/search.tmpl:52
-msgid "section(s) <em>$section_enc</em>"
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+msgid "section(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
 msgid "all architectures"
 msgstr ""
 
-#: templates/html/search.tmpl:53
-msgid "architecture(s) <em>$architectures_enc</em>"
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+msgid "architecture(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 msgid "packages"
 msgstr ""
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 msgid "source packages"
 msgstr ""
 
-#: templates/html/search.tmpl:56
+#: templates/html/search.tmpl:83
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 
-#: templates/html/search.tmpl:59
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:61
+#: templates/html/search.tmpl:88
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgstr ""
 
-#: templates/html/search.tmpl:67
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 
-#: templates/html/search.tmpl:72
+#: templates/html/search.tmpl:99
 msgid ""
 "Note that this only shows the best matches, sorted by relevance. If the "
 "first few packages don't match what you searched for, try using more "
 "keywords or alternative keywords."
 msgstr ""
 
-#: templates/html/search.tmpl:74
+#: templates/html/search.tmpl:103
+msgid ""
+"Your keyword was too generic, for optimizing reasons some results might have "
+"been suppressed.<br>Please consider using a longer keyword or more keywords."
+msgstr ""
+
+#: templates/html/search.tmpl:105
 msgid ""
-"Your search was too wide so we will only display exact matches. At least <em>"
-"%u</em> results have been omitted and will not be displayed. Please consider "
-"using a longer keyword or more keywords."
+"Your keyword was too generic.<br>Please consider using a longer keyword or "
+"more keywords."
 msgstr ""
 
-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
 msgid "Sorry, your search gave no results"
 msgstr ""
 
-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:118
 msgid "Package %s"
 msgstr ""
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "also provided by:"
 msgstr ""
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr ""
 
-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:139
 msgid "Source Package %s"
 msgstr ""
 
-#: templates/html/search.tmpl:113
+#: templates/html/search.tmpl:146
 msgid "Binary packages:"
 msgstr ""
 
-#: templates/html/search.tmpl:115
-msgid "%u binary packages"
+#: templates/html/search.tmpl:148
+msgid "hide %u binary packages"
 msgstr ""
 
-#: templates/html/search.tmpl:125
+#: templates/html/search.tmpl:148
+msgid "show %u binary packages"
+msgstr ""
+
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -578,22 +591,6 @@ msgstr ""
 msgid "Search in other suite:"
 msgstr ""
 
-#: templates/html/search_contents.tmpl:58
-msgid "Limit search to a specific architecture:"
-msgstr ""
-
-#: templates/html/search_contents.tmpl:63
-msgid "Search in <a href=\"%s\">all architectures</a>"
-msgstr ""
-
-#: templates/html/search_contents.tmpl:72
-msgid "section(s) <em>%s</em>"
-msgstr ""
-
-#: templates/html/search_contents.tmpl:73
-msgid "architecture(s) <em>%s</em>"
-msgstr ""
-
 #: templates/html/search_contents.tmpl:74
 msgid "paths that end with"
 msgstr ""
@@ -626,7 +623,7 @@ msgid "Sort results by filename"
 msgstr ""
 
 #: templates/html/search_contents.tmpl:98
-#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:327
+#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:331
 msgid "File"
 msgstr ""
 
@@ -650,111 +647,111 @@ msgstr ""
 msgid "Section:"
 msgstr ""
 
-#: templates/html/show.tmpl:21
+#: templates/html/show.tmpl:22
 msgid "Details of source package %s in %s"
 msgstr ""
 
-#: templates/html/show.tmpl:22
+#: templates/html/show.tmpl:23
 msgid "Details of package %s in %s"
 msgstr ""
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 msgid "Source package building this package"
 msgstr ""
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 msgid "Source:"
 msgstr ""
 
-#: templates/html/show.tmpl:52
+#: templates/html/show.tmpl:53
 msgid "Virtual Package: %s"
 msgstr ""
 
-#: templates/html/show.tmpl:54
+#: templates/html/show.tmpl:55
 msgid "Source Package: %s (%s)"
 msgstr ""
 
-#: templates/html/show.tmpl:56
+#: templates/html/show.tmpl:57
 msgid "Package: %s (%s)"
 msgstr ""
 
-#: templates/html/show.tmpl:60
+#: templates/html/show.tmpl:61
 msgid "essential"
 msgstr ""
 
-#: templates/html/show.tmpl:64
+#: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr ""
 
-#: templates/html/show.tmpl:65
-msgid "Debian Resources:"
+#: templates/html/show.tmpl:66
+msgid "%s Resources:"
 msgstr ""
 
-#: templates/html/show.tmpl:67
+#: templates/html/show.tmpl:68
 msgid "Bug Reports"
 msgstr ""
 
-#: templates/html/show.tmpl:70 templates/html/show.tmpl:72
+#: templates/html/show.tmpl:71 templates/html/show.tmpl:73
 msgid "Developer Information (PTS)"
 msgstr ""
 
-#: templates/html/show.tmpl:76
+#: templates/html/show.tmpl:77
 msgid "%s Changelog"
 msgstr ""
 
-#: templates/html/show.tmpl:77
+#: templates/html/show.tmpl:78
 msgid "Copyright File"
 msgstr ""
 
-#: templates/html/show.tmpl:81
+#: templates/html/show.tmpl:82
 msgid "Debian Source Repository"
 msgstr ""
 
-#: templates/html/show.tmpl:95
+#: templates/html/show.tmpl:96
 msgid "Download Source Package <a href=\"%s\">%s</a>:"
 msgstr ""
 
-#: templates/html/show.tmpl:102
+#: templates/html/show.tmpl:103
 msgid "Not found"
 msgstr ""
 
-#: templates/html/show.tmpl:107
+#: templates/html/show.tmpl:108
 msgid "Maintainer:"
 msgstr ""
 
-#: templates/html/show.tmpl:109
+#: templates/html/show.tmpl:110
 msgid "Maintainers:"
 msgstr ""
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "An overview over the maintainer's packages and uploads"
 msgstr ""
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "QA Page"
 msgstr ""
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Archive of the Maintainer Mailinglist"
 msgstr ""
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Mail Archive"
 msgstr ""
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:132
 msgid "External Resources:"
 msgstr ""
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:134
 msgid "Homepage"
 msgstr ""
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:140
 msgid "Similar packages:"
 msgstr ""
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:156
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
 "distribution. That means it is likely unstable or buggy, and it may even "
@@ -762,131 +759,139 @@ msgid ""
 "and other possible documentation before using it."
 msgstr ""
 
-#: templates/html/show.tmpl:176
+#: templates/html/show.tmpl:180
 msgid ""
 "This is a <em>virtual package</em>. See the <a href=\"%s\">Debian policy</a> "
 "for a <a href=\"%sch-binary.html#s-virtual_pkg\">definition of virtual "
 "packages</a>."
 msgstr ""
 
-#: templates/html/show.tmpl:184
+#: templates/html/show.tmpl:188
 msgid "Tags"
 msgstr ""
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:211
 msgid "Packages providing %s"
 msgstr ""
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:220
 msgid "The following binary packages are built from this source package:"
 msgstr ""
 
-#: templates/html/show.tmpl:225
+#: templates/html/show.tmpl:229
 msgid "Other Packages Related to %s"
 msgstr ""
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:231
 msgid "legend"
 msgstr ""
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:233
 msgid "build-depends"
 msgstr ""
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:234
 msgid "build-depends-indep"
 msgstr ""
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:236
 msgid "depends"
 msgstr ""
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:237
 msgid "recommends"
 msgstr ""
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:238
 msgid "suggests"
 msgstr ""
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:248
 msgid "or "
 msgstr ""
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:256
 msgid "also a virtual package provided by"
 msgstr ""
 
-#: templates/html/show.tmpl:259
-msgid "%u providing packages"
+#: templates/html/show.tmpl:258
+msgid "virtual package provided by"
 msgstr ""
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:263
+msgid "hide %u providing packages"
+msgstr ""
+
+#: templates/html/show.tmpl:263
+msgid "show %u providing packages"
+msgstr ""
+
+#: templates/html/show.tmpl:281
 msgid "Download %s"
 msgstr ""
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:283
 msgid ""
 "The download table links to the download of the package and a file overview. "
 "In addition it gives information about the package size and the installed "
 "size."
 msgstr ""
 
-#: templates/html/show.tmpl:280
+#: templates/html/show.tmpl:284
 msgid "Download for all available architectures"
 msgstr ""
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:285
 msgid "Architecture"
 msgstr ""
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:286
 msgid "Version"
 msgstr ""
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:287
 msgid "Package Size"
 msgstr ""
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:288
 msgid "Installed Size"
 msgstr ""
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:289
 msgid "Files"
 msgstr ""
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:297
 msgid "(unofficial port)"
 msgstr ""
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:308 templates/html/show.tmpl:336
 msgid "%s&nbsp;kB"
 msgstr ""
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:311
 msgid "list of files"
 msgstr ""
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:313
 msgid "no current information"
 msgstr ""
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:330
 msgid "Download information for the files of this source package"
 msgstr ""
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:331
 msgid "Size (in kB)"
 msgstr ""
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:349
 msgid ""
 "Debian Package Source Repository (<acronym title=\"Version Control System"
 "\">VCS</acronym>: <a href=\"%s\">%s</a>)"
 msgstr ""
 
-#: templates/html/show.tmpl:349
+#: templates/html/show.tmpl:353
 msgid "Debian Package Source Repository (Browsable)"
 msgstr ""
 
@@ -938,14 +943,14 @@ msgid ""
 "last 7 days."
 msgstr ""
 
-#: templates/rss/newpkg.tmpl:28 templates/txt/index.tmpl:5
+#: templates/rss/newpkg.tmpl:28 templates/txt/index_head.tmpl:4
 msgid "Copyright ©"
 msgstr ""
 
-#: templates/txt/index.tmpl:2
+#: templates/txt/index_head.tmpl:1
 msgid "All %s Packages in \"%s\""
 msgstr ""
 
-#: templates/txt/index.tmpl:6
+#: templates/txt/index_head.tmpl:5
 msgid "See <URL:%s> for the license terms."
 msgstr ""
diff --git a/po/templates.ja.po b/po/templates.ja.po
index ced9ae2..19677fb 100644
--- a/po/templates.ja.po
+++ b/po/templates.ja.po
@@ -7,40 +7,39 @@ msgstr ""
 "Project-Id-Version: packages.debian.org trunk\n"
 "Report-Msgid-Bugs-To: debian-www@lists.debian.org\n"
 "POT-Creation-Date: 2007-10-14 03:22+0200\n"
-"PO-Revision-Date: 2007-12-11 19:40+0900\n"
+"PO-Revision-Date: 2008-02-17 13:25+0900\n"
 "Last-Translator: Noritada Kobayashi <nori1@dolphin.c.u-tokyo.ac.jp>\n"
 "Language-Team: Japanese <debian-www@debian.or.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: templates/config.tmpl:40
+#: templates/config.tmpl:41
 msgid "Debian Web Mailinglist"
 msgstr "Debian ウェブメーリングリスト"
 
-#: templates/config.tmpl:45
+#: templates/config.tmpl:46
 msgid "%s Webmaster"
 msgstr "%s ウェブマスター"
 
-#: templates/config.tmpl:48
+#: templates/config.tmpl:49
 msgid "%s is a <a href=\"%s\">trademark</a> of %s"
 msgstr "%1 は %3 の<a href=\"%2\">登録商標</a>です。"
 
-#: templates/config.tmpl:53
+#: templates/config.tmpl:54
 msgid ""
-"Please note that this is an experimental version of <a href=\"http://"
-"packages.debian.org/\">packages.debian.org</a>. Errors and obsolete "
-"information should be expected"
+"Please note that this is an experimental version of <a href=\"http://%s/\">%"
+"s</a>. Errors and obsolete information should be expected"
 msgstr ""
-"注意: このサイトは <a href=\"http://packages.debian.org/\">packages.debian."
-"org</a> の試験版です。エラーや古い情報があると思ってください。"
+"注意: このサイトは <a href=\"http://%s/\">%s</a> の試験版です。エラーや古い情"
+"報があると思ってください。"
 
 #. @translators: . = decimal_point , = thousands_sep, see Number::Format 
-#: templates/config.tmpl:56
+#: templates/config.tmpl:57
 msgid "."
 msgstr "."
 
-#: templates/config.tmpl:57
+#: templates/config.tmpl:58
 msgid ","
 msgstr ","
 
@@ -108,27 +107,27 @@ msgstr "GNU/kFreeBSD (i386)"
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 
-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:178
 msgid "North America"
 msgstr "北アメリカ"
 
-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:179
 msgid "South America"
 msgstr "南アメリカ"
 
-#: templates/config/mirrors.tmpl:184
+#: templates/config/mirrors.tmpl:180
 msgid "Asia"
 msgstr "アジア"
 
-#: templates/config/mirrors.tmpl:185
+#: templates/config/mirrors.tmpl:181
 msgid "Australia and New Zealand"
 msgstr "オーストラリア・ニュージーランド"
 
-#: templates/config/mirrors.tmpl:186
+#: templates/config/mirrors.tmpl:182
 msgid "Europe"
 msgstr "ヨーロッパ"
 
-#: templates/config/mirrors.tmpl:187
+#: templates/config/mirrors.tmpl:183
 msgid "Africa"
 msgstr "アフリカ"
 
@@ -137,12 +136,12 @@ msgid "Package Download Selection -- %s"
 msgstr "パッケージのダウンロードに関する選択 -- %s"
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 msgid "Distribution:"
 msgstr "ディストリビューション:"
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 msgid "Overview over this suite"
 msgstr "このスイートの概要"
 
@@ -186,7 +185,7 @@ msgstr ""
 msgid "Replacing <em>%s</em> with the mirror in question."
 msgstr "<em>%s</em> を使いたいミラーに置き換えてください。"
 
-#: templates/html/download.tmpl:37 templates/html/show.tmpl:152
+#: templates/html/download.tmpl:37 templates/html/show.tmpl:155
 msgid "Experimental package"
 msgstr "試験的な (experimental の) パッケージ"
 
@@ -202,11 +201,11 @@ msgstr ""
 "すかもしれません。使用前には、変更履歴やその他の参照可能なドキュメントを必ず"
 "調べてください。"
 
-#: templates/html/download.tmpl:41 templates/html/show.tmpl:157
+#: templates/html/download.tmpl:41 templates/html/show.tmpl:160
 msgid "debian-installer udeb package"
 msgstr "debian-installer 用の udeb パッケージ"
 
-#: templates/html/download.tmpl:42 templates/html/show.tmpl:158
+#: templates/html/download.tmpl:42 templates/html/show.tmpl:161
 msgid ""
 "Warning: This package is intended for the use in building <a href=\"http://"
 "www.debian.org/devel/debian-installer\">debian-installer</a> images only. Do "
@@ -278,7 +277,7 @@ msgstr "%s Byte (%s %s)"
 msgid "Exact Size"
 msgstr "正確なサイズ"
 
-#: templates/html/download.tmpl:103 templates/html/show.tmpl:327
+#: templates/html/download.tmpl:103 templates/html/show.tmpl:331
 msgid "MD5 checksum"
 msgstr "MD5 チェックサム"
 
@@ -341,7 +340,7 @@ msgstr ""
 "てください。その他の連絡先に関する情報は、%s の<a href=\"%s\">コンタクトペー"
 "ジ</a>をご覧ください。"
 
-#: templates/html/foot.tmpl:33 templates/txt/index.tmpl:4
+#: templates/html/foot.tmpl:33 templates/txt/index_head.tmpl:3
 msgid "Generated:"
 msgstr "生成:"
 
@@ -395,37 +394,32 @@ msgstr "%s パッケージホームページ"
 msgid "Packages"
 msgstr "パッケージ"
 
-#: templates/html/index.tmpl:3
+#: templates/html/index_head.tmpl:2
 msgid "Source Packages in \"%s\", %s %s"
 msgstr "\"%s\" の %s %s に含まれるソースパッケージ"
 
-#: templates/html/index.tmpl:4
+#: templates/html/index_head.tmpl:3
 msgid "Source Packages in \"%s\""
 msgstr "\"%s\" に含まれるソースパッケージ"
 
 # TRANSLATION-FIXME: "%3 Section", "%3 Subsection", and "Priority %s" would be the best.
-#: templates/html/index.tmpl:6
+#: templates/html/index_head.tmpl:5
 msgid "Software Packages in \"%s\", %s %s"
 msgstr "\"%s\" の%s %s に含まれるソフトウェアパッケージ"
 
-#: templates/html/index.tmpl:7
+#: templates/html/index_head.tmpl:6
 msgid "Software Packages in \"%s\""
 msgstr "\"%s\" に含まれるソフトウェアパッケージ"
 
-#: templates/html/index.tmpl:14
+#: templates/html/index_head.tmpl:13
 msgid "All Packages"
 msgstr "すべてのパッケージ"
 
-#: templates/html/index.tmpl:16 templates/html/show.tmpl:15
+#: templates/html/index_head.tmpl:15 templates/html/show.tmpl:15
 #: templates/html/suite_index.tmpl:2
 msgid "Source"
 msgstr "ソース"
 
-#: templates/html/index.tmpl:43 templates/html/show.tmpl:254
-#: templates/txt/index.tmpl:15
-msgid "virtual package provided by"
-msgstr "以下のパッケージによって提供される仮想パッケージです: "
-
 #: templates/html/newpkg.tmpl:2 templates/html/newpkg.tmpl:7
 msgid "New Packages in \"%s\""
 msgstr "\"%s\" の新規パッケージ"
@@ -493,15 +487,7 @@ msgstr "パッケージ検索結果 -- %s"
 msgid "Package Search Results"
 msgstr "パッケージ検索結果"
 
-#: templates/html/search.tmpl:33
-msgid ""
-"You can try a different search on the <a href=\"%s#search_packages"
-"\">Packages search page</a>."
-msgstr ""
-"<a href=\"%s#search_packages\">パッケージ検索ページ</a>で別の検索を実行できま"
-"す。"
-
-#: templates/html/search.tmpl:37
+#: templates/html/search.tmpl:35
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
@@ -509,68 +495,84 @@ msgstr ""
 "キーワードに完全に一致する単語のみを検索しました。<a href=\"%s\">単語の部分的"
 "な一致を有効にして</a>検索してみるとよいでしょう。"
 
-#: templates/html/search.tmpl:42
+#: templates/html/search.tmpl:40
+msgid "Search in specific suite:"
+msgstr "特定のスイートに絞って検索:"
+
+#: templates/html/search.tmpl:49
+msgid "Search in <a href=\"%s\">all suites</a>"
+msgstr "<a href=\"%s\">すべてのスイート</a>で検索"
+
+#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+msgid "Limit search to a specific architecture:"
+msgstr "特定のアーキテクチャに絞って検索:"
+
+#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+msgid "Search in <a href=\"%s\">all architectures</a>"
+msgstr "<a href=\"%s\">すべてのアーキテクチャ</a>で検索"
+
+#: templates/html/search.tmpl:69
 msgid ""
-"<a href=\"%s\">%u</a> results have not been displayed due to the search "
+"<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
-"検索パラメータの設定によって、<a href=\"%s\">%u</a> 個の結果が非表示になって"
-"います。"
+"検索パラメータの設定によって、<a href=\"%s\">一部</a>の結果が非表示になってい"
+"ます。"
 
-#: templates/html/search.tmpl:51
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr "すべてのスイート"
 
-#: templates/html/search.tmpl:51
-msgid "suite(s) <em>$suite_enc</em>"
-msgstr "<em>$suite_enc</em> スイート"
+#: templates/html/search.tmpl:78
+msgid "suite(s) <em>%s</em>"
+msgstr "<em>%s</em> スイート"
 
-#: templates/html/search.tmpl:52 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
 msgid "all sections"
 msgstr "すべてのセクション"
 
-#: templates/html/search.tmpl:52
-msgid "section(s) <em>$section_enc</em>"
-msgstr "<em>$section_enc</em> セクション"
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+msgid "section(s) <em>%s</em>"
+msgstr "<em>%s</em> セクション"
 
-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
 msgid "all architectures"
 msgstr "すべてのアーキテクチャ"
 
-#: templates/html/search.tmpl:53
-msgid "architecture(s) <em>$architectures_enc</em>"
-msgstr "<em>$architectures_enc</em> アーキテクチャ"
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+msgid "architecture(s) <em>%s</em>"
+msgstr "<em>%s</em> アーキテクチャ"
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 msgid "packages"
 msgstr "パッケージ"
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 msgid "source packages"
 msgstr "ソースパッケージ"
 
-#: templates/html/search.tmpl:56
+#: templates/html/search.tmpl:83
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr "<em>%2</em> を名前に含む%1を、%3、%4、%5で検索しました。"
 
-#: templates/html/search.tmpl:59
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr " (単語の一部が一致したものも含んでいます)"
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:61
+#: templates/html/search.tmpl:88
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgstr ""
 "名前や説明に<em>%s</em>を含むパッケージを、%s、%s、%sで検索しました%s。"
 
-#: templates/html/search.tmpl:67
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr "<strong>%u</strong> 個の一致するパッケージが見つかりました。"
 
-#: templates/html/search.tmpl:72
+#: templates/html/search.tmpl:99
 msgid ""
 "Note that this only shows the best matches, sorted by relevance. If the "
 "first few packages don't match what you searched for, try using more "
@@ -580,45 +582,56 @@ msgstr ""
 "初のいくつかのパッケージが検索しようとしたものと一致していない場合は、キー"
 "ワードを追加するか他のキーワードを用いてみてください。"
 
-#: templates/html/search.tmpl:74
+#: templates/html/search.tmpl:103
 msgid ""
-"Your search was too wide so we will only display exact matches. At least <em>"
-"%u</em> results have been omitted and will not be displayed. Please consider "
-"using a longer keyword or more keywords."
+"Your keyword was too generic, for optimizing reasons some results might have "
+"been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
-"あまりにも幅の広い検索なので、ここでは完全に一致するものを表示するだけに留め"
-"ています。少なくとも <em>%u</em> 個の結果が省略され、非表示となっています。さ"
-"らに長いキーワードを用いるか、キーワードを追加することを検討してください。"
+"キーワードが一般的すぎるので、最適化上の理由から一部の結果が非表示となってい"
+"る可能性があります。<br>もっと長いキーワードを用いるか、キーワードを追加する"
+"ことを検討してください。"
 
-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:105
+msgid ""
+"Your keyword was too generic.<br>Please consider using a longer keyword or "
+"more keywords."
+msgstr ""
+"キーワードが一般的すぎます。<br>もっと長いキーワードを用いるか、キーワードを"
+"追加することを検討してください。"
+
+#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
 msgid "Sorry, your search gave no results"
 msgstr "残念ながら、検索結果はありませんでした"
 
-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:118
 msgid "Package %s"
 msgstr "%s パッケージ"
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "also provided by:"
 msgstr "また、以下のパッケージによって提供されてもいます:"
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr "以下のパッケージによって提供されています:"
 
-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:139
 msgid "Source Package %s"
 msgstr "%s ソースパッケージ"
 
-#: templates/html/search.tmpl:113
+#: templates/html/search.tmpl:146
 msgid "Binary packages:"
 msgstr "バイナリパッケージ:"
 
-#: templates/html/search.tmpl:115
-msgid "%u binary packages"
-msgstr "%u 個のバイナリパッケージ"
+#: templates/html/search.tmpl:148
+msgid "hide %u binary packages"
+msgstr "%u 個のバイナリパッケージを非表示"
+
+#: templates/html/search.tmpl:148
+msgid "show %u binary packages"
+msgstr "%u 個のバイナリパッケージを表示"
 
-#: templates/html/search.tmpl:125
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -650,22 +663,6 @@ msgstr "<em>%s</em> を末尾に持つパスを検索"
 msgid "Search in other suite:"
 msgstr "他のスイートでの検索:"
 
-#: templates/html/search_contents.tmpl:58
-msgid "Limit search to a specific architecture:"
-msgstr "特定のアーキテクチャに絞って検索:"
-
-#: templates/html/search_contents.tmpl:63
-msgid "Search in <a href=\"%s\">all architectures</a>"
-msgstr "<a href=\"%s\">すべてのアーキテクチャ</a>で検索"
-
-#: templates/html/search_contents.tmpl:72
-msgid "section(s) <em>%s</em>"
-msgstr "<em>%s</em> セクション"
-
-#: templates/html/search_contents.tmpl:73
-msgid "architecture(s) <em>%s</em>"
-msgstr "<em>%s</em> アーキテクチャ"
-
 #: templates/html/search_contents.tmpl:74
 msgid "paths that end with"
 msgstr "を末尾に持つパス"
@@ -694,7 +691,7 @@ msgid ""
 "100 matches. Please consider using a longer keyword or more keywords."
 msgstr ""
 "注意: あまりにも幅の広い検索なので、ここでは最初の約 100 個の結果のみを表示す"
-"るだけに留めています。さらに長いキーワードを用いるか、キーワードを追加するこ"
+"るだけに留めています。もっと長いキーワードを用いるか、キーワードを追加するこ"
 "とを検討してください。"
 
 #: templates/html/search_contents.tmpl:97
@@ -702,7 +699,7 @@ msgid "Sort results by filename"
 msgstr "ファイル名の順に結果を並び換える"
 
 #: templates/html/search_contents.tmpl:98
-#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:327
+#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:331
 msgid "File"
 msgstr "ファイル"
 
@@ -726,111 +723,111 @@ msgstr "このセクションのすべてのパッケージ"
 msgid "Section:"
 msgstr "セクション:"
 
-#: templates/html/show.tmpl:21
+#: templates/html/show.tmpl:22
 msgid "Details of source package %s in %s"
 msgstr "%2 の %1 ソースパッケージに関する詳細"
 
-#: templates/html/show.tmpl:22
+#: templates/html/show.tmpl:23
 msgid "Details of package %s in %s"
 msgstr "%2 の %1 パッケージに関する詳細"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 msgid "Source package building this package"
 msgstr "このパッケージをビルドするためのソースパッケージ"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 msgid "Source:"
 msgstr "ソース:"
 
-#: templates/html/show.tmpl:52
+#: templates/html/show.tmpl:53
 msgid "Virtual Package: %s"
 msgstr "仮想パッケージ: %s"
 
-#: templates/html/show.tmpl:54
+#: templates/html/show.tmpl:55
 msgid "Source Package: %s (%s)"
 msgstr "ソースパッケージ: %s (%s)"
 
-#: templates/html/show.tmpl:56
+#: templates/html/show.tmpl:57
 msgid "Package: %s (%s)"
 msgstr "パッケージ: %s (%s)"
 
-#: templates/html/show.tmpl:60
+#: templates/html/show.tmpl:61
 msgid "essential"
 msgstr "必須"
 
-#: templates/html/show.tmpl:64
+#: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "%s に関するリンク"
 
-#: templates/html/show.tmpl:65
-msgid "Debian Resources:"
-msgstr "Debian の資源:"
+#: templates/html/show.tmpl:66
+msgid "%s Resources:"
+msgstr "%s の資源:"
 
-#: templates/html/show.tmpl:67
+#: templates/html/show.tmpl:68
 msgid "Bug Reports"
 msgstr "バグ報告"
 
-#: templates/html/show.tmpl:70 templates/html/show.tmpl:72
+#: templates/html/show.tmpl:71 templates/html/show.tmpl:73
 msgid "Developer Information (PTS)"
 msgstr "開発者情報 (PTS)"
 
-#: templates/html/show.tmpl:76
+#: templates/html/show.tmpl:77
 msgid "%s Changelog"
 msgstr "%s での変更履歴"
 
-#: templates/html/show.tmpl:77
+#: templates/html/show.tmpl:78
 msgid "Copyright File"
 msgstr "著作権ファイル"
 
-#: templates/html/show.tmpl:81
+#: templates/html/show.tmpl:82
 msgid "Debian Source Repository"
 msgstr "Debian ソースリポジトリ"
 
-#: templates/html/show.tmpl:95
+#: templates/html/show.tmpl:96
 msgid "Download Source Package <a href=\"%s\">%s</a>:"
 msgstr "<a href=\"%s\">%s</a> ソースパッケージをダウンロード:"
 
-#: templates/html/show.tmpl:102
+#: templates/html/show.tmpl:103
 msgid "Not found"
 msgstr "見つかりません"
 
-#: templates/html/show.tmpl:107
+#: templates/html/show.tmpl:108
 msgid "Maintainer:"
 msgstr "メンテナ:"
 
-#: templates/html/show.tmpl:109
+#: templates/html/show.tmpl:110
 msgid "Maintainers:"
 msgstr "メンテナ:"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "An overview over the maintainer's packages and uploads"
 msgstr "メンテナのパッケージやアップロードの概要"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "QA Page"
 msgstr "QA ページ"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Archive of the Maintainer Mailinglist"
 msgstr "メンテナメーリングリストのアーカイブ"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Mail Archive"
 msgstr "メールアーカイブ"
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:132
 msgid "External Resources:"
 msgstr "外部の資源:"
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:134
 msgid "Homepage"
 msgstr "ホームページ"
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:140
 msgid "Similar packages:"
 msgstr "類似のパッケージ:"
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:156
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
 "distribution. That means it is likely unstable or buggy, and it may even "
@@ -842,7 +839,7 @@ msgstr ""
 "すかもしれません。使用前には、<a href=\"%s\">変更履歴</a>やその他の参照可能な"
 "ドキュメントを必ず調べてください。"
 
-#: templates/html/show.tmpl:176
+#: templates/html/show.tmpl:180
 msgid ""
 "This is a <em>virtual package</em>. See the <a href=\"%s\">Debian policy</a> "
 "for a <a href=\"%sch-binary.html#s-virtual_pkg\">definition of virtual "
@@ -852,63 +849,71 @@ msgstr ""
 "\">仮想パッケージの定義</a>については <a href=\"%s\">Debian ポリシーマニュア"
 "ル</a>を参照してください。"
 
-#: templates/html/show.tmpl:184
+#: templates/html/show.tmpl:188
 msgid "Tags"
 msgstr "タグ"
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:211
 msgid "Packages providing %s"
 msgstr "%s を提供するパッケージ"
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:220
 msgid "The following binary packages are built from this source package:"
 msgstr "以下のバイナリパッケージがこのソースパッケージからビルドされています。"
 
-#: templates/html/show.tmpl:225
+#: templates/html/show.tmpl:229
 msgid "Other Packages Related to %s"
 msgstr "その他の %s 関連パッケージ"
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:231
 msgid "legend"
 msgstr "凡例"
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:233
 msgid "build-depends"
 msgstr "構築依存"
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:234
 msgid "build-depends-indep"
 msgstr "構築依存 (アーキテクチャ非依存)"
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:236
 msgid "depends"
 msgstr "依存"
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:237
 msgid "recommends"
 msgstr "推奨"
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:238
 msgid "suggests"
 msgstr "提案"
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:248
 msgid "or "
 msgstr "または "
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:256
 msgid "also a virtual package provided by"
 msgstr "以下のパッケージによって提供される仮想パッケージでもあります: "
 
-#: templates/html/show.tmpl:259
-msgid "%u providing packages"
-msgstr "%u 個の提供パッケージ"
+#: templates/html/show.tmpl:258
+msgid "virtual package provided by"
+msgstr "以下のパッケージによって提供される仮想パッケージです: "
+
+#: templates/html/show.tmpl:263
+msgid "hide %u providing packages"
+msgstr "%u 個の提供パッケージを非表示"
+
+#: templates/html/show.tmpl:263
+msgid "show %u providing packages"
+msgstr "%u 個の提供パッケージを表示"
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:281
 msgid "Download %s"
 msgstr "%s のダウンロード"
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:283
 msgid ""
 "The download table links to the download of the package and a file overview. "
 "In addition it gives information about the package size and the installed "
@@ -918,55 +923,55 @@ msgstr ""
 "リンク。加えて、パッケージサイズやインストールサイズに関する情報も含んでいま"
 "す。"
 
-#: templates/html/show.tmpl:280
+#: templates/html/show.tmpl:284
 msgid "Download for all available architectures"
 msgstr "すべての利用可能アーキテクチャ向けのダウンロード"
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:285
 msgid "Architecture"
 msgstr "アーキテクチャ"
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:286
 msgid "Version"
 msgstr "バージョン"
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:287
 msgid "Package Size"
 msgstr "パッケージサイズ"
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:288
 msgid "Installed Size"
 msgstr "インストールサイズ"
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:289
 msgid "Files"
 msgstr "ファイル"
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:297
 msgid "(unofficial port)"
 msgstr "(非公式の移植版)"
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:308 templates/html/show.tmpl:336
 msgid "%s&nbsp;kB"
 msgstr "%s&nbsp;kB"
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:311
 msgid "list of files"
 msgstr "ファイル一覧"
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:313
 msgid "no current information"
 msgstr "現在の情報はありません"
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:330
 msgid "Download information for the files of this source package"
 msgstr "このソースパッケージのファイルのダウンロードに関する情報"
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:331
 msgid "Size (in kB)"
 msgstr "サイズ (単位: kB)"
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:349
 msgid ""
 "Debian Package Source Repository (<acronym title=\"Version Control System"
 "\">VCS</acronym>: <a href=\"%s\">%s</a>)"
@@ -974,7 +979,7 @@ msgstr ""
 "Debian パッケージソースリポジトリ (<acronym title=\"バージョン管理システム"
 "\">VCS</acronym>: <a href=\"%s\">%s</a>)"
 
-#: templates/html/show.tmpl:349
+#: templates/html/show.tmpl:353
 msgid "Debian Package Source Repository (Browsable)"
 msgstr "Debian パッケージソースリポジトリ (ブラウザで表示可能)"
 
@@ -1030,18 +1035,31 @@ msgstr ""
 "以下のパッケージは、%2 アーカイブの %1 スイートに最近 7 日間に追加されたもの"
 "です。"
 
-#: templates/rss/newpkg.tmpl:28 templates/txt/index.tmpl:5
+#: templates/rss/newpkg.tmpl:28 templates/txt/index_head.tmpl:4
 msgid "Copyright ©"
 msgstr "Copyright ©"
 
-#: templates/txt/index.tmpl:2
+#: templates/txt/index_head.tmpl:1
 msgid "All %s Packages in \"%s\""
 msgstr "\"%s\" に含まれるすべての %s パッケージ"
 
-#: templates/txt/index.tmpl:6
+#: templates/txt/index_head.tmpl:5
 msgid "See <URL:%s> for the license terms."
 msgstr "ライセンス条項については <URL:%s> をご覧ください。"
 
+#~ msgid "suite(s) <em>$suite_enc</em>"
+#~ msgstr "<em>$suite_enc</em> スイート"
+
+#~ msgid "section(s) <em>$section_enc</em>"
+#~ msgstr "<em>$section_enc</em> セクション"
+
+#~ msgid "architecture(s) <em>$architectures_enc</em>"
+#~ msgstr "<em>$architectures_enc</em> アーキテクチャ"
+
+#~ msgid ""
+#~ "Packages that were added to the %s %s archive during the last 7 days."
+#~ msgstr "%s %s アーカイブに最近 7 日間に追加されたパッケージ。"
+
 #~ msgid ""
 #~ "Packages that were added to the %s %s archive (section \"%s\") during the "
 #~ "last 7 days."
@@ -1049,5 +1067,8 @@ msgstr "ライセンス条項については <URL:%s> をご覧ください。"
 #~ "%s %s アーカイブ (\"%s\" セクション) に最近 7 日間に追加されたパッケージ。"
 
 #~ msgid ""
-#~ "Packages that were added to the %s %s archive during the last 7 days."
-#~ msgstr "%s %s アーカイブに最近 7 日間に追加されたパッケージ。"
+#~ "You can try a different search on the <a href=\"%s#search_packages"
+#~ "\">Packages search page</a>."
+#~ msgstr ""
+#~ "<a href=\"%s#search_packages\">パッケージ検索ページ</a>で別の検索を実行で"
+#~ "きます。"
diff --git a/po/templates.nl.po b/po/templates.nl.po
index 8397a1f..2ad7cb0 100644
--- a/po/templates.nl.po
+++ b/po/templates.nl.po
@@ -17,31 +17,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: templates/config.tmpl:40
+#: templates/config.tmpl:41
 msgid "Debian Web Mailinglist"
 msgstr ""
 
-#: templates/config.tmpl:45
+#: templates/config.tmpl:46
 msgid "%s Webmaster"
 msgstr ""
 
-#: templates/config.tmpl:48
+#: templates/config.tmpl:49
 msgid "%s is a <a href=\"%s\">trademark</a> of %s"
 msgstr "%s is een <a href=\"%s\">handelsmerk</a> van %s"
 
-#: templates/config.tmpl:53
+#: templates/config.tmpl:54
 msgid ""
-"Please note that this is an experimental version of <a href=\"http://"
-"packages.debian.org/\">packages.debian.org</a>. Errors and obsolete "
-"information should be expected"
+"Please note that this is an experimental version of <a href=\"http://%s/\">%"
+"s</a>. Errors and obsolete information should be expected"
 msgstr ""
 
-#. @translators: . = decimal_point , = thousands_sep, see Number::Format
-#: templates/config.tmpl:56
+#. @translators: . = decimal_point , = thousands_sep, see Number::Format 
+#: templates/config.tmpl:57
 msgid "."
 msgstr ","
 
-#: templates/config.tmpl:57
+#: templates/config.tmpl:58
 msgid ","
 msgstr "."
 
@@ -109,27 +108,27 @@ msgstr "GNU/kFreeBSD (i386)"
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 
-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:178
 msgid "North America"
 msgstr "Noord Amerika"
 
-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:179
 msgid "South America"
 msgstr "Zuid Amerika"
 
-#: templates/config/mirrors.tmpl:184
+#: templates/config/mirrors.tmpl:180
 msgid "Asia"
 msgstr "Azië"
 
-#: templates/config/mirrors.tmpl:185
+#: templates/config/mirrors.tmpl:181
 msgid "Australia and New Zealand"
 msgstr "Australië en Nieuw Zeeland"
 
-#: templates/config/mirrors.tmpl:186
+#: templates/config/mirrors.tmpl:182
 msgid "Europe"
 msgstr "Europa"
 
-#: templates/config/mirrors.tmpl:187
+#: templates/config/mirrors.tmpl:183
 msgid "Africa"
 msgstr "Afrika"
 
@@ -138,21 +137,20 @@ msgid "Package Download Selection -- %s"
 msgstr "Selectie voor pakketdownload -- %s"
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 msgid "Distribution:"
 msgstr "Distributie:"
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 #, fuzzy
 msgid "Overview over this suite"
 msgstr "Overzicht van deze distributie"
 
 #: templates/html/download.tmpl:6 templates/html/filelist.tmpl:6
 #: templates/html/show.tmpl:17
-#, fuzzy
 msgid "Package:"
-msgstr "Pakket niet beschikbaar"
+msgstr "Pakket:"
 
 #: templates/html/download.tmpl:8
 msgid "Download"
@@ -183,7 +181,7 @@ msgstr ""
 msgid "Replacing <em>%s</em> with the mirror in question."
 msgstr ""
 
-#: templates/html/download.tmpl:37 templates/html/show.tmpl:152
+#: templates/html/download.tmpl:37 templates/html/show.tmpl:155
 msgid "Experimental package"
 msgstr "Experimenteel pakket"
 
@@ -196,16 +194,15 @@ msgid ""
 msgstr ""
 "Waarschuwing: Dit pakket komt uit de <strong>experimental</strong> "
 "distributie. Dit houdt in dat het mogelijk instabiel is of nog fouten bevat; "
-"het is zelfs mogelijk dat het verlies van gegevens kan veroorzaken. Raadpleeg "
-"vooral de changelog en andere beschikbare documentatie voordat u het pakket "
-"gebruikt."
+"het is zelfs mogelijk dat het verlies van gegevens kan veroorzaken. "
+"Raadpleeg vooral de changelog en andere beschikbare documentatie voordat u "
+"het pakket gebruikt."
 
-#: templates/html/download.tmpl:41 templates/html/show.tmpl:157
-#| msgid "List of all packages"
+#: templates/html/download.tmpl:41 templates/html/show.tmpl:160
 msgid "debian-installer udeb package"
 msgstr "udeb-pakket voor debian-installer"
 
-#: templates/html/download.tmpl:42 templates/html/show.tmpl:158
+#: templates/html/download.tmpl:42 templates/html/show.tmpl:161
 #, fuzzy
 #| msgid ""
 #| "Warning: This package is intended for the use in building <a href="
@@ -227,12 +224,14 @@ msgid ""
 msgstr ""
 
 #: templates/html/download.tmpl:75
-msgid "You can download the requested file from the <tt>%s</tt> subdirectory at:"
+msgid ""
+"You can download the requested file from the <tt>%s</tt> subdirectory at:"
 msgstr ""
 
 #: templates/html/download.tmpl:77
 msgid "%s security updates are officially distributed only via <tt>%s</tt>."
-msgstr "%s beveiligingsupdates worden officieel alleen verspreid via <tt>%s</tt>."
+msgstr ""
+"%s beveiligingsupdates worden officieel alleen verspreid via <tt>%s</tt>."
 
 #: templates/html/download.tmpl:84
 msgid ""
@@ -256,7 +255,6 @@ msgid ""
 msgstr ""
 
 #: templates/html/download.tmpl:100
-#| msgid "More Information on %s"
 msgid "More information on <kbd>%s</kbd>:"
 msgstr "Nadere informatie over <kbd>%s</kbd>:"
 
@@ -268,13 +266,11 @@ msgstr "%s Byte (%s %s)"
 msgid "Exact Size"
 msgstr "Exacte grootte"
 
-#: templates/html/download.tmpl:103 templates/html/show.tmpl:327
+#: templates/html/download.tmpl:103 templates/html/show.tmpl:331
 msgid "MD5 checksum"
 msgstr "MD5 checksum"
 
 #: templates/html/download.tmpl:104 templates/html/download.tmpl:105
-#, fuzzy
-#| msgid "Not available"
 msgid "Not Available"
 msgstr "Niet beschikbaar"
 
@@ -291,15 +287,17 @@ msgid "Filelist of package %s/%s/%s"
 msgstr "Bestandenoverzicht voor pakket %s/%s/%s"
 
 #: templates/html/filelist.tmpl:3
-msgid "Filelist of package <em>%s</em> in <em>%s</em> of architecture <em>%s</em>"
-msgstr "Bestandenoverzicht voor pakket <em>%s</em> in <em>%s</em> voor het platform <em>%s</em>"
+msgid ""
+"Filelist of package <em>%s</em> in <em>%s</em> of architecture <em>%s</em>"
+msgstr ""
+"Bestandenoverzicht voor pakket <em>%s</em> in <em>%s</em> voor het platform "
+"<em>%s</em>"
 
 #: templates/html/filelist.tmpl:8
 msgid "Filelist"
 msgstr "Bestandenoverzicht"
 
 #: templates/html/foot.tmpl:11
-#| msgid "This page is also available in the following languages:\n"
 msgid "This page is also available in the following languages:"
 msgstr "Deze pagina is ook beschikbaar in de volgende talen:"
 
@@ -334,21 +332,17 @@ msgstr ""
 "href=\"mailto:%s\">%s</a>. Voor meer informatie om met ons in contact te "
 "komen, zie de <a href=\"%s/contact\">contact pagina</a>."
 
-#: templates/html/foot.tmpl:33 templates/txt/index.tmpl:4
+#: templates/html/foot.tmpl:33 templates/txt/index_head.tmpl:3
 msgid "Generated:"
 msgstr "Gegenereerd:"
 
 #: templates/html/foot.tmpl:35
-#, fuzzy
-#| msgid ""
-#| "Copyright &copy; 1997-2005 <a href=\"http://www.spi-inc.org\">SPI</a>; "
-#| "See <a href=\"%s/license\">license terms</a>."
 msgid ""
 "Content Copyright &copy; %s <a href=\"%s\">%s</a>; See <a href=\"%s"
 "\">license terms</a>."
 msgstr ""
-"Copyright &copy; 1997-2005 <a href=\"http://www.spi-inc.org\">SPI</a>; Ziede "
-"<a href=\"%s/license\">licentievoorwaarden</a>."
+"Copyright &copy; %s <a href=\"%s\">%s</a>. Zie de <a href=\"%s"
+"\">licentievoorwaarden</a>."
 
 #: templates/html/foot.tmpl:39
 #, fuzzy
@@ -393,41 +387,32 @@ msgstr "Pakket niet beschikbaar"
 msgid "Packages"
 msgstr "Pakketten"
 
-#: templates/html/index.tmpl:3
+#: templates/html/index_head.tmpl:2
 msgid "Source Packages in \"%s\", %s %s"
 msgstr "Bronpakketten in \"%s\", %s %s"
 
-#: templates/html/index.tmpl:4
-#| msgid "Software Packages in \"%s\""
+#: templates/html/index_head.tmpl:3
 msgid "Source Packages in \"%s\""
 msgstr "Bronpakketten in \"%s\""
 
-#: templates/html/index.tmpl:6
+#: templates/html/index_head.tmpl:5
 msgid "Software Packages in \"%s\", %s %s"
 msgstr "Softwarepakketten in \"%s\", %s %s"
 
-#: templates/html/index.tmpl:7
+#: templates/html/index_head.tmpl:6
 msgid "Software Packages in \"%s\""
 msgstr "Softwarepakketten in \"%s\""
 
-#: templates/html/index.tmpl:14
-#, fuzzy
-#| msgid "All packages"
+#: templates/html/index_head.tmpl:13
 msgid "All Packages"
 msgstr "Alle pakketten"
 
-#: templates/html/index.tmpl:16 templates/html/show.tmpl:15
+#: templates/html/index_head.tmpl:15 templates/html/show.tmpl:15
 #: templates/html/suite_index.tmpl:2
 msgid "Source"
 msgstr "Bron"
 
-#: templates/html/index.tmpl:43 templates/html/show.tmpl:254
-#: templates/txt/index.tmpl:15
-msgid "virtual package provided by"
-msgstr "virtueel pakket geboden door"
-
 #: templates/html/newpkg.tmpl:2 templates/html/newpkg.tmpl:7
-#, fuzzy
 msgid "New Packages in \"%s\""
 msgstr "Nieuwe pakketten in \"%s\""
 
@@ -475,11 +460,9 @@ msgstr ""
 
 #: templates/html/newpkg.tmpl:28
 msgid " <em>(%u days old)</em>"
-msgstr ""
+msgstr " <em>(%u dagen oud)</em>"
 
 #: templates/html/newpkg.tmpl:32 templates/html/suite_index.tmpl:41
-#, fuzzy
-#| msgid "All packages"
 msgid "All packages"
 msgstr "Alle pakketten"
 
@@ -505,122 +488,148 @@ msgstr "Alle Debianpakketten in \"%s\""
 msgid "Package Search Results"
 msgstr "Alle Debianpakketten in \"%s\""
 
-#: templates/html/search.tmpl:33
-#, fuzzy
-msgid ""
-"You can try a different search on the <a href=\"%s#search_packages"
-"\">Packages search page</a>."
-msgstr ""
-"Terug naar: <a href=\"%s/\">Debian Project hoofdpagina</a> || <a href=\"%s/"
-"\">Pakketten zoekpagina</a>"
-
-#: templates/html/search.tmpl:37
+#: templates/html/search.tmpl:35
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgstr ""
 
-#: templates/html/search.tmpl:42
+#: templates/html/search.tmpl:40
+msgid "Search in specific suite:"
+msgstr ""
+
+#: templates/html/search.tmpl:49
+#, fuzzy
+#| msgid "Search for <a href=\"%s\">other versions of %s</a>"
+msgid "Search in <a href=\"%s\">all suites</a>"
+msgstr "Zoek naar <a href=\"%s\">andere versies van %s</a>"
+
+#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+msgid "Limit search to a specific architecture:"
+msgstr ""
+
+#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+#, fuzzy
+#| msgid "Search for <a href=\"%s\">other versions of %s</a>"
+msgid "Search in <a href=\"%s\">all architectures</a>"
+msgstr "Zoek naar <a href=\"%s\">andere versies van %s</a>"
+
+#: templates/html/search.tmpl:69
 msgid ""
-"<a href=\"%s\">%u</a> results have not been displayed due to the search "
+"<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
 
-#: templates/html/search.tmpl:51
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr "alle suites"
 
-#: templates/html/search.tmpl:51
-msgid "suite(s) <em>$suite_enc</em>"
+#: templates/html/search.tmpl:78
+#, fuzzy
+#| msgid "suite(s) <em>$suite_enc</em>"
+msgid "suite(s) <em>%s</em>"
 msgstr "suite(s) <em>$suite_enc</em>"
 
-#: templates/html/search.tmpl:52 templates/html/search_contents.tmpl:72
-#, fuzzy
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
 msgid "all sections"
-msgstr "Sectie"
+msgstr "alle secties"
 
-#: templates/html/search.tmpl:52
-msgid "section(s) <em>$section_enc</em>"
-msgstr "sectie(s) <em>$section_enc</em>"
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+msgid "section(s) <em>%s</em>"
+msgstr ""
 
-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
 msgid "all architectures"
 msgstr "alle platformen"
 
-#: templates/html/search.tmpl:53
-msgid "architecture(s) <em>$architectures_enc</em>"
-msgstr "platform(en) <em>$architectures_enc</em>"
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+msgid "architecture(s) <em>%s</em>"
+msgstr ""
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 msgid "packages"
 msgstr "pakketten"
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 msgid "source packages"
 msgstr "bronpakketten"
 
-#: templates/html/search.tmpl:56
-msgid "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
+#: templates/html/search.tmpl:83
+msgid ""
+"You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 
-#: templates/html/search.tmpl:59
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:61
+#: templates/html/search.tmpl:88
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgstr ""
 
-#: templates/html/search.tmpl:67
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 
-#: templates/html/search.tmpl:72
+#: templates/html/search.tmpl:99
 msgid ""
 "Note that this only shows the best matches, sorted by relevance. If the "
 "first few packages don't match what you searched for, try using more "
 "keywords or alternative keywords."
 msgstr ""
 
-#: templates/html/search.tmpl:74
+#: templates/html/search.tmpl:103
 msgid ""
-"Your search was too wide so we will only display exact matches. At least <em>"
-"%u</em> results have been omitted and will not be displayed. Please consider "
-"using a longer keyword or more keywords."
+"Your keyword was too generic, for optimizing reasons some results might have "
+"been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
 
-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:105
+msgid ""
+"Your keyword was too generic.<br>Please consider using a longer keyword or "
+"more keywords."
+msgstr ""
+
+#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
 msgid "Sorry, your search gave no results"
 msgstr ""
 
-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:118
 msgid "Package %s"
 msgstr "Pakket %s"
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "also provided by:"
 msgstr "ook geboden door:"
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr "geboden door:"
 
-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:139
 msgid "Source Package %s"
 msgstr "Bronpakket %s"
 
-#: templates/html/search.tmpl:113
+#: templates/html/search.tmpl:146
 msgid "Binary packages:"
 msgstr "Binaire pakketten:"
 
-#: templates/html/search.tmpl:115
-msgid "%u binary packages"
+#: templates/html/search.tmpl:148
+#, fuzzy
+#| msgid "%u binary packages"
+msgid "hide %u binary packages"
+msgstr "%u binaire pakketten"
+
+#: templates/html/search.tmpl:148
+#, fuzzy
+#| msgid "%u binary packages"
+msgid "show %u binary packages"
 msgstr "%u binaire pakketten"
 
-#: templates/html/search.tmpl:125
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -651,24 +660,6 @@ msgstr ""
 msgid "Search in other suite:"
 msgstr ""
 
-#: templates/html/search_contents.tmpl:58
-msgid "Limit search to a specific architecture:"
-msgstr ""
-
-#: templates/html/search_contents.tmpl:63
-#, fuzzy
-#| msgid "Search for <a href=\"%s\">other versions of %s</a>"
-msgid "Search in <a href=\"%s\">all architectures</a>"
-msgstr "Zoek naar <a href=\"%s\">andere versies van %s</a>"
-
-#: templates/html/search_contents.tmpl:72
-msgid "section(s) <em>%s</em>"
-msgstr ""
-
-#: templates/html/search_contents.tmpl:73
-msgid "architecture(s) <em>%s</em>"
-msgstr ""
-
 #: templates/html/search_contents.tmpl:74
 msgid "paths that end with"
 msgstr ""
@@ -681,7 +672,7 @@ msgstr ""
 msgid "filenames that contain"
 msgstr ""
 
-#. @translators: I'm really sorry :/
+#. @translators: I'm really sorry :/ 
 #: templates/html/search_contents.tmpl:81
 msgid "You have searched for %s <em>%s</em> in suite <em>%s</em>, %s, and %s."
 msgstr ""
@@ -701,7 +692,7 @@ msgid "Sort results by filename"
 msgstr ""
 
 #: templates/html/search_contents.tmpl:98
-#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:327
+#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:331
 msgid "File"
 msgstr "Bestand"
 
@@ -711,7 +702,6 @@ msgid "Sort results by package name"
 msgstr "Bronpakket"
 
 #: templates/html/search_contents.tmpl:114
-#| msgid "not"
 msgid "not %s"
 msgstr "niet %s"
 
@@ -727,119 +717,114 @@ msgstr "Alle pakketten in deze sectie"
 msgid "Section:"
 msgstr "Sectie:"
 
-#: templates/html/show.tmpl:21
+#: templates/html/show.tmpl:22
 msgid "Details of source package %s in %s"
-msgstr "Details voor bronpakkett %s in %s"
+msgstr "Details voor bronpakket %s in %s"
 
-#: templates/html/show.tmpl:22
+#: templates/html/show.tmpl:23
 msgid "Details of package %s in %s"
-msgstr "Details voor pakkett %s in %s"
+msgstr "Details voor pakket %s in %s"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 #, fuzzy
 msgid "Source package building this package"
 msgstr "Bronpakket"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 msgid "Source:"
 msgstr "Bron:"
 
-#: templates/html/show.tmpl:52
+#: templates/html/show.tmpl:53
 msgid "Virtual Package: %s"
 msgstr "Virtueel pakket: %s"
 
-#: templates/html/show.tmpl:54
+#: templates/html/show.tmpl:55
 msgid "Source Package: %s (%s)"
 msgstr "Bronpakket: %s (%s)"
 
-#: templates/html/show.tmpl:56
+#: templates/html/show.tmpl:57
 msgid "Package: %s (%s)"
 msgstr "Pakket: %s (%s)"
 
-#: templates/html/show.tmpl:60
-#| msgid "Essential"
+#: templates/html/show.tmpl:61
 msgid "essential"
 msgstr "essentieel"
 
-#: templates/html/show.tmpl:64
+#: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "Verwijzigingen voor %s"
 
-#: templates/html/show.tmpl:65
-msgid "Debian Resources:"
-msgstr "Debian bronnen:"
+#: templates/html/show.tmpl:66
+msgid "%s Resources:"
+msgstr "%s bronnen:"
 
-#: templates/html/show.tmpl:67
+#: templates/html/show.tmpl:68
 msgid "Bug Reports"
 msgstr "Probleemrapporten"
 
-#: templates/html/show.tmpl:70 templates/html/show.tmpl:72
+#: templates/html/show.tmpl:71 templates/html/show.tmpl:73
 #, fuzzy
 #| msgid "More Information on %s"
 msgid "Developer Information (PTS)"
 msgstr "Meer informatie over %s"
 
-#: templates/html/show.tmpl:76
+#: templates/html/show.tmpl:77
 msgid "%s Changelog"
 msgstr "%s Changelog"
 
-#: templates/html/show.tmpl:77
+#: templates/html/show.tmpl:78
 msgid "Copyright File"
 msgstr "Copyright-bestand"
 
-#: templates/html/show.tmpl:81
+#: templates/html/show.tmpl:82
 msgid "Debian Source Repository"
 msgstr ""
 
-#: templates/html/show.tmpl:95
+#: templates/html/show.tmpl:96
 msgid "Download Source Package <a href=\"%s\">%s</a>:"
 msgstr "Het bronpakket <a href=\"%s\">%s</a> downloaden:"
 
-#: templates/html/show.tmpl:102
+#: templates/html/show.tmpl:103
 msgid "Not found"
 msgstr "Niet gevonden"
 
-#: templates/html/show.tmpl:107
-#| msgid "Maintainer"
+#: templates/html/show.tmpl:108
 msgid "Maintainer:"
 msgstr "Beheerder:"
 
-#: templates/html/show.tmpl:109
-#| msgid "Maintainer"
+#: templates/html/show.tmpl:110
 msgid "Maintainers:"
 msgstr "Beheerders:"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "An overview over the maintainer's packages and uploads"
 msgstr ""
 
-#: templates/html/show.tmpl:120
-#, fuzzy
-#| msgid "All packages"
+#: templates/html/show.tmpl:123
 msgid "QA Page"
-msgstr "Alle pakketten"
+msgstr "QA-pagina"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Archive of the Maintainer Mailinglist"
 msgstr ""
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Mail Archive"
-msgstr ""
+msgstr "Mailarchief"
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:132
 msgid "External Resources:"
 msgstr "Externe bronnen:"
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:134
 msgid "Homepage"
-msgstr ""
+msgstr "Homepage"
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:140
 msgid "Similar packages:"
 msgstr "Vergelijkbare pakketten:"
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:156
 #, fuzzy
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
@@ -853,7 +838,7 @@ msgstr ""
 "Als u deze waarschuwing negeert en het pakket toch installeert, dan is dat "
 "op uw eigen risico."
 
-#: templates/html/show.tmpl:176
+#: templates/html/show.tmpl:180
 msgid ""
 "This is a <em>virtual package</em>. See the <a href=\"%s\">Debian policy</a> "
 "for a <a href=\"%sch-binary.html#s-virtual_pkg\">definition of virtual "
@@ -863,124 +848,136 @@ msgstr ""
 "beleidshandboek</a> voor de <a href=\"%sch-binary.html#s-virtual_pkg"
 "\">definitie van een virtueel pakket</a>."
 
-#: templates/html/show.tmpl:184
+#: templates/html/show.tmpl:188
 msgid "Tags"
 msgstr ""
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:211
 msgid "Packages providing %s"
 msgstr "Pakketten die %s bieden:"
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:220
 msgid "The following binary packages are built from this source package:"
 msgstr "De volgende binaire pakketten worden van dit bronpakket gebouwd:"
 
-#: templates/html/show.tmpl:225
+#: templates/html/show.tmpl:229
 msgid "Other Packages Related to %s"
 msgstr "Andere aan %s gerelateerde pakketten"
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:231
 msgid "legend"
 msgstr ""
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:233
 msgid "build-depends"
 msgstr "build-depends"
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:234
 msgid "build-depends-indep"
 msgstr "build-depends-indep"
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:236
 msgid "depends"
 msgstr "depends"
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:237
 msgid "recommends"
 msgstr "recommends"
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:238
 msgid "suggests"
 msgstr "suggests"
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:248
 msgid "or "
 msgstr "of "
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:256
 msgid "also a virtual package provided by"
 msgstr "Ook een virtueel pakket geboden door:"
 
-#: templates/html/show.tmpl:259
-msgid "%u providing packages"
+#: templates/html/show.tmpl:258
+msgid "virtual package provided by"
+msgstr "virtueel pakket geboden door"
+
+#: templates/html/show.tmpl:263
+#, fuzzy
+#| msgid "%u providing packages"
+msgid "hide %u providing packages"
+msgstr "pakketten die %u bieden"
+
+#: templates/html/show.tmpl:263
+#, fuzzy
+#| msgid "%u providing packages"
+msgid "show %u providing packages"
 msgstr "pakketten die %u bieden"
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:281
 msgid "Download %s"
 msgstr "%s downloaden"
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:283
 msgid ""
 "The download table links to the download of the package and a file overview. "
 "In addition it gives information about the package size and the installed "
 "size."
 msgstr ""
 
-#: templates/html/show.tmpl:280
+#: templates/html/show.tmpl:284
 msgid "Download for all available architectures"
 msgstr "Pakket downloaden voor alle beschikbare platforms"
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:285
 msgid "Architecture"
 msgstr "Platform"
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:286
 msgid "Version"
 msgstr "Versie"
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:287
 msgid "Package Size"
 msgstr "Pakketgrootte"
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:288
 msgid "Installed Size"
 msgstr "Geïnstalleerde grootte"
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:289
 msgid "Files"
 msgstr "Bestanden"
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:297
 msgid "(unofficial port)"
 msgstr ""
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:308 templates/html/show.tmpl:336
 msgid "%s&nbsp;kB"
 msgstr "%s&nbsp;kB"
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:311
 msgid "list of files"
 msgstr "overzicht"
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:313
 msgid "no current information"
 msgstr "geen actuale informatie"
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:330
 msgid "Download information for the files of this source package"
 msgstr ""
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:331
 msgid "Size (in kB)"
 msgstr "Grootte (in kB)"
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:349
 msgid ""
 "Debian Package Source Repository (<acronym title=\"Version Control System"
 "\">VCS</acronym>: <a href=\"%s\">%s</a>)"
 msgstr ""
 
-#: templates/html/show.tmpl:349
+#: templates/html/show.tmpl:353
 #, fuzzy
 msgid "Debian Package Source Repository (Browsable)"
 msgstr "Alle Debianpakketten in \"%s\""
@@ -1016,9 +1013,8 @@ msgid "Debtags"
 msgstr "Debtags"
 
 #: templates/html/tag_index.tmpl:10
-#, fuzzy
 msgid "Facet: %s"
-msgstr "Pakket: %s"
+msgstr "Facet: %s"
 
 #: templates/rss/newpkg.tmpl:16
 #, fuzzy
@@ -1043,16 +1039,28 @@ msgstr ""
 "De volgende pakketten zijn in de afgelopen 7 dagen aan de «unstable» "
 "distributie toegevoegd."
 
-#: templates/rss/newpkg.tmpl:28 templates/txt/index.tmpl:5
+#: templates/rss/newpkg.tmpl:28 templates/txt/index_head.tmpl:4
 msgid "Copyright ©"
 msgstr "Copyright ©"
 
-#: templates/txt/index.tmpl:2
-#| msgid "New Packages in \"%s\""
+#: templates/txt/index_head.tmpl:1
 msgid "All %s Packages in \"%s\""
 msgstr "Alle %s pakketten in \"%s\""
 
-#: templates/txt/index.tmpl:6
+#: templates/txt/index_head.tmpl:5
 msgid "See <URL:%s> for the license terms."
 msgstr ""
 
+#~ msgid "section(s) <em>$section_enc</em>"
+#~ msgstr "sectie(s) <em>$section_enc</em>"
+
+#~ msgid "architecture(s) <em>$architectures_enc</em>"
+#~ msgstr "platform(en) <em>$architectures_enc</em>"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can try a different search on the <a href=\"%s#search_packages"
+#~ "\">Packages search page</a>."
+#~ msgstr ""
+#~ "Terug naar: <a href=\"%s/\">Debian Project hoofdpagina</a> || <a href=\"%"
+#~ "s/\">Pakketten zoekpagina</a>"
diff --git a/po/templates.pot b/po/templates.pot
index 92d45fc..cac9f99 100644
--- a/po/templates.pot
+++ b/po/templates.pot
@@ -3,28 +3,28 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: templates/config.tmpl:40
+#: templates/config.tmpl:41
 msgid "Debian Web Mailinglist"
 msgstr ""
 
-#: templates/config.tmpl:45
+#: templates/config.tmpl:46
 msgid "%s Webmaster"
 msgstr ""
 
-#: templates/config.tmpl:48
+#: templates/config.tmpl:49
 msgid "%s is a <a href=\"%s\">trademark</a> of %s"
 msgstr ""
 
-#: templates/config.tmpl:53
-msgid "Please note that this is an experimental version of <a href=\"http://packages.debian.org/\">packages.debian.org</a>. Errors and obsolete information should be expected"
+#: templates/config.tmpl:54
+msgid "Please note that this is an experimental version of <a href=\"http://%s/\">%s</a>. Errors and obsolete information should be expected"
 msgstr ""
 
 #. @translators: . = decimal_point , = thousands_sep, see Number::Format 
-#: templates/config.tmpl:56
+#: templates/config.tmpl:57
 msgid "."
 msgstr ""
 
-#: templates/config.tmpl:57
+#: templates/config.tmpl:58
 msgid ","
 msgstr ""
 
@@ -92,27 +92,27 @@ msgstr ""
 msgid "GNU/kFreeBSD (amd64)"
 msgstr ""
 
-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:178
 msgid "North America"
 msgstr ""
 
-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:179
 msgid "South America"
 msgstr ""
 
-#: templates/config/mirrors.tmpl:184
+#: templates/config/mirrors.tmpl:180
 msgid "Asia"
 msgstr ""
 
-#: templates/config/mirrors.tmpl:185
+#: templates/config/mirrors.tmpl:181
 msgid "Australia and New Zealand"
 msgstr ""
 
-#: templates/config/mirrors.tmpl:186
+#: templates/config/mirrors.tmpl:182
 msgid "Europe"
 msgstr ""
 
-#: templates/config/mirrors.tmpl:187
+#: templates/config/mirrors.tmpl:183
 msgid "Africa"
 msgstr ""
 
@@ -122,14 +122,14 @@ msgstr ""
 
 #: templates/html/download.tmpl:5
 #: templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10
+#: templates/html/index_head.tmpl:9
 #: templates/html/show.tmpl:14
 msgid "Distribution:"
 msgstr ""
 
 #: templates/html/download.tmpl:5
 #: templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10
+#: templates/html/index_head.tmpl:9
 #: templates/html/show.tmpl:14
 msgid "Overview over this suite"
 msgstr ""
@@ -165,7 +165,7 @@ msgid "Replacing <em>%s</em> with the mirror in question."
 msgstr ""
 
 #: templates/html/download.tmpl:37
-#: templates/html/show.tmpl:152
+#: templates/html/show.tmpl:155
 msgid "Experimental package"
 msgstr ""
 
@@ -174,12 +174,12 @@ msgid "Warning: This package is from the <strong>experimental</strong> distribut
 msgstr ""
 
 #: templates/html/download.tmpl:41
-#: templates/html/show.tmpl:157
+#: templates/html/show.tmpl:160
 msgid "debian-installer udeb package"
 msgstr ""
 
 #: templates/html/download.tmpl:42
-#: templates/html/show.tmpl:158
+#: templates/html/show.tmpl:161
 msgid "Warning: This package is intended for the use in building <a href=\"http://www.debian.org/devel/debian-installer\">debian-installer</a> images only. Do not install it on a normal %s system."
 msgstr ""
 
@@ -220,7 +220,7 @@ msgid "%s Byte (%s %s)"
 msgstr ""
 
 #: templates/html/download.tmpl:103
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:331
 msgid "MD5 checksum"
 msgstr ""
 
@@ -275,7 +275,7 @@ msgid "To report a problem with the web site, e-mail <a href=\"mailto:%s\">%s</a
 msgstr ""
 
 #: templates/html/foot.tmpl:33
-#: templates/txt/index.tmpl:4
+#: templates/txt/index_head.tmpl:3
 msgid "Generated:"
 msgstr ""
 
@@ -325,38 +325,32 @@ msgstr ""
 msgid "Packages"
 msgstr ""
 
-#: templates/html/index.tmpl:3
+#: templates/html/index_head.tmpl:2
 msgid "Source Packages in \"%s\", %s %s"
 msgstr ""
 
-#: templates/html/index.tmpl:4
+#: templates/html/index_head.tmpl:3
 msgid "Source Packages in \"%s\""
 msgstr ""
 
-#: templates/html/index.tmpl:6
+#: templates/html/index_head.tmpl:5
 msgid "Software Packages in \"%s\", %s %s"
 msgstr ""
 
-#: templates/html/index.tmpl:7
+#: templates/html/index_head.tmpl:6
 msgid "Software Packages in \"%s\""
 msgstr ""
 
-#: templates/html/index.tmpl:14
+#: templates/html/index_head.tmpl:13
 msgid "All Packages"
 msgstr ""
 
-#: templates/html/index.tmpl:16
+#: templates/html/index_head.tmpl:15
 #: templates/html/show.tmpl:15
 #: templates/html/suite_index.tmpl:2
 msgid "Source"
 msgstr ""
 
-#: templates/html/index.tmpl:43
-#: templates/html/show.tmpl:254
-#: templates/txt/index.tmpl:15
-msgid "virtual package provided by"
-msgstr ""
-
 #: templates/html/newpkg.tmpl:2
 #: templates/html/newpkg.tmpl:7
 msgid "New Packages in \"%s\""
@@ -417,107 +411,131 @@ msgstr ""
 msgid "Package Search Results"
 msgstr ""
 
-#: templates/html/search.tmpl:33
-msgid "You can try a different search on the <a href=\"%s#search_packages\">Packages search page</a>."
+#: templates/html/search.tmpl:35
+msgid "You have searched only for words exactly matching your keywords. You can try to search <a href=\"%s\">allowing subword matching</a>."
 msgstr ""
 
-#: templates/html/search.tmpl:37
-msgid "You have searched only for words exactly matching your keywords. You can try to search <a href=\"%s\">allowing subword matching</a>."
+#: templates/html/search.tmpl:40
+msgid "Search in specific suite:"
 msgstr ""
 
-#: templates/html/search.tmpl:42
-msgid "<a href=\"%s\">%u</a> results have not been displayed due to the search parameters."
+#: templates/html/search.tmpl:49
+msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr ""
 
-#: templates/html/search.tmpl:51
+#: templates/html/search.tmpl:53
+#: templates/html/search_contents.tmpl:58
+msgid "Limit search to a specific architecture:"
+msgstr ""
+
+#: templates/html/search.tmpl:62
+#: templates/html/search_contents.tmpl:63
+msgid "Search in <a href=\"%s\">all architectures</a>"
+msgstr ""
+
+#: templates/html/search.tmpl:69
+msgid "<a href=\"%s\">Some</a> results have not been displayed due to the search parameters."
+msgstr ""
+
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr ""
 
-#: templates/html/search.tmpl:51
-msgid "suite(s) <em>$suite_enc</em>"
+#: templates/html/search.tmpl:78
+msgid "suite(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:52
+#: templates/html/search.tmpl:79
 #: templates/html/search_contents.tmpl:72
 msgid "all sections"
 msgstr ""
 
-#: templates/html/search.tmpl:52
-msgid "section(s) <em>$section_enc</em>"
+#: templates/html/search.tmpl:79
+#: templates/html/search_contents.tmpl:72
+msgid "section(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:53
+#: templates/html/search.tmpl:80
 #: templates/html/search_contents.tmpl:73
 msgid "all architectures"
 msgstr ""
 
-#: templates/html/search.tmpl:53
-msgid "architecture(s) <em>$architectures_enc</em>"
+#: templates/html/search.tmpl:80
+#: templates/html/search_contents.tmpl:73
+msgid "architecture(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 msgid "source packages"
 msgstr ""
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 msgid "packages"
 msgstr ""
 
-#: templates/html/search.tmpl:56
+#: templates/html/search.tmpl:83
 msgid "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 
-#: templates/html/search.tmpl:59
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:61
+#: templates/html/search.tmpl:88
 msgid "You have searched for <em>%s</em> in packages names and descriptions in %s, %s, and %s%s."
 msgstr ""
 
-#: templates/html/search.tmpl:67
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 
-#: templates/html/search.tmpl:72
+#: templates/html/search.tmpl:99
 msgid "Note that this only shows the best matches, sorted by relevance. If the first few packages don't match what you searched for, try using more keywords or alternative keywords."
 msgstr ""
 
-#: templates/html/search.tmpl:74
-msgid "Your search was too wide so we will only display exact matches. At least <em>%u</em> results have been omitted and will not be displayed. Please consider using a longer keyword or more keywords."
+#: templates/html/search.tmpl:103
+msgid "Your keyword was too generic, for optimizing reasons some results might have been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
 
-#: templates/html/search.tmpl:79
+#: templates/html/search.tmpl:105
+msgid "Your keyword was too generic.<br>Please consider using a longer keyword or more keywords."
+msgstr ""
+
+#: templates/html/search.tmpl:111
 #: templates/html/search_contents.tmpl:131
 msgid "Sorry, your search gave no results"
 msgstr ""
 
-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:118
 msgid "Package %s"
 msgstr ""
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "also provided by:"
 msgstr ""
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr ""
 
-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:139
 msgid "Source Package %s"
 msgstr ""
 
-#: templates/html/search.tmpl:113
+#: templates/html/search.tmpl:146
 msgid "Binary packages:"
 msgstr ""
 
-#: templates/html/search.tmpl:115
-msgid "%u binary packages"
+#: templates/html/search.tmpl:148
+msgid "show %u binary packages"
+msgstr ""
+
+#: templates/html/search.tmpl:148
+msgid "hide %u binary packages"
 msgstr ""
 
-#: templates/html/search.tmpl:125
+#: templates/html/search.tmpl:158
 msgid "<a href=\"%s\">%u</a> results have not been displayed because you requested only exact matches."
 msgstr ""
 
@@ -545,22 +563,6 @@ msgstr ""
 msgid "Search in other suite:"
 msgstr ""
 
-#: templates/html/search_contents.tmpl:58
-msgid "Limit search to a specific architecture:"
-msgstr ""
-
-#: templates/html/search_contents.tmpl:63
-msgid "Search in <a href=\"%s\">all architectures</a>"
-msgstr ""
-
-#: templates/html/search_contents.tmpl:72
-msgid "section(s) <em>%s</em>"
-msgstr ""
-
-#: templates/html/search_contents.tmpl:73
-msgid "architecture(s) <em>%s</em>"
-msgstr ""
-
 #: templates/html/search_contents.tmpl:74
 msgid "paths that end with"
 msgstr ""
@@ -592,7 +594,7 @@ msgstr ""
 
 #: templates/html/search_contents.tmpl:98
 #: templates/html/search_contents.tmpl:124
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:331
 msgid "File"
 msgstr ""
 
@@ -616,234 +618,242 @@ msgstr ""
 msgid "All packages in this section"
 msgstr ""
 
-#: templates/html/show.tmpl:21
+#: templates/html/show.tmpl:22
 msgid "Details of source package %s in %s"
 msgstr ""
 
-#: templates/html/show.tmpl:22
+#: templates/html/show.tmpl:23
 msgid "Details of package %s in %s"
 msgstr ""
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 msgid "Source:"
 msgstr ""
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 msgid "Source package building this package"
 msgstr ""
 
-#: templates/html/show.tmpl:52
+#: templates/html/show.tmpl:53
 msgid "Virtual Package: %s"
 msgstr ""
 
-#: templates/html/show.tmpl:54
+#: templates/html/show.tmpl:55
 msgid "Source Package: %s (%s)"
 msgstr ""
 
-#: templates/html/show.tmpl:56
+#: templates/html/show.tmpl:57
 msgid "Package: %s (%s)"
 msgstr ""
 
-#: templates/html/show.tmpl:60
+#: templates/html/show.tmpl:61
 msgid "essential"
 msgstr ""
 
-#: templates/html/show.tmpl:64
+#: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr ""
 
-#: templates/html/show.tmpl:65
-msgid "Debian Resources:"
+#: templates/html/show.tmpl:66
+msgid "%s Resources:"
 msgstr ""
 
-#: templates/html/show.tmpl:67
+#: templates/html/show.tmpl:68
 msgid "Bug Reports"
 msgstr ""
 
-#: templates/html/show.tmpl:70
-#: templates/html/show.tmpl:72
+#: templates/html/show.tmpl:71
+#: templates/html/show.tmpl:73
 msgid "Developer Information (PTS)"
 msgstr ""
 
-#: templates/html/show.tmpl:76
+#: templates/html/show.tmpl:77
 msgid "%s Changelog"
 msgstr ""
 
-#: templates/html/show.tmpl:77
+#: templates/html/show.tmpl:78
 msgid "Copyright File"
 msgstr ""
 
-#: templates/html/show.tmpl:81
+#: templates/html/show.tmpl:82
 msgid "Debian Source Repository"
 msgstr ""
 
-#: templates/html/show.tmpl:95
+#: templates/html/show.tmpl:96
 msgid "Download Source Package <a href=\"%s\">%s</a>:"
 msgstr ""
 
-#: templates/html/show.tmpl:102
+#: templates/html/show.tmpl:103
 msgid "Not found"
 msgstr ""
 
-#: templates/html/show.tmpl:107
+#: templates/html/show.tmpl:108
 msgid "Maintainer:"
 msgstr ""
 
-#: templates/html/show.tmpl:109
+#: templates/html/show.tmpl:110
 msgid "Maintainers:"
 msgstr ""
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "An overview over the maintainer's packages and uploads"
 msgstr ""
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "QA Page"
 msgstr ""
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Archive of the Maintainer Mailinglist"
 msgstr ""
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Mail Archive"
 msgstr ""
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:132
 msgid "External Resources:"
 msgstr ""
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:134
 msgid "Homepage"
 msgstr ""
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:140
 msgid "Similar packages:"
 msgstr ""
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:156
 msgid "Warning: This package is from the <strong>experimental</strong> distribution. That means it is likely unstable or buggy, and it may even cause data loss. Please be sure to consult the <a href=\"%s\">changelog</a> and other possible documentation before using it."
 msgstr ""
 
-#: templates/html/show.tmpl:176
+#: templates/html/show.tmpl:180
 msgid "This is a <em>virtual package</em>. See the <a href=\"%s\">Debian policy</a> for a <a href=\"%sch-binary.html#s-virtual_pkg\">definition of virtual packages</a>."
 msgstr ""
 
-#: templates/html/show.tmpl:184
+#: templates/html/show.tmpl:188
 msgid "Tags"
 msgstr ""
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:211
 msgid "Packages providing %s"
 msgstr ""
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:220
 msgid "The following binary packages are built from this source package:"
 msgstr ""
 
-#: templates/html/show.tmpl:225
+#: templates/html/show.tmpl:229
 msgid "Other Packages Related to %s"
 msgstr ""
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:231
 msgid "legend"
 msgstr ""
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:233
 msgid "build-depends"
 msgstr ""
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:234
 msgid "build-depends-indep"
 msgstr ""
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:236
 msgid "depends"
 msgstr ""
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:237
 msgid "recommends"
 msgstr ""
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:238
 msgid "suggests"
 msgstr ""
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:248
 msgid "or "
 msgstr ""
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:256
 msgid "also a virtual package provided by"
 msgstr ""
 
-#: templates/html/show.tmpl:259
-msgid "%u providing packages"
+#: templates/html/show.tmpl:258
+msgid "virtual package provided by"
+msgstr ""
+
+#: templates/html/show.tmpl:263
+msgid "show %u providing packages"
+msgstr ""
+
+#: templates/html/show.tmpl:263
+msgid "hide %u providing packages"
 msgstr ""
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:281
 msgid "Download %s"
 msgstr ""
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:283
 msgid "The download table links to the download of the package and a file overview. In addition it gives information about the package size and the installed size."
 msgstr ""
 
-#: templates/html/show.tmpl:280
+#: templates/html/show.tmpl:284
 msgid "Download for all available architectures"
 msgstr ""
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:285
 msgid "Architecture"
 msgstr ""
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:286
 msgid "Version"
 msgstr ""
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:287
 msgid "Package Size"
 msgstr ""
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:288
 msgid "Installed Size"
 msgstr ""
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:289
 msgid "Files"
 msgstr ""
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:297
 msgid "(unofficial port)"
 msgstr ""
 
-#: templates/html/show.tmpl:304
-#: templates/html/show.tmpl:304
-#: templates/html/show.tmpl:332
+#: templates/html/show.tmpl:308
+#: templates/html/show.tmpl:308
+#: templates/html/show.tmpl:336
 msgid "%s&nbsp;kB"
 msgstr ""
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:311
 msgid "list of files"
 msgstr ""
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:313
 msgid "no current information"
 msgstr ""
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:330
 msgid "Download information for the files of this source package"
 msgstr ""
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:331
 msgid "Size (in kB)"
 msgstr ""
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:349
 msgid "Debian Package Source Repository (<acronym title=\"Version Control System\">VCS</acronym>: <a href=\"%s\">%s</a>)"
 msgstr ""
 
-#: templates/html/show.tmpl:349
+#: templates/html/show.tmpl:353
 msgid "Debian Package Source Repository (Browsable)"
 msgstr ""
 
@@ -894,15 +904,15 @@ msgid "The following packages were added to suite %s in the %s archive during th
 msgstr ""
 
 #: templates/rss/newpkg.tmpl:28
-#: templates/txt/index.tmpl:5
+#: templates/txt/index_head.tmpl:4
 msgid "Copyright ©"
 msgstr ""
 
-#: templates/txt/index.tmpl:2
+#: templates/txt/index_head.tmpl:1
 msgid "All %s Packages in \"%s\""
 msgstr ""
 
-#: templates/txt/index.tmpl:6
+#: templates/txt/index_head.tmpl:5
 msgid "See <URL:%s> for the license terms."
 msgstr ""
 
diff --git a/po/templates.ru.po b/po/templates.ru.po
index d116ab7..35af884 100644
--- a/po/templates.ru.po
+++ b/po/templates.ru.po
@@ -1,10 +1,10 @@
 # translation of templates.ru.po to Russian
-# Yuri Kozlov <kozlov.y@gmail.com>, 2007.
+# Yuri Kozlov <kozlov.y@gmail.com>, 2007, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: Debian webwml templates\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-12-16 19:09+0300\n"
+"PO-Revision-Date: 2008-02-23 11:29+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,33 +13,32 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: templates/config.tmpl:40
+#: templates/config.tmpl:41
 msgid "Debian Web Mailinglist"
 msgstr "Список рассылки редакторов веб-страниц Debian"
 
-#: templates/config.tmpl:45
+#: templates/config.tmpl:46
 msgid "%s Webmaster"
 msgstr "веб-мастер %s"
 
-#: templates/config.tmpl:48
+#: templates/config.tmpl:49
 msgid "%s is a <a href=\"%s\">trademark</a> of %s"
 msgstr "%s это <a href=\"%s\">торговый знак</a> компании %s"
 
-#: templates/config.tmpl:53
+#: templates/config.tmpl:54
 msgid ""
-"Please note that this is an experimental version of <a href=\"http://"
-"packages.debian.org/\">packages.debian.org</a>. Errors and obsolete "
-"information should be expected"
+"Please note that this is an experimental version of <a href=\"http://%s/\">%"
+"s</a>. Errors and obsolete information should be expected"
 msgstr ""
-"Это экспериментальная версия <a href=\"http://packages.debian.org/"
-"\">packages.debian.org</a>. Возможны ошибки и устаревшая информация"
+"Это экспериментальная версия <a href=\"http://%s/\">%s</a>. Возможны ошибки "
+"и устаревшая информация"
 
 #. @translators: . = decimal_point , = thousands_sep, see Number::Format
-#: templates/config.tmpl:56
+#: templates/config.tmpl:57
 msgid "."
 msgstr ","
 
-#: templates/config.tmpl:57
+#: templates/config.tmpl:58
 msgid ","
 msgstr " "
 
@@ -107,27 +106,27 @@ msgstr "GNU/kFreeBSD (i386)"
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 
-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:178
 msgid "North America"
 msgstr "Северная Америка"
 
-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:179
 msgid "South America"
 msgstr "Южная Америка"
 
-#: templates/config/mirrors.tmpl:184
+#: templates/config/mirrors.tmpl:180
 msgid "Asia"
 msgstr "Азия"
 
-#: templates/config/mirrors.tmpl:185
+#: templates/config/mirrors.tmpl:181
 msgid "Australia and New Zealand"
 msgstr "Австралия и Новая Зеландия"
 
-#: templates/config/mirrors.tmpl:186
+#: templates/config/mirrors.tmpl:182
 msgid "Europe"
 msgstr "Европа"
 
-#: templates/config/mirrors.tmpl:187
+#: templates/config/mirrors.tmpl:183
 msgid "Africa"
 msgstr "Африка"
 
@@ -136,12 +135,12 @@ msgid "Package Download Selection -- %s"
 msgstr "Выбранный пакет для загрузки -- %s"
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 msgid "Distribution:"
 msgstr "Дистрибутив:"
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 msgid "Overview over this suite"
 msgstr "Краткое описание комплекта"
 
@@ -184,7 +183,7 @@ msgstr ""
 msgid "Replacing <em>%s</em> with the mirror in question."
 msgstr "Заменив <em>%s</em> нужным сервером."
 
-#: templates/html/download.tmpl:37 templates/html/show.tmpl:152
+#: templates/html/download.tmpl:37 templates/html/show.tmpl:155
 msgid "Experimental package"
 msgstr "Экспериментальный пакет"
 
@@ -200,11 +199,11 @@ msgstr ""
 "даже может вызвать потерю данных. Перед использованием внимательно "
 "прочитайте журнал изменений пакета и другую доступную документацию."
 
-#: templates/html/download.tmpl:41 templates/html/show.tmpl:157
+#: templates/html/download.tmpl:41 templates/html/show.tmpl:160
 msgid "debian-installer udeb package"
 msgstr "пакет udeb для debian-installer"
 
-#: templates/html/download.tmpl:42 templates/html/show.tmpl:158
+#: templates/html/download.tmpl:42 templates/html/show.tmpl:161
 msgid ""
 "Warning: This package is intended for the use in building <a href=\"http://"
 "www.debian.org/devel/debian-installer\">debian-installer</a> images only. Do "
@@ -274,7 +273,7 @@ msgstr "%s байт (%s %s)"
 msgid "Exact Size"
 msgstr "Точный размер"
 
-#: templates/html/download.tmpl:103 templates/html/show.tmpl:327
+#: templates/html/download.tmpl:103 templates/html/show.tmpl:331
 msgid "MD5 checksum"
 msgstr "Контрольная сумма MD5"
 
@@ -327,12 +326,12 @@ msgid ""
 "To report a problem with the web site, e-mail <a href=\"mailto:%s\">%s</a>. "
 "For other contact information, see the %s <a href=\"%s\">contact page</a>."
 msgstr ""
-"Чтобы сообщить о проблеме, связанной с web-сайтом, отправьте сообщение (на "
+"Чтобы сообщить о проблеме, связанной с веб-сайтом, отправьте сообщение (на "
 "английском) в список рассылки <a href=\"mailto:%s\">%s</a>. Прочую "
 "контактную информацию см. на странице %s <a href=\"%s\">Как с нами "
 "связаться</a>."
 
-#: templates/html/foot.tmpl:33 templates/txt/index.tmpl:4
+#: templates/html/foot.tmpl:33 templates/txt/index_head.tmpl:3
 msgid "Generated:"
 msgstr "Сгенерирована:"
 
@@ -385,36 +384,31 @@ msgstr "Домашняя страница пакетов %s"
 msgid "Packages"
 msgstr "Пакеты"
 
-#: templates/html/index.tmpl:3
+#: templates/html/index_head.tmpl:2
 msgid "Source Packages in \"%s\", %s %s"
 msgstr "Пакеты исходного кода в \"%s\", %s %s"
 
-#: templates/html/index.tmpl:4
+#: templates/html/index_head.tmpl:3
 msgid "Source Packages in \"%s\""
 msgstr "Пакеты исходного кода в \"%s\""
 
-#: templates/html/index.tmpl:6
+#: templates/html/index_head.tmpl:5
 msgid "Software Packages in \"%s\", %s %s"
 msgstr "Пакеты программ в \"%s\", %s %s"
 
-#: templates/html/index.tmpl:7
+#: templates/html/index_head.tmpl:6
 msgid "Software Packages in \"%s\""
 msgstr "Пакеты программ в \"%s\""
 
-#: templates/html/index.tmpl:14
+#: templates/html/index_head.tmpl:13
 msgid "All Packages"
 msgstr "Все пакеты"
 
-#: templates/html/index.tmpl:16 templates/html/show.tmpl:15
+#: templates/html/index_head.tmpl:15 templates/html/show.tmpl:15
 #: templates/html/suite_index.tmpl:2
 msgid "Source"
 msgstr "Исходный код"
 
-#: templates/html/index.tmpl:43 templates/html/show.tmpl:254
-#: templates/txt/index.tmpl:15
-msgid "virtual package provided by"
-msgstr "виртуальный пакет, предоставляемый"
-
 #: templates/html/newpkg.tmpl:2 templates/html/newpkg.tmpl:7
 msgid "New Packages in \"%s\""
 msgstr "Новые пакеты в \"%s\""
@@ -481,15 +475,7 @@ msgstr "Результаты поиска пакетов -- %s"
 msgid "Package Search Results"
 msgstr "Результаты поиска пакетов"
 
-#: templates/html/search.tmpl:33
-msgid ""
-"You can try a different search on the <a href=\"%s#search_packages"
-"\">Packages search page</a>."
-msgstr ""
-"Вы можете попробовать поиск с другими параметрами на <a href=\"%"
-"s#search_packages\">странице поиска пакетов</a>."
-
-#: templates/html/search.tmpl:37
+#: templates/html/search.tmpl:35
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
@@ -498,64 +484,86 @@ msgstr ""
 "попытаться выполнить поиск с <a href=\"%s\">совпадением отдельных частей "
 "слова</a>."
 
-#: templates/html/search.tmpl:42
+#: templates/html/search.tmpl:40
+msgid "Search in specific suite:"
+msgstr "Поиск в заданном комплекте:"
+
+#: templates/html/search.tmpl:49
+msgid "Search in <a href=\"%s\">all suites</a>"
+msgstr "Поиск во <a href=\"%s\">всех комплектах</a>"
+
+#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+msgid "Limit search to a specific architecture:"
+msgstr "Ограничить поиск определённой архитектурой:"
+
+#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+msgid "Search in <a href=\"%s\">all architectures</a>"
+msgstr "Поиск во <a href=\"%s\">всех архитектурах</a>"
+
+#: templates/html/search.tmpl:69
 msgid ""
-"<a href=\"%s\">%u</a> results have not been displayed due to the search "
+"<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
-msgstr "<a href=\"%s\">%u</a> результаты не были показаны из-за параметров поиска."
+msgstr ""
+"<a href=\"%s\">Некоторые</a> результаты не были показаны из-за параметров "
+"поиска."
 
-#: templates/html/search.tmpl:51
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr "все комплекты"
 
-#: templates/html/search.tmpl:51
-msgid "suite(s) <em>$suite_enc</em>"
-msgstr "комплект(ы) <em>$suite_enc</em>"
+#: templates/html/search.tmpl:78
+msgid "suite(s) <em>%s</em>"
+msgstr "комплект(ы) <em>%s</em>"
 
-#: templates/html/search.tmpl:52 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
 msgid "all sections"
 msgstr "все секции"
 
-#: templates/html/search.tmpl:52
-msgid "section(s) <em>$section_enc</em>"
-msgstr "секция(и) <em>$section_enc</em>"
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+msgid "section(s) <em>%s</em>"
+msgstr "секция(и) <em>%s</em>"
 
-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
 msgid "all architectures"
 msgstr "все архитектуры"
 
-#: templates/html/search.tmpl:53
-msgid "architecture(s) <em>$architectures_enc</em>"
-msgstr "архитектура(ы) <em>$architectures_enc</em>"
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+msgid "architecture(s) <em>%s</em>"
+msgstr "архитектура(ы) <em>%s</em>"
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 msgid "packages"
 msgstr "пакеты"
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 msgid "source packages"
 msgstr "пакеты исходного кода"
 
-#: templates/html/search.tmpl:56
+#: templates/html/search.tmpl:83
 msgid "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
-msgstr "Вы искали %s в именах, которые содержат <em>%s</em> в %s, %s и %s."
+msgstr ""
+"Вы искали %s, в именах которых есть <em>%s</em>. Были просмотрены %s, %s и %"
+"s."
 
-#: templates/html/search.tmpl:59
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr " (включая совпадение части слова)"
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:61
+#: templates/html/search.tmpl:88
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
-msgstr "Вы искали <em>%s</em> в именах пакетов и описаниях в %s, %s и %s%s."
+msgstr ""
+"Вы искали <em>%s</em> в именах пакетов и описаниях. Были просмотрены %s, %s "
+"и %s%s."
 
-#: templates/html/search.tmpl:67
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
-msgstr "Найдено <strong>%u</strong> подходящих пакетов."
+msgstr "Количество подходящих пакетов: <strong>%u</strong>."
 
-#: templates/html/search.tmpl:72
+#: templates/html/search.tmpl:99
 msgid ""
 "Note that this only shows the best matches, sorted by relevance. If the "
 "first few packages don't match what you searched for, try using more "
@@ -565,46 +573,59 @@ msgstr ""
 "значимости. Если первые несколько пакетов не то, что вы искали, попробуйте "
 "использовать больше ключевых слов или другие ключевые слова."
 
-#: templates/html/search.tmpl:74
+#: templates/html/search.tmpl:103
+#| msgid ""
+#| "Your keyword was too generic, for optimizing reasons some results might "
+#| "have been supressed.<br>Please consider using a longer keyword or more "
+#| "keywords."
 msgid ""
-"Your search was too wide so we will only display exact matches. At least <em>"
-"%u</em> results have been omitted and will not be displayed. Please consider "
-"using a longer keyword or more keywords."
+"Your keyword was too generic, for optimizing reasons some results might have "
+"been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
-"Вы указали слишком широкий диапазон поиска поэтому будут показаны только "
-"точные совпадения. По крайней мере <em>%u</em> результатов было пропущено и "
-"не показано. Попробуйте использовать более длинное ключевое слово или "
-"введите больше ключевых слов."
+"Указанное ключевое слово слишком часто используется, с целью оптимизаци "
+"некоторые результаты показаны не будут.<br>Попробуйте использовать более длинное ключевое слово или введите больше ключевых слов."
 
-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:105
+msgid ""
+"Your keyword was too generic.<br>Please consider using a longer keyword or "
+"more keywords."
+msgstr ""
+"Вы указали слишком общее ключевое слово.<br>Попробуйте использовать более "
+"длинное ключевое слово или введите больше ключевых слов."
+
+#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
 msgid "Sorry, your search gave no results"
 msgstr "Ничего не найдено"
 
-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:118
 msgid "Package %s"
 msgstr "Пакет %s"
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "also provided by:"
 msgstr "также предоставляется:"
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr "предоставляется:"
 
-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:139
 msgid "Source Package %s"
 msgstr "Пакет исходного кода %s"
 
-#: templates/html/search.tmpl:113
+#: templates/html/search.tmpl:146
 msgid "Binary packages:"
 msgstr "Бинарный пакет:"
 
-#: templates/html/search.tmpl:115
-msgid "%u binary packages"
-msgstr "%u бинарных пакетов"
+#: templates/html/search.tmpl:148
+msgid "hide %u binary packages"
+msgstr "скрыть бинарные пакеты (%u)"
+
+#: templates/html/search.tmpl:148
+msgid "show %u binary packages"
+msgstr "показать бинарные пакеты (%u)"
 
-#: templates/html/search.tmpl:125
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -636,22 +657,6 @@ msgstr "Поиск пути, заканчивающегося <em>%s</em>"
 msgid "Search in other suite:"
 msgstr "Поиск в другом комплекте:"
 
-#: templates/html/search_contents.tmpl:58
-msgid "Limit search to a specific architecture:"
-msgstr "Ограничить поиск определённой архитектурой:"
-
-#: templates/html/search_contents.tmpl:63
-msgid "Search in <a href=\"%s\">all architectures</a>"
-msgstr "Поиск во <a href=\"%s\">всех архитектурах</a>"
-
-#: templates/html/search_contents.tmpl:72
-msgid "section(s) <em>%s</em>"
-msgstr "секция(и) <em>%s</em>"
-
-#: templates/html/search_contents.tmpl:73
-msgid "architecture(s) <em>%s</em>"
-msgstr "архитектура(ы) <em>%s</em>"
-
 #: templates/html/search_contents.tmpl:74
 msgid "paths that end with"
 msgstr "пути, заканчивающиеся"
@@ -667,11 +672,11 @@ msgstr "имена файлов, содержащих"
 #. @translators: I'm really sorry :/
 #: templates/html/search_contents.tmpl:81
 msgid "You have searched for %s <em>%s</em> in suite <em>%s</em>, %s, and %s."
-msgstr "Вы искали %s <em>%s</em> в комплекте <em>%s</em>, %s и %s."
+msgstr "Вы искали %s <em>%s</em> в комплекте <em>%s</em>. Были просмотрены %s и %s."
 
 #: templates/html/search_contents.tmpl:85
 msgid "Found <strong>%u results</strong>."
-msgstr "Найдено <strong>%u совпадений</strong>."
+msgstr "Количество найденных совпадений: <strong>%u</strong>."
 
 #: templates/html/search_contents.tmpl:88
 msgid ""
@@ -687,7 +692,7 @@ msgid "Sort results by filename"
 msgstr "Сортировать результаты по имени файла"
 
 #: templates/html/search_contents.tmpl:98
-#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:327
+#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:331
 msgid "File"
 msgstr "Файл"
 
@@ -711,111 +716,111 @@ msgstr "Все пакеты в этой секции"
 msgid "Section:"
 msgstr "Секция:"
 
-#: templates/html/show.tmpl:21
+#: templates/html/show.tmpl:22
 msgid "Details of source package %s in %s"
 msgstr "Подробная информация о пакете исходного кода %s в %s"
 
-#: templates/html/show.tmpl:22
+#: templates/html/show.tmpl:23
 msgid "Details of package %s in %s"
 msgstr "Подробная информация о пакете %s в %s"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 msgid "Source package building this package"
 msgstr "Пакет исходного кода для сборки этого пакета"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 msgid "Source:"
 msgstr "Исходник:"
 
-#: templates/html/show.tmpl:52
+#: templates/html/show.tmpl:53
 msgid "Virtual Package: %s"
 msgstr "Виртуальный пакет: %s"
 
-#: templates/html/show.tmpl:54
+#: templates/html/show.tmpl:55
 msgid "Source Package: %s (%s)"
 msgstr "Пакет исходного кода: %s (%s)"
 
-#: templates/html/show.tmpl:56
+#: templates/html/show.tmpl:57
 msgid "Package: %s (%s)"
 msgstr "Пакет: %s (%s)"
 
-#: templates/html/show.tmpl:60
+#: templates/html/show.tmpl:61
 msgid "essential"
 msgstr "значимый"
 
-#: templates/html/show.tmpl:64
+#: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "Ссылки для %s"
 
-#: templates/html/show.tmpl:65
-msgid "Debian Resources:"
-msgstr "Ресурсы Debian:"
+#: templates/html/show.tmpl:66
+msgid "%s Resources:"
+msgstr "Ресурсы %s:"
 
-#: templates/html/show.tmpl:67
+#: templates/html/show.tmpl:68
 msgid "Bug Reports"
 msgstr "Отчёты об ошибках"
 
-#: templates/html/show.tmpl:70 templates/html/show.tmpl:72
+#: templates/html/show.tmpl:71 templates/html/show.tmpl:73
 msgid "Developer Information (PTS)"
 msgstr "Информация разработчика (PTS)"
 
-#: templates/html/show.tmpl:76
+#: templates/html/show.tmpl:77
 msgid "%s Changelog"
 msgstr "%s журнал изменений"
 
-#: templates/html/show.tmpl:77
+#: templates/html/show.tmpl:78
 msgid "Copyright File"
 msgstr "Файл авторских прав"
 
-#: templates/html/show.tmpl:81
+#: templates/html/show.tmpl:82
 msgid "Debian Source Repository"
 msgstr "Репозиторий исходного кода Debian"
 
-#: templates/html/show.tmpl:95
+#: templates/html/show.tmpl:96
 msgid "Download Source Package <a href=\"%s\">%s</a>:"
 msgstr "Загрузка пакета исходного кода <a href=\"%s\">%s</a>:"
 
-#: templates/html/show.tmpl:102
+#: templates/html/show.tmpl:103
 msgid "Not found"
 msgstr "Не найден"
 
-#: templates/html/show.tmpl:107
+#: templates/html/show.tmpl:108
 msgid "Maintainer:"
 msgstr "Сопровождающий:"
 
-#: templates/html/show.tmpl:109
+#: templates/html/show.tmpl:110
 msgid "Maintainers:"
 msgstr "Сопровождающие:"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "An overview over the maintainer's packages and uploads"
 msgstr "Обзор пакетов и закачек сопровождающего"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "QA Page"
-msgstr "Поддержка качества"
+msgstr "Контроль качества"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Archive of the Maintainer Mailinglist"
 msgstr "Архив списка рассылки сопровождающего"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Mail Archive"
 msgstr "Почтовый архив"
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:132
 msgid "External Resources:"
 msgstr "Внешние ресурсы:"
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:134
 msgid "Homepage"
 msgstr "В начало"
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:140
 msgid "Similar packages:"
 msgstr "Подобные пакеты:"
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:156
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
 "distribution. That means it is likely unstable or buggy, and it may even "
@@ -827,7 +832,7 @@ msgstr ""
 "даже может вызвать потерю данных. Перед использованием внимательно "
 "прочитайте файл <a href=\"%s\">changelog</a> и другую доступную документацию."
 
-#: templates/html/show.tmpl:176
+#: templates/html/show.tmpl:180
 msgid ""
 "This is a <em>virtual package</em>. See the <a href=\"%s\">Debian policy</a> "
 "for a <a href=\"%sch-binary.html#s-virtual_pkg\">definition of virtual "
@@ -837,63 +842,71 @@ msgstr ""
 "virtual_pkg\">что такое виртуальные пакеты</a> читайте в <a href=\"%s"
 "\">политике Debian</a>."
 
-#: templates/html/show.tmpl:184
+#: templates/html/show.tmpl:188
 msgid "Tags"
 msgstr "Теги"
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:211
 msgid "Packages providing %s"
 msgstr "Пакеты, предоставляющие %s"
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:220
 msgid "The following binary packages are built from this source package:"
 msgstr "Из этого пакета исходных кодов собираются следующие бинарные пакеты:"
 
-#: templates/html/show.tmpl:225
+#: templates/html/show.tmpl:229
 msgid "Other Packages Related to %s"
 msgstr "Другие пакеты, относящиеся к %s"
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:231
 msgid "legend"
 msgstr "легенда"
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:233
 msgid "build-depends"
-msgstr "build-depends"
+msgstr "нужен для сборки"
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:234
 msgid "build-depends-indep"
-msgstr "build-depends-indep"
+msgstr "нужен для сборки"
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:236
 msgid "depends"
 msgstr "зависимости"
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:237
 msgid "recommends"
 msgstr "рекомендации"
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:238
 msgid "suggests"
 msgstr "предложения"
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:248
 msgid "or "
 msgstr "или "
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:256
 msgid "also a virtual package provided by"
 msgstr "также виртуальный пакет, предоставляемый"
 
-#: templates/html/show.tmpl:259
-msgid "%u providing packages"
-msgstr "%u предоставляемых пакетов"
+#: templates/html/show.tmpl:258
+msgid "virtual package provided by"
+msgstr "виртуальный пакет, предоставляемый"
+
+#: templates/html/show.tmpl:263
+msgid "hide %u providing packages"
+msgstr "скрыть предоставляющие пакеты (%u)"
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:263
+msgid "show %u providing packages"
+msgstr "показать предоставляющие пакеты (%u)"
+
+#: templates/html/show.tmpl:281
 msgid "Download %s"
 msgstr "Загрузка %s"
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:283
 msgid ""
 "The download table links to the download of the package and a file overview. "
 "In addition it gives information about the package size and the installed "
@@ -903,55 +916,55 @@ msgstr ""
 "Также она даёт информацию о размере пакета и размере пакета в установленном "
 "состоянии."
 
-#: templates/html/show.tmpl:280
+#: templates/html/show.tmpl:284
 msgid "Download for all available architectures"
 msgstr "Загрузить для всех доступных архитектур"
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:285
 msgid "Architecture"
 msgstr "Архитектура"
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:286
 msgid "Version"
 msgstr "Версия"
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:287
 msgid "Package Size"
 msgstr "Размер пакета"
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:288
 msgid "Installed Size"
 msgstr "В установленном виде"
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:289
 msgid "Files"
 msgstr "Файлы"
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:297
 msgid "(unofficial port)"
 msgstr "(неофициальный перенос)"
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:308 templates/html/show.tmpl:336
 msgid "%s&nbsp;kB"
 msgstr "%s&nbsp;Кб"
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:311
 msgid "list of files"
 msgstr "список файлов"
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:313
 msgid "no current information"
 msgstr "пока нет информации"
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:330
 msgid "Download information for the files of this source package"
 msgstr "Загрузить информацию о файлах данного пакета исходных кодов"
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:331
 msgid "Size (in kB)"
 msgstr "Размер (в Кб)"
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:349
 msgid ""
 "Debian Package Source Repository (<acronym title=\"Version Control System"
 "\">VCS</acronym>: <a href=\"%s\">%s</a>)"
@@ -959,7 +972,7 @@ msgstr ""
 "Репозиторий пакетов исходных кодов Debian (<acronym title=\"Version Control "
 "System\">VCS</acronym>: <a href=\"%s\">%s</a>)"
 
-#: templates/html/show.tmpl:349
+#: templates/html/show.tmpl:353
 msgid "Debian Package Source Repository (Browsable)"
 msgstr "Репозиторий пакетов исходных кодов Debian (просмотр)"
 
@@ -1015,15 +1028,15 @@ msgstr ""
 "За последние 7 дней в комплект %s архива %s были добавлены указанные ниже "
 "пакеты."
 
-#: templates/rss/newpkg.tmpl:28 templates/txt/index.tmpl:5
+#: templates/rss/newpkg.tmpl:28 templates/txt/index_head.tmpl:4
 msgid "Copyright ©"
 msgstr "Авторские права ©"
 
-#: templates/txt/index.tmpl:2
+#: templates/txt/index_head.tmpl:1
 msgid "All %s Packages in \"%s\""
 msgstr "Все %s пакеты в \"%s\""
 
-#: templates/txt/index.tmpl:6
+#: templates/txt/index_head.tmpl:5
 msgid "See <URL:%s> for the license terms."
 msgstr "Об условиях лицензии смотрите <URL:%s>."
 
diff --git a/po/templates.sv.po b/po/templates.sv.po
index 97c2e30..5a5a8bd 100644
--- a/po/templates.sv.po
+++ b/po/templates.sv.po
@@ -1,43 +1,44 @@
+# Peter Karlsson <peterk@debian.org>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: Debian webwml organization\n"
-"PO-Revision-Date: 2006-10-26 23:10+0100\n"
+"Project-Id-Version: templates\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: (null)\n"
+"PO-Revision-Date: 2008-02-19 21:37+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
-"Language-Team: debian-l10n-swedish@lists.debian.org\n"
+"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: templates/config.tmpl:40
+#: templates/config.tmpl:41
 msgid "Debian Web Mailinglist"
 msgstr "Debians webbsändlista"
 
-#: templates/config.tmpl:45
+#: templates/config.tmpl:46
 msgid "%s Webmaster"
 msgstr "Webbansvarig för %s"
 
-#: templates/config.tmpl:48
+#: templates/config.tmpl:49
 msgid "%s is a <a href=\"%s\">trademark</a> of %s"
 msgstr "%s är ett <a href=\"%s\">varumärke</a> hos %s"
 
-#: templates/config.tmpl:53
+#: templates/config.tmpl:54
 msgid ""
-"Please note that this is an experimental version of <a href=\"http://"
-"packages.debian.org/\">packages.debian.org</a>. Errors and obsolete "
-"information should be expected"
+"Please note that this is an experimental version of <a href=\"http://%s/\">%"
+"s</a>. Errors and obsolete information should be expected"
 msgstr ""
-"Observera att detta är en experimentell version av <a href=\"http://packages."
-"debian.org/\">packages.debian.org</a>. Fel och föråldrad information kan "
-"förväntas"
+"Observera att detta är en experimentell version av <a href=\"http://%s/\">%"
+"s</a>. Fel och föråldrad information kan förväntas"
 
 #. @translators: . = decimal_point , = thousands_sep, see Number::Format 
-#: templates/config.tmpl:56
+#: templates/config.tmpl:57
 msgid "."
-msgstr ""
+msgstr ","
 
-#: templates/config.tmpl:57
+#: templates/config.tmpl:58
 msgid ","
-msgstr ""
+msgstr "."
 
 #: templates/config/architectures.tmpl:4
 msgid "Intel x86"
@@ -103,27 +104,27 @@ msgstr "GNU/kFreeBSD (i386)"
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 
-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:178
 msgid "North America"
 msgstr "Nordamerika"
 
-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:179
 msgid "South America"
 msgstr "Sydamerika"
 
-#: templates/config/mirrors.tmpl:184
+#: templates/config/mirrors.tmpl:180
 msgid "Asia"
 msgstr "Asien"
 
-#: templates/config/mirrors.tmpl:185
+#: templates/config/mirrors.tmpl:181
 msgid "Australia and New Zealand"
 msgstr "Australien och Nya Zeeland"
 
-#: templates/config/mirrors.tmpl:186
+#: templates/config/mirrors.tmpl:182
 msgid "Europe"
 msgstr "Europa"
 
-#: templates/config/mirrors.tmpl:187
+#: templates/config/mirrors.tmpl:183
 msgid "Africa"
 msgstr "Afrika"
 
@@ -132,12 +133,12 @@ msgid "Package Download Selection -- %s"
 msgstr "Val av pakethämtning -- %s"
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 msgid "Distribution:"
 msgstr "Distribution:"
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 msgid "Overview over this suite"
 msgstr "Översikt över denna svit"
 
@@ -181,7 +182,7 @@ msgstr ""
 msgid "Replacing <em>%s</em> with the mirror in question."
 msgstr "Ersätt <em>%s</em> med spegeln i fråga."
 
-#: templates/html/download.tmpl:37 templates/html/show.tmpl:152
+#: templates/html/download.tmpl:37 templates/html/show.tmpl:155
 msgid "Experimental package"
 msgstr "Experimentellt paket"
 
@@ -197,11 +198,11 @@ msgstr ""
 "kanske till och med kan orsaka dataförluster. Se till att läsa "
 "ändringsloggen och annan dokumentation innan du använder det."
 
-#: templates/html/download.tmpl:41 templates/html/show.tmpl:157
+#: templates/html/download.tmpl:41 templates/html/show.tmpl:160
 msgid "debian-installer udeb package"
 msgstr "udeb-paket för debian-installer"
 
-#: templates/html/download.tmpl:42 templates/html/show.tmpl:158
+#: templates/html/download.tmpl:42 templates/html/show.tmpl:161
 msgid ""
 "Warning: This package is intended for the use in building <a href=\"http://"
 "www.debian.org/devel/debian-installer\">debian-installer</a> images only. Do "
@@ -272,7 +273,7 @@ msgstr "%s byte (%s %s)"
 msgid "Exact Size"
 msgstr "Exakt storlek"
 
-#: templates/html/download.tmpl:103 templates/html/show.tmpl:327
+#: templates/html/download.tmpl:103 templates/html/show.tmpl:331
 msgid "MD5 checksum"
 msgstr "MD5-kontrollsumma"
 
@@ -282,7 +283,7 @@ msgstr "Ej tillgänglig"
 
 #: templates/html/download.tmpl:104
 msgid "SHA1 checksum"
-msgstr "SHA1-kontrollsymma"
+msgstr "SHA1-kontrollsumma"
 
 #: templates/html/download.tmpl:105
 msgid "SHA256 checksum"
@@ -334,7 +335,7 @@ msgstr ""
 "org\">debian-l10n-swedish@lists.debian.org</a>. För övrig "
 "kontaktinformation, se %ss <a href=\"%s\">kontaktsida</a>."
 
-#: templates/html/foot.tmpl:33 templates/txt/index.tmpl:4
+#: templates/html/foot.tmpl:33 templates/txt/index_head.tmpl:3
 msgid "Generated:"
 msgstr "Skapad:"
 
@@ -387,36 +388,31 @@ msgstr "%ss startsida för paket"
 msgid "Packages"
 msgstr "Paket"
 
-#: templates/html/index.tmpl:3
+#: templates/html/index_head.tmpl:2
 msgid "Source Packages in \"%s\", %s %s"
 msgstr "Källkodspaket i \"%s\", %s %s"
 
-#: templates/html/index.tmpl:4
+#: templates/html/index_head.tmpl:3
 msgid "Source Packages in \"%s\""
 msgstr "Källkodspaket i \"%s\""
 
-#: templates/html/index.tmpl:6
+#: templates/html/index_head.tmpl:5
 msgid "Software Packages in \"%s\", %s %s"
 msgstr "Källkodspaket i \"%s\", %s %s"
 
-#: templates/html/index.tmpl:7
+#: templates/html/index_head.tmpl:6
 msgid "Software Packages in \"%s\""
 msgstr "Källkodspaket i \"%s\""
 
-#: templates/html/index.tmpl:14
+#: templates/html/index_head.tmpl:13
 msgid "All Packages"
 msgstr "Alla paket"
 
-#: templates/html/index.tmpl:16 templates/html/show.tmpl:15
+#: templates/html/index_head.tmpl:15 templates/html/show.tmpl:15
 #: templates/html/suite_index.tmpl:2
 msgid "Source"
 msgstr "Källkod"
 
-#: templates/html/index.tmpl:43 templates/html/show.tmpl:254
-#: templates/txt/index.tmpl:15
-msgid "virtual package provided by"
-msgstr "virtuellt paket som tillhandahålls av"
-
 #: templates/html/newpkg.tmpl:2 templates/html/newpkg.tmpl:7
 msgid "New Packages in \"%s\""
 msgstr "Nya paket i \"%s\""
@@ -486,15 +482,7 @@ msgstr "Paketsökresultat -- %s"
 msgid "Package Search Results"
 msgstr "Paketsökresultat"
 
-#: templates/html/search.tmpl:33
-msgid ""
-"You can try a different search on the <a href=\"%s#search_packages"
-"\">Packages search page</a>."
-msgstr ""
-"Du kan prova en annan sökning på <a href=\"%s#search_packages"
-"\">paketsöksidan</a>."
-
-#: templates/html/search.tmpl:37
+#: templates/html/search.tmpl:35
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
@@ -502,56 +490,73 @@ msgstr ""
 "Du har bara sökt efter ord som exakt träffar dina nyckelord. Du kan försöka "
 "söka med <a href=\"%s\">träff av delord aktiverade</a>."
 
-#: templates/html/search.tmpl:42
+#: templates/html/search.tmpl:40
+msgid "Search in specific suite:"
+msgstr "Sök i specifik svit:"
+
+#: templates/html/search.tmpl:49
+msgid "Search in <a href=\"%s\">all suites</a>"
+msgstr "Sök i <a  href=\"%s\">alla sviter</a>"
+
+#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+msgid "Limit search to a specific architecture:"
+msgstr "Begränsa sökningen till en specifik arkitektur:"
+
+#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+msgid "Search in <a href=\"%s\">all architectures</a>"
+msgstr "Sök i <a  href=\"%s\">alla arkitekturer</a>"
+
+#: templates/html/search.tmpl:69
 msgid ""
-"<a href=\"%s\">%u</a> results have not been displayed due to the search "
+"<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
-"<a href=\"%s\">%u</a> resultat har inte visats på grund av sökparametrarna."
+"<a href=\"%s\">Vissa</a> resultat har inte visats på grund av "
+"sökparametrarna."
 
-#: templates/html/search.tmpl:51
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr "alla sviter"
 
-#: templates/html/search.tmpl:51
-msgid "suite(s) <em>$suite_enc</em>"
-msgstr "svit(er) <em>$suite_enc</em>"
+#: templates/html/search.tmpl:78
+msgid "suite(s) <em>%s</em>"
+msgstr "svit(en) <em>%s</em>"
 
-#: templates/html/search.tmpl:52 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
 msgid "all sections"
 msgstr "alla sektioner"
 
-#: templates/html/search.tmpl:52
-msgid "section(s) <em>$section_enc</em>"
-msgstr "sektion(er) <em>$section_enc</em>"
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+msgid "section(s) <em>%s</em>"
+msgstr "sektion(er) <em>%s</em>"
 
-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
 msgid "all architectures"
 msgstr "alla arkitekturer"
 
-#: templates/html/search.tmpl:53
-msgid "architecture(s) <em>$architectures_enc</em>"
-msgstr "arkitektur(er) <em>$architectures_enc</em>"
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+msgid "architecture(s) <em>%s</em>"
+msgstr "arkitektur(er) <em>%s</em>"
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 msgid "packages"
 msgstr "paket"
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 msgid "source packages"
 msgstr "källkodspaket"
 
-#: templates/html/search.tmpl:56
+#: templates/html/search.tmpl:83
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr "Du har sökt efter %s vars namn innehåller <em>%s</em> i %s, %s och %s."
 
-#: templates/html/search.tmpl:59
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr " (inkluderar delordsträffar)"
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:61
+#: templates/html/search.tmpl:88
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
@@ -559,11 +564,11 @@ msgstr ""
 "Du har sökt efter <em>%s</em> i paketnamn och beskrivningar i %s, %s och %s%"
 "s."
 
-#: templates/html/search.tmpl:67
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr "Hittade <strong>%u</strong> paket."
 
-#: templates/html/search.tmpl:72
+#: templates/html/search.tmpl:99
 msgid ""
 "Note that this only shows the best matches, sorted by relevance. If the "
 "first few packages don't match what you searched for, try using more "
@@ -573,45 +578,55 @@ msgstr ""
 "de första paketen inte är det du sökte efter, försök använda fler eller "
 "andra nyckelord."
 
-#: templates/html/search.tmpl:74
+#: templates/html/search.tmpl:103
 msgid ""
-"Your search was too wide so we will only display exact matches. At least <em>"
-"%u</em> results have been omitted and will not be displayed. Please consider "
-"using a longer keyword or more keywords."
+"Your keyword was too generic, for optimizing reasons some results might have "
+"been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
-"Din sökning var så vid att vi bara visar exakta träffar. Åtminstone <em>%u</"
-"em> resulat har uteslutits och kommer inte att visas. Försök använda ett "
-"längre eller fler nyckelord."
+"Ditt nyckelord var för allmänt, och på grund av optimeringar kan vissa "
+"resultat ha dolts.<br>FÖrsök använda ett längre, eller flera, nyckelord."
 
-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:105
+msgid ""
+"Your keyword was too generic.<br>Please consider using a longer keyword or "
+"more keywords."
+msgstr ""
+"Ditt nyckelord var för allmänt<br>FÖrsök använda ett längre, eller flera,"
+"nyckelord."
+
+#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
 msgid "Sorry, your search gave no results"
 msgstr "Din sökning gav dessvärre inga resultat"
 
-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:118
 msgid "Package %s"
 msgstr "Paketet %s"
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "also provided by:"
 msgstr "tillhandahålls också av:"
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr "tillhandahålls av:"
 
-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:139
 msgid "Source Package %s"
 msgstr "Källkodspaketet %s"
 
-#: templates/html/search.tmpl:113
+#: templates/html/search.tmpl:146
 msgid "Binary packages:"
 msgstr "Binärpaket:"
 
-#: templates/html/search.tmpl:115
-msgid "%u binary packages"
-msgstr "%u binärpaket"
+#: templates/html/search.tmpl:148
+msgid "hide %u binary packages"
+msgstr "dölj %u binärpaket"
+
+#: templates/html/search.tmpl:148
+msgid "show %u binary packages"
+msgstr "visa %u binärpaket"
 
-#: templates/html/search.tmpl:125
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -633,7 +648,7 @@ msgstr "Sök efter <em>%s</em> i filnamn"
 
 #: templates/html/search_contents.tmpl:39
 msgid "Search exact filename <em>%s</em>"
-msgstr "Sök exakt filnemn <em>%s</em>"
+msgstr "Sök exakt filnamn <em>%s</em>"
 
 #: templates/html/search_contents.tmpl:44
 msgid "Search for paths ending with <em>%s</em>"
@@ -643,22 +658,6 @@ msgstr "Sök sökvägar som slutar med <em>%s</em>"
 msgid "Search in other suite:"
 msgstr "Sök i annan svit:"
 
-#: templates/html/search_contents.tmpl:58
-msgid "Limit search to a specific architecture:"
-msgstr "Begränsa sökningen till en specifik arkitektur:"
-
-#: templates/html/search_contents.tmpl:63
-msgid "Search in <a href=\"%s\">all architectures</a>"
-msgstr "Sök i <a  href=\"%s\">alla arkitekturer</a>"
-
-#: templates/html/search_contents.tmpl:72
-msgid "section(s) <em>%s</em>"
-msgstr "sektion(er) <em>%s</em>"
-
-#: templates/html/search_contents.tmpl:73
-msgid "architecture(s) <em>%s</em>"
-msgstr "arkitektur(er) <em>%s</em>"
-
 #: templates/html/search_contents.tmpl:74
 msgid "paths that end with"
 msgstr "sökvägar som slutar med"
@@ -693,7 +692,7 @@ msgid "Sort results by filename"
 msgstr "Sök resultat efter filnamn"
 
 #: templates/html/search_contents.tmpl:98
-#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:327
+#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:331
 msgid "File"
 msgstr "Fil"
 
@@ -717,111 +716,111 @@ msgstr "Alla paket i sektionen"
 msgid "Section:"
 msgstr "Sektion:"
 
-#: templates/html/show.tmpl:21
+#: templates/html/show.tmpl:22
 msgid "Details of source package %s in %s"
 msgstr "Detaljer för källkodspaketet %s i %s"
 
-#: templates/html/show.tmpl:22
+#: templates/html/show.tmpl:23
 msgid "Details of package %s in %s"
 msgstr "Detaljer för paketet %s i %s"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 msgid "Source package building this package"
 msgstr "Källkodspaketet som bygger detta paket"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 msgid "Source:"
 msgstr "Källkod:"
 
-#: templates/html/show.tmpl:52
+#: templates/html/show.tmpl:53
 msgid "Virtual Package: %s"
 msgstr "Virtuellt paket: %s"
 
-#: templates/html/show.tmpl:54
+#: templates/html/show.tmpl:55
 msgid "Source Package: %s (%s)"
 msgstr "Källkodspaket: %s (%s)"
 
-#: templates/html/show.tmpl:56
+#: templates/html/show.tmpl:57
 msgid "Package: %s (%s)"
 msgstr "Paket: %s (%s)"
 
-#: templates/html/show.tmpl:60
+#: templates/html/show.tmpl:61
 msgid "essential"
 msgstr "systemkritiskt"
 
-#: templates/html/show.tmpl:64
+#: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "Länkar för %s"
 
-#: templates/html/show.tmpl:65
-msgid "Debian Resources:"
-msgstr "Debianresurser:"
+#: templates/html/show.tmpl:66
+msgid "%s Resources:"
+msgstr "%sresurser:"
 
-#: templates/html/show.tmpl:67
+#: templates/html/show.tmpl:68
 msgid "Bug Reports"
 msgstr "Felrapporter"
 
-#: templates/html/show.tmpl:70 templates/html/show.tmpl:72
+#: templates/html/show.tmpl:71 templates/html/show.tmpl:73
 msgid "Developer Information (PTS)"
 msgstr "Utvecklarinformation (PTS)"
 
-#: templates/html/show.tmpl:76
+#: templates/html/show.tmpl:77
 msgid "%s Changelog"
 msgstr "Ändringslogg för %s"
 
-#: templates/html/show.tmpl:77
+#: templates/html/show.tmpl:78
 msgid "Copyright File"
 msgstr "Upphovsrättsfil"
 
-#: templates/html/show.tmpl:81
+#: templates/html/show.tmpl:82
 msgid "Debian Source Repository"
 msgstr "Debians källkodsarkiv"
 
-#: templates/html/show.tmpl:95
+#: templates/html/show.tmpl:96
 msgid "Download Source Package <a href=\"%s\">%s</a>:"
 msgstr "Hämta källkodspaketet <a href=\"%s\">%s</a>:"
 
-#: templates/html/show.tmpl:102
+#: templates/html/show.tmpl:103
 msgid "Not found"
 msgstr "Hittades ej"
 
-#: templates/html/show.tmpl:107
+#: templates/html/show.tmpl:108
 msgid "Maintainer:"
 msgstr "Ansvarig:"
 
-#: templates/html/show.tmpl:109
+#: templates/html/show.tmpl:110
 msgid "Maintainers:"
 msgstr "Ansvariga:"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "An overview over the maintainer's packages and uploads"
 msgstr "En översikt över ansvarigas paket och insändningar"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "QA Page"
 msgstr "QA-sida"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Archive of the Maintainer Mailinglist"
-msgstr ""
+msgstr "Arkiv för paketansvarigas sändlista"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Mail Archive"
-msgstr ""
+msgstr "E-postarkiv"
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:132
 msgid "External Resources:"
 msgstr "Externa resurser:"
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:134
 msgid "Homepage"
 msgstr "Hemsida"
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:140
 msgid "Similar packages:"
 msgstr "Liknande paket:"
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:156
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
 "distribution. That means it is likely unstable or buggy, and it may even "
@@ -833,7 +832,7 @@ msgstr ""
 "kanske till och med kan orsaka dataförluster. Se till att läsa <a href=\"%s"
 "\">ändringsloggen</a> och annan dokumentation innan du använder det."
 
-#: templates/html/show.tmpl:176
+#: templates/html/show.tmpl:180
 msgid ""
 "This is a <em>virtual package</em>. See the <a href=\"%s\">Debian policy</a> "
 "for a <a href=\"%sch-binary.html#s-virtual_pkg\">definition of virtual "
@@ -843,63 +842,71 @@ msgstr ""
 "för en <a href=\"%sch-binary.html#s-virtual_pkg\">definition av virtuella "
 "paket</a>."
 
-#: templates/html/show.tmpl:184
+#: templates/html/show.tmpl:188
 msgid "Tags"
 msgstr "Märken"
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:211
 msgid "Packages providing %s"
 msgstr "Paket som tillhandahåller %s"
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:220
 msgid "The following binary packages are built from this source package:"
 msgstr "Följande binärpaket byggs från detta källkodspaket:"
 
-#: templates/html/show.tmpl:225
+#: templates/html/show.tmpl:229
 msgid "Other Packages Related to %s"
-msgstr "Andra paket besäktade med %s"
+msgstr "Andra paket besläktade med %s"
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:231
 msgid "legend"
-msgstr "beskrivnign"
+msgstr "beskrivning"
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:233
 msgid "build-depends"
 msgstr "bygg-beroende"
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:234
 msgid "build-depends-indep"
 msgstr "arkitekturoberoende bygg-beroende"
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:236
 msgid "depends"
 msgstr "beror"
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:237
 msgid "recommends"
 msgstr "rekommenderar"
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:238
 msgid "suggests"
 msgstr "föreslår"
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:248
 msgid "or "
 msgstr "eller "
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:256
 msgid "also a virtual package provided by"
 msgstr "också ett virtuellt paket som tillhandahålls av"
 
-#: templates/html/show.tmpl:259
-msgid "%u providing packages"
-msgstr "%u tillhandahåller paketen"
+#: templates/html/show.tmpl:258
+msgid "virtual package provided by"
+msgstr "virtuellt paket som tillhandahålls av"
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:263
+msgid "hide %u providing packages"
+msgstr "dölj %u tillhandahållande paket"
+
+#: templates/html/show.tmpl:263
+msgid "show %u providing packages"
+msgstr "visa %u tillhandahållande paket"
+
+#: templates/html/show.tmpl:281
 msgid "Download %s"
 msgstr "Hämta %s"
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:283
 msgid ""
 "The download table links to the download of the package and a file overview. "
 "In addition it gives information about the package size and the installed "
@@ -908,55 +915,55 @@ msgstr ""
 "Hämtningstabellen länkar till hämtningar för paketet och en filöversikt. "
 "Dessutom innehåller den information om paketstorlek och installerad storlek."
 
-#: templates/html/show.tmpl:280
+#: templates/html/show.tmpl:284
 msgid "Download for all available architectures"
 msgstr "Hämtningar för alla tillgängliga arkitekturer"
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:285
 msgid "Architecture"
 msgstr "Arkitektur"
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:286
 msgid "Version"
 msgstr "Version"
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:287
 msgid "Package Size"
 msgstr "Paketstorlek"
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:288
 msgid "Installed Size"
 msgstr "Installerad storlek"
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:289
 msgid "Files"
 msgstr "Filer"
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:297
 msgid "(unofficial port)"
 msgstr "(inofficiell anpassning)"
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:308 templates/html/show.tmpl:336
 msgid "%s&nbsp;kB"
 msgstr "%s&nbsp;kbyte"
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:311
 msgid "list of files"
 msgstr "filförteckning"
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:313
 msgid "no current information"
 msgstr "ingen aktuell information"
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:330
 msgid "Download information for the files of this source package"
 msgstr "Hämtningsinformation för filer i källkodspaketet"
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:331
 msgid "Size (in kB)"
 msgstr "Storlek (i kbyte)"
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:349
 msgid ""
 "Debian Package Source Repository (<acronym title=\"Version Control System"
 "\">VCS</acronym>: <a href=\"%s\">%s</a>)"
@@ -964,7 +971,7 @@ msgstr ""
 "Debians paketkällkodsarkiv- (<acronym title=\"Version Control System\">VCS</"
 "acronym>: <a href=\"%s\">%s</a>)"
 
-#: templates/html/show.tmpl:349
+#: templates/html/show.tmpl:353
 msgid "Debian Package Source Repository (Browsable)"
 msgstr "Debians paketkällkodsarkiv (blädderbart)"
 
@@ -1020,14 +1027,21 @@ msgstr ""
 "Följande paket har lagts till i sviten %s i %sarkivet under de senaste 7 "
 "dagarna."
 
-#: templates/rss/newpkg.tmpl:28 templates/txt/index.tmpl:5
+#: templates/rss/newpkg.tmpl:28 templates/txt/index_head.tmpl:4
 msgid "Copyright ©"
 msgstr "Upphovsrättsskyddat ©"
 
-#: templates/txt/index.tmpl:2
+#: templates/txt/index_head.tmpl:1
 msgid "All %s Packages in \"%s\""
 msgstr "Alla %spaket i \"%s\""
 
-#: templates/txt/index.tmpl:6
+#: templates/txt/index_head.tmpl:5
 msgid "See <URL:%s> for the license terms."
 msgstr "Se <URL:%s> för licensvillkor."
+
+#~ msgid ""
+#~ "You can try a different search on the <a href=\"%s#search_packages"
+#~ "\">Packages search page</a>."
+#~ msgstr ""
+#~ "Du kan prova en annan sökning på <a href=\"%s#search_packages"
+#~ "\">paketsöksidan</a>."
diff --git a/po/templates.uk.po b/po/templates.uk.po
index f2bf38b..1ebc7e6 100644
--- a/po/templates.uk.po
+++ b/po/templates.uk.po
@@ -17,31 +17,30 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: templates/config.tmpl:40
+#: templates/config.tmpl:41
 msgid "Debian Web Mailinglist"
 msgstr ""
 
-#: templates/config.tmpl:45
+#: templates/config.tmpl:46
 msgid "%s Webmaster"
 msgstr ""
 
-#: templates/config.tmpl:48
+#: templates/config.tmpl:49
 msgid "%s is a <a href=\"%s\">trademark</a> of %s"
 msgstr ""
 
-#: templates/config.tmpl:53
+#: templates/config.tmpl:54
 msgid ""
-"Please note that this is an experimental version of <a href=\"http://"
-"packages.debian.org/\">packages.debian.org</a>. Errors and obsolete "
-"information should be expected"
+"Please note that this is an experimental version of <a href=\"http://%s/\">%"
+"s</a>. Errors and obsolete information should be expected"
 msgstr ""
 
 #. @translators: . = decimal_point , = thousands_sep, see Number::Format 
-#: templates/config.tmpl:56
+#: templates/config.tmpl:57
 msgid "."
 msgstr ""
 
-#: templates/config.tmpl:57
+#: templates/config.tmpl:58
 msgid ","
 msgstr ""
 
@@ -109,27 +108,27 @@ msgstr ""
 msgid "GNU/kFreeBSD (amd64)"
 msgstr ""
 
-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:178
 msgid "North America"
 msgstr ""
 
-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:179
 msgid "South America"
 msgstr ""
 
-#: templates/config/mirrors.tmpl:184
+#: templates/config/mirrors.tmpl:180
 msgid "Asia"
 msgstr ""
 
-#: templates/config/mirrors.tmpl:185
+#: templates/config/mirrors.tmpl:181
 msgid "Australia and New Zealand"
 msgstr ""
 
-#: templates/config/mirrors.tmpl:186
+#: templates/config/mirrors.tmpl:182
 msgid "Europe"
 msgstr ""
 
-#: templates/config/mirrors.tmpl:187
+#: templates/config/mirrors.tmpl:183
 msgid "Africa"
 msgstr ""
 
@@ -138,12 +137,12 @@ msgid "Package Download Selection -- %s"
 msgstr ""
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 msgid "Distribution:"
 msgstr "Дистрибутив"
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 #, fuzzy
 msgid "Overview over this suite"
 msgstr "Огляд цього дистрибутива"
@@ -183,7 +182,7 @@ msgstr ""
 msgid "Replacing <em>%s</em> with the mirror in question."
 msgstr ""
 
-#: templates/html/download.tmpl:37 templates/html/show.tmpl:152
+#: templates/html/download.tmpl:37 templates/html/show.tmpl:155
 msgid "Experimental package"
 msgstr "Експериментальний пакунок"
 
@@ -200,11 +199,11 @@ msgstr ""
 "і він навіть може призвести до втрати даних. Якщо ви проігноруєте це "
 "попередження і встановите його, то робіть це на ваш ризик."
 
-#: templates/html/download.tmpl:41 templates/html/show.tmpl:157
+#: templates/html/download.tmpl:41 templates/html/show.tmpl:160
 msgid "debian-installer udeb package"
 msgstr "udeb-пакунок встановлювача"
 
-#: templates/html/download.tmpl:42 templates/html/show.tmpl:158
+#: templates/html/download.tmpl:42 templates/html/show.tmpl:161
 #, fuzzy
 #| msgid ""
 #| "Warning: This package is intended for the use in building <a href="
@@ -271,7 +270,7 @@ msgstr ""
 msgid "Exact Size"
 msgstr "Розмір пакунка"
 
-#: templates/html/download.tmpl:103 templates/html/show.tmpl:327
+#: templates/html/download.tmpl:103 templates/html/show.tmpl:331
 msgid "MD5 checksum"
 msgstr ""
 
@@ -344,7 +343,7 @@ msgstr ""
 "\"mailto:%s\">%s</a>. Додаткову інформацію дивиться на <a href=\"%s/contact"
 "\">сторінці з контактною інформацією</a>."
 
-#: templates/html/foot.tmpl:33 templates/txt/index.tmpl:4
+#: templates/html/foot.tmpl:33 templates/txt/index_head.tmpl:3
 msgid "Generated:"
 msgstr ""
 
@@ -411,44 +410,38 @@ msgstr "Розмір пакунка"
 msgid "Packages"
 msgstr "Пакунок: %s (%s)"
 
-#: templates/html/index.tmpl:3
+#: templates/html/index_head.tmpl:2
 #, fuzzy
 msgid "Source Packages in \"%s\", %s %s"
 msgstr "Пакунки в дистрибутиві „%s“, розділі %s"
 
-#: templates/html/index.tmpl:4
+#: templates/html/index_head.tmpl:3
 #, fuzzy
 #| msgid "Software Packages in \"%s\""
 msgid "Source Packages in \"%s\""
 msgstr "Пакунки в дистрибутиві „%s“"
 
-#: templates/html/index.tmpl:6
+#: templates/html/index_head.tmpl:5
 #, fuzzy
 msgid "Software Packages in \"%s\", %s %s"
 msgstr "Пакунки в дистрибутиві „%s“, розділі %s"
 
-#: templates/html/index.tmpl:7
+#: templates/html/index_head.tmpl:6
 msgid "Software Packages in \"%s\""
 msgstr "Пакунки в дистрибутиві „%s“"
 
-#: templates/html/index.tmpl:14
+#: templates/html/index_head.tmpl:13
 #, fuzzy
 #| msgid "All packages"
 msgid "All Packages"
 msgstr "Всі пакунки"
 
-#: templates/html/index.tmpl:16 templates/html/show.tmpl:15
+#: templates/html/index_head.tmpl:15 templates/html/show.tmpl:15
 #: templates/html/suite_index.tmpl:2
 #, fuzzy
 msgid "Source"
 msgstr "Джерельний пакунок:"
 
-#: templates/html/index.tmpl:43 templates/html/show.tmpl:254
-#: templates/txt/index.tmpl:15
-#, fuzzy
-msgid "virtual package provided by"
-msgstr "віртуальний пакунок"
-
 #: templates/html/newpkg.tmpl:2 templates/html/newpkg.tmpl:7
 #, fuzzy
 msgid "New Packages in \"%s\""
@@ -528,131 +521,152 @@ msgstr "Всі пакунки Debian в дистрибутиві „%s“"
 msgid "Package Search Results"
 msgstr "Всі пакунки Debian в дистрибутиві „%s“"
 
-#: templates/html/search.tmpl:33
-#, fuzzy
-msgid ""
-"You can try a different search on the <a href=\"%s#search_packages"
-"\">Packages search page</a>."
-msgstr ""
-"Повернутися до: <a href=\"%s/\">головної сторінки проекту Debian</a> || <a "
-"href=\"%s/\">сторінки пошуку пакунків</a>"
-
-#: templates/html/search.tmpl:37
+#: templates/html/search.tmpl:35
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
 msgstr ""
 
-#: templates/html/search.tmpl:42
+#: templates/html/search.tmpl:40
+msgid "Search in specific suite:"
+msgstr ""
+
+#: templates/html/search.tmpl:49
+#, fuzzy
+#| msgid "Search for <a href=\"%s\">other versions of %s</a>"
+msgid "Search in <a href=\"%s\">all suites</a>"
+msgstr "Шукати на <a href=\"%s\">інші версії %s</a>"
+
+#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+msgid "Limit search to a specific architecture:"
+msgstr ""
+
+#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+#, fuzzy
+#| msgid "Search for <a href=\"%s\">other versions of %s</a>"
+msgid "Search in <a href=\"%s\">all architectures</a>"
+msgstr "Шукати на <a href=\"%s\">інші версії %s</a>"
+
+#: templates/html/search.tmpl:69
 msgid ""
-"<a href=\"%s\">%u</a> results have not been displayed due to the search "
+"<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
 
-#: templates/html/search.tmpl:51
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr ""
 
-#: templates/html/search.tmpl:51
-msgid "suite(s) <em>$suite_enc</em>"
+#: templates/html/search.tmpl:78
+msgid "suite(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:52 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
 #, fuzzy
 msgid "all sections"
 msgstr "Розділ"
 
-#: templates/html/search.tmpl:52
-msgid "section(s) <em>$section_enc</em>"
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+msgid "section(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
 #, fuzzy
 msgid "all architectures"
 msgstr "Архітектура"
 
-#: templates/html/search.tmpl:53
-msgid "architecture(s) <em>$architectures_enc</em>"
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+msgid "architecture(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 #, fuzzy
 msgid "packages"
 msgstr "Розмір пакунка"
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 #, fuzzy
 msgid "source packages"
 msgstr "Джерельний пакунок"
 
-#: templates/html/search.tmpl:56
+#: templates/html/search.tmpl:83
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr ""
 
-#: templates/html/search.tmpl:59
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:61
+#: templates/html/search.tmpl:88
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
 msgstr ""
 
-#: templates/html/search.tmpl:67
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 
-#: templates/html/search.tmpl:72
+#: templates/html/search.tmpl:99
 msgid ""
 "Note that this only shows the best matches, sorted by relevance. If the "
 "first few packages don't match what you searched for, try using more "
 "keywords or alternative keywords."
 msgstr ""
 
-#: templates/html/search.tmpl:74
+#: templates/html/search.tmpl:103
 msgid ""
-"Your search was too wide so we will only display exact matches. At least <em>"
-"%u</em> results have been omitted and will not be displayed. Please consider "
-"using a longer keyword or more keywords."
+"Your keyword was too generic, for optimizing reasons some results might have "
+"been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
 
-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:105
+msgid ""
+"Your keyword was too generic.<br>Please consider using a longer keyword or "
+"more keywords."
+msgstr ""
+
+#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
 msgid "Sorry, your search gave no results"
 msgstr ""
 
-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:118
 #, fuzzy
 msgid "Package %s"
 msgstr "Пакунок: %s (%s)"
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 #, fuzzy
 msgid "also provided by:"
 msgstr "віртуальний пакунок"
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr ""
 
-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:139
 #, fuzzy
 msgid "Source Package %s"
 msgstr "Джерельний пакунок"
 
-#: templates/html/search.tmpl:113
+#: templates/html/search.tmpl:146
 #, fuzzy
 msgid "Binary packages:"
 msgstr "віртуальний пакунок"
 
-#: templates/html/search.tmpl:115
+#: templates/html/search.tmpl:148
+#, fuzzy
+msgid "hide %u binary packages"
+msgstr "Розмір пакунка"
+
+#: templates/html/search.tmpl:148
 #, fuzzy
-msgid "%u binary packages"
+msgid "show %u binary packages"
 msgstr "Розмір пакунка"
 
-#: templates/html/search.tmpl:125
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -683,24 +697,6 @@ msgstr ""
 msgid "Search in other suite:"
 msgstr ""
 
-#: templates/html/search_contents.tmpl:58
-msgid "Limit search to a specific architecture:"
-msgstr ""
-
-#: templates/html/search_contents.tmpl:63
-#, fuzzy
-#| msgid "Search for <a href=\"%s\">other versions of %s</a>"
-msgid "Search in <a href=\"%s\">all architectures</a>"
-msgstr "Шукати на <a href=\"%s\">інші версії %s</a>"
-
-#: templates/html/search_contents.tmpl:72
-msgid "section(s) <em>%s</em>"
-msgstr ""
-
-#: templates/html/search_contents.tmpl:73
-msgid "architecture(s) <em>%s</em>"
-msgstr ""
-
 #: templates/html/search_contents.tmpl:74
 msgid "paths that end with"
 msgstr ""
@@ -733,7 +729,7 @@ msgid "Sort results by filename"
 msgstr ""
 
 #: templates/html/search_contents.tmpl:98
-#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:327
+#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:331
 msgid "File"
 msgstr "Файл"
 
@@ -761,127 +757,128 @@ msgstr "Всі пакунки в цьому розділі"
 msgid "Section:"
 msgstr "Розділ:"
 
-#: templates/html/show.tmpl:21
+#: templates/html/show.tmpl:22
 #, fuzzy
 msgid "Details of source package %s in %s"
 msgstr "Джерельні пакунки в дистрибутиві „%s“"
 
-#: templates/html/show.tmpl:22
+#: templates/html/show.tmpl:23
 #, fuzzy
 msgid "Details of package %s in %s"
 msgstr "Нові пакунки в дистрибутиві %s"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 #, fuzzy
 msgid "Source package building this package"
 msgstr "Джерельний пакунок"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 #, fuzzy
 msgid "Source:"
 msgstr "Джерельний пакунок:"
 
-#: templates/html/show.tmpl:52
+#: templates/html/show.tmpl:53
 msgid "Virtual Package: %s"
 msgstr "Віртуальний пакунок: %s"
 
-#: templates/html/show.tmpl:54
+#: templates/html/show.tmpl:55
 #, fuzzy
 msgid "Source Package: %s (%s)"
 msgstr "Джерельний пакунок: %s (%s)"
 
-#: templates/html/show.tmpl:56
+#: templates/html/show.tmpl:57
 msgid "Package: %s (%s)"
 msgstr "Пакунок: %s (%s)"
 
-#: templates/html/show.tmpl:60
+#: templates/html/show.tmpl:61
 #, fuzzy
 #| msgid "Essential"
 msgid "essential"
 msgstr "Необхідний"
 
-#: templates/html/show.tmpl:64
+#: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr ""
 
-#: templates/html/show.tmpl:65
-msgid "Debian Resources:"
-msgstr ""
+#: templates/html/show.tmpl:66
+#, fuzzy
+msgid "%s Resources:"
+msgstr "Джерельний пакунок:"
 
-#: templates/html/show.tmpl:67
+#: templates/html/show.tmpl:68
 msgid "Bug Reports"
 msgstr ""
 
-#: templates/html/show.tmpl:70 templates/html/show.tmpl:72
+#: templates/html/show.tmpl:71 templates/html/show.tmpl:73
 #, fuzzy
 #| msgid "More Information on %s"
 msgid "Developer Information (PTS)"
 msgstr "Додаткова інформація про %s"
 
-#: templates/html/show.tmpl:76
+#: templates/html/show.tmpl:77
 msgid "%s Changelog"
 msgstr ""
 
-#: templates/html/show.tmpl:77
+#: templates/html/show.tmpl:78
 msgid "Copyright File"
 msgstr ""
 
-#: templates/html/show.tmpl:81
+#: templates/html/show.tmpl:82
 msgid "Debian Source Repository"
 msgstr ""
 
-#: templates/html/show.tmpl:95
+#: templates/html/show.tmpl:96
 msgid "Download Source Package <a href=\"%s\">%s</a>:"
 msgstr ""
 
-#: templates/html/show.tmpl:102
+#: templates/html/show.tmpl:103
 msgid "Not found"
 msgstr "Не знайдено"
 
-#: templates/html/show.tmpl:107
+#: templates/html/show.tmpl:108
 #, fuzzy
 #| msgid "Maintainer"
 msgid "Maintainer:"
 msgstr "Супроводжуючий"
 
-#: templates/html/show.tmpl:109
+#: templates/html/show.tmpl:110
 #, fuzzy
 #| msgid "Maintainer"
 msgid "Maintainers:"
 msgstr "Супроводжуючий"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "An overview over the maintainer's packages and uploads"
 msgstr ""
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 #, fuzzy
 #| msgid "All packages"
 msgid "QA Page"
 msgstr "Всі пакунки"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Archive of the Maintainer Mailinglist"
 msgstr ""
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Mail Archive"
 msgstr ""
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:132
 msgid "External Resources:"
 msgstr ""
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:134
 msgid "Homepage"
 msgstr ""
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:140
 #, fuzzy
 msgid "Similar packages:"
 msgstr "віртуальний пакунок"
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:156
 #, fuzzy
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
@@ -894,7 +891,7 @@ msgstr ""
 "і він навіть може призвести до втрати даних. Якщо ви проігноруєте це "
 "попередження і встановите його, то робіть це на ваш ризик."
 
-#: templates/html/show.tmpl:176
+#: templates/html/show.tmpl:180
 msgid ""
 "This is a <em>virtual package</em>. See the <a href=\"%s\">Debian policy</a> "
 "for a <a href=\"%sch-binary.html#s-virtual_pkg\">definition of virtual "
@@ -904,67 +901,77 @@ msgstr ""
 "\">Політику Debian</a> щоб дізнатись про <a href=\"%sch-binary.html#s-"
 "virtual_pkg\">визначення віртуальних пакунків</a>."
 
-#: templates/html/show.tmpl:184
+#: templates/html/show.tmpl:188
 msgid "Tags"
 msgstr ""
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:211
 msgid "Packages providing %s"
 msgstr "Пакунки що надають %s"
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:220
 msgid "The following binary packages are built from this source package:"
 msgstr "Наступні двійкові пакунки побудовано з цього джерельного пакунка:"
 
-#: templates/html/show.tmpl:225
+#: templates/html/show.tmpl:229
 msgid "Other Packages Related to %s"
 msgstr "Інші пакунки пов'язані з %s"
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:231
 msgid "legend"
 msgstr ""
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:233
 msgid "build-depends"
 msgstr ""
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:234
 msgid "build-depends-indep"
 msgstr ""
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:236
 msgid "depends"
 msgstr ""
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:237
 msgid "recommends"
 msgstr ""
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:238
 msgid "suggests"
 msgstr ""
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:248
 #, fuzzy
 #| msgid "or"
 msgid "or "
 msgstr "або"
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:256
 #, fuzzy
 msgid "also a virtual package provided by"
 msgstr "віртуальний пакунок"
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:258
 #, fuzzy
-msgid "%u providing packages"
+msgid "virtual package provided by"
+msgstr "віртуальний пакунок"
+
+#: templates/html/show.tmpl:263
+#, fuzzy
+msgid "hide %u providing packages"
+msgstr "Розмір пакунка"
+
+#: templates/html/show.tmpl:263
+#, fuzzy
+msgid "show %u providing packages"
 msgstr "Розмір пакунка"
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:281
 msgid "Download %s"
 msgstr "Завантажити %s"
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:283
 msgid ""
 "The download table links to the download of the package and a file overview. "
 "In addition it gives information about the package size and the installed "
@@ -974,62 +981,62 @@ msgstr ""
 "файлів. Додатково, вона містить інформацію про розмір пакунка та розмір "
 "після встановлення."
 
-#: templates/html/show.tmpl:280
+#: templates/html/show.tmpl:284
 msgid "Download for all available architectures"
 msgstr "Завантаження для всіх доступних архітектур"
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:285
 msgid "Architecture"
 msgstr "Архітектура"
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:286
 msgid "Version"
 msgstr "Версія"
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:287
 msgid "Package Size"
 msgstr "Розмір пакунка"
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:288
 msgid "Installed Size"
 msgstr "Розмір після встановлення"
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:289
 msgid "Files"
 msgstr "Файли"
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:297
 msgid "(unofficial port)"
 msgstr ""
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:308 templates/html/show.tmpl:336
 msgid "%s&nbsp;kB"
 msgstr ""
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:311
 msgid "list of files"
 msgstr "список файлів"
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:313
 #, fuzzy
 msgid "no current information"
 msgstr "Додаткова інформація про %s"
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:330
 msgid "Download information for the files of this source package"
 msgstr ""
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:331
 msgid "Size (in kB)"
 msgstr "Розмір (в кБ)"
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:349
 msgid ""
 "Debian Package Source Repository (<acronym title=\"Version Control System"
 "\">VCS</acronym>: <a href=\"%s\">%s</a>)"
 msgstr ""
 
-#: templates/html/show.tmpl:349
+#: templates/html/show.tmpl:353
 #, fuzzy
 msgid "Debian Package Source Repository (Browsable)"
 msgstr "Всі пакунки Debian в дистрибутиві „%s“"
@@ -1095,242 +1102,250 @@ msgstr ""
 "Наступні пакунки було додано до нестабільного архіву Debian протягом "
 "останніх семи днів."
 
-#: templates/rss/newpkg.tmpl:28 templates/txt/index.tmpl:5
+#: templates/rss/newpkg.tmpl:28 templates/txt/index_head.tmpl:4
 msgid "Copyright ©"
 msgstr ""
 
-#: templates/txt/index.tmpl:2
+#: templates/txt/index_head.tmpl:1
 #, fuzzy
 #| msgid "New Packages in \"%s\""
 msgid "All %s Packages in \"%s\""
 msgstr "Нові пакунки в дистрибутиві „%s“"
 
-#: templates/txt/index.tmpl:6
+#: templates/txt/index_head.tmpl:5
 msgid "See <URL:%s> for the license terms."
 msgstr ""
 
 #, fuzzy
-#~| msgid ""
-#~| "Packages that were added to the unstable Debian archive during the last "
-#~| "7 days."
-#~ msgid ""
-#~ "Packages that were added to the %s %s archive (section \"%s\") during the "
-#~ "last 7 days."
-#~ msgstr ""
-#~ "Пакунки які біли додані до нестабільного архіву Debian впродовж останніх "
-#~ "7 днів."
+#~ msgid "two or more packages specified (%s)"
+#~ msgstr "Джерельний пакунок: %s (%s)"
 
 #, fuzzy
-#~| msgid ""
-#~| "Packages that were added to the unstable Debian archive during the last "
-#~| "7 days."
-#~ msgid ""
-#~ "Packages that were added to the %s %s archive during the last 7 days."
-#~ msgstr ""
-#~ "Пакунки які біли додані до нестабільного архіву Debian впродовж останніх "
-#~ "7 днів."
+#~ msgid "No such package in this suite on this architecture."
+#~ msgstr "Немає пакунків в цій секції цього дистрибутиву"
+
+#~ msgid "Virtual package"
+#~ msgstr "Віртуальний пакунок"
 
 #, fuzzy
-#~ msgid ""
-#~ "Note that the <strong>experimental</strong> distribution is not self-"
-#~ "contained; missing dependencies are likely found in the <a href=\"%s"
-#~ "\">unstable</a> distribution."
-#~ msgstr ""
-#~ "Майте на увазі, що „<span class=\"pred\">експериментальний</span>“ "
-#~ "дистрибутив не є самодостатнім; відсутні залежності скоріше за все є „<a "
-#~ "href=\"../../unstable/\">нестабільному</a>“ дистрибутиві."
+#~ msgid "No such package."
+#~ msgstr "Джерельний пакунок"
 
-#~ msgid "Versions:"
-#~ msgstr "Версії:"
+#, fuzzy
+#~ msgid "Package not available in this suite."
+#~ msgstr "Пакунок недоступний"
 
-#~ msgid ""
-#~ "Copyright (C) 1997-2005 SPI;\n"
-#~ "See <URL:http://www.debian.org/license> for the license terms.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Copyright (C) 1997-2005 SPI;\n"
-#~ "Перегляньте <URL:http://www.debian.org/license> щодо умов ліцензії.\n"
-#~ "\n"
+#~ msgid "Package not available"
+#~ msgstr "Пакунок недоступний"
 
-#~ msgid "No essential packages in this suite"
-#~ msgstr "Немає необхідних пакунків в цьому дистрибутиві"
+#, fuzzy
+#~ msgid "Software Packages in \"%s\", subsection %s"
+#~ msgstr "Пакунки в дистрибутиві „%s“, розділі %s"
 
-#~ msgid "Software Packages in \"%s\", essential packages"
-#~ msgstr "Пакунки в дистрибутиві „%s“, необхідні пакунки"
+#~ msgid "Software Packages in \"%s\", priority %s"
+#~ msgstr "Пакунки в дистрибутиві „%s“, пріоритет %s"
 
-#~ msgid "No packages with this priority in this suite"
-#~ msgstr "Немає пакунків з цим пріоритетом в цьому розділі"
+#, fuzzy
+#~ msgid "search for a package"
+#~ msgstr "Список всіх пакунків"
 
+#, fuzzy
+#~ msgid " (section %s)"
+#~ msgstr "Розділ"
+
+#, fuzzy
 #~ msgid ""
-#~ "Warning: These packages are intended for the use in building <a href="
-#~ "\"http://www.debian.org/devel/debian-installer/\">debian-installer</a> "
-#~ "images only. Do not install them on a normal Debian system."
+#~ "The following packages were added to suite %s%s in the Debian archive "
+#~ "during the last 7 days."
 #~ msgstr ""
-#~ "Увага: Ці пакунки призначені для використання тільки при побудові образів "
-#~ "<a href=\"http://www.debian.org/devel/debian-installer/\">встановлювача "
-#~ "Debian</a>. Не встановлюйте їх на нормальній системі Debian."
+#~ "Наступні пакунки було додано до нестабільного архіву Debian протягом "
+#~ "останніх семи днів."
 
-#~ msgid "yes"
-#~ msgstr "так"
+#, fuzzy
+#~ msgid "Nothing found"
+#~ msgstr "Не знайдено"
 
-#~ msgid "Priority"
-#~ msgstr "Приоритет"
+#~ msgid "Download %s\n"
+#~ msgstr "Завантажити %s\n"
 
-#~ msgid "Uploaders"
-#~ msgstr "Завантажувачі"
+#~ msgid "virtual package"
+#~ msgstr "віртуальний пакунок"
 
-#~ msgid "Size is measured in kBytes."
-#~ msgstr "Розмір даний в кілобайтах."
+#~ msgid "Overview over this distribution"
+#~ msgstr "Огляд цього дистрибутива"
 
-#~ msgid ""
-#~ "Users of experimental packages are encouraged to contact the package "
-#~ "maintainers directly in case of problems."
-#~ msgstr ""
-#~ "Користувачам експериментальних пакунків у випадку виникнення проблем "
-#~ "рекомендується зв'язуватись зі супроводжуючими пакунків напряму."
+#~ msgid "md5sum"
+#~ msgstr "сума MD5"
 
-#~ msgid ""
-#~ "Packages that were added to the \"%s\" component next to the unstable "
-#~ "Debian archive during the last 7 days."
-#~ msgstr ""
-#~ "Пакунки які було додано до компоненту „%s“ впродовж останніх 7 днів."
+#~ msgid "Check for <a href=\"%s\">Bug Reports</a> about %s."
+#~ msgstr "Перегляньте <a href=\"%s\">повідомлення про помилки</a> про %s."
 
-#~ msgid ""
-#~ "The following packages were added to the \"%s\" component next to the "
-#~ "Debian archive during the last 7 days."
-#~ msgstr ""
-#~ "Наступні пакунки було додано до компоненту „%s“ впродовж останніх 7 днів."
+#~ msgid "Source Package:"
+#~ msgstr "Джерельний пакунок:"
 
-#~ msgid ""
-#~ "Warning: The <span class=\"pred\">experimental</span> distribution "
-#~ "contains software that is likely unstable or buggy and may even cause "
-#~ "data loss. If you ignore this warning and install it nevertheless, you do "
-#~ "it on your own risk."
-#~ msgstr ""
-#~ "Увага: „<span class=\"pred\">Експериментальний</span>“ містить програмне "
-#~ "забезпечення, яке напевне є нестабільним або містить помилки і навіть "
-#~ "може спричинити втрату даних. Якщо ви проігноруєте це попередження і "
-#~ "встановите його, то робіть це на ваш ризик."
+#~ msgid "View the <a href=\"%s\">Debian changelog</a>"
+#~ msgstr "Переглянути <a href=\"%s\">журнал змін Debian</a>"
 
-#~ msgid ""
-#~ "Debian is a registered trademark of Software in the Public Interest, Inc."
-#~ msgstr ""
-#~ "Debian є зареєстрованою торговою маркою Software in the Public Interest, "
-#~ "Inc."
+#~ msgid "View the <a href=\"%s\">copyright file</a>"
+#~ msgstr "Переглянути <a href=\"%s\">файл з авторськими правами</a>"
 
-#~ msgid "Last Modified: "
-#~ msgstr "Остання зміна:"
+#~ msgid "%s is responsible for this Debian package."
+#~ msgstr "%s відповідає за цей пакунок Debian"
 
-#~ msgid ""
-#~ "Back to: <a href=\"%s/\">Debian Project homepage</a> || <a href=\"%s/"
-#~ "\">Packages search page</a>"
-#~ msgstr ""
-#~ "Повернутися до: <a href=\"%s/\">головної сторінки проекту Debian</a> || "
-#~ "<a href=\"%s/\">сторінки пошуку пакунків</a>"
+#~ msgid " and %s are responsible for this Debian package."
+#~ msgstr " і %s відповідають з цей пакунок Debian."
 
-#~ msgid "Site map"
-#~ msgstr "Карта сайту"
+#~ msgid "See the <a href=\"%s\">developer information for %s</a>."
+#~ msgstr "Перегляньте <a href=\"%s\">інформацію для розробників про %s</a>."
 
-#~ msgid "Development"
-#~ msgstr "Розробка"
+#, fuzzy
+#~ msgid "Search on:"
+#~ msgstr "Пошук"
 
-#~ msgid "Support"
-#~ msgstr "Підтримка"
+#~ msgid "Debian Project"
+#~ msgstr "Проект Debian"
 
-#~ msgid "Getting&nbsp;Debian"
-#~ msgstr "Отримання&nbsp;Debian"
+#~ msgid "About&nbsp;Debian"
+#~ msgstr "Про&nbsp;Debian"
 
 #~ msgid "News"
 #~ msgstr "Новини"
 
-#~ msgid "About&nbsp;Debian"
-#~ msgstr "Про&nbsp;Debian"
+#~ msgid "Getting&nbsp;Debian"
+#~ msgstr "Отримання&nbsp;Debian"
 
-#~ msgid "Debian Project"
-#~ msgstr "Проект Debian"
+#~ msgid "Support"
+#~ msgstr "Підтримка"
 
-#, fuzzy
-#~ msgid "Search on:"
-#~ msgstr "Пошук"
+#~ msgid "Development"
+#~ msgstr "Розробка"
 
-#~ msgid "See the <a href=\"%s\">developer information for %s</a>."
-#~ msgstr "Перегляньте <a href=\"%s\">інформацію для розробників про %s</a>."
+#~ msgid "Site map"
+#~ msgstr "Карта сайту"
 
-#~ msgid " and %s are responsible for this Debian package."
-#~ msgstr " і %s відповідають з цей пакунок Debian."
+#~ msgid ""
+#~ "Back to: <a href=\"%s/\">Debian Project homepage</a> || <a href=\"%s/"
+#~ "\">Packages search page</a>"
+#~ msgstr ""
+#~ "Повернутися до: <a href=\"%s/\">головної сторінки проекту Debian</a> || "
+#~ "<a href=\"%s/\">сторінки пошуку пакунків</a>"
 
-#~ msgid "%s is responsible for this Debian package."
-#~ msgstr "%s відповідає за цей пакунок Debian"
+#~ msgid "Last Modified: "
+#~ msgstr "Остання зміна:"
 
-#~ msgid "View the <a href=\"%s\">copyright file</a>"
-#~ msgstr "Переглянути <a href=\"%s\">файл з авторськими правами</a>"
+#~ msgid ""
+#~ "Debian is a registered trademark of Software in the Public Interest, Inc."
+#~ msgstr ""
+#~ "Debian є зареєстрованою торговою маркою Software in the Public Interest, "
+#~ "Inc."
 
-#~ msgid "View the <a href=\"%s\">Debian changelog</a>"
-#~ msgstr "Переглянути <a href=\"%s\">журнал змін Debian</a>"
+#~ msgid ""
+#~ "Warning: The <span class=\"pred\">experimental</span> distribution "
+#~ "contains software that is likely unstable or buggy and may even cause "
+#~ "data loss. If you ignore this warning and install it nevertheless, you do "
+#~ "it on your own risk."
+#~ msgstr ""
+#~ "Увага: „<span class=\"pred\">Експериментальний</span>“ містить програмне "
+#~ "забезпечення, яке напевне є нестабільним або містить помилки і навіть "
+#~ "може спричинити втрату даних. Якщо ви проігноруєте це попередження і "
+#~ "встановите його, то робіть це на ваш ризик."
 
-#~ msgid "Source Package:"
-#~ msgstr "Джерельний пакунок:"
+#~ msgid ""
+#~ "The following packages were added to the \"%s\" component next to the "
+#~ "Debian archive during the last 7 days."
+#~ msgstr ""
+#~ "Наступні пакунки було додано до компоненту „%s“ впродовж останніх 7 днів."
 
-#~ msgid "Check for <a href=\"%s\">Bug Reports</a> about %s."
-#~ msgstr "Перегляньте <a href=\"%s\">повідомлення про помилки</a> про %s."
+#~ msgid ""
+#~ "Packages that were added to the \"%s\" component next to the unstable "
+#~ "Debian archive during the last 7 days."
+#~ msgstr ""
+#~ "Пакунки які було додано до компоненту „%s“ впродовж останніх 7 днів."
 
-#~ msgid "md5sum"
-#~ msgstr "сума MD5"
+#~ msgid ""
+#~ "Users of experimental packages are encouraged to contact the package "
+#~ "maintainers directly in case of problems."
+#~ msgstr ""
+#~ "Користувачам експериментальних пакунків у випадку виникнення проблем "
+#~ "рекомендується зв'язуватись зі супроводжуючими пакунків напряму."
 
-#~ msgid "Overview over this distribution"
-#~ msgstr "Огляд цього дистрибутива"
+#~ msgid "Size is measured in kBytes."
+#~ msgstr "Розмір даний в кілобайтах."
 
-#~ msgid "virtual package"
-#~ msgstr "віртуальний пакунок"
+#~ msgid "Uploaders"
+#~ msgstr "Завантажувачі"
 
-#~ msgid "Download %s\n"
-#~ msgstr "Завантажити %s\n"
+#~ msgid "Priority"
+#~ msgstr "Приоритет"
 
-#, fuzzy
-#~ msgid "Nothing found"
-#~ msgstr "Не знайдено"
+#~ msgid "yes"
+#~ msgstr "так"
 
-#, fuzzy
 #~ msgid ""
-#~ "The following packages were added to suite %s%s in the Debian archive "
-#~ "during the last 7 days."
+#~ "Warning: These packages are intended for the use in building <a href="
+#~ "\"http://www.debian.org/devel/debian-installer/\">debian-installer</a> "
+#~ "images only. Do not install them on a normal Debian system."
 #~ msgstr ""
-#~ "Наступні пакунки було додано до нестабільного архіву Debian протягом "
-#~ "останніх семи днів."
+#~ "Увага: Ці пакунки призначені для використання тільки при побудові образів "
+#~ "<a href=\"http://www.debian.org/devel/debian-installer/\">встановлювача "
+#~ "Debian</a>. Не встановлюйте їх на нормальній системі Debian."
 
-#, fuzzy
-#~ msgid " (section %s)"
-#~ msgstr "Розділ"
+#~ msgid "No packages with this priority in this suite"
+#~ msgstr "Немає пакунків з цим пріоритетом в цьому розділі"
 
-#, fuzzy
-#~ msgid "search for a package"
-#~ msgstr "Список всіх пакунків"
+#~ msgid "Software Packages in \"%s\", essential packages"
+#~ msgstr "Пакунки в дистрибутиві „%s“, необхідні пакунки"
 
-#~ msgid "Software Packages in \"%s\", priority %s"
-#~ msgstr "Пакунки в дистрибутиві „%s“, пріоритет %s"
+#~ msgid "No essential packages in this suite"
+#~ msgstr "Немає необхідних пакунків в цьому дистрибутиві"
 
-#, fuzzy
-#~ msgid "Software Packages in \"%s\", subsection %s"
-#~ msgstr "Пакунки в дистрибутиві „%s“, розділі %s"
+#~ msgid ""
+#~ "Copyright (C) 1997-2005 SPI;\n"
+#~ "See <URL:http://www.debian.org/license> for the license terms.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Copyright (C) 1997-2005 SPI;\n"
+#~ "Перегляньте <URL:http://www.debian.org/license> щодо умов ліцензії.\n"
+#~ "\n"
 
-#~ msgid "Package not available"
-#~ msgstr "Пакунок недоступний"
+#~ msgid "Versions:"
+#~ msgstr "Версії:"
 
 #, fuzzy
-#~ msgid "Package not available in this suite."
-#~ msgstr "Пакунок недоступний"
+#~ msgid ""
+#~ "Note that the <strong>experimental</strong> distribution is not self-"
+#~ "contained; missing dependencies are likely found in the <a href=\"%s"
+#~ "\">unstable</a> distribution."
+#~ msgstr ""
+#~ "Майте на увазі, що „<span class=\"pred\">експериментальний</span>“ "
+#~ "дистрибутив не є самодостатнім; відсутні залежності скоріше за все є „<a "
+#~ "href=\"../../unstable/\">нестабільному</a>“ дистрибутиві."
 
 #, fuzzy
-#~ msgid "No such package."
-#~ msgstr "Джерельний пакунок"
-
-#~ msgid "Virtual package"
-#~ msgstr "Віртуальний пакунок"
+#~| msgid ""
+#~| "Packages that were added to the unstable Debian archive during the last "
+#~| "7 days."
+#~ msgid ""
+#~ "Packages that were added to the %s %s archive during the last 7 days."
+#~ msgstr ""
+#~ "Пакунки які біли додані до нестабільного архіву Debian впродовж останніх "
+#~ "7 днів."
 
 #, fuzzy
-#~ msgid "No such package in this suite on this architecture."
-#~ msgstr "Немає пакунків в цій секції цього дистрибутиву"
+#~| msgid ""
+#~| "Packages that were added to the unstable Debian archive during the last "
+#~| "7 days."
+#~ msgid ""
+#~ "Packages that were added to the %s %s archive (section \"%s\") during the "
+#~ "last 7 days."
+#~ msgstr ""
+#~ "Пакунки які біли додані до нестабільного архіву Debian впродовж останніх "
+#~ "7 днів."
 
 #, fuzzy
-#~ msgid "two or more packages specified (%s)"
-#~ msgstr "Джерельний пакунок: %s (%s)"
+#~ msgid ""
+#~ "You can try a different search on the <a href=\"%s#search_packages"
+#~ "\">Packages search page</a>."
+#~ msgstr ""
+#~ "Повернутися до: <a href=\"%s/\">головної сторінки проекту Debian</a> || "
+#~ "<a href=\"%s/\">сторінки пошуку пакунків</a>"
diff --git a/po/templates.zh-cn.po b/po/templates.zh-cn.po
index baf3358..a2bcc09 100644
--- a/po/templates.zh-cn.po
+++ b/po/templates.zh-cn.po
@@ -10,33 +10,32 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: templates/config.tmpl:40
+#: templates/config.tmpl:41
 msgid "Debian Web Mailinglist"
 msgstr "Debian 邮件列表"
 
-#: templates/config.tmpl:45
+#: templates/config.tmpl:46
 msgid "%s Webmaster"
 msgstr "%s 网管"
 
-#: templates/config.tmpl:48
+#: templates/config.tmpl:49
 msgid "%s is a <a href=\"%s\">trademark</a> of %s"
 msgstr "%1 是 %3 的一个<a href=\"%3\">注册商标</a>"
 
-#: templates/config.tmpl:53
+#: templates/config.tmpl:54
 msgid ""
-"Please note that this is an experimental version of <a href=\"http://"
-"packages.debian.org/\">packages.debian.org</a>. Errors and obsolete "
-"information should be expected"
+"Please note that this is an experimental version of <a href=\"http://%s/\">%"
+"s</a>. Errors and obsolete information should be expected"
 msgstr ""
-"注意: 这是 <a href=\"http://packages.debian.org/\">packages.debian.org</a> 的"
-"一个试制版本。错误的以及过时的信息有时难以避免"
+"注意: 这是 <a href=\"http://%s/\">%s</a> 的一个试制版本。错误的以及过时的信息"
+"有时难以避免"
 
 #. @translators: . = decimal_point , = thousands_sep, see Number::Format 
-#: templates/config.tmpl:56
+#: templates/config.tmpl:57
 msgid "."
 msgstr ""
 
-#: templates/config.tmpl:57
+#: templates/config.tmpl:58
 msgid ","
 msgstr ""
 
@@ -104,27 +103,27 @@ msgstr "GNU/kFreeBSD (i386)"
 msgid "GNU/kFreeBSD (amd64)"
 msgstr "GNU/kFreeBSD (amd64)"
 
-#: templates/config/mirrors.tmpl:182
+#: templates/config/mirrors.tmpl:178
 msgid "North America"
 msgstr "北美洲"
 
-#: templates/config/mirrors.tmpl:183
+#: templates/config/mirrors.tmpl:179
 msgid "South America"
 msgstr "南美洲"
 
-#: templates/config/mirrors.tmpl:184
+#: templates/config/mirrors.tmpl:180
 msgid "Asia"
 msgstr "亚洲"
 
-#: templates/config/mirrors.tmpl:185
+#: templates/config/mirrors.tmpl:181
 msgid "Australia and New Zealand"
 msgstr "澳洲和大洋洲"
 
-#: templates/config/mirrors.tmpl:186
+#: templates/config/mirrors.tmpl:182
 msgid "Europe"
 msgstr "欧洲"
 
-#: templates/config/mirrors.tmpl:187
+#: templates/config/mirrors.tmpl:183
 msgid "Africa"
 msgstr "非洲"
 
@@ -133,12 +132,12 @@ msgid "Package Download Selection -- %s"
 msgstr "软件包下载地址选集 -- %s"
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 msgid "Distribution:"
 msgstr "发行版:"
 
 #: templates/html/download.tmpl:5 templates/html/filelist.tmpl:5
-#: templates/html/index.tmpl:10 templates/html/show.tmpl:14
+#: templates/html/index_head.tmpl:9 templates/html/show.tmpl:14
 msgid "Overview over this suite"
 msgstr "该发行版一览"
 
@@ -181,7 +180,7 @@ msgstr ""
 msgid "Replacing <em>%s</em> with the mirror in question."
 msgstr "请使用最终确定的源镜像替换 <em>%s</em>。"
 
-#: templates/html/download.tmpl:37 templates/html/show.tmpl:152
+#: templates/html/download.tmpl:37 templates/html/show.tmpl:155
 msgid "Experimental package"
 msgstr "试制(Experimental)软件包"
 
@@ -196,11 +195,11 @@ msgstr ""
 "表现出不稳定或者出现 bug ，甚至是导致资料损失。请务必在使用之前查阅 "
 "changelog 以及其他潜在的文档。"
 
-#: templates/html/download.tmpl:41 templates/html/show.tmpl:157
+#: templates/html/download.tmpl:41 templates/html/show.tmpl:160
 msgid "debian-installer udeb package"
 msgstr "Debian 安装程序 udeb 包"
 
-#: templates/html/download.tmpl:42 templates/html/show.tmpl:158
+#: templates/html/download.tmpl:42 templates/html/show.tmpl:161
 msgid ""
 "Warning: This package is intended for the use in building <a href=\"http://"
 "www.debian.org/devel/debian-installer\">debian-installer</a> images only. Do "
@@ -265,7 +264,7 @@ msgstr "%s 字节(%s %s)"
 msgid "Exact Size"
 msgstr "实际大小"
 
-#: templates/html/download.tmpl:103 templates/html/show.tmpl:327
+#: templates/html/download.tmpl:103 templates/html/show.tmpl:331
 msgid "MD5 checksum"
 msgstr "MD5 校验码"
 
@@ -323,7 +322,7 @@ msgstr ""
 "报告本网站的问题，请发送电子邮件至 <a href=\"mailto:%s\">%s</a>。请查阅 %s "
 "<a href=\"%s\">联系方式</a>了解更多信息。"
 
-#: templates/html/foot.tmpl:33 templates/txt/index.tmpl:4
+#: templates/html/foot.tmpl:33 templates/txt/index_head.tmpl:3
 msgid "Generated:"
 msgstr "最近修订日期:"
 
@@ -375,36 +374,31 @@ msgstr "%s 软件包首页"
 msgid "Packages"
 msgstr "软件包"
 
-#: templates/html/index.tmpl:3
+#: templates/html/index_head.tmpl:2
 msgid "Source Packages in \"%s\", %s %s"
 msgstr "属于 \"%1\" 发行版 %3 %2的源码包"
 
-#: templates/html/index.tmpl:4
+#: templates/html/index_head.tmpl:3
 msgid "Source Packages in \"%s\""
 msgstr "属于 \"%1\" 发行版的源码包"
 
-#: templates/html/index.tmpl:6
+#: templates/html/index_head.tmpl:5
 msgid "Software Packages in \"%s\", %s %s"
 msgstr "属于 \"%1\" 发行版 %3 %2的软件包"
 
-#: templates/html/index.tmpl:7
+#: templates/html/index_head.tmpl:6
 msgid "Software Packages in \"%s\""
 msgstr "属于 \"%1\" 发行版的软件包"
 
-#: templates/html/index.tmpl:14
+#: templates/html/index_head.tmpl:13
 msgid "All Packages"
 msgstr "所有包"
 
-#: templates/html/index.tmpl:16 templates/html/show.tmpl:15
+#: templates/html/index_head.tmpl:15 templates/html/show.tmpl:15
 #: templates/html/suite_index.tmpl:2
 msgid "Source"
 msgstr "源代码"
 
-#: templates/html/index.tmpl:43 templates/html/show.tmpl:254
-#: templates/txt/index.tmpl:15
-msgid "virtual package provided by"
-msgstr "本虚包由这些包填实:"
-
 #: templates/html/newpkg.tmpl:2 templates/html/newpkg.tmpl:7
 msgid "New Packages in \"%s\""
 msgstr "属于 \"%s\" 发行版的新进软件包"
@@ -467,14 +461,7 @@ msgstr "软件包搜索结果 -- %s"
 msgid "Package Search Results"
 msgstr "软件包搜索结果"
 
-#: templates/html/search.tmpl:33
-msgid ""
-"You can try a different search on the <a href=\"%s#search_packages"
-"\">Packages search page</a>."
-msgstr ""
-"您可以在<a href=\"%s#search_packages\">软件包搜索页面</a>重新搜索一次。"
-
-#: templates/html/search.tmpl:37
+#: templates/html/search.tmpl:35
 msgid ""
 "You have searched only for words exactly matching your keywords. You can try "
 "to search <a href=\"%s\">allowing subword matching</a>."
@@ -482,56 +469,82 @@ msgstr ""
 "您刚才搜索的仅限于完整匹配您指定关键字的内容。您还可以尝试搜索<a href=\"%s\">"
 "部分匹配</a>您指定关键字的内容。"
 
-#: templates/html/search.tmpl:42
+#: templates/html/search.tmpl:40
+#, fuzzy
+#| msgid "Search in other suite:"
+msgid "Search in specific suite:"
+msgstr "在其他的发行版中搜索:"
+
+#: templates/html/search.tmpl:49
+#, fuzzy
+#| msgid "Search in <a href=\"%s\">all architectures</a>"
+msgid "Search in <a href=\"%s\">all suites</a>"
+msgstr "在<a href=\"%s\">所有硬件架构</a>中搜索"
+
+#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
+msgid "Limit search to a specific architecture:"
+msgstr "只搜索某一种硬件架构:"
+
+#: templates/html/search.tmpl:62 templates/html/search_contents.tmpl:63
+msgid "Search in <a href=\"%s\">all architectures</a>"
+msgstr "在<a href=\"%s\">所有硬件架构</a>中搜索"
+
+#: templates/html/search.tmpl:69
+#, fuzzy
+#| msgid ""
+#| "<a href=\"%s\">%u</a> results have not been displayed due to the search "
+#| "parameters."
 msgid ""
-"<a href=\"%s\">%u</a> results have not been displayed due to the search "
+"<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
 msgstr ""
 "由于参数界定了搜索范围，导致 <a href=\"%s\">%u</a> 个相关结果没有列出。"
 
-#: templates/html/search.tmpl:51
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr "所有发行版"
 
-#: templates/html/search.tmpl:51
-msgid "suite(s) <em>$suite_enc</em>"
-msgstr " <em>$suite_enc</em> 发行版"
+#: templates/html/search.tmpl:78
+#, fuzzy
+#| msgid "section(s) <em>%s</em>"
+msgid "suite(s) <em>%s</em>"
+msgstr " <em>%s</em> 版面"
 
-#: templates/html/search.tmpl:52 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
 msgid "all sections"
 msgstr "所有版面"
 
-#: templates/html/search.tmpl:52
-msgid "section(s) <em>$section_enc</em>"
-msgstr " <em>$section_enc</em> 版面"
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
+msgid "section(s) <em>%s</em>"
+msgstr " <em>%s</em> 版面"
 
-#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
 msgid "all architectures"
 msgstr "所有硬件架构"
 
-#: templates/html/search.tmpl:53
-msgid "architecture(s) <em>$architectures_enc</em>"
-msgstr " <em>$architectures_enc</em> 硬件架构"
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
+msgid "architecture(s) <em>%s</em>"
+msgstr " <em>%s</em> 硬件架构"
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 msgid "packages"
 msgstr "软件包"
 
-#: templates/html/search.tmpl:55
+#: templates/html/search.tmpl:82
 msgid "source packages"
 msgstr "源码包"
 
-#: templates/html/search.tmpl:56
+#: templates/html/search.tmpl:83
 msgid ""
 "You have searched for %s that names contain <em>%s</em> in %s, %s, and %s."
 msgstr "您在%3中%5下%4里，指定关键字 <em>%2</em> 在%1名称中搜索的结果。"
 
-#: templates/html/search.tmpl:59
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr "(包括部分关键字匹配)"
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:61
+#: templates/html/search.tmpl:88
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
@@ -539,11 +552,11 @@ msgstr ""
 "您在%2中%4下%3里，指定关键字 <em>%1</em> 在软件包名称和描述信息中搜索的结果%"
 "5。"
 
-#: templates/html/search.tmpl:67
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr "找到 <strong>%u</strong> 个匹配的软件包。"
 
-#: templates/html/search.tmpl:72
+#: templates/html/search.tmpl:99
 msgid ""
 "Note that this only shows the best matches, sorted by relevance. If the "
 "first few packages don't match what you searched for, try using more "
@@ -552,44 +565,69 @@ msgstr ""
 "注意: 这里列出的是最符合搜索关键字要求的结果，并按相关性作了排序。如果前几个"
 "包不是您要找的，请尝试更多的或者其它的关键字。"
 
-#: templates/html/search.tmpl:74
+#: templates/html/search.tmpl:103
+#, fuzzy
+#| msgid ""
+#| "Your search was too wide so we will only display exact matches. At least "
+#| "<em>%u</em> results have been omitted and will not be displayed. Please "
+#| "consider using a longer keyword or more keywords."
 msgid ""
-"Your search was too wide so we will only display exact matches. At least <em>"
-"%u</em> results have been omitted and will not be displayed. Please consider "
-"using a longer keyword or more keywords."
+"Your keyword was too generic, for optimizing reasons some results might have "
+"been suppressed.<br>Please consider using a longer keyword or more keywords."
 msgstr ""
 "由于您的搜索范围太大我们只列出了能完整匹配搜索关键字的结果。至少有 <em>%u</"
 "em> 个相关结果没有被列出。请考虑更换一个更准确的关键字或者添加更多的关键字。"
 
-#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:131
+#: templates/html/search.tmpl:105
+#, fuzzy
+#| msgid ""
+#| "Note: Your search was too wide so we will only display only the first "
+#| "about 100 matches. Please consider using a longer keyword or more "
+#| "keywords."
+msgid ""
+"Your keyword was too generic.<br>Please consider using a longer keyword or "
+"more keywords."
+msgstr ""
+"注意: 由于您的搜索范围太大我们只列出了前 100 个结果。请考虑更换一个更准确的关"
+"键字或者添加更多的关键字。"
+
+#: templates/html/search.tmpl:111 templates/html/search_contents.tmpl:131
 msgid "Sorry, your search gave no results"
 msgstr "很遗憾，您没能搜索到任何结果"
 
-#: templates/html/search.tmpl:86
+#: templates/html/search.tmpl:118
 msgid "Package %s"
 msgstr "软件包 %s"
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "also provided by:"
 msgstr "同时提供该包的还有:"
 
-#: templates/html/search.tmpl:96
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr "由这些包填实:"
 
-#: templates/html/search.tmpl:105
+#: templates/html/search.tmpl:139
 msgid "Source Package %s"
 msgstr "源码包 %s"
 
-#: templates/html/search.tmpl:113
+#: templates/html/search.tmpl:146
 msgid "Binary packages:"
 msgstr "二进制包:"
 
-#: templates/html/search.tmpl:115
-msgid "%u binary packages"
+#: templates/html/search.tmpl:148
+#, fuzzy
+#| msgid "%u binary packages"
+msgid "hide %u binary packages"
 msgstr "%u 个二进制包"
 
-#: templates/html/search.tmpl:125
+#: templates/html/search.tmpl:148
+#, fuzzy
+#| msgid "%u binary packages"
+msgid "show %u binary packages"
+msgstr "%u 个二进制包"
+
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -621,22 +659,6 @@ msgstr "搜索文件名以 <em>%s</em> 结尾的内容"
 msgid "Search in other suite:"
 msgstr "在其他的发行版中搜索:"
 
-#: templates/html/search_contents.tmpl:58
-msgid "Limit search to a specific architecture:"
-msgstr "只搜索某一种硬件架构:"
-
-#: templates/html/search_contents.tmpl:63
-msgid "Search in <a href=\"%s\">all architectures</a>"
-msgstr "在<a href=\"%s\">所有硬件架构</a>中搜索"
-
-#: templates/html/search_contents.tmpl:72
-msgid "section(s) <em>%s</em>"
-msgstr " <em>%s</em> 版面"
-
-#: templates/html/search_contents.tmpl:73
-msgid "architecture(s) <em>%s</em>"
-msgstr " <em>%s</em> 硬件架构"
-
 #: templates/html/search_contents.tmpl:74
 msgid "paths that end with"
 msgstr "路径末尾是"
@@ -671,7 +693,7 @@ msgid "Sort results by filename"
 msgstr "按文件名排序"
 
 #: templates/html/search_contents.tmpl:98
-#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:327
+#: templates/html/search_contents.tmpl:124 templates/html/show.tmpl:331
 msgid "File"
 msgstr "文件"
 
@@ -695,111 +717,111 @@ msgstr "属于本版面的所有软件包"
 msgid "Section:"
 msgstr "版面:"
 
-#: templates/html/show.tmpl:21
+#: templates/html/show.tmpl:22
 msgid "Details of source package %s in %s"
 msgstr "在 %2 中的 %1 源码包详细信息"
 
-#: templates/html/show.tmpl:22
+#: templates/html/show.tmpl:23
 msgid "Details of package %s in %s"
 msgstr "在 %2 中的 %1 软件包详细信息"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 msgid "Source package building this package"
 msgstr "构建这个包的源码包"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 msgid "Source:"
 msgstr "源代码:"
 
-#: templates/html/show.tmpl:52
+#: templates/html/show.tmpl:53
 msgid "Virtual Package: %s"
 msgstr "虚包: %s"
 
-#: templates/html/show.tmpl:54
+#: templates/html/show.tmpl:55
 msgid "Source Package: %s (%s)"
 msgstr "源码包: %s (%s)"
 
-#: templates/html/show.tmpl:56
+#: templates/html/show.tmpl:57
 msgid "Package: %s (%s)"
 msgstr "软件包: %s (%s)"
 
-#: templates/html/show.tmpl:60
+#: templates/html/show.tmpl:61
 msgid "essential"
 msgstr "必备"
 
-#: templates/html/show.tmpl:64
+#: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr "%s 的相关链接"
 
-#: templates/html/show.tmpl:65
-msgid "Debian Resources:"
-msgstr "Debian 的资源:"
+#: templates/html/show.tmpl:66
+msgid "%s Resources:"
+msgstr "%s 的资源:"
 
-#: templates/html/show.tmpl:67
+#: templates/html/show.tmpl:68
 msgid "Bug Reports"
 msgstr "报告问题"
 
-#: templates/html/show.tmpl:70 templates/html/show.tmpl:72
+#: templates/html/show.tmpl:71 templates/html/show.tmpl:73
 msgid "Developer Information (PTS)"
 msgstr "开发者信息(PTS)"
 
-#: templates/html/show.tmpl:76
+#: templates/html/show.tmpl:77
 msgid "%s Changelog"
 msgstr "%s Changelog"
 
-#: templates/html/show.tmpl:77
+#: templates/html/show.tmpl:78
 msgid "Copyright File"
 msgstr "版权文件"
 
-#: templates/html/show.tmpl:81
+#: templates/html/show.tmpl:82
 msgid "Debian Source Repository"
 msgstr "Debian 源代码仓库"
 
-#: templates/html/show.tmpl:95
+#: templates/html/show.tmpl:96
 msgid "Download Source Package <a href=\"%s\">%s</a>:"
 msgstr "下载源码包 <a href=\"%s\">%s</a>:"
 
-#: templates/html/show.tmpl:102
+#: templates/html/show.tmpl:103
 msgid "Not found"
 msgstr "未找到"
 
-#: templates/html/show.tmpl:107
+#: templates/html/show.tmpl:108
 msgid "Maintainer:"
 msgstr "维护者:"
 
-#: templates/html/show.tmpl:109
+#: templates/html/show.tmpl:110
 msgid "Maintainers:"
 msgstr "维护小组:"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "An overview over the maintainer's packages and uploads"
 msgstr "该维护者负责的软件包一览"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:123
 msgid "QA Page"
 msgstr "QA 页面"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Archive of the Maintainer Mailinglist"
 msgstr ""
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:124
 msgid "Mail Archive"
 msgstr ""
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:132
 msgid "External Resources:"
 msgstr "外部的资源:"
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:134
 msgid "Homepage"
 msgstr "主页"
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:140
 msgid "Similar packages:"
 msgstr "相似软件包:"
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:156
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
 "distribution. That means it is likely unstable or buggy, and it may even "
@@ -810,7 +832,7 @@ msgstr ""
 "表现出不稳定或者出现 bug ，甚至是导致资料损失。请务必在使用之前查阅 <a href="
 "\"%s\">changelog</a> 以及其他潜在的文档。"
 
-#: templates/html/show.tmpl:176
+#: templates/html/show.tmpl:180
 msgid ""
 "This is a <em>virtual package</em>. See the <a href=\"%s\">Debian policy</a> "
 "for a <a href=\"%sch-binary.html#s-virtual_pkg\">definition of virtual "
@@ -819,63 +841,75 @@ msgstr ""
 "这是一个<em>虚包</em>。查看<a href=\"%s\">Debian 政策</a>了解<a href=\"%sch-"
 "binary.html#s-virtual_pkg\">虚包的定义</a>。"
 
-#: templates/html/show.tmpl:184
+#: templates/html/show.tmpl:188
 msgid "Tags"
 msgstr "标签"
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:211
 msgid "Packages providing %s"
 msgstr "负责填实 %s 的软件包"
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:220
 msgid "The following binary packages are built from this source package:"
 msgstr "本源码包构建了以下这些二进制包:"
 
-#: templates/html/show.tmpl:225
+#: templates/html/show.tmpl:229
 msgid "Other Packages Related to %s"
 msgstr "其它与 %s 有关的软件包"
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:231
 msgid "legend"
 msgstr "图例"
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:233
 msgid "build-depends"
 msgstr "完整构建时刻依赖"
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:234
 msgid "build-depends-indep"
 msgstr "单独构建时刻依赖"
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:236
 msgid "depends"
 msgstr "依赖"
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:237
 msgid "recommends"
 msgstr "推荐"
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:238
 msgid "suggests"
 msgstr "建议"
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:248
 msgid "or "
 msgstr "或者"
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:256
 msgid "also a virtual package provided by"
 msgstr "同时作为一个虚包由这些包填实:"
 
-#: templates/html/show.tmpl:259
-msgid "%u providing packages"
+#: templates/html/show.tmpl:258
+msgid "virtual package provided by"
+msgstr "本虚包由这些包填实:"
+
+#: templates/html/show.tmpl:263
+#, fuzzy
+#| msgid "%u providing packages"
+msgid "hide %u providing packages"
+msgstr "%u 个虚包填实者"
+
+#: templates/html/show.tmpl:263
+#, fuzzy
+#| msgid "%u providing packages"
+msgid "show %u providing packages"
 msgstr "%u 个虚包填实者"
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:281
 msgid "Download %s"
 msgstr "下载 %s"
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:283
 msgid ""
 "The download table links to the download of the package and a file overview. "
 "In addition it gives information about the package size and the installed "
@@ -884,55 +918,55 @@ msgstr ""
 "下载表格中分别链接了软件包的下载地址和软件包内容的浏览地址。同时还给出了软件"
 "包的实际大小和安装后占用空间的情况。"
 
-#: templates/html/show.tmpl:280
+#: templates/html/show.tmpl:284
 msgid "Download for all available architectures"
 msgstr "下载可用于所有硬件架构的"
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:285
 msgid "Architecture"
 msgstr "硬件架构"
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:286
 msgid "Version"
 msgstr "版本"
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:287
 msgid "Package Size"
 msgstr "软件包大小"
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:288
 msgid "Installed Size"
 msgstr "安装后大小"
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:289
 msgid "Files"
 msgstr "文件"
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:297
 msgid "(unofficial port)"
 msgstr "(非官方移植版)"
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:308 templates/html/show.tmpl:336
 msgid "%s&nbsp;kB"
 msgstr "%s&nbsp;kB"
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:311
 msgid "list of files"
 msgstr "文件列表"
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:313
 msgid "no current information"
 msgstr "没有当前信息"
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:330
 msgid "Download information for the files of this source package"
 msgstr "源码包文件的下载信息"
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:331
 msgid "Size (in kB)"
 msgstr "大小(单位: kB)"
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:349
 msgid ""
 "Debian Package Source Repository (<acronym title=\"Version Control System"
 "\">VCS</acronym>: <a href=\"%s\">%s</a>)"
@@ -940,7 +974,7 @@ msgstr ""
 "Debian 软件包源码仓库(<acronym title=\"Version Control System\">VCS</"
 "acronym>: <a href=\"%s\">%s</a>)"
 
-#: templates/html/show.tmpl:349
+#: templates/html/show.tmpl:353
 msgid "Debian Package Source Repository (Browsable)"
 msgstr "Debian 软件包源码仓库(可在线浏览)"
 
@@ -992,14 +1026,29 @@ msgid ""
 "last 7 days."
 msgstr "以下是在最近 7 天内被选进 %2 的 %1 发行版之中的软件包。"
 
-#: templates/rss/newpkg.tmpl:28 templates/txt/index.tmpl:5
+#: templates/rss/newpkg.tmpl:28 templates/txt/index_head.tmpl:4
 msgid "Copyright ©"
 msgstr "Copyright ©"
 
-#: templates/txt/index.tmpl:2
+#: templates/txt/index_head.tmpl:1
 msgid "All %s Packages in \"%s\""
 msgstr "\"%2\" 包含所有的 %1 软件包"
 
-#: templates/txt/index.tmpl:6
+#: templates/txt/index_head.tmpl:5
 msgid "See <URL:%s> for the license terms."
 msgstr "查看 <URL:%s> 以便了解许可证的各项条款。"
+
+#~ msgid "suite(s) <em>$suite_enc</em>"
+#~ msgstr " <em>$suite_enc</em> 发行版"
+
+#~ msgid "section(s) <em>$section_enc</em>"
+#~ msgstr " <em>$section_enc</em> 版面"
+
+#~ msgid "architecture(s) <em>$architectures_enc</em>"
+#~ msgstr " <em>$architectures_enc</em> 硬件架构"
+
+#~ msgid ""
+#~ "You can try a different search on the <a href=\"%s#search_packages"
+#~ "\">Packages search page</a>."
+#~ msgstr ""
+#~ "您可以在<a href=\"%s#search_packages\">软件包搜索页面</a>重新搜索一次。"
diff --git a/static/index.tmpl b/static/index.tmpl
index c12bc7a..4d2b38a 100644
--- a/static/index.tmpl
+++ b/static/index.tmpl
@@ -7,6 +7,8 @@
     all_suites = [ 'sarge', 'sarge-volatile', 'sarge-backports',
     	       	   'etch', 'etch-m68k', 'etch-volatile', 'etch-backports',
 		   'lenny', 'sid' ]
+    version_numbers = { sarge => '3.1',
+			etch   => '4.0' }
     current_release = 'etch'
     all_sections = [ 'main', 'contrib', 'non-free' ]
     all_architectures = [ 'alpha', 'arm', 'armel', 'amd64', 'hppa', 'i386',
@@ -15,7 +17,7 @@
 -%]
 
 <p>This site provides you with information about all the packages
-available in the <a href="[% homepage %]">[% organisation %]</a>
+available in the <a href="[% project_homepage %]">[% organisation %]</a>
 Package archive.
 
 <p><em>Please contact <a href="mailto:[% admin.mail %]">[% admin.name %]</a>
@@ -25,11 +27,12 @@ if you encounter any problems!</em></p>
 
 <ul style="font-size:large">
 [% FOREACH s IN all_suites %]
-<li><a href="[% s %]/">[% s %]</a></li>
+<li><a href="[% s %]/">[% s %]</a>
+[% IF version_numbers.$s %]([% version_numbers.$s %])[% END %]</li>
 [% END %]
 </ul>
 
-<p>There is also a list of <a href="[% all_suites.-1 %]/newpkg_main">packages
+<p>There is also a list of <a href="[% all_suites.-1 %]/main/newpkg">packages
 recently added to [% all_suites.-1 %]</a>.</p>
 
 <h2>Search</h2>
diff --git a/static/packages.js b/static/packages.js
index 1de28bc..172e6b4 100644
--- a/static/packages.js
+++ b/static/packages.js
@@ -1,13 +1,14 @@
 
-function init_toggle_elem(id_str,user_str) {
-	toggle_toggle_elem(id_str,user_str,'hide');
+function init_toggle_elem(id_str,show_user_str,hide_user_str) {
+	toggle_toggle_elem(id_str,show_user_str,hide_user_str,'hide');
 }
 
-function toggle_toggle_elem(id_str,user_str,mode) {
+function toggle_toggle_elem(id_str,show_user_str,hide_user_str,mode) {
 	var other_mode = ( mode == "hide" ) ? "show" : "hide";
+	var user_str = ( mode == "hide" ) ? show_user_str : hide_user_str;
 	var link = document.createElement("a");
-	link.setAttribute("href","javascript:toggle_toggle_elem(\""+id_str+"\",\""+user_str+"\",\""+other_mode+"\")");
-	var txt = document.createTextNode("["+other_mode+" "+user_str+"]");
+	link.setAttribute("href","javascript:toggle_toggle_elem(\""+id_str+"\",\""+show_user_str+"\",\""+hide_user_str+"\",\""+other_mode+"\")");
+	var txt = document.createTextNode("["+user_str+"]");
 	link.appendChild(txt);
 	if (document.getElementById("js_"+id_str).childNodes.length > 0) { 
 		document.getElementById("js_"+id_str).replaceChild(link,document.getElementById("js_"+id_str).firstChild);
@@ -146,4 +147,4 @@ function show_all_tabs() {
 	if (item) {
 		item.style.fontWeight = "bold";
 	}
-}
\ No newline at end of file
+}
diff --git a/templates/config.tmpl b/templates/config.tmpl
index 1fee16b..e4ccf72 100644
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -1,9 +1,10 @@
 [%- DEFAULT
    charset = 'UTF-8'
-   lang = 'en'
+   po_lang = 'en'
+   ddtp_lang = 'en'
 
    organisation = 'Debian'
-   homepage = 'http://www.debian.org/'
+   project_homepage = 'http://www.debian.org/'
    packages_homepage = 'http://packages.debian.net/'
    searchformurl = packages_homepage
    search_url = '/'
@@ -18,9 +19,9 @@
    security_suite_suffix = '/updates'
    changelogs_url = 'http://packages.debian.org/changelogs/'
    policy_url = 'http://www.debian.org/doc/debian-policy/'
-   cn_help_url = homepage _ 'intro/cn'
+   cn_help_url = project_homepage _ 'intro/cn'
    logo = {
-	url => homepage,
+	url => project_homepage,
         src => '/Pics/openlogo-nd-25.png',
         alt => organisation,
    }
@@ -30,16 +31,16 @@
         years => '1997 - ' _ timestamp.year,
    }
    license = {
-	url => homepage _ 'license'
+	url => project_homepage _ 'license'
    }
    trademark = {
 	name => copyright.name,
-	url => homepage _ 'trademark'
+	url => project_homepage _ 'trademark'
    }
    contact = {
 	name => g('Debian Web Mailinglist'),
 	mail => 'debian-www@lists.debian.org',
-        url => homepage _ 'contact',
+        url => project_homepage _ 'contact',
    }
    admin = {
 	name => g('%s Webmaster', organisation),
@@ -50,7 +51,7 @@
 [%-
    # possible values for importance: high, normal, low
    sitewidemsg = { importance => "high",
-		   txt => g('Please note that this is an experimental version of <a href="http://packages.debian.org/">packages.debian.org</a>. Errors and obsolete information should be expected') }
+		   txt => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') }
 -%]
 [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
 [%- USE num = Number.Format( decimal_point => g('.'),
diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index 7568213..9547482 100644
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -158,10 +158,6 @@ mirrors = {
 				url_name => 'kfreebsd-gnu',
 				name => 'GNU/kFreeBSD',
 			},
-			armel => {
-				url => 'http://wiki.debian.org/ArmEabiPort',
-				name => 'armel',
-			},
 		},
 		north_america => [
 			"www.gtlib.gatech.edu/pub/gnuab/debian",
diff --git a/templates/html/foot.tmpl b/templates/html/foot.tmpl
index ed94954..a6705db 100644
--- a/templates/html/foot.tmpl
+++ b/templates/html/foot.tmpl
@@ -24,7 +24,7 @@ Total page evaluation took [% benchmark %]<br>
 [% END %]
 
 <hr class="hidecss">
-<p [%- ' class="bordertop"' IF langs.size > 0 %]>[% g('Back to:') %] <a href="[% homepage %]">[% g('%s Homepage', organisation) %]</a> || <a href="[% searchformurl %]">[% g('Packages search page') %]</a></p>
+<p [%- ' class="bordertop"' IF langs.size > 0 %]>[% g('Back to:') %] <a href="[% project_homepage %]">[% g('%s Homepage', organisation) %]</a> || <a href="[% searchformurl %]">[% g('Packages search page') %]</a></p>
 
 <hr class="hidecss">
 <div id="fineprint" class="bordertop">
diff --git a/templates/html/head.tmpl b/templates/html/head.tmpl
index 362a32e..9aed6a2 100644
--- a/templates/html/head.tmpl
+++ b/templates/html/head.tmpl
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html lang="[% lang %]">
+<html lang="[% po_lang %]">
 <head>
 <title>[% organisation %] -- [% title_tag %]</title>
 <link rev="made" href="mailto:[% admin.mail %]">
@@ -61,7 +61,7 @@
 
 <p class="hidecss"><a href="#inner">[% g('skip the navigation') %]</a></p>
 <div id="pnavbar">
- &gt;&gt; <a href="[% homepage %]" title="[% g('%s Homepage', organisation) %]">[% organisation %]</a>
+ &gt;&gt; <a href="[% project_homepage %]" title="[% g('%s Homepage', organisation) %]">[% organisation %]</a>
  &gt;&gt; <a href="[% packages_homepage %]" title="[% g('%s Packages Homepage', organisation) %]">[% g('Packages') %]</a>
 [% FOREACH n IN navigation %]
  &gt;&gt; [% IF n.url %]<a href="[% n.url %]" [% IF n.title %]title="[% n.title %]"[% END %]>[% n.name %]</a>[% ELSE %][% n.name %][% END %] 
diff --git a/templates/html/index.tmpl b/templates/html/index.tmpl
deleted file mode 100644
index cc20983..0000000
--- a/templates/html/index.tmpl
+++ /dev/null
@@ -1,58 +0,0 @@
-[% PROCESS 'config/archive_layout.tmpl' %]
-[% IF is_source;
-	title_common = category ? g('Source Packages in "%s", %s %s', suite, category.id, category.name)
-				: g('Source Packages in "%s"', suite);
-   ELSE;
-	title_common = category ? g('Software Packages in "%s", %s %s', suite, category.id, category.name)
-				: g('Software Packages in "%s"', suite);
-   END;
-
-   nav_arr = [ { prefix=>g('Distribution:'), title=>g('Overview over this suite'), url=>make_url('/','','suite',suite), name=>suite } ];
-   IF category;
-	nav_last = { prefix=>"$category.id:", name=>category.name };
-   ELSE;
-	nav_last = { name=>g('All Packages') };
-   END;
-   nav_arr.push( { name=>g('Source'),
-	           url=>make_url('/','','suite',suite,'source','source') } )
-	IF is_source;
-   nav_arr.push( nav_last );
-%]
-[% PROCESS 'html/head.tmpl' 
-	title_tag = title_common
-	page_title = title_common
-	keywords = "$suite, $category.name"
-	navigation = nav_arr
-%]
-
-[% FOREACH p IN packages %]
-  [% '<dl>' IF loop.first %]
-
-  [% BLOCK marker %] [<strong class="pmarker">[% text %]</strong>] [%- END %]
-  [% BLOCK markers %]
-    [% PROCESS marker text=p.section IF p.section != main_section %]
-    [% PROCESS marker text=p.archive IF p.archive != main_archive %]
-  [% END %]
-  [%- IF p.trans_desc.$lang;
-	sdesc = p.trans_desc.$lang;
-      ELSE;
-	sdesc = p.desc;
-      END -%]
-  [% IF p.providers.size %]
-    <dt><a href="[% p.name %]" id="[% p.name %]">[% p.name %]</a></dt>
-       <dd>[% g('virtual package provided by') %]
-	[% FOREACH provider IN p.providers %]<a href="../[% provider | uri %]">[% provider %]</a>
-	[%- ', ' UNLESS loop.last %][% END %]</dd>
-    [% IF p.versions.length %]
-      <dt><a href="[% p.name %]">[% p.name %]</a> ([% p.versions %])[% PROCESS markers %]</dt>
-         <dd>[% sdesc | html %]</dd>
-    [% END %]
-  [% ELSE %]
-    <dt><a href="[% p.name %]" id="[% p.name %]">[% p.name %]</a> ([% p.versions %])[% PROCESS markers %]</dt>
-       <dd>[% sdesc | html %]</dd>
-  [% END %]
-
-  [% '</dl>' IF loop.last %]
-[% END %]
-
-[%- PROCESS 'html/foot.tmpl' -%]
diff --git a/templates/html/index_foot.tmpl b/templates/html/index_foot.tmpl
new file mode 100644
index 0000000..23db4cf
--- /dev/null
+++ b/templates/html/index_foot.tmpl
@@ -0,0 +1,3 @@
+</dl>
+
+[%- PROCESS 'html/foot.tmpl' -%]
diff --git a/templates/html/index_head.tmpl b/templates/html/index_head.tmpl
new file mode 100644
index 0000000..43fe97c
--- /dev/null
+++ b/templates/html/index_head.tmpl
@@ -0,0 +1,27 @@
+[% IF is_source;
+	title_common = category ? g('Source Packages in "%s", %s %s', suite, g(category.id), category.name)
+				: g('Source Packages in "%s"', suite);
+   ELSE;
+	title_common = category ? g('Software Packages in "%s", %s %s', suite, g(category.id), category.name)
+				: g('Software Packages in "%s"', suite);
+   END;
+
+   nav_arr = [ { prefix=>g('Distribution:'), title=>g('Overview over this suite'), url=>make_url('/','','suite',suite), name=>suite } ];
+   IF category;
+	nav_last = { prefix=>g(category.id) _ ":", name=>category.name };
+   ELSE;
+	nav_last = { name=>g('All Packages') };
+   END;
+   nav_arr.push( { name=>g('Source'),
+	           url=>make_url('/','','suite',suite,'source','source') } )
+	IF is_source;
+   nav_arr.push( nav_last );
+%]
+[% PROCESS 'html/head.tmpl' 
+	title_tag = title_common
+	page_title = title_common
+	keywords = "$suite, $category.name"
+	navigation = nav_arr
+%]
+
+<dl>
diff --git a/templates/html/menu.inc b/templates/html/menu.inc
deleted file mode 100644
index aa9c43d..0000000
--- a/templates/html/menu.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-[% BLOCK menuitem -%]
-  [&nbsp;[% prefix -%]
-  [%- IF url -%]
-    <a [% 'title="' _ title _ '"' IF title %] href="[% url %]">[% name %]</a>
-  [%- ELSE -%]
-   <strong>[% name %]</strong>
-  [%- END -%]
-  &nbsp;]
-[%- END -%]
-[% BLOCK marker %] [<strong class="pmarker">[% text %]</strong>] [%- END %]
diff --git a/templates/html/search.tmpl b/templates/html/search.tmpl
index f90586a..d28efc1 100644
--- a/templates/html/search.tmpl
+++ b/templates/html/search.tmpl
@@ -27,20 +27,47 @@
     }
    navigation = [ { name => g('Package Search Results') } ]
 -%]
+[%- PROCESS 'html/util.inc' -%]
 
 <div id="psearchsug">
 [% UNLESS results %]
-	<p>[% g('You can try a different search on the <a href="%s#search_packages">Packages search page</a>.',
-		searchformurl) %]</p>
-	
 	[% IF opts.searchon != "names" && opts.exact %]
 	<p>[% g('You have searched only for words exactly matching your keywords. You can try to search <a href="%s">allowing subword matching</a>.',
 		make_search_url('',"keywords=$keyword_esc",'exact',0) ) %]</p>
 	[% END %]
 [% END %]
+
+<p>[% g('Search in specific suite:') %]
+[% FOREACH s IN all_suites %]
+	[% IF s != suite_str %]
+	[<a href="[% make_search_url('',"keywords=$keyword_esc",'suite',s) %]">[% s %]</a>]
+	[% ELSE %]
+	[[% s %]]
+	[% END %]
+[% END %]
+[% IF search_suites.size == 1 %]
+<p>[% g('Search in <a href="%s">all suites</a>',
+	make_search_url('',"keywords=$keyword_esc",'suite','all')) %]
+[% END %]
+
+<p>[% g('Limit search to a specific architecture:') %]
+[% FOREACH a IN all_architectures %]
+   [% IF a != arch_str %]
+   [<a href="[% make_search_url('',"keywords=$keyword_esc",'arch',a) %]">[% a %]</a>]
+   [% ELSE %]
+   [[% a %]]
+   [% END %]
+[% END %]
+[% IF search_architectures.size == 1 %]
+<p>[% g('Search in <a href="%s">all architectures</a>',
+	make_search_url('',"keywords=$keyword_esc",'arch','any')) %]
+[% END %]
+
+</div>
+
 [% IF opts.searchon == "names" && non_results %]
-<p>[% g('<a href="%s">%u</a> results have not been displayed due to the search parameters.',
-	"$search_url$keyword_esc", non_results) %]</p>
+<p>[% g('<a href="%s">Some</a> results have not been displayed due to the search parameters.',
+	"$search_url$keyword_esc") %]</p>
 [% END %]
 </div>
 
@@ -48,9 +75,9 @@
 
 <div id="psearchres">
 
-[% suite_wording = suite_enc.match("^(default|all)$") ? g("all suites") : g("suite(s) <em>$suite_enc</em>");
-   section_wording = (section_enc == 'all') ? g("all sections") : g("section(s) <em>$section_enc</em>");
-   arch_wording = (architectures_enc == 'any') ? g("all architectures") : g("architecture(s) <em>$architectures_enc</em>");
+[% suite_wording = suite_enc.match("^(default|all)$") ? g("all suites") : g("suite(s) <em>%s</em>", suite_enc);
+   section_wording = (section_enc == 'all') ? g("all sections") : g("section(s) <em>%s</em>", section_enc);
+   arch_wording = (architectures_enc == 'any') ? g("all architectures") : g("architecture(s) <em>%s</em>", architectures_enc);
     IF opts.searchon == "names";
 	source_wording = opts.source ? g("source packages") : g("packages");
 	msg = g("You have searched for %s that names contain <em>%s</em> in %s, %s, and %s.",
@@ -71,11 +98,16 @@
 [% IF opts.searchon != "names" %]
 <p id="psearchtoomanyhits">[% g("Note that this only shows the best matches, sorted by relevance. If the first few packages don't match what you searched for, try using more keywords or alternative keywords.") %]</p>
 [% ELSE %]
-<p id="psearchtoomanyhits">[% g('Your search was too wide so we will only display exact matches. At least <em>%u</em> results have been omitted and will not be displayed. Please consider using a longer keyword or more keywords.',
-	too_many_hits) %]</p>
+<p id="psearchtoomanyhits">
+[%- IF results %]
+[% g("Your keyword was too generic, for optimizing reasons some results might have been suppressed.<br>Please consider using a longer keyword or more keywords.") %]
+[%- ELSE -%]
+[% g("Your keyword was too generic.<br>Please consider using a longer keyword or more keywords.") %]
+[% END -%]
+</p>
 [% END; END %]
 
-[% UNLESS results %]
+[% UNLESS results || too_many_hits %]
 <p id="psearchnoresult">[% g('Sorry, your search gave no results') %]</p>
 [% END %]
 
@@ -88,7 +120,9 @@
   [% FOREACH s IN suites;
 	suite = s.suite %]
     <li class="[% suite %]"><a class="resultlink" href="[% make_url(pkg,'','suite',suite,'arch','','section','') %]">[% suite %]
-	[%- ' (' _ suite_aliases.$suite _ ')' IF suite_aliases.$suite %]</a>[% ' (' _ s.subsection _ ')' IF s.subsection %]: [% IF s.trans_desc.$lang; s.trans_desc.$lang | html; ELSE; s.desc | html; END %]  [%- IF s.section && s.section != main_section %] [<strong class="pmarker">[% s.section %]</strong>][% END %]
+	[%- ' (' _ suite_aliases.$suite _ ')' IF suite_aliases.$suite %]</a>[% ' (' _ s.subsection _ ')' IF s.subsection %]:
+	[% PROCESS desc_i18n trans_desc=s.trans_desc desc=s.desc %]
+	[%- PROCESS marker text=s.section IF s.section && s.section != main_section %]
     [% FOREACH s.versions %]
       <br>[% version %] [%- IF archive != main_archive %] [<strong class="pmarker">[% archive %]</strong>][% END %]: [% architectures.join(' ') %]
     [% END %]
@@ -108,11 +142,10 @@
      [% origin = (archive == main_archive) ? suite : "$suite/$archive";
 	js_id = string2id("$pkg$suite$archive")  %]
     <li><a class="resultlink" href="[% make_url(pkg,'','source','source','suite',origin,'section','','arch','') %]">[% origin %]</a> ([% subsection %]): [% version %]
-      [%- IF section %] [<strong class="pmarker">[% section %]</strong>][% END %]
-      [%- IF real_archive %] [<strong class="pmarker">[% real_archive %]</strong>][% END %]
+      [%- PROCESS marker text=section IF section %] [%- PROCESS marker text=real_archive IF real_archive %]
     <br>[% g('Binary packages:') %] <span id="js_[% js_id %]" class="p_js_elem"></span> <span id="html_[% js_id %]" class="binaries">[% FOREACH binary IN binaries.sort %]<a href="[% make_url(binary,'','source','','suite',suite,'archive',archive,'arch','','archive','') %]">[% binary %]</a>[% ', ' UNLESS loop.last %][% END %]</span>
 	[% IF binaries.size > 10 %]
-	<script type="text/javascript">init_toggle_elem("[% js_id %]","[% g('%u binary packages', binaries.size) %])</script>
+	<script type="text/javascript">init_toggle_elem("[% js_id %]","[% g('show %u binary packages', binaries.size) %]","[% g('hide %u binary packages', binaries.size) %]")</script>
 	[% END %]
     </li>
   [% END %]
diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index bfd3c78..b8cc43e 100644
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -16,7 +16,8 @@
     nav_arr.push( { prefix=>g('Section:'), title=>g('All packages in this section'), url=>make_url("$subsection/"), name=>subsection } );
     nav_arr.push( { prefix=>g('Package:'), name=>pkg } ); -%]
 [% desclang = 'en';
-   SET desclang = lang IF desc.$lang.long %]
+   SET desclang = po_lang IF desc.$po_lang.long;
+   SET desclang = ddtp_lang IF desc.$ddtp_lang.long %]
 [%- PROCESS 'html/head.tmpl'
    title_tag = is_source ? g('Details of source package %s in %s', pkg, suite)
 	                 : g('Details of package %s in %s', pkg, suite)
@@ -29,7 +30,7 @@
   navigation = nav_arr
 -%]
 <!-- show.tmpl -->
-[% PROCESS 'html/menu.inc' %]
+[% PROCESS 'html/util.inc' %]
 [% FOREACH s IN suites %]
    [% '<div id="pothers">' IF loop.first %]
    [%- IF s == suite -%]
@@ -62,7 +63,7 @@
 [% UNLESS is_virtual %]
 <div id="pmoreinfo">
 <h2>[% g('Links for %s', pkg) %]</h2>
-<h3>[% g('Debian Resources:') %]</h3>
+<h3>[% g('%s Resources:', organisation) %]</h3>
 <ul>
 <li><a href="[% (is_source ? src_bugs_url : bugs_url) _ pkg %]">[% g('Bug Reports') %]</a></li>
 
@@ -114,6 +115,8 @@
 	mailarchiveurl = 'http://lists.debian.org/' _ matches.0 _ '/';
   ELSIF (matches = mail.match('^(.*)@lists\.alioth\.debian\.org$'));
 	mailarchiveurl = 'http://lists.alioth.debian.org/pipermail/' _ matches.0 _ '/';
+  ELSIF (matches = mail.match('^(.*)@lists\.ubuntu\.com$'));
+  	mailarchiveurl = 'http://lists.ubuntu.com/archives/' _ matches.0 _ '/';
   END -%]
   [%- '<ul>' IF loop.first -%]
 	<li><a href="mailto:[% mail %]">[% name | html %]</a>
@@ -166,13 +169,14 @@
 
 [% IF desc %]
 <div id="pdesctab">
-<div id="pdesc">
 [% UNLESS is_virtual %]
+<div id="pdesc" [% "lang=\"$desclang\"" IF desclang != po_lang %]>
 	[% IF desc.$desclang.short %]
 	<h2>[% desc.$desclang.short %]</h2>
 	<p>[% desc.$desclang.long %]
 	[% END %]
 [% ELSE %]
+<div id="pdesc">
 	<p>[% g('This is a <em>virtual package</em>. See the <a href="%s">Debian policy</a> for a <a href="%sch-binary.html#s-virtual_pkg">definition of virtual packages</a>.',
 		policy_url, policy_url) %]</p>
 [% END %]
@@ -183,10 +187,10 @@
     <div id="ptags"><p>
     <a href="[% tags_url %]edit.html?pkg=[% pkg | uri %]">[% g('Tags') %]</a>:
   [%- END %]
-  [% facet = tag.0; lfacet = "$facet-$lang"; 
+  [% facet = tag.0; lfacet = "$facet-$po_lang"; 
      facet_name = debtags_voc.$lfacet;
      SET facet_name = debtags_voc.$facet UNLESS facet_name;
-     tag_id = "$tag.0::$tag.1"; ltag = "$tag_id-$lang";
+     tag_id = "$tag.0::$tag.1"; ltag = "$tag_id-$po_lang";
      tag_name = debtags_voc.$ltag;
      SET tag_name = debtags_voc.$tag_id UNLESS tag_name;
    %]
@@ -206,7 +210,7 @@
 [% FOREACH p IN providers %]
   [% IF loop.first %]<div id="pdeps"><h2>[% g('Packages providing %s', pkg) %]</h2><dl>[% END %]
     <dt>[% IF p.available %]<a href="[% make_url(p.name,'','source','') %]">[% p.name %]</a>[% ELSE; p.name; END %]</dt>
-    <dd>[% IF p.trans_desc.$lang; p.trans_desc.$lang | html; ELSE; p.desc | html; END %]</dd>
+    [% PROCESS desc_i18n_dd trans_desc=p.trans_desc desc=p.desc %]
   [% '</dl></div>' IF loop.last %]
 [% END %]
 </div> <!-- pdesctab -->
@@ -215,7 +219,7 @@
 [% FOREACH b IN binaries %]
   [% IF loop.first %]<div id="pbinaries">[% g('The following binary packages are built from this source package:') %]<dl>[% END %]
     <dt>[% IF b.available %]<a href="[% make_url(b.name,'','source','') %]">[% b.name %]</a>[% ELSE; b.name; END %]</dt>
-    <dd>[% IF b.trans_desc.$lang; b.trans_desc.$lang | html; ELSE; b.desc | html; END %]</dd>
+    [% PROCESS desc_i18n_dd trans_desc=b.trans_desc desc=b.desc %]
   [% '</dl></div>' IF loop.last %]
 [% END %]
 
@@ -246,7 +250,7 @@
 	[% ' (' _ version _ ')' IF version %]
         [% ' [' _ arch_str _ ']' IF arch_str %]</dt>
       [%- IF !is_old_pkgs -%]
-        <dd>[% IF trans_desc.$lang; trans_desc.$lang | html; ELSE; desc | html; END -%]
+        [% PROCESS desc_i18n_dd no_end_tag=1 trans_desc=trans_desc desc=desc -%]
         [%- IF providers.pkgs.size > 0 -%]
 	  [% IF providers.also;
 		'<br>' _ g('also a virtual package provided by');
@@ -256,7 +260,7 @@
 	  [% js_id = name %]
 	    <span id="js_[% js_id %]" class="p_js_elem"></span> <span id="html_[% js_id %]">[% FOREACH provider IN providers.pkgs.sort %]<a href="[% make_url(provider,'','suite',suite,'source','') %]">[% provider %]</a>[% ', ' UNLESS loop.last %][% END %]</span>
 	[% IF providers.pkgs.size > 10 %]
-	<script type="text/javascript">init_toggle_elem("[% js_id %]",[% g('%u providing packages', providers.pkgs.size) %]</script>
+	<script type="text/javascript">init_toggle_elem("[% js_id %]","[% g('show %u providing packages', providers.pkgs.size) %]", "[% g('hide %u providing packages', providers.pkgs.size) %]")</script>
 	[% END %]
         [% END %]
         </dd>
diff --git a/templates/html/suite_index.tmpl b/templates/html/suite_index.tmpl
index baf70e4..d42c528 100644
--- a/templates/html/suite_index.tmpl
+++ b/templates/html/suite_index.tmpl
@@ -6,7 +6,7 @@
 	keywords = suite
 	navigation = nav_arr
 %]
-[% PROCESS 'html/menu.inc' %]
+[% PROCESS 'html/util.inc' %]
 [% FOREACH s IN suites %]
    [% '<div id="pothers">' IF loop.first %]
    [%- IF s == suite -%]
diff --git a/templates/html/util.inc b/templates/html/util.inc
new file mode 100644
index 0000000..731b8ae
--- /dev/null
+++ b/templates/html/util.inc
@@ -0,0 +1,32 @@
+[% BLOCK menuitem -%]
+  [&nbsp;[% prefix -%]
+  [%- IF url -%]
+    <a [% 'title="' _ title _ '"' IF title %] href="[% url %]">[% name %]</a>
+  [%- ELSE -%]
+   <strong>[% name %]</strong>
+  [%- END -%]
+  &nbsp;]
+[%- END -%]
+[% BLOCK marker %] [<strong class="pmarker">[% text %]</strong>] [%- END %]
+[%- BLOCK desc_i18n;
+   IF trans_desc.$ddtp_lang;
+      trans_desc.$ddtp_lang | html;
+   ELSIF trans_desc.$po_lang;
+      trans_desc.$po_lang | html;
+   ELSE;
+      desc | html;
+   END;
+END -%]
+[%- BLOCK desc_i18n_dd;
+   IF trans_desc.$ddtp_lang;
+      '<dd lang="' _ ddtp_lang _ '">';
+      trans_desc.$ddtp_lang | html;
+   ELSIF trans_desc.$po_lang;
+      '<dd>';
+      trans_desc.$po_lang | html;
+   ELSE;
+      '<dd lang="en">';
+      desc | html;
+   END;
+   '</dd>' UNLESS no_end_tag;
+END -%]
diff --git a/templates/rss/newpkg.tmpl b/templates/rss/newpkg.tmpl
index c95ee53..378cca3 100644
--- a/templates/rss/newpkg.tmpl
+++ b/templates/rss/newpkg.tmpl
@@ -24,7 +24,7 @@
 	suite, organisation);
     END; -%]
 </description>
-<dc:language>[% lang %]</dc:language>
+<dc:language>[% po_lang %]</dc:language>
 <dc:rights>[% g('Copyright ©') %] [% timestamp.year %], [% copyright.name %]</dc:rights>
 <dc:date>[% rss_timestamp %]</dc:date>
 <dc:publisher>[% contact.mail %]</dc:publisher>
diff --git a/templates/txt/index.tmpl b/templates/txt/index.tmpl
deleted file mode 100644
index 226f03e..0000000
--- a/templates/txt/index.tmpl
+++ /dev/null
@@ -1,20 +0,0 @@
-[%- PROCESS 'config/archive_layout.tmpl' -%]
-[% g('All %s Packages in "%s"', organisation, suite) %]
-
-[% g('Generated:') _ ' ' _ timestamp.string %]
-[% g('Copyright ©') _ ' ' _ copyright.years _ ' ' _ copyright.name %];
-[% g('See <URL:%s> for the license terms.', license.url) %]
-
-[% FOREACH packages -%]
-  [%- BLOCK marker %] [[% text %]][% END -%]
-  [%- BLOCK markers -%]
-    [%- PROCESS marker text=section IF section != main_section -%]
-    [%- PROCESS marker text=archive IF archive != main_archive -%]
-  [%- END -%]
-  [%- IF providers.size %]
-[% name %] [% g('virtual package provided by') _ ' ' _ providers.join(', ') %]
-  [%- END -%]
-  [%- IF versions %]
-[% name %] ([% versions %])[% PROCESS markers %] [% desc %]
-  [%- END -%]
-[%- END %]
diff --git a/templates/txt/index_foot.tmpl b/templates/txt/index_foot.tmpl
new file mode 100644
index 0000000..e69de29
diff --git a/templates/txt/index_head.tmpl b/templates/txt/index_head.tmpl
new file mode 100644
index 0000000..7fd13a3
--- /dev/null
+++ b/templates/txt/index_head.tmpl
@@ -0,0 +1,5 @@
+[% g('All %s Packages in "%s"', organisation, suite) %]
+
+[% g('Generated:') _ ' ' _ timestamp.string %]
+[% g('Copyright ©') _ ' ' _ copyright.years _ ' ' _ copyright.name %];
+[% g('See <URL:%s> for the license terms.', license.url) %]