Merge of the 1.3.1 release

Creation of an unique include file (common.php)
Creation of an unique define file (include/constants.php)
Modification of the installation procedure


git-svn-id: http://piwigo.org/svn/trunk@345 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 6 insertions, 2 deletions

diff --git a/language/english.php b/language/english.php
index 8f779f734..03c506a5a 100644
--- a/language/english.php
+++ b/language/english.php
@@ -155,7 +155,7 @@ $lang['upload_err_username'] = 'the username must be given';
 $lang['upload_username'] = 'Username';
 $lang['upload_successful'] = 'Picture uploaded with success, an administrator will validate it as soon as possible';
 // new or modified in release 1.3
-$lang['charset'] = 'ISO_8859-1';
+$lang['charset'] = 'iso-8859-1';
 $lang['no'] = 'no';
 $lang['yes'] = 'yes';
 $lang['guest'] = 'guest';
@@ -535,6 +535,10 @@ if ( $isadmin )
   $lang['waiting_update'] = 'Validated pictures will be displayed only once pictures database updated';
   $lang['conf_upload_available_info'] = 'Authorizing the upload of pictures by users on the categories of the website (not on a remote server). This is general parameter, it is needed to authorize upload category by category, by default, no category is "uploadable".';
   $lang['install_help'] = 'Need help ? Ask your question on <a href="http://forum.phpwebgallery.net">PhpWebGallery message board</a>.';
+  // new or modified in release 1.3.1
+  $lang['cat_unknown_id'] = 'This category is unknown in the database';
+}
+
   // new or modified in release 1.4
   $lang['install_end_message'] = 'The configuration of PhpWebGallery is finished, here is the next step<br /><br />
 For security reason, please delete file "install.php"<br />
@@ -544,5 +548,5 @@ Once this file deleted , follow this instructions :
   <li>this login will enable you to access to the administration panel and to the instructions in order to place pictures in your directories</li>
 </ul>';
   $lang['install_warning'] = 'The file "install.php" is still present. Please remove it from your server. It is not secure to keep it.';
-}
+
 ?>
\ No newline at end of file