3 files changed, 63 insertions, 38 deletions
diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php
index b21cc7c01..e29eb15c3 100644
--- a/admin/include/functions_upgrade.php
+++ b/admin/include/functions_upgrade.php
@@ -132,11 +132,8 @@ WHERE id IN ("' . implode('","', $plugins) . '")
 ;';
     mysql_query($query);
 
-    array_push(
-      $page['infos'],
-      'As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:
-<pre>' . implode(', ', $plugins) . '</pre>'
-      );
+    array_push($page['infos'],
+      l10n('deactivated plugins') . '<pre>' . implode(', ', $plugins) . '</pre>');
   }
 }
 
diff --git a/admin/template/goto/install.tpl b/admin/template/goto/install.tpl
index 553eb737d..a0e8eff6f 100644
--- a/admin/template/goto/install.tpl
+++ b/admin/template/goto/install.tpl
@@ -1,7 +1,7 @@
 {* $Id$ *}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
 "http://www.w3.org/TR/html4/strict.dtd">
-<html lang="fr">
+<html lang="{$lang_info.code}" dir="{$lang_info.direction}">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset={$T_CONTENT_ENCODING}">
 <meta http-equiv="Content-script-type" content="text/javascript">
diff --git a/admin/template/goto/upgrade.tpl b/admin/template/goto/upgrade.tpl
index 2af91c70e..c36d25b5a 100644
--- a/admin/template/goto/upgrade.tpl
+++ b/admin/template/goto/upgrade.tpl
@@ -1,44 +1,72 @@
 {* $Id$ *}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html lang="{$lang_info.code}" dir="{$lang_info.direction}">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-script-type" content="text/javascript">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico">
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/layout.css">
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/default-colors.css">
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/theme/{$themeconf.theme}/theme.css">
+{literal}
+<style type="text/css">
+#theHeader { height: 105px; }
 
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"  />
-    <title>Piwigo : Upgrade to {$RELEASE}</title>
-  </head>
+.content {
+ width: 800px;
+ min-height: 0px !important;
+ margin: auto;
+ padding: 25px;
+ text-align: left;
+}
 
-  <body>
-    {if isset($introduction)}
-    <h1>Welcome to Piwigo upgrade page.</h1>
+h2 { width: 770px !important; }
+</style>
+{/literal}
+<title>Piwigo {$RELEASE} - {'Upgrade'|@translate}</title>
+</head>
 
-    <p>This page proposes to upgrade your database corresponding to your old
-version of Piwigo to the current version. The upgrade assistant
-thinks you are currently running a
-<strong>release {$introduction.CURRENT_RELEASE}</strong> (or equivalent).</p>
+<body>
+<div id="headbranch"></div> {* Dummy block for double background management *}
+<div id="theHeader"></div>
+<div id="content" class="content">
 
-    <p><a href="{$introduction.RUN_UPGRADE_URL}">Upgrade from release
-{$introduction.CURRENT_RELEASE} to {$RELEASE}</a></p>
-    {/if}
+{if isset($introduction)}
+<h2>Piwigo {$RELEASE} - {'Upgrade'|@translate}</h2>
 
-    {if isset($upgrade)}
-    <h1>Upgrade from version {$upgrade.VERSION} to {$RELEASE}</h1>
+<p>{'language'|@translate} &nbsp;
+<select name="language" onchange="document.location = 'upgrade.php?language='+this.options[this.selectedIndex].value;">
+  {html_options options=$language_options selected=$language_selection}
+</select>
+</p>
 
-    <p>Statistics</p>
-    <ul>
-      <li>total upgrade time : {$upgrade.TOTAL_TIME}</li>
-      <li>total SQL time : {$upgrade.SQL_TIME}</li>
-      <li>SQL queries : {$upgrade.NB_QUERIES}</li>
-    </ul>
+<p>{'introduction message'|@translate|@sprintf:$introduction.CURRENT_RELEASE}</p>
 
-    <p>Upgrade informations</p>
+<p style="text-align: center;">
+<a href="{$introduction.RUN_UPGRADE_URL}">{'Upgrade from %s to %s'|@translate|@sprintf:$introduction.CURRENT_RELEASE:$RELEASE}</b>
+</p>
+{/if}
 
-    <ul>
-      {foreach from=$infos item=info}
-      <li>{$info}</li>
-      {/foreach}
-    </ul>
+{if isset($upgrade)}
+<h2>{'Upgrade from %s to %s'|@translate|@sprintf:$upgrade.VERSION:$RELEASE}</h2>
 
-    {/if}
-  </body>
+<p><b>{'Statistics'|@translate}</b></p>
+<ul>
+  <li>{'total upgrade time'|@translate} : {$upgrade.TOTAL_TIME}</li>
+  <li>{'total SQL time'|@translate} : {$upgrade.SQL_TIME}</li>
+  <li>{'SQL queries'|@translate} : {$upgrade.NB_QUERIES}</li>
+</ul>
 
+<p><b>{'Upgrade informations'|@translate}</b></p>
+<ul>
+  {foreach from=$infos item=info}
+  <li>{$info}</li>
+  {/foreach}
+</ul>
+{/if}
+
+</div> {* content *}
+</body>
 </html>