get everything ready for 3.1 beta 1

diff --git a/HISTORY b/HISTORY
index c96e40b8fae73687c6f9d5235386c4cfab751d32..080bc79fd2ff67b324d7c072860f1d3c6e2ac943 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -1,13 +1,11 @@
 phpPgAdmin History
 ------------------
 
-Version 3.1-dev
----------------
+Version 3.1-beta-1
+------------------
 
 Features:
-* Turkish update from Devrim Gunduz
 * Add first & last links to nav.  Double number of pages shown.
-* German update from Markus Bertheau
 * Allow granting privileges WITH GRANT OPTION for 7.4
 * Allow revoking GRANT OPTION with CASCADE option for 7.4
 * Display new PostgreSQL 7.4 grant options and grantor in privileges
@@ -29,22 +27,12 @@ Features:
 * View and edit table comments
 * Changed XML format significantly.  Now doesn't use field names as
   tag names, outputs column type information, and is in correct XML format!
-* 'Save as Report' feature when viewing record sets
+* Save result sets as views and reports in most cases 
+* Download the results of selects and reports
 * Tick all box on Select feature
 * Export in HTML format
-* Download the results of selects and reports
-* Traditional Chinese update from Chih-Hsin Lee
 * Allow listing of operators
-* Polish update from Rafal
-* Swedish translation from Stefan Malqvist
 * Add a robots.txt file to prevent search engine indexation
-* Italian translation update from Nicola Soranzo
-* German update from Markus Bertheau
-* Spanish update from Martin Marques
-* Trad. Chinese update from Chih-Hsin Lee
-* Save selects as views
-* Russian update from Step
-* Slovak update from Andrej
 * Can now safely edit row based on OID.  Guards are in place against duplicate OIDs.
 * Works properly if you have cookies disabled
 
@@ -60,6 +48,20 @@ Bug Fixes:
 * Lots of reports fixes (titles, page reloads, etc.)
 * Selecting for NULL values in Select feature
 
+Translations:
+* Italian translation update from Nicola Soranzo
+* German update from Markus Bertheau
+* Spanish update from Martin Marques
+* Trad. Chinese update from Chih-Hsin Lee
+* Russian update from Step
+* Slovak update from Andrej
+* Polish update from Rafal
+* Swedish translation from Stefan Malqvist
+* Turkish update from Devrim Gunduz
+* German update from Markus Bertheau
+* Traditional Chinese update from Chih-Hsin Lee
+* Spanish update from Martin
+
 Version 3.0.1
 -------------
 

diff --git a/TODO b/TODO
index df480a14ca06fe8cfb26b5cd64e3fa0b1c57292e..94d59d40be584db42fbbd4b854085a0c01f50c70 100644 (file)
--- a/TODO
+++ b/TODO
@@ -126,7 +126,7 @@ Exotic
 ------
 
 * Support contrib/tsearch2 for easy full text indexes
-* -Search for object feature (chriskl, half done)
+* -Search for object feature (chriskl)
 * Pivot reports (ADODB has a feature for this)
 
 Principles

diff --git a/lang/italian.php b/lang/italian.php
index 2e823fa6ce4071d810c1ece10ba78e11baf3617f..7380999d19f6e82fecec55e7a29def9ef3b1e1e2 100644 (file)
--- a/lang/italian.php
+++ b/lang/italian.php
@@ -4,7 +4,7 @@
         * Italian language file, based on the english language file for phpPgAdmin.
         * Nicola Soranzo [nsoranzo@tiscali.it]
          *
-        * $Id: italian.php,v 1.12 2003/09/01 03:08:12 chriskl Exp $
+        * $Id: italian.php,v 1.13 2003/09/11 03:30:19 chriskl Exp $
         */
 
        // Language and character set - Lingua e set di caratteri
@@ -20,7 +20,7 @@
        $lang['strpgsqlhome_url'] = 'http://www.postgresql.org/';
        $lang['strlocaldocs'] = 'Documentazione su PostgreSQL (locale)';
        $lang['strreportbug'] = 'Riferisci un bug';
-       $lang['strviewfaq'] = 'Visualizza le FAQ';
+       $lang['strviewfaq'] = 'Visualizza le FAQ (domande ricorrenti)';
        $lang['strviewfaq_url'] = 'http://phppgadmin.sourceforge.net/?page=faq';
 
        // Basic strings - Stringhe basilari
@@ -56,7 +56,7 @@
        $lang['strsave'] = 'Salva';
        $lang['strreset'] = 'Reset';
        $lang['strinsert'] = 'Inserisci';
-       $lang['strselect'] = 'Seleziona righe';
+       $lang['strselect'] = 'Seleziona';
        $lang['strdelete'] = 'Cancella';
        $lang['strupdate'] = 'Aggiorna';
        $lang['strreferences'] = 'Riferimenti'; 

diff --git a/lang/recoded/italian.php b/lang/recoded/italian.php
index 9d852a29b2c94c3cd735de8715721c77445aa777..ae14a9591e1aec8543b0fde09e826026c4be5289 100644 (file)
--- a/lang/recoded/italian.php
+++ b/lang/recoded/italian.php
@@ -4,7 +4,7 @@
         * Italian language file, based on the english language file for phpPgAdmin.
         * Nicola Soranzo [nsoranzo@tiscali.it]
          *
-        * $Id: italian.php,v 1.7 2003/09/01 03:08:12 chriskl Exp $
+        * $Id: italian.php,v 1.8 2003/09/11 03:30:19 chriskl Exp $
         */
 
        // Language and character set - Lingua e set di caratteri
@@ -20,7 +20,7 @@
        $lang['strpgsqlhome_url'] = 'http://www.postgresql.org/';
        $lang['strlocaldocs'] = 'Documentazione su PostgreSQL (locale)';
        $lang['strreportbug'] = 'Riferisci un bug';
-       $lang['strviewfaq'] = 'Visualizza le FAQ';
+       $lang['strviewfaq'] = 'Visualizza le FAQ (domande ricorrenti)';
        $lang['strviewfaq_url'] = 'http://phppgadmin.sourceforge.net/?page=faq';
 
        // Basic strings - Stringhe basilari
@@ -56,7 +56,7 @@
        $lang['strsave'] = 'Salva';
        $lang['strreset'] = 'Reset';
        $lang['strinsert'] = 'Inserisci';
-       $lang['strselect'] = 'Seleziona righe';
+       $lang['strselect'] = 'Seleziona';
        $lang['strdelete'] = 'Cancella';
        $lang['strupdate'] = 'Aggiorna';
        $lang['strreferences'] = 'Riferimenti'; 

diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php
index a69722bab97ac0832578546f44de6ebe5b886e7d..d1b2b9f08cd596e9d642154d42894d231437601f 100644 (file)
--- a/libraries/lib.inc.php
+++ b/libraries/lib.inc.php
@@ -3,7 +3,7 @@
        /**
         * Function library read in upon startup
         *
-        * $Id: lib.inc.php,v 1.60 2003/09/10 07:25:49 chriskl Exp $
+        * $Id: lib.inc.php,v 1.61 2003/09/11 03:30:19 chriskl Exp $
         */
        
        // Set error reporting level to max
@@ -13,7 +13,7 @@
        $appName = 'phpPgAdmin';
 
        // Application version
-       $appVersion = '3.1-rc1';
+       $appVersion = '3.1-beta-1';
 
 
        // Check to see if the configuration file exists, if not, explain