From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sat, 16 Feb 2008 00:55:26 +0000 (+0100)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=4c6c02445d6bd955db66d82946b8c955b1f43615;hp=3cf32c32f93178b8645cb641b57e24c724e6cc13;p=deb%2Fpackages.git

Merge branch 'master' into ubuntu-master

Conflicts:

	cron.d/100syncarchive
	cron.d/300maintainerdb
	templates/config.tmpl
	templates/config/mirrors.tmpl
---

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 05123e7..811a3e5 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,60 +43,152 @@ 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,
-			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]),
-		};
-	    }
-	}
+	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";
+    }
+}
 
-	$template->page( 'suite_index', \%content,
-			 "$wwwdir/$key/index.$lang.html.new");
-	rename( "$wwwdir/$key/index.$lang.html.new",
-		"$wwwdir/$key/index.$lang.html" );
+sub close_file {
+    my ($key, $vars, $file) = @_;
 
-	$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" );
+    $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");
 }
 
-print "collecting package info ...\n";
-my %allpkgs;
-while (my ($pkg, $data) = each %packages) {
+
+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");
+}
+
+
+print "write headers ...\n";
+foreach my $source (("", "source/")) {
+    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 '-';
+	    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 }});
+	}
+    }
+}
+
+
+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 );
@@ -114,15 +209,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' );
@@ -134,25 +230,90 @@ 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);
-
 print "collecting source package info ...\n";
-my %allsrcpkgs;
-while (my ($pkg, $data) = each %src_packages) {
-    my %pkg;    
-    foreach (split /\000/o, $data||'') {
+$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,
@@ -165,101 +326,78 @@ 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";
+print "write footers ...\n";
+foreach my $source (("", "source/")) {
     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 = ( po_lang => $lang, ddtp_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" );
-	    }
+	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 }});
 	}
     }
 }
+
+__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..f7fa9a4 100755
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@ -140,8 +140,8 @@ 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-.*)$/) {
+	    #FIXME: hardcoded archs. (debports has no contrib/non-free)
+	    if ($arch !~ m/^kfreebsd-.*$/) {
 		system("ln", "-sf", $filelist_db,
 		       "$DBDIR/filelists_${suite}_all.db") == 0
 			   or die "Oops";
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/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/500update_po b/cron.d/500update_po
index a76f321..754951d 100755
--- a/cron.d/500update_po
+++ b/cron.d/500update_po
@@ -31,7 +31,8 @@ templates/html/error.tmpl
 templates/html/filelist.tmpl
 templates/html/foot.tmpl
 templates/html/head.tmpl
-templates/html/index.tmpl
+templates/html/index_head.tmpl
+templates/html/index_foot.tmpl
 templates/html/messages.tmpl
 templates/html/newpkg.tmpl
 templates/html/search.tmpl
@@ -42,7 +43,8 @@ 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"
 
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/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 9f844f2..75264a0 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -315,6 +315,7 @@ sub do_dispatch {
 
     #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 3129b0b..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};
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 39af897..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: 2008-02-01 03:55+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:232
+#: 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:244
+#: bin/create_index_pages:169 bin/create_index_pages:390
 msgid "Subsection"
 msgstr "Unterbereich"
 
-#: bin/create_index_pages:256
+#: bin/create_index_pages:176 bin/create_index_pages:397
 msgid "Priority"
 msgstr "Priorität"
 
-#: lib/Packages/Dispatcher.pm:310
+#: 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"
@@ -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 b432527..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: 2008-02-01 03:55+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:232
+#: 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:244
+#: bin/create_index_pages:169 bin/create_index_pages:390
 msgid "Subsection"
 msgstr "Alaosasto"
 
-#: bin/create_index_pages:256
+#: bin/create_index_pages:176 bin/create_index_pages:397
 msgid "Priority"
 msgstr "Tärkeys"
 
-#: lib/Packages/Dispatcher.pm:310
+#: lib/Packages/Dispatcher.pm:319
 msgid "requested format not available for this document"
 msgstr "pyydetty muoto ei ole käytettävissä tälle asiakirjalle"
 
@@ -74,7 +78,7 @@ msgstr "useampi kuin yksi jakelu määritetty show_static-metodille (%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"
@@ -152,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 3060bb0..297112b 100644
--- a/po/pdo.fr.po
+++ b/po/pdo.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-01 03:55+0100\n"
+"POT-Creation-Date: 2008-02-08 17:22+0100\n"
 "PO-Revision-Date: 2005-10-25 17:52+0200\n"
 "Last-Translator: Guilhelm Panaget <guilhelm.panaget@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -14,23 +14,28 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: bin/create_index_pages:232
+#: 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:244
+#: bin/create_index_pages:169 bin/create_index_pages:390
 #, fuzzy
 #| msgid "Section:"
 msgid "Subsection"
 msgstr "Section&nbsp;:"
 
-#: bin/create_index_pages:256
+#: bin/create_index_pages:176 bin/create_index_pages:397
 msgid "Priority"
 msgstr "Priorité"
 
-#: lib/Packages/Dispatcher.pm:310
+#: 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 ""
@@ -161,251 +166,263 @@ msgid "package has bad maintainer field"
 msgstr ""
 
 #, 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."
-
-#~ msgid "Other Packages Related to %s"
-#~ msgstr "Autres paquets associés à %s"
+#~ "Consulter les <a href=\"%s\">informations de développement de %s</a>."
 
-#~ msgid "Download %s\n"
-#~ msgstr "Télécharger %s\n"
+#~ msgid " and %s are responsible for this Debian package."
+#~ msgstr " et %s sont responsables 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 "%s is responsible for this Debian package."
+#~ msgstr "%s est responsable de ce paquet Debian."
 
-#~ msgid "Download for all available architectures"
-#~ msgstr "Télécharger pour toutes les architectures proposées"
+#~ msgid "View the <a href=\"%s\">copyright file</a>"
+#~ msgstr "Consulter le <a href=\"%s\">fichier de licence</a>"
 
-#~ msgid "Architecture"
-#~ msgstr "Architecture"
+#~ msgid "View the <a href=\"%s\">Debian changelog</a>"
+#~ msgstr "Consulter le <a href=\"%s\">journal des modifications Debian</a>"
 
-#~ msgid "Version"
-#~ msgstr "Version"
+#~ msgid "Not found"
+#~ msgstr "Introuvable"
 
-#~ 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 ""
 #~ "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 a4c9152..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: 2008-02-01 03:55+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:232
+#: 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:244
+#: bin/create_index_pages:169 bin/create_index_pages:390
 msgid "Subsection"
 msgstr ""
 
-#: bin/create_index_pages:256
+#: bin/create_index_pages:176 bin/create_index_pages:397
 msgid "Priority"
 msgstr ""
 
-#: lib/Packages/Dispatcher.pm:310
+#: 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 ""
diff --git a/po/pdo.ja.po b/po/pdo.ja.po
index 9355ff7..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: 2008-02-01 03:55+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:232
+#: 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:244
+#: bin/create_index_pages:169 bin/create_index_pages:390
 msgid "Subsection"
 msgstr "サブセクション"
 
-#: bin/create_index_pages:256
+#: bin/create_index_pages:176 bin/create_index_pages:397
 msgid "Priority"
 msgstr "優先度"
 
-#: lib/Packages/Dispatcher.pm:310
+#: 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"
@@ -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 d71e603..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: 2008-02-01 03:55+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,19 +17,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: bin/create_index_pages:232
+#: 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:244
+#: bin/create_index_pages:169 bin/create_index_pages:390
 msgid "Subsection"
 msgstr "Subsectie"
 
-#: bin/create_index_pages:256
+#: bin/create_index_pages:176 bin/create_index_pages:397
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: lib/Packages/Dispatcher.pm:310
+#: lib/Packages/Dispatcher.pm:319
 msgid "requested format not available for this document"
 msgstr ""
 
@@ -76,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 ""
diff --git a/po/pdo.pot b/po/pdo.pot
index 8b7c23b..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: 2008-02-01 03:55+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 ""
@@ -136,18 +136,22 @@ msgstr ""
 msgid "package has bad maintainer field"
 msgstr ""
 
-#: lib/Packages/Dispatcher.pm:310
+#: lib/Packages/Dispatcher.pm:319
 msgid "requested format not available for this document"
 msgstr ""
 
-#: bin/create_index_pages:232
+#: 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:244
+#: bin/create_index_pages:169 bin/create_index_pages:390
 msgid "Subsection"
 msgstr ""
 
-#: bin/create_index_pages:256
+#: 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 04a5d95..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: 2008-02-01 03:55+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"
@@ -17,19 +17,23 @@ 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:232
+#: 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:244
+#: bin/create_index_pages:169 bin/create_index_pages:390
 msgid "Subsection"
 msgstr "Подсекция"
 
-#: bin/create_index_pages:256
+#: bin/create_index_pages:176 bin/create_index_pages:397
 msgid "Priority"
 msgstr "Приоритет"
 
-#: lib/Packages/Dispatcher.pm:310
+#: lib/Packages/Dispatcher.pm:319
 msgid "requested format not available for this document"
 msgstr "запрошенный формат недоступен для этого документа"
 
@@ -76,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"
diff --git a/po/pdo.sv.po b/po/pdo.sv.po
index 160d43c..33f5551 100644
--- a/po/pdo.sv.po
+++ b/po/pdo.sv.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: packages.git\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-01 03:55+0100\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"
@@ -10,19 +10,23 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: bin/create_index_pages:232
+#: 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:244
+#: bin/create_index_pages:169 bin/create_index_pages:390
 msgid "Subsection"
 msgstr "Undersektion"
 
-#: bin/create_index_pages:256
+#: bin/create_index_pages:176 bin/create_index_pages:397
 msgid "Priority"
 msgstr "Prioritet"
 
-#: lib/Packages/Dispatcher.pm:310
+#: lib/Packages/Dispatcher.pm:319
 msgid "requested format not available for this document"
 msgstr "angivet format inte tillgängligt för dokumentet"
 
@@ -69,7 +73,7 @@ msgstr "mer än en svit angavs för show_static (%s)"
 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:75
+#: lib/Packages/DoIndex.pm:70
 #, perl-format
 msgid "couldn't read index file %s: %s"
 msgstr "kunde inte läsa indexfilen %s: %s"
@@ -147,8 +151,11 @@ msgstr "Inte tillgängligt"
 msgid "package has bad maintainer field"
 msgstr "paketet har felaktigt ansvarigfält"
 
-#~ 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)"
+
+#~ msgid "%s set more than once in path"
+#~ msgstr "%s satt fler än en gång i sökvägen"
 
 #~ msgid ""
 #~ "We're supposed to display the homepage here, instead of getting dispatch."
@@ -156,8 +163,5 @@ msgstr "paketet har felaktigt ansvarigfält"
 #~ 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"
-
-#~ msgid "two or more packages specified (%s)"
-#~ msgstr "två eller flera paket angavs (%s)"
+#~ 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 2a81576..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: 2008-02-01 03:55+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:232
+#: 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:244
+#: bin/create_index_pages:169 bin/create_index_pages:390
 #, fuzzy
 #| msgid "Section:"
 msgid "Subsection"
 msgstr "Розділ:"
 
-#: bin/create_index_pages:256
+#: bin/create_index_pages:176 bin/create_index_pages:397
 msgid "Priority"
 msgstr "Приоритет"
 
-#: lib/Packages/Dispatcher.pm:310
+#: 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 ""
@@ -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 58857e7..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: 2008-02-01 03:55+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,19 +10,23 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: bin/create_index_pages:232
+#: 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:244
+#: bin/create_index_pages:169 bin/create_index_pages:390
 msgid "Subsection"
 msgstr "子版面"
 
-#: bin/create_index_pages:256
+#: bin/create_index_pages:176 bin/create_index_pages:397
 msgid "Priority"
 msgstr "优先级"
 
-#: lib/Packages/Dispatcher.pm:310
+#: lib/Packages/Dispatcher.pm:319
 msgid "requested format not available for this document"
 msgstr "要求的格式在此文档中暂时不可用"
 
@@ -69,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"
diff --git a/po/templates.de.po b/po/templates.de.po
index 32a2f89..1a95d51 100644
--- a/po/templates.de.po
+++ b/po/templates.de.po
@@ -10,34 +10,33 @@ 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 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:153
 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:158
 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:159
 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:329
 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,7 +487,7 @@ msgstr "Ergebnisse der Debian-Paketsuche -- %s"
 msgid "Package Search Results"
 msgstr "Ergebnisse der Debian-Paketsuche"
 
-#: templates/html/search.tmpl:34
+#: 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>."
@@ -501,23 +495,23 @@ 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:39
+#: templates/html/search.tmpl:40
 msgid "Search in specific suite:"
 msgstr "Suche in bestimmter Suite:"
 
-#: templates/html/search.tmpl:48
+#: 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:52 templates/html/search_contents.tmpl:58
+#: 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:61 templates/html/search_contents.tmpl:63
+#: 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:68
+#: templates/html/search.tmpl:69
 msgid ""
 "<a href=\"%s\">Some</a> results have not been displayed due to the search "
 "parameters."
@@ -525,51 +519,51 @@ msgstr ""
 "<a href=\"%s\">Einige</a> Ergebnisse wurden aufgrund der Suchparameter nicht "
 "angezeigt."
 
-#: templates/html/search.tmpl:77
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr "allen Suites"
 
-#: templates/html/search.tmpl:77
+#: templates/html/search.tmpl:78
 msgid "suite(s) <em>%s</em>"
 msgstr "Suite(s) <em>%s</em>"
 
-#: templates/html/search.tmpl:78 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:78 templates/html/search_contents.tmpl:72
+#: 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:79 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:79 templates/html/search_contents.tmpl:73
+#: 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:81
+#: templates/html/search.tmpl:82
 msgid "packages"
 msgstr "Paketen"
 
-#: templates/html/search.tmpl:81
+#: templates/html/search.tmpl:82
 msgid "source packages"
 msgstr "Quellcode-Paketen"
 
-#: templates/html/search.tmpl:82
+#: 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:85
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr " (enthält Teilwortabgleich)"
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:87
+#: templates/html/search.tmpl:88
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
@@ -577,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:93
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr "<strong>%u</strong> passende Pakete gefunden."
 
-#: templates/html/search.tmpl:98
+#: 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 "
@@ -591,7 +585,7 @@ msgstr ""
 "Relevanz. Falls die ersten paar Pakete nicht auf Ihre Suche passen, "
 "versuchen Sie, mehr oder andere Suchbegriffe zu verwenden."
 
-#: templates/html/search.tmpl:102
+#: 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."
@@ -600,7 +594,7 @@ msgstr ""
 "einige Ergebnisse unterdrückt sein.<br />Bitte verwenden Sie ein längeres "
 "oder weitere Suchbegriffe."
 
-#: templates/html/search.tmpl:104
+#: templates/html/search.tmpl:105
 msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."
@@ -608,39 +602,39 @@ msgstr ""
 "Ihr Schlüsselwort war zu allgemein.<br />Bitte verwenden Sie ein längeres "
 "oder weitere Suchbegriffe."
 
-#: templates/html/search.tmpl:110 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:117
+#: templates/html/search.tmpl:118
 msgid "Package %s"
 msgstr "Paket %s"
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "also provided by:"
 msgstr "auch bereitgestellt durch:"
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr "bereitgestellt durch:"
 
-#: templates/html/search.tmpl:136
+#: templates/html/search.tmpl:139
 msgid "Source Package %s"
 msgstr "Quellcode-Paket %s"
 
-#: templates/html/search.tmpl:144
+#: templates/html/search.tmpl:146
 msgid "Binary packages:"
 msgstr "Binär-Pakete:"
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 msgid "hide %u binary packages"
 msgstr "verberge %u binäre Pakete"
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 msgid "show %u binary packages"
 msgstr "zeige %u binäre Pakete"
 
-#: templates/html/search.tmpl:156
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -708,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:329
 msgid "File"
 msgstr "Datei"
 
@@ -732,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
+#: templates/html/show.tmpl:66
 msgid "Debian Resources:"
 msgstr "Debian-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:121
 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:121
 msgid "QA Page"
 msgstr "QS-Seite"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Archive of the Maintainer Mailinglist"
 msgstr "Archiv der Betreuer-Mailingliste"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Mail Archive"
 msgstr "E-Mail-Archiv"
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:130
 msgid "External Resources:"
 msgstr "Externe Ressourcen:"
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:132
 msgid "Homepage"
 msgstr "Homepage"
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:138
 msgid "Similar packages:"
 msgstr "Ähnliche Pakete: "
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:154
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
 "distribution. That means it is likely unstable or buggy, and it may even "
@@ -849,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:178
 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 "
@@ -859,67 +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:186
 msgid "Tags"
 msgstr "Markierungen"
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:209
 msgid "Packages providing %s"
 msgstr "Pakete, die %s bereitstellen"
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:218
 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:227
 msgid "Other Packages Related to %s"
 msgstr "Andere Pakete mit Bezug zu %s"
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:229
 msgid "legend"
 msgstr "Legende"
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:231
 msgid "build-depends"
 msgstr "build-depends"
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:232
 msgid "build-depends-indep"
 msgstr "build-depends-indep"
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:234
 msgid "depends"
 msgstr "hängt ab von"
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:235
 msgid "recommends"
 msgstr "empfiehlt"
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:236
 msgid "suggests"
 msgstr "schlägt vor"
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:246
 msgid "or "
 msgstr "oder "
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:254
 msgid "also a virtual package provided by"
 msgstr "auch ein virtuelles Paket, bereitgestellt durch"
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:256
+msgid "virtual package provided by"
+msgstr "virtuelles Paket, bereitgestellt durch"
+
+#: templates/html/show.tmpl:261
 msgid "hide %u providing packages"
 msgstr "verberge %u bereitstellende Pakete"
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:261
 msgid "show %u providing packages"
 msgstr "zeige %u bereitstellende Pakete"
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:279
 msgid "Download %s"
 msgstr "%s herunterladen"
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:281
 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 "
@@ -929,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:282
 msgid "Download for all available architectures"
 msgstr "Download für alle verfügbaren Architekturen"
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:283
 msgid "Architecture"
 msgstr "Architektur"
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:284
 msgid "Version"
 msgstr "Version"
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:285
 msgid "Package Size"
 msgstr "Paketgröße"
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:286
 msgid "Installed Size"
 msgstr "Größe (installiert)"
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:287
 msgid "Files"
 msgstr "Dateien"
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:295
 msgid "(unofficial port)"
 msgstr "(inoffizielle Portierung)"
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:306 templates/html/show.tmpl:334
 msgid "%s&nbsp;kB"
 msgstr "%s&nbsp;kB"
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:309
 msgid "list of files"
 msgstr "Liste der Dateien"
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:311
 msgid "no current information"
 msgstr "keine aktuellen Informationen"
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:328
 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:329
 msgid "Size (in kB)"
 msgstr "Größe (in kB)"
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:347
 msgid ""
 "Debian Package Source Repository (<acronym title=\"Version Control System"
 "\">VCS</acronym>: <a href=\"%s\">%s</a>)"
@@ -985,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:351
 msgid "Debian Package Source Repository (Browsable)"
 msgstr "Quellcode-Depot des Debian-Pakets (browsable)"
 
@@ -1041,15 +1039,15 @@ 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."
 
diff --git a/po/templates.fi.po b/po/templates.fi.po
index 6fc4170..8a011c2 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:153
 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:158
 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:159
 #, 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:329
 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,144 +482,144 @@ msgstr "Pakettihaun tulokset -- %s"
 msgid "Package Search Results"
 msgstr "Pakettihaun tulokset"
 
-#: templates/html/search.tmpl:34
+#: 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:39
+#: templates/html/search.tmpl:40
 msgid "Search in specific suite:"
 msgstr ""
 
-#: templates/html/search.tmpl:48
+#: 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:52 templates/html/search_contents.tmpl:58
+#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
 msgid "Limit search to a specific architecture:"
 msgstr ""
 
-#: templates/html/search.tmpl:61 templates/html/search_contents.tmpl:63
+#: 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:68
+#: 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:77
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr "kaikki jakelut"
 
-#: templates/html/search.tmpl:77
+#: templates/html/search.tmpl:78
 msgid "suite(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:78 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:78 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
 msgid "section(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:79 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:79 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
 msgid "architecture(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:81
+#: templates/html/search.tmpl:82
 msgid "packages"
 msgstr "paketit"
 
-#: templates/html/search.tmpl:81
+#: templates/html/search.tmpl:82
 msgid "source packages"
 msgstr "lähdepaketit"
 
-#: templates/html/search.tmpl:82
+#: 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:85
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:87
+#: 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:93
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 
-#: templates/html/search.tmpl:98
+#: 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:102
+#: 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."
 msgstr ""
 
-#: templates/html/search.tmpl:104
+#: 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:110 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:117
+#: templates/html/search.tmpl:118
 msgid "Package %s"
 msgstr "Paketti %s"
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "also provided by:"
 msgstr "jonka toteuttaa myös:"
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr "jonka toteuttaa:"
 
-#: templates/html/search.tmpl:136
+#: templates/html/search.tmpl:139
 #, fuzzy
 msgid "Source Package %s"
 msgstr "Lähdepaketti"
 
-#: templates/html/search.tmpl:144
+#: templates/html/search.tmpl:146
 #, fuzzy
 msgid "Binary packages:"
 msgstr "näennäispaketti"
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 #, fuzzy
 msgid "hide %u binary packages"
 msgstr "Paketin koko"
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 #, fuzzy
 msgid "show %u binary packages"
 msgstr "Paketin koko"
 
-#: templates/html/search.tmpl:156
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -689,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:329
 msgid "File"
 msgstr "Tiedosto"
 
@@ -714,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
+#: templates/html/show.tmpl:66
 msgid "Debian Resources:"
 msgstr "Debian-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:121
 msgid "An overview over the maintainer's packages and uploads"
 msgstr ""
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:121
 msgid "QA Page"
 msgstr "Laadunvalvontasivu"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Archive of the Maintainer Mailinglist"
 msgstr ""
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Mail Archive"
 msgstr ""
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:130
 msgid "External Resources:"
 msgstr ""
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:132
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:138
 msgid "Similar packages:"
 msgstr "Samankaltaisia paketteja:"
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:154
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
 "distribution. That means it is likely unstable or buggy, and it may even "
@@ -836,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:178
 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 "
@@ -846,69 +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:186
 msgid "Tags"
 msgstr "Tagit"
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:209
 msgid "Packages providing %s"
 msgstr "Paketit, jotka toteuttavat paketin %s"
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:218
 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:227
 msgid "Other Packages Related to %s"
 msgstr "Muut pakettiin %s liittyvät paketit"
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:229
 msgid "legend"
 msgstr ""
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:231
 msgid "build-depends"
 msgstr ""
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:232
 msgid "build-depends-indep"
 msgstr ""
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:234
 msgid "depends"
 msgstr ""
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:235
 msgid "recommends"
 msgstr ""
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:236
 msgid "suggests"
 msgstr ""
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:246
 msgid "or "
 msgstr "tai "
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:254
 msgid "also a virtual package provided by"
 msgstr "myös näennäispaketti, jonka toteuttaa"
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:256
+msgid "virtual package provided by"
+msgstr "näennäispaketti, jonka toteuttaa"
+
+#: templates/html/show.tmpl:261
 #, fuzzy
 msgid "hide %u providing packages"
 msgstr "Paketin koko"
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:261
 #, fuzzy
 msgid "show %u providing packages"
 msgstr "Paketin koko"
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:279
 msgid "Download %s"
 msgstr "Imuroi %s"
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:281
 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,62 +915,62 @@ msgstr ""
 "Lisäksi se antaa tietoa paketin koosta sekä asennukseen tarvittavasta "
 "levytilasta."
 
-#: templates/html/show.tmpl:280
+#: templates/html/show.tmpl:282
 msgid "Download for all available architectures"
 msgstr "Imurointi kaikille saataville arkkitehtuureille"
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:283
 msgid "Architecture"
 msgstr "Arkkitehtuuri"
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:284
 msgid "Version"
 msgstr "Versio"
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:285
 msgid "Package Size"
 msgstr "Paketin koko"
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:286
 msgid "Installed Size"
 msgstr "Koko asennettuna"
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:287
 msgid "Files"
 msgstr "Tiedostot"
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:295
 msgid "(unofficial port)"
 msgstr "(epävirallinen siirros)"
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:306 templates/html/show.tmpl:334
 msgid "%s&nbsp;kB"
 msgstr "%s&nbsp;kt"
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:309
 msgid "list of files"
 msgstr "tiedostoluettelo"
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:311
 #, fuzzy
 msgid "no current information"
 msgstr "Lisätietoa paketista %s"
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:328
 msgid "Download information for the files of this source package"
 msgstr ""
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:329
 msgid "Size (in kB)"
 msgstr "Koko (kt)"
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:347
 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:351
 #, fuzzy
 msgid "Debian Package Source Repository (Browsable)"
 msgstr "Kaikki jakelun \"%s\" Debian-paketit"
@@ -1035,15 +1032,15 @@ 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>."
 
diff --git a/po/templates.fr.po b/po/templates.fr.po
index eb262c2..a411ad0 100644
--- a/po/templates.fr.po
+++ b/po/templates.fr.po
@@ -14,31 +14,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 ""
 
@@ -106,27 +105,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 ""
 
@@ -135,12 +134,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 "Distribution&nbsp;:"
 
 #: 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"
@@ -180,7 +179,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:153
 msgid "Experimental package"
 msgstr "Paquet «&nbsp;experimental&nbsp;»"
 
@@ -197,11 +196,11 @@ msgstr ""
 "instable ou bogué et peut éventuellement corrompre vos données. Son "
 "installation s'effectue donc à vos risques et périls."
 
-#: templates/html/download.tmpl:41 templates/html/show.tmpl:157
+#: templates/html/download.tmpl:41 templates/html/show.tmpl:158
 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:159
 #, fuzzy
 #| msgid ""
 #| "Warning: This package is intended for the use in building <a href="
@@ -268,7 +267,7 @@ msgstr ""
 msgid "Exact Size"
 msgstr "Taille du paquet"
 
-#: templates/html/download.tmpl:103 templates/html/show.tmpl:327
+#: templates/html/download.tmpl:103 templates/html/show.tmpl:329
 msgid "MD5 checksum"
 msgstr ""
 
@@ -344,7 +343,7 @@ msgstr ""
 "obtenir d'autres informations, référez-vous à la <a href=\"%s/contact\">page "
 "contact</a> de Debian."
 
-#: 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 "Taille du paquet"
 msgid "Packages"
 msgstr "Paquet&nbsp;: %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 "Software Packages in \"%s\""
 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\""
@@ -529,152 +522,152 @@ 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:34
+#: 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:39
+#: templates/html/search.tmpl:40
 msgid "Search in specific suite:"
 msgstr ""
 
-#: templates/html/search.tmpl:48
+#: 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:52 templates/html/search_contents.tmpl:58
+#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
 msgid "Limit search to a specific architecture:"
 msgstr ""
 
-#: templates/html/search.tmpl:61 templates/html/search_contents.tmpl:63
+#: 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 "Chercher d'<a href=\"%s\">autres versions de %s</a>"
 
-#: templates/html/search.tmpl:68
+#: 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:77
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr ""
 
-#: templates/html/search.tmpl:77
+#: templates/html/search.tmpl:78
 msgid "suite(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:78 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:78 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
 msgid "section(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:79 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:79 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
 msgid "architecture(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:81
+#: templates/html/search.tmpl:82
 #, fuzzy
 msgid "packages"
 msgstr "Taille du paquet"
 
-#: templates/html/search.tmpl:81
+#: templates/html/search.tmpl:82
 #, fuzzy
 msgid "source packages"
 msgstr "Paquet source"
 
-#: templates/html/search.tmpl:82
+#: 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:85
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:87
+#: 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:93
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 
-#: templates/html/search.tmpl:98
+#: 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:102
+#: 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."
 msgstr ""
 
-#: templates/html/search.tmpl:104
+#: 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:110 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:117
+#: templates/html/search.tmpl:118
 #, fuzzy
 msgid "Package %s"
 msgstr "Paquet&nbsp;: %s (%s)"
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 #, fuzzy
 msgid "also provided by:"
 msgstr "paquet virtuel"
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr ""
 
-#: templates/html/search.tmpl:136
+#: templates/html/search.tmpl:139
 #, fuzzy
 msgid "Source Package %s"
 msgstr "Paquet source"
 
-#: templates/html/search.tmpl:144
+#: templates/html/search.tmpl:146
 #, fuzzy
 msgid "Binary packages:"
 msgstr "paquet virtuel"
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 #, fuzzy
 msgid "hide %u binary packages"
 msgstr "Taille du paquet"
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 #, fuzzy
 msgid "show %u binary packages"
 msgstr "Taille du paquet"
 
-#: templates/html/search.tmpl:156
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -737,7 +730,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:329
 msgid "File"
 msgstr "Fichier"
 
@@ -765,127 +758,127 @@ msgstr "Tous les paquets de cette section"
 msgid "Section:"
 msgstr "Section&nbsp;:"
 
-#: 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 package building this package"
 msgstr "Paquet source"
 
-#: templates/html/show.tmpl:45
+#: templates/html/show.tmpl:46
 #, fuzzy
 msgid "Source:"
 msgstr "Paquet source&nbsp;:"
 
-#: 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"
 msgid "essential"
 msgstr "Essentiel"
 
-#: templates/html/show.tmpl:64
+#: templates/html/show.tmpl:65
 msgid "Links for %s"
 msgstr ""
 
-#: templates/html/show.tmpl:65
+#: templates/html/show.tmpl:66
 msgid "Debian 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 "Plus d'informations sur %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 "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 "Responsable"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:121
 msgid "An overview over the maintainer's packages and uploads"
 msgstr ""
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:121
 #, fuzzy
 #| msgid "All packages"
 msgid "QA Page"
 msgstr "Tous les paquets"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Archive of the Maintainer Mailinglist"
 msgstr ""
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Mail Archive"
 msgstr ""
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:130
 msgid "External Resources:"
 msgstr ""
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:132
 msgid "Homepage"
 msgstr ""
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:138
 #, fuzzy
 msgid "Similar packages:"
 msgstr "paquet virtuel"
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:154
 #, fuzzy
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
@@ -898,7 +891,7 @@ msgstr ""
 "instable ou bogué et peut éventuellement corrompre vos données. Son "
 "installation s'effectue donc à vos risques et périls."
 
-#: templates/html/show.tmpl:176
+#: templates/html/show.tmpl:178
 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 "
@@ -908,74 +901,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:186
 msgid "Tags"
 msgstr ""
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:209
 msgid "Packages providing %s"
 msgstr "Paquets fournissant %s"
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:218
 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:227
 msgid "Other Packages Related to %s"
 msgstr "Autres paquets associés à %s"
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:229
 msgid "legend"
 msgstr ""
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:231
 msgid "build-depends"
 msgstr ""
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:232
 msgid "build-depends-indep"
 msgstr ""
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:234
 msgid "depends"
 msgstr ""
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:235
 msgid "recommends"
 msgstr ""
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:236
 msgid "suggests"
 msgstr ""
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:246
 #, fuzzy
 #| msgid "or"
 msgid "or "
 msgstr "ou"
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:254
 #, fuzzy
 msgid "also a virtual package provided by"
 msgstr "paquet virtuel"
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:256
+#, fuzzy
+msgid "virtual package provided by"
+msgstr "paquet virtuel"
+
+#: templates/html/show.tmpl:261
 #, fuzzy
 msgid "hide %u providing packages"
 msgstr "Taille du paquet"
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:261
 #, fuzzy
 msgid "show %u providing packages"
 msgstr "Taille du paquet"
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:279
 msgid "Download %s"
 msgstr "Télécharger %s"
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:281
 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 "
@@ -985,62 +983,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:282
 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:283
 msgid "Architecture"
 msgstr "Architecture"
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:284
 msgid "Version"
 msgstr "Version"
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:285
 msgid "Package Size"
 msgstr "Taille du paquet"
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:286
 msgid "Installed Size"
 msgstr "Espace occupé"
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:287
 msgid "Files"
 msgstr "Fichiers"
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:295
 msgid "(unofficial port)"
 msgstr ""
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:306 templates/html/show.tmpl:334
 msgid "%s&nbsp;kB"
 msgstr ""
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:309
 msgid "list of files"
 msgstr "liste des fichiers"
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:311
 #, fuzzy
 msgid "no current information"
 msgstr "Plus d'informations sur %s"
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:328
 msgid "Download information for the files of this source package"
 msgstr ""
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:329
 msgid "Size (in kB)"
 msgstr "Taille (en kOctets)"
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:347
 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:351
 #, fuzzy
 msgid "Debian Package Source Repository (Browsable)"
 msgstr "Tous les paquets Debian dans «&nbsp;%s&nbsp;»"
@@ -1106,17 +1104,17 @@ 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 "New Packages in \"%s\""
 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 ""
 
@@ -1272,9 +1270,9 @@ msgstr ""
 #~ "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."
+#~ "Nous encourageons les utilisateurs de paquets d'«&nbsp;experimental&nbsp;» "
+#~ "rencontrant des problèmes à contacter directement le responsable du "
+#~ "paquet."
 
 #~ msgid "Size is measured in kBytes."
 #~ msgstr "La taille est indiquée en kOctets"
diff --git a/po/templates.hu.po b/po/templates.hu.po
index 0c9e471..bd3b666 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:153
 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:158
 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:159
 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:329
 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,138 +430,138 @@ msgstr ""
 msgid "Package Search Results"
 msgstr ""
 
-#: templates/html/search.tmpl:34
+#: 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:39
+#: templates/html/search.tmpl:40
 msgid "Search in specific suite:"
 msgstr ""
 
-#: templates/html/search.tmpl:48
+#: templates/html/search.tmpl:49
 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr ""
 
-#: templates/html/search.tmpl:52 templates/html/search_contents.tmpl:58
+#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
 msgid "Limit search to a specific architecture:"
 msgstr ""
 
-#: templates/html/search.tmpl:61 templates/html/search_contents.tmpl:63
+#: 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:68
+#: 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:77
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr ""
 
-#: templates/html/search.tmpl:77
+#: templates/html/search.tmpl:78
 msgid "suite(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:78 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:78 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
 msgid "section(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:79 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:79 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
 msgid "architecture(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:81
+#: templates/html/search.tmpl:82
 msgid "packages"
 msgstr ""
 
-#: templates/html/search.tmpl:81
+#: templates/html/search.tmpl:82
 msgid "source packages"
 msgstr ""
 
-#: templates/html/search.tmpl:82
+#: 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:85
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:87
+#: 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:93
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 
-#: templates/html/search.tmpl:98
+#: 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:102
+#: 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."
 msgstr ""
 
-#: templates/html/search.tmpl:104
+#: 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:110 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:117
+#: templates/html/search.tmpl:118
 msgid "Package %s"
 msgstr ""
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "also provided by:"
 msgstr ""
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr ""
 
-#: templates/html/search.tmpl:136
+#: templates/html/search.tmpl:139
 msgid "Source Package %s"
 msgstr ""
 
-#: templates/html/search.tmpl:144
+#: templates/html/search.tmpl:146
 msgid "Binary packages:"
 msgstr ""
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 msgid "hide %u binary packages"
 msgstr ""
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 msgid "show %u binary packages"
 msgstr ""
 
-#: templates/html/search.tmpl:156
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -629,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:329
 msgid "File"
 msgstr ""
 
@@ -653,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
+#: templates/html/show.tmpl:66
 msgid "Debian 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:121
 msgid "An overview over the maintainer's packages and uploads"
 msgstr ""
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:121
 msgid "QA Page"
 msgstr ""
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Archive of the Maintainer Mailinglist"
 msgstr ""
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Mail Archive"
 msgstr ""
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:130
 msgid "External Resources:"
 msgstr ""
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:132
 msgid "Homepage"
 msgstr ""
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:138
 msgid "Similar packages:"
 msgstr ""
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:154
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
 "distribution. That means it is likely unstable or buggy, and it may even "
@@ -765,135 +759,139 @@ msgid ""
 "and other possible documentation before using it."
 msgstr ""
 
-#: templates/html/show.tmpl:176
+#: templates/html/show.tmpl:178
 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:186
 msgid "Tags"
 msgstr ""
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:209
 msgid "Packages providing %s"
 msgstr ""
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:218
 msgid "The following binary packages are built from this source package:"
 msgstr ""
 
-#: templates/html/show.tmpl:225
+#: templates/html/show.tmpl:227
 msgid "Other Packages Related to %s"
 msgstr ""
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:229
 msgid "legend"
 msgstr ""
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:231
 msgid "build-depends"
 msgstr ""
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:232
 msgid "build-depends-indep"
 msgstr ""
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:234
 msgid "depends"
 msgstr ""
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:235
 msgid "recommends"
 msgstr ""
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:236
 msgid "suggests"
 msgstr ""
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:246
 msgid "or "
 msgstr ""
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:254
 msgid "also a virtual package provided by"
 msgstr ""
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:256
+msgid "virtual package provided by"
+msgstr ""
+
+#: templates/html/show.tmpl:261
 msgid "hide %u providing packages"
 msgstr ""
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:261
 msgid "show %u providing packages"
 msgstr ""
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:279
 msgid "Download %s"
 msgstr ""
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:281
 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:282
 msgid "Download for all available architectures"
 msgstr ""
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:283
 msgid "Architecture"
 msgstr ""
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:284
 msgid "Version"
 msgstr ""
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:285
 msgid "Package Size"
 msgstr ""
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:286
 msgid "Installed Size"
 msgstr ""
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:287
 msgid "Files"
 msgstr ""
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:295
 msgid "(unofficial port)"
 msgstr ""
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:306 templates/html/show.tmpl:334
 msgid "%s&nbsp;kB"
 msgstr ""
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:309
 msgid "list of files"
 msgstr ""
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:311
 msgid "no current information"
 msgstr ""
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:328
 msgid "Download information for the files of this source package"
 msgstr ""
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:329
 msgid "Size (in kB)"
 msgstr ""
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:347
 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:351
 msgid "Debian Package Source Repository (Browsable)"
 msgstr ""
 
@@ -945,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 cf1ee69..5726e46 100644
--- a/po/templates.ja.po
+++ b/po/templates.ja.po
@@ -14,33 +14,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=\"%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:153
 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:158
 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:159
 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:329
 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,7 +487,7 @@ msgstr "パッケージ検索結果 -- %s"
 msgid "Package Search Results"
 msgstr "パッケージ検索結果"
 
-#: templates/html/search.tmpl:34
+#: 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>."
@@ -501,27 +495,27 @@ msgstr ""
 "キーワードに完全に一致する単語のみを検索しました。<a href=\"%s\">単語の部分的"
 "な一致を有効にして</a>検索してみるとよいでしょう。"
 
-#: templates/html/search.tmpl:39
+#: templates/html/search.tmpl:40
 #, fuzzy
 #| msgid "Search in other suite:"
 msgid "Search in specific suite:"
 msgstr "他のスイートでの検索:"
 
-#: templates/html/search.tmpl:48
+#: 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:52 templates/html/search_contents.tmpl:58
+#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
 msgid "Limit search to a specific architecture:"
 msgstr "特定のアーキテクチャに絞って検索:"
 
-#: templates/html/search.tmpl:61 templates/html/search_contents.tmpl:63
+#: 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:68
+#: templates/html/search.tmpl:69
 #, fuzzy
 #| msgid ""
 #| "<a href=\"%s\">%u</a> results have not been displayed due to the search "
@@ -533,60 +527,60 @@ msgstr ""
 "検索パラメータの設定によって、<a href=\"%s\">%u</a> 個の結果が非表示になって"
 "います。"
 
-#: templates/html/search.tmpl:77
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr "すべてのスイート"
 
-#: templates/html/search.tmpl:77
+#: templates/html/search.tmpl:78
 msgid "suite(s) <em>%s</em>"
 msgstr "<em>%s</em> スイート"
 
-#: templates/html/search.tmpl:78 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:78 templates/html/search_contents.tmpl:72
+#: 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:79 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:79 templates/html/search_contents.tmpl:73
+#: 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:81
+#: templates/html/search.tmpl:82
 msgid "packages"
 msgstr "パッケージ"
 
-#: templates/html/search.tmpl:81
+#: templates/html/search.tmpl:82
 msgid "source packages"
 msgstr "ソースパッケージ"
 
-#: templates/html/search.tmpl:82
+#: 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:85
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr " (単語の一部が一致したものも含んでいます)"
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:87
+#: 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:93
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr "<strong>%u</strong> 個の一致するパッケージが見つかりました。"
 
-#: templates/html/search.tmpl:98
+#: 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 "
@@ -596,7 +590,7 @@ msgstr ""
 "初のいくつかのパッケージが検索しようとしたものと一致していない場合は、キー"
 "ワードを追加するか他のキーワードを用いてみてください。"
 
-#: templates/html/search.tmpl:102
+#: templates/html/search.tmpl:103
 #, fuzzy
 #| msgid ""
 #| "Your search was too wide so we will only display exact matches. At least "
@@ -611,7 +605,7 @@ msgstr ""
 "らに長いキーワードを用いるか、キーワードを追加することを検討してください。"
 
 # FIXME: "... only ... only ..." is OK?
-#: templates/html/search.tmpl:104
+#: templates/html/search.tmpl:105
 #, fuzzy
 #| msgid ""
 #| "Note: Your search was too wide so we will only display only the first "
@@ -625,39 +619,39 @@ msgstr ""
 "るだけに留めています。さらに長いキーワードを用いるか、キーワードを追加するこ"
 "とを検討してください。"
 
-#: templates/html/search.tmpl:110 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:117
+#: templates/html/search.tmpl:118
 msgid "Package %s"
 msgstr "%s パッケージ"
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "also provided by:"
 msgstr "また、以下のパッケージによって提供されてもいます:"
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr "以下のパッケージによって提供されています:"
 
-#: templates/html/search.tmpl:136
+#: templates/html/search.tmpl:139
 msgid "Source Package %s"
 msgstr "%s ソースパッケージ"
 
-#: templates/html/search.tmpl:144
+#: templates/html/search.tmpl:146
 msgid "Binary packages:"
 msgstr "バイナリパッケージ:"
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 msgid "hide %u binary packages"
 msgstr "%u 個のバイナリパッケージを非表示"
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 msgid "show %u binary packages"
 msgstr "%u 個のバイナリパッケージを表示"
 
-#: templates/html/search.tmpl:156
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -725,7 +719,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:329
 msgid "File"
 msgstr "ファイル"
 
@@ -749,111 +743,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
+#: templates/html/show.tmpl:66
 msgid "Debian Resources:"
 msgstr "Debian の資源:"
 
-#: 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:121
 msgid "An overview over the maintainer's packages and uploads"
 msgstr "メンテナのパッケージやアップロードの概要"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:121
 msgid "QA Page"
 msgstr "QA ページ"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Archive of the Maintainer Mailinglist"
 msgstr "メンテナメーリングリストのアーカイブ"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Mail Archive"
 msgstr "メールアーカイブ"
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:130
 msgid "External Resources:"
 msgstr "外部の資源:"
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:132
 msgid "Homepage"
 msgstr "ホームページ"
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:138
 msgid "Similar packages:"
 msgstr "類似のパッケージ:"
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:154
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
 "distribution. That means it is likely unstable or buggy, and it may even "
@@ -865,7 +859,7 @@ msgstr ""
 "すかもしれません。使用前には、<a href=\"%s\">変更履歴</a>やその他の参照可能な"
 "ドキュメントを必ず調べてください。"
 
-#: templates/html/show.tmpl:176
+#: templates/html/show.tmpl:178
 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 "
@@ -875,67 +869,71 @@ msgstr ""
 "\">仮想パッケージの定義</a>については <a href=\"%s\">Debian ポリシーマニュア"
 "ル</a>を参照してください。"
 
-#: templates/html/show.tmpl:184
+#: templates/html/show.tmpl:186
 msgid "Tags"
 msgstr "タグ"
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:209
 msgid "Packages providing %s"
 msgstr "%s を提供するパッケージ"
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:218
 msgid "The following binary packages are built from this source package:"
 msgstr "以下のバイナリパッケージがこのソースパッケージからビルドされています。"
 
-#: templates/html/show.tmpl:225
+#: templates/html/show.tmpl:227
 msgid "Other Packages Related to %s"
 msgstr "その他の %s 関連パッケージ"
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:229
 msgid "legend"
 msgstr "凡例"
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:231
 msgid "build-depends"
 msgstr "構築依存"
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:232
 msgid "build-depends-indep"
 msgstr "構築依存 (アーキテクチャ非依存)"
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:234
 msgid "depends"
 msgstr "依存"
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:235
 msgid "recommends"
 msgstr "推奨"
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:236
 msgid "suggests"
 msgstr "提案"
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:246
 msgid "or "
 msgstr "または "
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:254
 msgid "also a virtual package provided by"
 msgstr "以下のパッケージによって提供される仮想パッケージでもあります: "
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:256
+msgid "virtual package provided by"
+msgstr "以下のパッケージによって提供される仮想パッケージです: "
+
+#: templates/html/show.tmpl:261
 msgid "hide %u providing packages"
 msgstr "%u 個の提供パッケージを非表示"
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:261
 msgid "show %u providing packages"
 msgstr "%u 個の提供パッケージを表示"
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:279
 msgid "Download %s"
 msgstr "%s のダウンロード"
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:281
 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 "
@@ -945,55 +943,55 @@ msgstr ""
 "リンク。加えて、パッケージサイズやインストールサイズに関する情報も含んでいま"
 "す。"
 
-#: templates/html/show.tmpl:280
+#: templates/html/show.tmpl:282
 msgid "Download for all available architectures"
 msgstr "すべての利用可能アーキテクチャ向けのダウンロード"
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:283
 msgid "Architecture"
 msgstr "アーキテクチャ"
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:284
 msgid "Version"
 msgstr "バージョン"
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:285
 msgid "Package Size"
 msgstr "パッケージサイズ"
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:286
 msgid "Installed Size"
 msgstr "インストールサイズ"
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:287
 msgid "Files"
 msgstr "ファイル"
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:295
 msgid "(unofficial port)"
 msgstr "(非公式の移植版)"
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:306 templates/html/show.tmpl:334
 msgid "%s&nbsp;kB"
 msgstr "%s&nbsp;kB"
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:309
 msgid "list of files"
 msgstr "ファイル一覧"
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:311
 msgid "no current information"
 msgstr "現在の情報はありません"
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:328
 msgid "Download information for the files of this source package"
 msgstr "このソースパッケージのファイルのダウンロードに関する情報"
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:329
 msgid "Size (in kB)"
 msgstr "サイズ (単位: kB)"
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:347
 msgid ""
 "Debian Package Source Repository (<acronym title=\"Version Control System"
 "\">VCS</acronym>: <a href=\"%s\">%s</a>)"
@@ -1001,7 +999,7 @@ msgstr ""
 "Debian パッケージソースリポジトリ (<acronym title=\"バージョン管理システム"
 "\">VCS</acronym>: <a href=\"%s\">%s</a>)"
 
-#: templates/html/show.tmpl:349
+#: templates/html/show.tmpl:351
 msgid "Debian Package Source Repository (Browsable)"
 msgstr "Debian パッケージソースリポジトリ (ブラウザで表示可能)"
 
@@ -1057,15 +1055,15 @@ 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> をご覧ください。"
 
diff --git a/po/templates.nl.po b/po/templates.nl.po
index 019558d..067b172 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
+#: 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,12 +137,12 @@ 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"
@@ -182,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:153
 msgid "Experimental package"
 msgstr "Experimenteel pakket"
 
@@ -199,11 +198,11 @@ msgstr ""
 "Raadpleeg vooral de changelog en andere beschikbare documentatie voordat u "
 "het pakket gebruikt."
 
-#: templates/html/download.tmpl:41 templates/html/show.tmpl:157
+#: templates/html/download.tmpl:41 templates/html/show.tmpl:158
 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:159
 #, fuzzy
 #| msgid ""
 #| "Warning: This package is intended for the use in building <a href="
@@ -267,7 +266,7 @@ 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:329
 msgid "MD5 checksum"
 msgstr "MD5 checksum"
 
@@ -333,7 +332,7 @@ 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:"
 
@@ -388,36 +387,31 @@ 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
+#: 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
+#: 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
 msgid "New Packages in \"%s\""
 msgstr "Nieuwe pakketten in \"%s\""
@@ -494,148 +488,148 @@ msgstr "Alle Debianpakketten in \"%s\""
 msgid "Package Search Results"
 msgstr "Alle Debianpakketten in \"%s\""
 
-#: templates/html/search.tmpl:34
+#: 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:39
+#: templates/html/search.tmpl:40
 msgid "Search in specific suite:"
 msgstr ""
 
-#: templates/html/search.tmpl:48
+#: 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:52 templates/html/search_contents.tmpl:58
+#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
 msgid "Limit search to a specific architecture:"
 msgstr ""
 
-#: templates/html/search.tmpl:61 templates/html/search_contents.tmpl:63
+#: 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:68
+#: 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:77
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr "alle suites"
 
-#: templates/html/search.tmpl:77
+#: 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:78 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
 msgid "all sections"
 msgstr "alle secties"
 
-#: templates/html/search.tmpl:78 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
 msgid "section(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:79 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:79 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
 msgid "architecture(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:81
+#: templates/html/search.tmpl:82
 msgid "packages"
 msgstr "pakketten"
 
-#: templates/html/search.tmpl:81
+#: templates/html/search.tmpl:82
 msgid "source packages"
 msgstr "bronpakketten"
 
-#: templates/html/search.tmpl:82
+#: 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:85
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:87
+#: 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:93
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 
-#: templates/html/search.tmpl:98
+#: 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:102
+#: 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."
 msgstr ""
 
-#: templates/html/search.tmpl:104
+#: 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:110 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:117
+#: templates/html/search.tmpl:118
 msgid "Package %s"
 msgstr "Pakket %s"
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "also provided by:"
 msgstr "ook geboden door:"
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr "geboden door:"
 
-#: templates/html/search.tmpl:136
+#: templates/html/search.tmpl:139
 msgid "Source Package %s"
 msgstr "Bronpakket %s"
 
-#: templates/html/search.tmpl:144
+#: templates/html/search.tmpl:146
 msgid "Binary packages:"
 msgstr "Binaire pakketten:"
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 #, fuzzy
 #| msgid "%u binary packages"
 msgid "hide %u binary packages"
 msgstr "%u binaire pakketten"
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 #, fuzzy
 #| msgid "%u binary packages"
 msgid "show %u binary packages"
 msgstr "%u binaire pakketten"
 
-#: templates/html/search.tmpl:156
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -698,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:329
 msgid "File"
 msgstr "Bestand"
 
@@ -723,114 +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 bronpakket %s in %s"
 
-#: templates/html/show.tmpl:22
+#: templates/html/show.tmpl:23
 msgid "Details of package %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
+#: 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
+#: templates/html/show.tmpl:66
 msgid "Debian Resources:"
 msgstr "Debian 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
+#: templates/html/show.tmpl:108
 msgid "Maintainer:"
 msgstr "Beheerder:"
 
-#: templates/html/show.tmpl:109
+#: templates/html/show.tmpl:110
 msgid "Maintainers:"
 msgstr "Beheerders:"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:121
 msgid "An overview over the maintainer's packages and uploads"
 msgstr ""
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:121
 msgid "QA Page"
 msgstr "QA-pagina"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Archive of the Maintainer Mailinglist"
 msgstr ""
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Mail Archive"
 msgstr "Mailarchief"
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:130
 msgid "External Resources:"
 msgstr "Externe bronnen:"
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:132
 msgid "Homepage"
 msgstr "Homepage"
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:138
 msgid "Similar packages:"
 msgstr "Vergelijkbare pakketten:"
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:154
 #, fuzzy
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
@@ -844,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:178
 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 "
@@ -854,132 +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:186
 msgid "Tags"
 msgstr ""
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:209
 msgid "Packages providing %s"
 msgstr "Pakketten die %s bieden:"
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:218
 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:227
 msgid "Other Packages Related to %s"
 msgstr "Andere aan %s gerelateerde pakketten"
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:229
 msgid "legend"
 msgstr ""
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:231
 msgid "build-depends"
 msgstr "build-depends"
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:232
 msgid "build-depends-indep"
 msgstr "build-depends-indep"
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:234
 msgid "depends"
 msgstr "depends"
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:235
 msgid "recommends"
 msgstr "recommends"
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:236
 msgid "suggests"
 msgstr "suggests"
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:246
 msgid "or "
 msgstr "of "
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:254
 msgid "also a virtual package provided by"
 msgstr "Ook een virtueel pakket geboden door:"
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:256
+msgid "virtual package provided by"
+msgstr "virtueel pakket geboden door"
+
+#: templates/html/show.tmpl:261
 #, fuzzy
 #| msgid "%u providing packages"
 msgid "hide %u providing packages"
 msgstr "pakketten die %u bieden"
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:261
 #, fuzzy
 #| msgid "%u providing packages"
 msgid "show %u providing packages"
 msgstr "pakketten die %u bieden"
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:279
 msgid "Download %s"
 msgstr "%s downloaden"
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:281
 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:282
 msgid "Download for all available architectures"
 msgstr "Pakket downloaden voor alle beschikbare platforms"
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:283
 msgid "Architecture"
 msgstr "Platform"
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:284
 msgid "Version"
 msgstr "Versie"
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:285
 msgid "Package Size"
 msgstr "Pakketgrootte"
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:286
 msgid "Installed Size"
 msgstr "Geïnstalleerde grootte"
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:287
 msgid "Files"
 msgstr "Bestanden"
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:295
 msgid "(unofficial port)"
 msgstr ""
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:306 templates/html/show.tmpl:334
 msgid "%s&nbsp;kB"
 msgstr "%s&nbsp;kB"
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:309
 msgid "list of files"
 msgstr "overzicht"
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:311
 msgid "no current information"
 msgstr "geen actuale informatie"
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:328
 msgid "Download information for the files of this source package"
 msgstr ""
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:329
 msgid "Size (in kB)"
 msgstr "Grootte (in kB)"
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:347
 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:351
 #, fuzzy
 msgid "Debian Package Source Repository (Browsable)"
 msgstr "Alle Debianpakketten in \"%s\""
@@ -1041,15 +1039,15 @@ 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
+#: 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 ""
 
diff --git a/po/templates.pot b/po/templates.pot
index 3fb7299..80ff3a8 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:153
 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:158
 msgid "debian-installer udeb package"
 msgstr ""
 
 #: templates/html/download.tmpl:42
-#: templates/html/show.tmpl:158
+#: templates/html/show.tmpl:159
 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:329
 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,131 +411,131 @@ msgstr ""
 msgid "Package Search Results"
 msgstr ""
 
-#: templates/html/search.tmpl:34
+#: 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:39
+#: templates/html/search.tmpl:40
 msgid "Search in specific suite:"
 msgstr ""
 
-#: templates/html/search.tmpl:48
+#: templates/html/search.tmpl:49
 msgid "Search in <a href=\"%s\">all suites</a>"
 msgstr ""
 
-#: templates/html/search.tmpl:52
+#: templates/html/search.tmpl:53
 #: templates/html/search_contents.tmpl:58
 msgid "Limit search to a specific architecture:"
 msgstr ""
 
-#: templates/html/search.tmpl:61
+#: 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:68
+#: 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:77
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr ""
 
-#: templates/html/search.tmpl:77
+#: templates/html/search.tmpl:78
 msgid "suite(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79
 #: templates/html/search_contents.tmpl:72
 msgid "all sections"
 msgstr ""
 
-#: templates/html/search.tmpl:78
+#: templates/html/search.tmpl:79
 #: templates/html/search_contents.tmpl:72
 msgid "section(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:79
+#: templates/html/search.tmpl:80
 #: templates/html/search_contents.tmpl:73
 msgid "all architectures"
 msgstr ""
 
-#: templates/html/search.tmpl:79
+#: templates/html/search.tmpl:80
 #: templates/html/search_contents.tmpl:73
 msgid "architecture(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:81
+#: templates/html/search.tmpl:82
 msgid "source packages"
 msgstr ""
 
-#: templates/html/search.tmpl:81
+#: templates/html/search.tmpl:82
 msgid "packages"
 msgstr ""
 
-#: templates/html/search.tmpl:82
+#: 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:85
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:87
+#: 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:93
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 
-#: templates/html/search.tmpl:98
+#: 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:102
+#: 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."
 msgstr ""
 
-#: templates/html/search.tmpl:104
+#: 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:110
+#: templates/html/search.tmpl:111
 #: templates/html/search_contents.tmpl:131
 msgid "Sorry, your search gave no results"
 msgstr ""
 
-#: templates/html/search.tmpl:117
+#: templates/html/search.tmpl:118
 msgid "Package %s"
 msgstr ""
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "also provided by:"
 msgstr ""
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr ""
 
-#: templates/html/search.tmpl:136
+#: templates/html/search.tmpl:139
 msgid "Source Package %s"
 msgstr ""
 
-#: templates/html/search.tmpl:144
+#: templates/html/search.tmpl:146
 msgid "Binary packages:"
 msgstr ""
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 msgid "show %u binary packages"
 msgstr ""
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 msgid "hide %u binary packages"
 msgstr ""
 
-#: templates/html/search.tmpl:156
+#: templates/html/search.tmpl:158
 msgid "<a href=\"%s\">%u</a> results have not been displayed because you requested only exact matches."
 msgstr ""
 
@@ -600,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:329
 msgid "File"
 msgstr ""
 
@@ -624,238 +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
+#: templates/html/show.tmpl:66
 msgid "Debian 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:121
 msgid "An overview over the maintainer's packages and uploads"
 msgstr ""
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:121
 msgid "QA Page"
 msgstr ""
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Archive of the Maintainer Mailinglist"
 msgstr ""
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Mail Archive"
 msgstr ""
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:130
 msgid "External Resources:"
 msgstr ""
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:132
 msgid "Homepage"
 msgstr ""
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:138
 msgid "Similar packages:"
 msgstr ""
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:154
 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:178
 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:186
 msgid "Tags"
 msgstr ""
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:209
 msgid "Packages providing %s"
 msgstr ""
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:218
 msgid "The following binary packages are built from this source package:"
 msgstr ""
 
-#: templates/html/show.tmpl:225
+#: templates/html/show.tmpl:227
 msgid "Other Packages Related to %s"
 msgstr ""
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:229
 msgid "legend"
 msgstr ""
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:231
 msgid "build-depends"
 msgstr ""
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:232
 msgid "build-depends-indep"
 msgstr ""
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:234
 msgid "depends"
 msgstr ""
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:235
 msgid "recommends"
 msgstr ""
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:236
 msgid "suggests"
 msgstr ""
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:246
 msgid "or "
 msgstr ""
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:254
 msgid "also a virtual package provided by"
 msgstr ""
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:256
+msgid "virtual package provided by"
+msgstr ""
+
+#: templates/html/show.tmpl:261
 msgid "show %u providing packages"
 msgstr ""
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:261
 msgid "hide %u providing packages"
 msgstr ""
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:279
 msgid "Download %s"
 msgstr ""
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:281
 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:282
 msgid "Download for all available architectures"
 msgstr ""
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:283
 msgid "Architecture"
 msgstr ""
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:284
 msgid "Version"
 msgstr ""
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:285
 msgid "Package Size"
 msgstr ""
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:286
 msgid "Installed Size"
 msgstr ""
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:287
 msgid "Files"
 msgstr ""
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:295
 msgid "(unofficial port)"
 msgstr ""
 
-#: templates/html/show.tmpl:304
-#: templates/html/show.tmpl:304
-#: templates/html/show.tmpl:332
+#: templates/html/show.tmpl:306
+#: templates/html/show.tmpl:306
+#: templates/html/show.tmpl:334
 msgid "%s&nbsp;kB"
 msgstr ""
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:309
 msgid "list of files"
 msgstr ""
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:311
 msgid "no current information"
 msgstr ""
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:328
 msgid "Download information for the files of this source package"
 msgstr ""
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:329
 msgid "Size (in kB)"
 msgstr ""
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:347
 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:351
 msgid "Debian Package Source Repository (Browsable)"
 msgstr ""
 
@@ -906,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 1136280..81afaa1 100644
--- a/po/templates.ru.po
+++ b/po/templates.ru.po
@@ -1,46 +1,44 @@
 # 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-09 17:42+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"
 "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"
 
-#: 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
+#. @translators: . = decimal_point , = thousands_sep, see Number::Format
+#: templates/config.tmpl:57
 msgid "."
 msgstr ","
 
-#: templates/config.tmpl:57
+#: templates/config.tmpl:58
 msgid ","
 msgstr " "
 
@@ -108,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 "Африка"
 
@@ -137,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 "Краткое описание комплекта"
 
@@ -185,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:153
 msgid "Experimental package"
 msgstr "Экспериментальный пакет"
 
@@ -201,11 +199,11 @@ msgstr ""
 "даже может вызвать потерю данных. Перед использованием внимательно "
 "прочитайте журнал изменений пакета и другую доступную документацию."
 
-#: templates/html/download.tmpl:41 templates/html/show.tmpl:157
+#: templates/html/download.tmpl:41 templates/html/show.tmpl:158
 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:159
 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 "
@@ -224,8 +222,7 @@ 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 "Вы можете скачать требуемый файл из подкаталога <tt>%s</tt> c:"
 
 #: templates/html/download.tmpl:77
@@ -276,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:329
 msgid "MD5 checksum"
 msgstr "Контрольная сумма MD5"
 
@@ -297,10 +294,8 @@ msgid "Filelist of package %s/%s/%s"
 msgstr "Список файлов пакета %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 ""
-"Список файлов пакета <em>%s</em> в <em>%s</em> для архитектуры <em>%s</em>"
+msgid "Filelist of package <em>%s</em> in <em>%s</em> of architecture <em>%s</em>"
+msgstr "Список файлов пакета <em>%s</em> в <em>%s</em> для архитектуры <em>%s</em>"
 
 #: templates/html/filelist.tmpl:8
 msgid "Filelist"
@@ -336,7 +331,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 "Сгенерирована:"
 
@@ -389,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\""
@@ -445,15 +435,13 @@ msgstr " Также их можно увидеть <a href=\"%s\">отсорти
 
 #: templates/html/newpkg.tmpl:20
 msgid " You can also display this list <a href=\"%s\">sorted by age</a>."
-msgstr ""
-" Также их можно увидеть <a href=\"%s\">отсортированными по возрасту</a>."
+msgstr " Также их можно увидеть <a href=\"%s\">отсортированными по возрасту</a>."
 
 #: templates/html/newpkg.tmpl:22
 msgid ""
 "This information is also available as an <a href=\"newpkg?format=rss\">RSS "
 "feed</a>"
-msgstr ""
-"Эта информация также доступна на <a href=\"newpkg?format=rss\">ленте RSS</a>"
+msgstr "Эта информация также доступна на <a href=\"newpkg?format=rss\">ленте RSS</a>"
 
 #: templates/html/newpkg.tmpl:23
 msgid "[RSS 1.0 Feed]"
@@ -487,7 +475,7 @@ msgstr "Результаты поиска пакетов -- %s"
 msgid "Package Search Results"
 msgstr "Результаты поиска пакетов"
 
-#: templates/html/search.tmpl:34
+#: 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>."
@@ -496,28 +484,25 @@ msgstr ""
 "попытаться выполнить поиск с <a href=\"%s\">совпадением отдельных частей "
 "слова</a>."
 
-#: templates/html/search.tmpl:39
-#, fuzzy
+#: templates/html/search.tmpl:40
 #| msgid "Search in other suite:"
 msgid "Search in specific suite:"
-msgstr "Поиск в другом комплекте:"
+msgstr "Поиск в заданном комплекте:"
 
-#: templates/html/search.tmpl:48
-#, fuzzy
+#: templates/html/search.tmpl:49
 #| msgid "Search in <a href=\"%s\">all architectures</a>"
 msgid "Search in <a href=\"%s\">all suites</a>"
-msgstr "Поиск во <a href=\"%s\">всех архитектурах</a>"
+msgstr "Поиск во <a href=\"%s\">всех комплектах</a>"
 
-#: templates/html/search.tmpl:52 templates/html/search_contents.tmpl:58
+#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
 msgid "Limit search to a specific architecture:"
 msgstr "Ограничить поиск определённой архитектурой:"
 
-#: templates/html/search.tmpl:61 templates/html/search_contents.tmpl:63
+#: 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:68
-#, fuzzy
+#: templates/html/search.tmpl:69
 #| msgid ""
 #| "<a href=\"%s\">%u</a> results have not been displayed due to the search "
 #| "parameters."
@@ -525,63 +510,64 @@ msgid ""
 "<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:77
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr "все комплекты"
 
-#: templates/html/search.tmpl:77
-#, fuzzy
+#: templates/html/search.tmpl:78
 #| msgid "section(s) <em>%s</em>"
 msgid "suite(s) <em>%s</em>"
-msgstr "секция(и) <em>%s</em>"
+msgstr "комплект(ы) <em>%s</em>"
 
-#: templates/html/search.tmpl:78 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:78 templates/html/search_contents.tmpl:72
+#: 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:79 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:79 templates/html/search_contents.tmpl:73
+#: 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:81
+#: templates/html/search.tmpl:82
 msgid "packages"
 msgstr "пакеты"
 
-#: templates/html/search.tmpl:81
+#: templates/html/search.tmpl:82
 msgid "source packages"
 msgstr "пакеты исходного кода"
 
-#: templates/html/search.tmpl:82
-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."
+#: 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."
 
-#: templates/html/search.tmpl:85
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr " (включая совпадение части слова)"
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:87
+#: 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:93
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr "Найдено <strong>%u</strong> подходящих пакетов."
 
-#: templates/html/search.tmpl:98
+#: 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 "
@@ -591,8 +577,7 @@ msgstr ""
 "значимости. Если первые несколько пакетов не то, что вы искали, попробуйте "
 "использовать больше ключевых слов или другие ключевые слова."
 
-#: templates/html/search.tmpl:102
-#, fuzzy
+#: 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 "
@@ -601,13 +586,11 @@ 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."
 msgstr ""
-"Вы указали слишком широкий диапазон поиска поэтому будут показаны только "
-"точные совпадения. По крайней мере <em>%u</em> результатов было пропущено и "
-"не показано. Попробуйте использовать более длинное ключевое слово или "
-"введите больше ключевых слов."
+"Вы указали слишком общее ключевое слово, с целью оптимизации некоторые "
+"результаты показаны не будут.<br>Попробуйте использовать "
+"более длинное ключевое слово или введите больше ключевых слов."
 
-#: templates/html/search.tmpl:104
-#, fuzzy
+#: templates/html/search.tmpl:105
 #| 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 "
@@ -616,47 +599,44 @@ msgid ""
 "Your keyword was too generic.<br>Please consider using a longer keyword or "
 "more keywords."
 msgstr ""
-"Замечание: Вы указали слишком широкий диапазон поиска поэтому будут показаны "
-"только первые 100 совпадений. Попробуйте использовать более длинное ключевое "
-"слово или введите больше ключевых слов."
+"Вы указали слишком общее ключевое слово.<br>Попробуйте использовать "
+"более длинное ключевое слово или введите больше ключевых слов."
 
-#: templates/html/search.tmpl:110 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:117
+#: templates/html/search.tmpl:118
 msgid "Package %s"
 msgstr "Пакет %s"
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "also provided by:"
 msgstr "также предоставляется:"
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr "предоставляется:"
 
-#: templates/html/search.tmpl:136
+#: templates/html/search.tmpl:139
 msgid "Source Package %s"
 msgstr "Пакет исходного кода %s"
 
-#: templates/html/search.tmpl:144
+#: templates/html/search.tmpl:146
 msgid "Binary packages:"
 msgstr "Бинарный пакет:"
 
-#: templates/html/search.tmpl:146
-#, fuzzy
+#: templates/html/search.tmpl:148
 #| msgid "%u binary packages"
 msgid "hide %u binary packages"
-msgstr "%u бинарных пакетов"
+msgstr "скрыть %u бинарных пакетов"
 
-#: templates/html/search.tmpl:146
-#, fuzzy
+#: templates/html/search.tmpl:148
 #| msgid "%u binary packages"
 msgid "show %u binary packages"
-msgstr "%u бинарных пакетов"
+msgstr "показать %u бинарных пакетов"
 
-#: templates/html/search.tmpl:156
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -700,7 +680,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 "Вы искали %s <em>%s</em> в комплекте <em>%s</em>, %s и %s."
@@ -723,7 +703,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:329
 msgid "File"
 msgstr "Файл"
 
@@ -747,111 +727,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
+#: templates/html/show.tmpl:66
 msgid "Debian Resources:"
 msgstr "Ресурсы Debian:"
 
-#: 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:121
 msgid "An overview over the maintainer's packages and uploads"
 msgstr "Обзор пакетов и закачек сопровождающего"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:121
 msgid "QA Page"
-msgstr "Поддержка качества"
+msgstr "Контроль качества"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Archive of the Maintainer Mailinglist"
 msgstr "Архив списка рассылки сопровождающего"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Mail Archive"
 msgstr "Почтовый архив"
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:130
 msgid "External Resources:"
 msgstr "Внешние ресурсы:"
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:132
 msgid "Homepage"
 msgstr "В начало"
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:138
 msgid "Similar packages:"
 msgstr "Подобные пакеты:"
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:154
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
 "distribution. That means it is likely unstable or buggy, and it may even "
@@ -863,7 +843,7 @@ msgstr ""
 "даже может вызвать потерю данных. Перед использованием внимательно "
 "прочитайте файл <a href=\"%s\">changelog</a> и другую доступную документацию."
 
-#: templates/html/show.tmpl:176
+#: templates/html/show.tmpl:178
 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 "
@@ -873,71 +853,73 @@ msgstr ""
 "virtual_pkg\">что такое виртуальные пакеты</a> читайте в <a href=\"%s"
 "\">политике Debian</a>."
 
-#: templates/html/show.tmpl:184
+#: templates/html/show.tmpl:186
 msgid "Tags"
 msgstr "Теги"
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:209
 msgid "Packages providing %s"
 msgstr "Пакеты, предоставляющие %s"
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:218
 msgid "The following binary packages are built from this source package:"
 msgstr "Из этого пакета исходных кодов собираются следующие бинарные пакеты:"
 
-#: templates/html/show.tmpl:225
+#: templates/html/show.tmpl:227
 msgid "Other Packages Related to %s"
 msgstr "Другие пакеты, относящиеся к %s"
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:229
 msgid "legend"
 msgstr "легенда"
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:231
 msgid "build-depends"
 msgstr "build-depends"
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:232
 msgid "build-depends-indep"
 msgstr "build-depends-indep"
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:234
 msgid "depends"
 msgstr "зависимости"
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:235
 msgid "recommends"
 msgstr "рекомендации"
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:236
 msgid "suggests"
 msgstr "предложения"
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:246
 msgid "or "
 msgstr "или "
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:254
 msgid "also a virtual package provided by"
 msgstr "также виртуальный пакет, предоставляемый"
 
-#: templates/html/show.tmpl:259
-#, fuzzy
+#: templates/html/show.tmpl:256
+msgid "virtual package provided by"
+msgstr "виртуальный пакет, предоставляемый"
+
+#: templates/html/show.tmpl:261
 #| msgid "%u providing packages"
 msgid "hide %u providing packages"
-msgstr "%u предоставляемых пакетов"
+msgstr "скрыть %u предоставляющих пакетов"
 
-#: templates/html/show.tmpl:259
-#, fuzzy
+#: templates/html/show.tmpl:261
 #| msgid "%u providing packages"
 msgid "show %u providing packages"
-msgstr "%u предоставляемых пакетов"
+msgstr "показаьт %u предоставляющих пакетов"
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:279
 msgid "Download %s"
 msgstr "Загрузка %s"
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:281
 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 "
@@ -947,55 +929,55 @@ msgstr ""
 "Также она даёт информацию о размере пакета и размере пакета в установленном "
 "состоянии."
 
-#: templates/html/show.tmpl:280
+#: templates/html/show.tmpl:282
 msgid "Download for all available architectures"
 msgstr "Загрузить для всех доступных архитектур"
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:283
 msgid "Architecture"
 msgstr "Архитектура"
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:284
 msgid "Version"
 msgstr "Версия"
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:285
 msgid "Package Size"
 msgstr "Размер пакета"
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:286
 msgid "Installed Size"
 msgstr "В установленном виде"
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:287
 msgid "Files"
 msgstr "Файлы"
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:295
 msgid "(unofficial port)"
 msgstr "(неофициальный перенос)"
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:306 templates/html/show.tmpl:334
 msgid "%s&nbsp;kB"
 msgstr "%s&nbsp;Кб"
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:309
 msgid "list of files"
 msgstr "список файлов"
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:311
 msgid "no current information"
 msgstr "пока нет информации"
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:328
 msgid "Download information for the files of this source package"
 msgstr "Загрузить информацию о файлах данного пакета исходных кодов"
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:329
 msgid "Size (in kB)"
 msgstr "Размер (в Кб)"
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:347
 msgid ""
 "Debian Package Source Repository (<acronym title=\"Version Control System"
 "\">VCS</acronym>: <a href=\"%s\">%s</a>)"
@@ -1003,7 +985,7 @@ msgstr ""
 "Репозиторий пакетов исходных кодов Debian (<acronym title=\"Version Control "
 "System\">VCS</acronym>: <a href=\"%s\">%s</a>)"
 
-#: templates/html/show.tmpl:349
+#: templates/html/show.tmpl:351
 msgid "Debian Package Source Repository (Browsable)"
 msgstr "Репозиторий пакетов исходных кодов Debian (просмотр)"
 
@@ -1059,30 +1041,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>."
 
-#~ 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/po/templates.sv.po b/po/templates.sv.po
index aa0f4b1..fbebe77 100644
--- a/po/templates.sv.po
+++ b/po/templates.sv.po
@@ -11,34 +11,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 "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 ","
 
-#: templates/config.tmpl:57
+#: templates/config.tmpl:58
 msgid ","
 msgstr "."
 
@@ -106,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"
 
@@ -135,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"
 
@@ -184,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:153
 msgid "Experimental package"
 msgstr "Experimentellt paket"
 
@@ -200,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:158
 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:159
 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 "
@@ -275,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:329
 msgid "MD5 checksum"
 msgstr "MD5-kontrollsumma"
 
@@ -337,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:"
 
@@ -390,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\""
@@ -489,7 +482,7 @@ msgstr "Paketsökresultat -- %s"
 msgid "Package Search Results"
 msgstr "Paketsökresultat"
 
-#: templates/html/search.tmpl:34
+#: 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>."
@@ -497,27 +490,27 @@ 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:39
+#: templates/html/search.tmpl:40
 #, fuzzy
 #| msgid "Search in other suite:"
 msgid "Search in specific suite:"
 msgstr "Sök i annan svit:"
 
-#: templates/html/search.tmpl:48
+#: 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 "Sök i <a  href=\"%s\">alla arkitekturer</a>"
 
-#: templates/html/search.tmpl:52 templates/html/search_contents.tmpl:58
+#: 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:61 templates/html/search_contents.tmpl:63
+#: 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:68
+#: templates/html/search.tmpl:69
 #, fuzzy
 #| msgid ""
 #| "<a href=\"%s\">%u</a> results have not been displayed due to the search "
@@ -528,49 +521,49 @@ msgid ""
 msgstr ""
 "<a href=\"%s\">%u</a> resultat har inte visats på grund av sökparametrarna."
 
-#: templates/html/search.tmpl:77
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr "alla sviter"
 
-#: templates/html/search.tmpl:77
+#: templates/html/search.tmpl:78
 msgid "suite(s) <em>%s</em>"
 msgstr "svit(en) <em>%s</em>"
 
-#: templates/html/search.tmpl:78 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:78 templates/html/search_contents.tmpl:72
+#: 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:79 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:79 templates/html/search_contents.tmpl:73
+#: 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:81
+#: templates/html/search.tmpl:82
 msgid "packages"
 msgstr "paket"
 
-#: templates/html/search.tmpl:81
+#: templates/html/search.tmpl:82
 msgid "source packages"
 msgstr "källkodspaket"
 
-#: templates/html/search.tmpl:82
+#: 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:85
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr " (inkluderar delordsträffar)"
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:87
+#: templates/html/search.tmpl:88
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
@@ -578,11 +571,11 @@ msgstr ""
 "Du har sökt efter <em>%s</em> i paketnamn och beskrivningar i %s, %s och %s%"
 "s."
 
-#: templates/html/search.tmpl:93
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr "Hittade <strong>%u</strong> paket."
 
-#: templates/html/search.tmpl:98
+#: 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 "
@@ -592,7 +585,7 @@ 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:102
+#: templates/html/search.tmpl:103
 #, fuzzy
 #| msgid ""
 #| "Your search was too wide so we will only display exact matches. At least "
@@ -606,7 +599,7 @@ msgstr ""
 "em> resultat har uteslutits och kommer inte att visas. Försök använda ett "
 "längre eller fler nyckelord."
 
-#: templates/html/search.tmpl:104
+#: templates/html/search.tmpl:105
 #, fuzzy
 #| msgid ""
 #| "Note: Your search was too wide so we will only display only the first "
@@ -619,39 +612,39 @@ msgstr ""
 "Observera: Din sökning var för vid, så vi visar bara de första omkring 100 "
 "träffarna. Försök använda ett längre eller fler nyckelord."
 
-#: templates/html/search.tmpl:110 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 "Din sökning gav dessvärre inga resultat"
 
-#: templates/html/search.tmpl:117
+#: templates/html/search.tmpl:118
 msgid "Package %s"
 msgstr "Paketet %s"
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "also provided by:"
 msgstr "tillhandahålls också av:"
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr "tillhandahålls av:"
 
-#: templates/html/search.tmpl:136
+#: templates/html/search.tmpl:139
 msgid "Source Package %s"
 msgstr "Källkodspaketet %s"
 
-#: templates/html/search.tmpl:144
+#: templates/html/search.tmpl:146
 msgid "Binary packages:"
 msgstr "Binärpaket:"
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 msgid "hide %u binary packages"
 msgstr "dölj %u binärpaket"
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 msgid "show %u binary packages"
 msgstr "visa %u binärpaket"
 
-#: templates/html/search.tmpl:156
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -717,7 +710,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:329
 msgid "File"
 msgstr "Fil"
 
@@ -741,111 +734,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
+#: templates/html/show.tmpl:66
 msgid "Debian Resources:"
 msgstr "Debianresurser:"
 
-#: 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:121
 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:121
 msgid "QA Page"
 msgstr "QA-sida"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Archive of the Maintainer Mailinglist"
 msgstr "Arkiv för paketansvarigas sändlista"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Mail Archive"
 msgstr "E-postarkiv"
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:130
 msgid "External Resources:"
 msgstr "Externa resurser:"
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:132
 msgid "Homepage"
 msgstr "Hemsida"
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:138
 msgid "Similar packages:"
 msgstr "Liknande paket:"
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:154
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
 "distribution. That means it is likely unstable or buggy, and it may even "
@@ -857,7 +850,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:178
 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 "
@@ -867,67 +860,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:186
 msgid "Tags"
 msgstr "Märken"
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:209
 msgid "Packages providing %s"
 msgstr "Paket som tillhandahåller %s"
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:218
 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:227
 msgid "Other Packages Related to %s"
 msgstr "Andra paket besläktade med %s"
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:229
 msgid "legend"
 msgstr "beskrivning"
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:231
 msgid "build-depends"
 msgstr "bygg-beroende"
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:232
 msgid "build-depends-indep"
 msgstr "arkitekturoberoende bygg-beroende"
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:234
 msgid "depends"
 msgstr "beror"
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:235
 msgid "recommends"
 msgstr "rekommenderar"
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:236
 msgid "suggests"
 msgstr "föreslår"
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:246
 msgid "or "
 msgstr "eller "
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:254
 msgid "also a virtual package provided by"
 msgstr "också ett virtuellt paket som tillhandahålls av"
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:256
+msgid "virtual package provided by"
+msgstr "virtuellt paket som tillhandahålls av"
+
+#: templates/html/show.tmpl:261
 msgid "hide %u providing packages"
 msgstr "dölj %u tillhandahållande paket"
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:261
 msgid "show %u providing packages"
 msgstr "visa %u tillhandahållande paket"
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:279
 msgid "Download %s"
 msgstr "Hämta %s"
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:281
 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 "
@@ -936,55 +933,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:282
 msgid "Download for all available architectures"
 msgstr "Hämtningar för alla tillgängliga arkitekturer"
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:283
 msgid "Architecture"
 msgstr "Arkitektur"
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:284
 msgid "Version"
 msgstr "Version"
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:285
 msgid "Package Size"
 msgstr "Paketstorlek"
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:286
 msgid "Installed Size"
 msgstr "Installerad storlek"
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:287
 msgid "Files"
 msgstr "Filer"
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:295
 msgid "(unofficial port)"
 msgstr "(inofficiell anpassning)"
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:306 templates/html/show.tmpl:334
 msgid "%s&nbsp;kB"
 msgstr "%s&nbsp;kbyte"
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:309
 msgid "list of files"
 msgstr "filförteckning"
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:311
 msgid "no current information"
 msgstr "ingen aktuell information"
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:328
 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:329
 msgid "Size (in kB)"
 msgstr "Storlek (i kbyte)"
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:347
 msgid ""
 "Debian Package Source Repository (<acronym title=\"Version Control System"
 "\">VCS</acronym>: <a href=\"%s\">%s</a>)"
@@ -992,7 +989,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:351
 msgid "Debian Package Source Repository (Browsable)"
 msgstr "Debians paketkällkodsarkiv (blädderbart)"
 
@@ -1048,15 +1045,15 @@ 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."
 
diff --git a/po/templates.uk.po b/po/templates.uk.po
index 9e781d4..c306df2 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:153
 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:158
 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:159
 #, 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:329
 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,152 +521,152 @@ msgstr "Всі пакунки Debian в дистрибутиві „%s“"
 msgid "Package Search Results"
 msgstr "Всі пакунки Debian в дистрибутиві „%s“"
 
-#: templates/html/search.tmpl:34
+#: 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:39
+#: templates/html/search.tmpl:40
 msgid "Search in specific suite:"
 msgstr ""
 
-#: templates/html/search.tmpl:48
+#: 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:52 templates/html/search_contents.tmpl:58
+#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
 msgid "Limit search to a specific architecture:"
 msgstr ""
 
-#: templates/html/search.tmpl:61 templates/html/search_contents.tmpl:63
+#: 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:68
+#: 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:77
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr ""
 
-#: templates/html/search.tmpl:77
+#: templates/html/search.tmpl:78
 msgid "suite(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:78 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:78 templates/html/search_contents.tmpl:72
+#: templates/html/search.tmpl:79 templates/html/search_contents.tmpl:72
 msgid "section(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:79 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:79 templates/html/search_contents.tmpl:73
+#: templates/html/search.tmpl:80 templates/html/search_contents.tmpl:73
 msgid "architecture(s) <em>%s</em>"
 msgstr ""
 
-#: templates/html/search.tmpl:81
+#: templates/html/search.tmpl:82
 #, fuzzy
 msgid "packages"
 msgstr "Розмір пакунка"
 
-#: templates/html/search.tmpl:81
+#: templates/html/search.tmpl:82
 #, fuzzy
 msgid "source packages"
 msgstr "Джерельний пакунок"
 
-#: templates/html/search.tmpl:82
+#: 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:85
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr ""
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:87
+#: 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:93
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr ""
 
-#: templates/html/search.tmpl:98
+#: 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:102
+#: 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."
 msgstr ""
 
-#: templates/html/search.tmpl:104
+#: 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:110 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:117
+#: templates/html/search.tmpl:118
 #, fuzzy
 msgid "Package %s"
 msgstr "Пакунок: %s (%s)"
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 #, fuzzy
 msgid "also provided by:"
 msgstr "віртуальний пакунок"
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr ""
 
-#: templates/html/search.tmpl:136
+#: templates/html/search.tmpl:139
 #, fuzzy
 msgid "Source Package %s"
 msgstr "Джерельний пакунок"
 
-#: templates/html/search.tmpl:144
+#: templates/html/search.tmpl:146
 #, fuzzy
 msgid "Binary packages:"
 msgstr "віртуальний пакунок"
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 #, fuzzy
 msgid "hide %u binary packages"
 msgstr "Розмір пакунка"
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 #, fuzzy
 msgid "show %u binary packages"
 msgstr "Розмір пакунка"
 
-#: templates/html/search.tmpl:156
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -736,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:329
 msgid "File"
 msgstr "Файл"
 
@@ -764,127 +757,127 @@ 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
+#: templates/html/show.tmpl:66
 msgid "Debian 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:121
 msgid "An overview over the maintainer's packages and uploads"
 msgstr ""
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:121
 #, fuzzy
 #| msgid "All packages"
 msgid "QA Page"
 msgstr "Всі пакунки"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Archive of the Maintainer Mailinglist"
 msgstr ""
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Mail Archive"
 msgstr ""
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:130
 msgid "External Resources:"
 msgstr ""
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:132
 msgid "Homepage"
 msgstr ""
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:138
 #, fuzzy
 msgid "Similar packages:"
 msgstr "віртуальний пакунок"
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:154
 #, fuzzy
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
@@ -897,7 +890,7 @@ msgstr ""
 "і він навіть може призвести до втрати даних. Якщо ви проігноруєте це "
 "попередження і встановите його, то робіть це на ваш ризик."
 
-#: templates/html/show.tmpl:176
+#: templates/html/show.tmpl:178
 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 "
@@ -907,72 +900,77 @@ msgstr ""
 "\">Політику Debian</a> щоб дізнатись про <a href=\"%sch-binary.html#s-"
 "virtual_pkg\">визначення віртуальних пакунків</a>."
 
-#: templates/html/show.tmpl:184
+#: templates/html/show.tmpl:186
 msgid "Tags"
 msgstr ""
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:209
 msgid "Packages providing %s"
 msgstr "Пакунки що надають %s"
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:218
 msgid "The following binary packages are built from this source package:"
 msgstr "Наступні двійкові пакунки побудовано з цього джерельного пакунка:"
 
-#: templates/html/show.tmpl:225
+#: templates/html/show.tmpl:227
 msgid "Other Packages Related to %s"
 msgstr "Інші пакунки пов'язані з %s"
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:229
 msgid "legend"
 msgstr ""
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:231
 msgid "build-depends"
 msgstr ""
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:232
 msgid "build-depends-indep"
 msgstr ""
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:234
 msgid "depends"
 msgstr ""
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:235
 msgid "recommends"
 msgstr ""
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:236
 msgid "suggests"
 msgstr ""
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:246
 #, fuzzy
 #| msgid "or"
 msgid "or "
 msgstr "або"
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:254
 #, fuzzy
 msgid "also a virtual package provided by"
 msgstr "віртуальний пакунок"
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:256
+#, fuzzy
+msgid "virtual package provided by"
+msgstr "віртуальний пакунок"
+
+#: templates/html/show.tmpl:261
 #, fuzzy
 msgid "hide %u providing packages"
 msgstr "Розмір пакунка"
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:261
 #, fuzzy
 msgid "show %u providing packages"
 msgstr "Розмір пакунка"
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:279
 msgid "Download %s"
 msgstr "Завантажити %s"
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:281
 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 "
@@ -982,62 +980,62 @@ msgstr ""
 "файлів. Додатково, вона містить інформацію про розмір пакунка та розмір "
 "після встановлення."
 
-#: templates/html/show.tmpl:280
+#: templates/html/show.tmpl:282
 msgid "Download for all available architectures"
 msgstr "Завантаження для всіх доступних архітектур"
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:283
 msgid "Architecture"
 msgstr "Архітектура"
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:284
 msgid "Version"
 msgstr "Версія"
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:285
 msgid "Package Size"
 msgstr "Розмір пакунка"
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:286
 msgid "Installed Size"
 msgstr "Розмір після встановлення"
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:287
 msgid "Files"
 msgstr "Файли"
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:295
 msgid "(unofficial port)"
 msgstr ""
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:306 templates/html/show.tmpl:334
 msgid "%s&nbsp;kB"
 msgstr ""
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:309
 msgid "list of files"
 msgstr "список файлів"
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:311
 #, fuzzy
 msgid "no current information"
 msgstr "Додаткова інформація про %s"
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:328
 msgid "Download information for the files of this source package"
 msgstr ""
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:329
 msgid "Size (in kB)"
 msgstr "Розмір (в кБ)"
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:347
 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:351
 #, fuzzy
 msgid "Debian Package Source Repository (Browsable)"
 msgstr "Всі пакунки Debian в дистрибутиві „%s“"
@@ -1103,17 +1101,17 @@ 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 ""
 
diff --git a/po/templates.zh-cn.po b/po/templates.zh-cn.po
index 0b45f93..574defd 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:153
 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:158
 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:159
 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:329
 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,7 +461,7 @@ msgstr "软件包搜索结果 -- %s"
 msgid "Package Search Results"
 msgstr "软件包搜索结果"
 
-#: templates/html/search.tmpl:34
+#: 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>."
@@ -475,27 +469,27 @@ msgstr ""
 "您刚才搜索的仅限于完整匹配您指定关键字的内容。您还可以尝试搜索<a href=\"%s\">"
 "部分匹配</a>您指定关键字的内容。"
 
-#: templates/html/search.tmpl:39
+#: templates/html/search.tmpl:40
 #, fuzzy
 #| msgid "Search in other suite:"
 msgid "Search in specific suite:"
 msgstr "在其他的发行版中搜索:"
 
-#: templates/html/search.tmpl:48
+#: 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:52 templates/html/search_contents.tmpl:58
+#: templates/html/search.tmpl:53 templates/html/search_contents.tmpl:58
 msgid "Limit search to a specific architecture:"
 msgstr "只搜索某一种硬件架构:"
 
-#: templates/html/search.tmpl:61 templates/html/search_contents.tmpl:63
+#: 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:68
+#: templates/html/search.tmpl:69
 #, fuzzy
 #| msgid ""
 #| "<a href=\"%s\">%u</a> results have not been displayed due to the search "
@@ -506,51 +500,51 @@ msgid ""
 msgstr ""
 "由于参数界定了搜索范围，导致 <a href=\"%s\">%u</a> 个相关结果没有列出。"
 
-#: templates/html/search.tmpl:77
+#: templates/html/search.tmpl:78
 msgid "all suites"
 msgstr "所有发行版"
 
-#: templates/html/search.tmpl:77
+#: 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:78 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:78 templates/html/search_contents.tmpl:72
+#: 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:79 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:79 templates/html/search_contents.tmpl:73
+#: 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:81
+#: templates/html/search.tmpl:82
 msgid "packages"
 msgstr "软件包"
 
-#: templates/html/search.tmpl:81
+#: templates/html/search.tmpl:82
 msgid "source packages"
 msgstr "源码包"
 
-#: templates/html/search.tmpl:82
+#: 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:85
+#: templates/html/search.tmpl:86
 msgid " (including subword matching)"
 msgstr "(包括部分关键字匹配)"
 
 #. @translators: I'm really sorry :/
-#: templates/html/search.tmpl:87
+#: templates/html/search.tmpl:88
 msgid ""
 "You have searched for <em>%s</em> in packages names and descriptions in %s, %"
 "s, and %s%s."
@@ -558,11 +552,11 @@ msgstr ""
 "您在%2中%4下%3里，指定关键字 <em>%1</em> 在软件包名称和描述信息中搜索的结果%"
 "5。"
 
-#: templates/html/search.tmpl:93
+#: templates/html/search.tmpl:94
 msgid "Found <strong>%u</strong> matching packages."
 msgstr "找到 <strong>%u</strong> 个匹配的软件包。"
 
-#: templates/html/search.tmpl:98
+#: 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 "
@@ -571,7 +565,7 @@ msgstr ""
 "注意: 这里列出的是最符合搜索关键字要求的结果，并按相关性作了排序。如果前几个"
 "包不是您要找的，请尝试更多的或者其它的关键字。"
 
-#: templates/html/search.tmpl:102
+#: templates/html/search.tmpl:103
 #, fuzzy
 #| msgid ""
 #| "Your search was too wide so we will only display exact matches. At least "
@@ -584,7 +578,7 @@ msgstr ""
 "由于您的搜索范围太大我们只列出了能完整匹配搜索关键字的结果。至少有 <em>%u</"
 "em> 个相关结果没有被列出。请考虑更换一个更准确的关键字或者添加更多的关键字。"
 
-#: templates/html/search.tmpl:104
+#: templates/html/search.tmpl:105
 #, fuzzy
 #| msgid ""
 #| "Note: Your search was too wide so we will only display only the first "
@@ -597,43 +591,43 @@ msgstr ""
 "注意: 由于您的搜索范围太大我们只列出了前 100 个结果。请考虑更换一个更准确的关"
 "键字或者添加更多的关键字。"
 
-#: templates/html/search.tmpl:110 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:117
+#: templates/html/search.tmpl:118
 msgid "Package %s"
 msgstr "软件包 %s"
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "also provided by:"
 msgstr "同时提供该包的还有:"
 
-#: templates/html/search.tmpl:127
+#: templates/html/search.tmpl:130
 msgid "provided by:"
 msgstr "由这些包填实:"
 
-#: templates/html/search.tmpl:136
+#: templates/html/search.tmpl:139
 msgid "Source Package %s"
 msgstr "源码包 %s"
 
-#: templates/html/search.tmpl:144
+#: templates/html/search.tmpl:146
 msgid "Binary packages:"
 msgstr "二进制包:"
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 #, fuzzy
 #| msgid "%u binary packages"
 msgid "hide %u binary packages"
 msgstr "%u 个二进制包"
 
-#: templates/html/search.tmpl:146
+#: templates/html/search.tmpl:148
 #, fuzzy
 #| msgid "%u binary packages"
 msgid "show %u binary packages"
 msgstr "%u 个二进制包"
 
-#: templates/html/search.tmpl:156
+#: templates/html/search.tmpl:158
 msgid ""
 "<a href=\"%s\">%u</a> results have not been displayed because you requested "
 "only exact matches."
@@ -699,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:329
 msgid "File"
 msgstr "文件"
 
@@ -723,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
+#: templates/html/show.tmpl:66
 msgid "Debian Resources:"
 msgstr "Debian 的资源:"
 
-#: 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:121
 msgid "An overview over the maintainer's packages and uploads"
 msgstr "该维护者负责的软件包一览"
 
-#: templates/html/show.tmpl:120
+#: templates/html/show.tmpl:121
 msgid "QA Page"
 msgstr "QA 页面"
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Archive of the Maintainer Mailinglist"
 msgstr ""
 
-#: templates/html/show.tmpl:121
+#: templates/html/show.tmpl:122
 msgid "Mail Archive"
 msgstr ""
 
-#: templates/html/show.tmpl:129
+#: templates/html/show.tmpl:130
 msgid "External Resources:"
 msgstr "外部的资源:"
 
-#: templates/html/show.tmpl:131
+#: templates/html/show.tmpl:132
 msgid "Homepage"
 msgstr "主页"
 
-#: templates/html/show.tmpl:137
+#: templates/html/show.tmpl:138
 msgid "Similar packages:"
 msgstr "相似软件包:"
 
-#: templates/html/show.tmpl:153
+#: templates/html/show.tmpl:154
 msgid ""
 "Warning: This package is from the <strong>experimental</strong> "
 "distribution. That means it is likely unstable or buggy, and it may even "
@@ -838,7 +832,7 @@ msgstr ""
 "表现出不稳定或者出现 bug ，甚至是导致资料损失。请务必在使用之前查阅 <a href="
 "\"%s\">changelog</a> 以及其他潜在的文档。"
 
-#: templates/html/show.tmpl:176
+#: templates/html/show.tmpl:178
 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 "
@@ -847,71 +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:186
 msgid "Tags"
 msgstr "标签"
 
-#: templates/html/show.tmpl:207
+#: templates/html/show.tmpl:209
 msgid "Packages providing %s"
 msgstr "负责填实 %s 的软件包"
 
-#: templates/html/show.tmpl:216
+#: templates/html/show.tmpl:218
 msgid "The following binary packages are built from this source package:"
 msgstr "本源码包构建了以下这些二进制包:"
 
-#: templates/html/show.tmpl:225
+#: templates/html/show.tmpl:227
 msgid "Other Packages Related to %s"
 msgstr "其它与 %s 有关的软件包"
 
-#: templates/html/show.tmpl:227
+#: templates/html/show.tmpl:229
 msgid "legend"
 msgstr "图例"
 
-#: templates/html/show.tmpl:229
+#: templates/html/show.tmpl:231
 msgid "build-depends"
 msgstr "完整构建时刻依赖"
 
-#: templates/html/show.tmpl:230
+#: templates/html/show.tmpl:232
 msgid "build-depends-indep"
 msgstr "单独构建时刻依赖"
 
-#: templates/html/show.tmpl:232
+#: templates/html/show.tmpl:234
 msgid "depends"
 msgstr "依赖"
 
-#: templates/html/show.tmpl:233
+#: templates/html/show.tmpl:235
 msgid "recommends"
 msgstr "推荐"
 
-#: templates/html/show.tmpl:234
+#: templates/html/show.tmpl:236
 msgid "suggests"
 msgstr "建议"
 
-#: templates/html/show.tmpl:244
+#: templates/html/show.tmpl:246
 msgid "or "
 msgstr "或者"
 
-#: templates/html/show.tmpl:252
+#: templates/html/show.tmpl:254
 msgid "also a virtual package provided by"
 msgstr "同时作为一个虚包由这些包填实:"
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:256
+msgid "virtual package provided by"
+msgstr "本虚包由这些包填实:"
+
+#: templates/html/show.tmpl:261
 #, fuzzy
 #| msgid "%u providing packages"
 msgid "hide %u providing packages"
 msgstr "%u 个虚包填实者"
 
-#: templates/html/show.tmpl:259
+#: templates/html/show.tmpl:261
 #, fuzzy
 #| msgid "%u providing packages"
 msgid "show %u providing packages"
 msgstr "%u 个虚包填实者"
 
-#: templates/html/show.tmpl:277
+#: templates/html/show.tmpl:279
 msgid "Download %s"
 msgstr "下载 %s"
 
-#: templates/html/show.tmpl:279
+#: templates/html/show.tmpl:281
 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 "
@@ -920,55 +918,55 @@ msgstr ""
 "下载表格中分别链接了软件包的下载地址和软件包内容的浏览地址。同时还给出了软件"
 "包的实际大小和安装后占用空间的情况。"
 
-#: templates/html/show.tmpl:280
+#: templates/html/show.tmpl:282
 msgid "Download for all available architectures"
 msgstr "下载可用于所有硬件架构的"
 
-#: templates/html/show.tmpl:281
+#: templates/html/show.tmpl:283
 msgid "Architecture"
 msgstr "硬件架构"
 
-#: templates/html/show.tmpl:282
+#: templates/html/show.tmpl:284
 msgid "Version"
 msgstr "版本"
 
-#: templates/html/show.tmpl:283
+#: templates/html/show.tmpl:285
 msgid "Package Size"
 msgstr "软件包大小"
 
-#: templates/html/show.tmpl:284
+#: templates/html/show.tmpl:286
 msgid "Installed Size"
 msgstr "安装后大小"
 
-#: templates/html/show.tmpl:285
+#: templates/html/show.tmpl:287
 msgid "Files"
 msgstr "文件"
 
-#: templates/html/show.tmpl:293
+#: templates/html/show.tmpl:295
 msgid "(unofficial port)"
 msgstr "(非官方移植版)"
 
-#: templates/html/show.tmpl:304 templates/html/show.tmpl:332
+#: templates/html/show.tmpl:306 templates/html/show.tmpl:334
 msgid "%s&nbsp;kB"
 msgstr "%s&nbsp;kB"
 
-#: templates/html/show.tmpl:307
+#: templates/html/show.tmpl:309
 msgid "list of files"
 msgstr "文件列表"
 
-#: templates/html/show.tmpl:309
+#: templates/html/show.tmpl:311
 msgid "no current information"
 msgstr "没有当前信息"
 
-#: templates/html/show.tmpl:326
+#: templates/html/show.tmpl:328
 msgid "Download information for the files of this source package"
 msgstr "源码包文件的下载信息"
 
-#: templates/html/show.tmpl:327
+#: templates/html/show.tmpl:329
 msgid "Size (in kB)"
 msgstr "大小(单位: kB)"
 
-#: templates/html/show.tmpl:345
+#: templates/html/show.tmpl:347
 msgid ""
 "Debian Package Source Repository (<acronym title=\"Version Control System"
 "\">VCS</acronym>: <a href=\"%s\">%s</a>)"
@@ -976,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:351
 msgid "Debian Package Source Repository (Browsable)"
 msgstr "Debian 软件包源码仓库(可在线浏览)"
 
@@ -1028,15 +1026,15 @@ 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> 以便了解许可证的各项条款。"
 
diff --git a/templates/config.tmpl b/templates/config.tmpl
index 451b0e6..9b71c47 100644
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -52,7 +52,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.ubuntu.com/">packages.ubuntu.com</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.ubuntu.com', 'packages.ubuntu.com') }
 -%]
 [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
 [%- USE num = Number.Format( decimal_point => g('.'),
diff --git a/templates/html/index.tmpl b/templates/html/index.tmpl
deleted file mode 100644
index cac305c..0000000
--- a/templates/html/index.tmpl
+++ /dev/null
@@ -1,60 +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 %]
-  [%- desclang = 'en';
-      IF p.trans_desc.$ddtp_lang;
-	sdesc = p.trans_desc.$ddtp_lang;
-	desclang = $ddtp_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 [% "lang=\"$desclang\"" IF desclang != po_lang %]>[% sdesc | html %]</dd>
-    [% END %]
-  [% ELSE %]
-    <dt><a href="[% p.name %]" id="[% p.name %]">[% p.name %]</a> ([% p.versions %])[% PROCESS markers %]</dt>
-       <dd [% "lang=\"$desclang\"" IF desclang != po_lang %]>[% 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/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) %]