Merge commit 'origin/master' into debian-master

Conflicts:

	templates/config.tmpl

diff --combined conf/apache.conf.sed.in
index 8cfd8070c9e0fd8681624507829a7321d3df301c,e6cc7f6e0a2c8068c2b947e88b7d7ae80e02d854..fff631f5e4da0452f20913ae6ff37cd41fcdcad8
--- 1/conf/apache.conf.sed.in
--- 2/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -71,8 -71,6 +71,8 @@@
     ErrorLog /var/log/apache2/%SITE%-error.log
     CustomLog /var/log/apache2/%SITE%-access.log combined
  
 +   CBandUser pdo
 +
     Alias /cgi-bin/ %TOPDIR%/cgi-bin/
    
     PerlModule ModPerl::Registry
@@@ -112,8 -110,8 +112,8 @@@
     RewriteRule ^/[^/]+\.css - [L]
     RewriteRule ^/[^/]+\.js - [L]
  
 -#   RewriteRule ^/$ http://www.debian.org/distrib/packages
 -   RewriteRule ^/$ /index.html [L]
 +   RewriteRule ^/$ http://www.debian.org/distrib/packages
 +#   RewriteRule ^/$ /index.html [L]
     RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
     RewriteRule ^/changelog:(.+)$  http://%SITE%/changelogs/${changelog-url:$1} [R,L,NE]
     RewriteRule ^/src:([^/]+)$ /source/$1 [R,L,NE]
@@@ -122,8 -120,7 +122,7 @@@
     RewriteCond %{QUERY_STRING} =""
     RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]
     RewriteCond %TOPDIR%/www%{REQUEST_FILENAME}.en.html -f [OR]
-    RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -l [OR]
-    RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -d
+    RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -l
     RewriteRule . - [L]
  
     RewriteRule ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [L,PT]

diff --combined templates/config.tmpl
index 26827e4fbee339a731e8a8d872727cc7adf2b3af,294d8f0a1ee8a3b3e764facbc44473621230f23a..dc836b92084d501c9bab20c7324d18e452f32506
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -1,10 -1,11 +1,11 @@@
  [%- DEFAULT
     charset = 'UTF-8'
-    lang = 'en'
+    po_lang = 'en'
+    ddtp_lang = 'en'
  
     organisation = 'Debian'
     homepage = 'http://www.debian.org/'
 -   packages_homepage = 'http://packages.debian.net/'
 +   packages_homepage = 'http://packages.debian.org/'
     searchformurl = packages_homepage
     search_url = '/'
     tags_url = 'http://debtags.alioth.debian.org/'
@@@ -49,9 -50,8 +50,9 @@@
  -%]
  [%-
     # possible values for importance: high, normal, low
 -   sitewidemsg = { importance => "high",
 -                 txt => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') }
 +#   sitewidemsg = { importance => "high",
- #                txt => g('Please note that this is an experimental version of <a href="http://packages.debian.org/">packages.debian.org</a>. Errors and obsolete information should be expected') }
++#                txt => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') }
 +#                txt => "Site maintainance in progress, some temporary problems might occour." }
  -%]
  [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
  [%- USE num = Number.Format( decimal_point => g('.'),