Merge branch 'master' into debian-master

diff --git a/bin/parse-contents b/bin/parse-contents
index ab7df273fb3a20f16fd4e483712bbbcd82836324..16bc7e497f7e9bf25daf0b5c5337415279fd7cff 100755 (executable)
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@ -47,7 +47,7 @@ my @archives = @ARCHIVES;
 my @suites = @SUITES;
 my @archs = @ARCHITECTURES;
 my %deborts_hash;
-@deborts_hash{qw( avr32 m68k powerpcspe sh4 sparc64 )} = ();
+@deborts_hash{qw( alpha avr32 hppa m68k powerpcspe sh4 sparc64 )} = ();
 
 $DBDIR .= "/contents";
 mkdirp( $DBDIR );

diff --git a/cron.d/100syncarchive_debports b/cron.d/100syncarchive_debports
index c384ef0baed840fdbab6ee250d6ad80ba5b783d1..ba53e3629ae557257f812055886613c5abb8b41f 100755 (executable)
--- a/cron.d/100syncarchive_debports
+++ b/cron.d/100syncarchive_debports
@@ -7,7 +7,7 @@ cd ${archivedir}
 
 # Main archive
 #
-architectures="avr32 powerpcspe sh4 m68k sparc64"
+architectures="alpha avr32 hppa m68k powerpcspe sh4 sparc64"
 
 for dist in sid experimental
   do

diff --git a/po/templates.fr.po b/po/templates.fr.po
index 5db741aa5eac11cc63a7ac0a3549cb280cb1b0f8..23c504374ae335dcd054b3a8b9f854c5cce3ff1a 100644 (file)
--- a/po/templates.fr.po
+++ b/po/templates.fr.po
@@ -1,5 +1,5 @@
 # Translation of templates to French
-# Copyright (C) 2009, 2010 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# Copyright (C) 2009-2011 Debian French l10n team <debian-l10n-french@lists.debian.org>
 # This file is distributed under the same license as the package.debian.org website.
 #
 # Guilhelm Panaget <guilhelm.panaget@free.fr>, 2009.
@@ -387,8 +387,8 @@ 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 sur les contacts, référez-vous à la <a href=\"%"
-"s/contact\">page contact</a> de %s."
+"obtenir d'autres informations sur les contacts de %s, référez-vous à la <a href=\"%"
+"s/contact\">page contact</a>"
 
 #: templates/html/foot.tmpl:32
 msgid ""

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index 79ee6f4b8bf4166acf0b73403de64330c851dd9e..b01bd335d174f0d599738bccad3aeab7ba44e920 100644 (file)
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -163,10 +163,22 @@ mirrors = {
                title => g('ports of packages to architectures not yet or not anymore available in Debian'),
                mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors',
                unofficial_port => {
+                       alpha => {
+                               url_name => 'alpha',
+                               name => 'Alpha',
+                       },
                        avr32 => {
                                url => 'http://avr32.debian.net/',
                                name => 'AVR32',
                        },
+                       hppa => {
+                               url_name => 'hppa',
+                               name => 'HPPA',
+                       },
+                       m68k => {
+                               url_name => 'm68k',
+                               name => 'M68K',
+                       },
                        powerpcspe => {
                                url => 'http://wiki.debian.org/PowerPCSPEPort',
                                name => 'PowerPCSPE',
@@ -179,10 +191,6 @@ mirrors = {
                                url => 'http://wiki.debian.org/Sparc64',
                                name => 'Sparc64',
                        },
-                       m68k => {
-                               url_name => 'm68k',
-                               name => 'M68K',
-                       },
                },
                north_america => [
                        "www.gtlib.gatech.edu/pub/gnuab/debian",