backport a whole bunch of stuff

diff --git a/HISTORY b/HISTORY
index f03193262f239021152cb07d72b620ac72ebba10..45ae3b8cdba4c665372099ea9a118c0f5aed7409 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -6,9 +6,12 @@ Version 3.5.1
 
 Bugs
 * Support 8.0beta5 schema tablespace changes
+* Help link fixes
+* Estimated row count in 7.0 and 7.1 fixes
 
 Translations
 * Romanian from Alin
+* Italian updates from Nicola
 
 Version 3.5
 -----------

diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 42f58f17f52da9a277b235a94a8747deb2c5d81e..b3970cca0125229f0156cea077a05fd76cd296b3 100755 (executable)
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -4,7 +4,7 @@
  * A class that implements the DB interface for Postgres
  * Note: This class uses ADODB and returns RecordSets.
  *
- * $Id: Postgres.php,v 1.251 2004/11/16 12:40:29 soranzo Exp $
+ * $Id: Postgres.php,v 1.250.2.1 2004/12/02 02:28:53 chriskl Exp $
  */
 
 // @@@ THOUGHT: What about inherits? ie. use of ONLY???

diff --git a/conf/config.inc.php-dist b/conf/config.inc.php-dist
index e51eed76abda7ffb860a867fe69890072cb6df91..1a7f8a8820666aa79d7496a4ce888fefd6140773 100644 (file)
--- a/conf/config.inc.php-dist
+++ b/conf/config.inc.php-dist
@@ -4,7 +4,7 @@
         * Central phpPgAdmin configuration.  As a user you may modify the
         * settings here for your particular configuration.
         *
-        * $Id: config.inc.php-dist,v 1.36 2004/11/15 16:03:46 soranzo Exp $
+        * $Id: config.inc.php-dist,v 1.35.2.1 2004/12/02 02:28:54 chriskl Exp $
         */
 
        // An example server.  Create as many of these as you wish,

diff --git a/help/PostgresDoc70.php b/help/PostgresDoc70.php
index e0ef2583691945c8546016cae2b0dac38a96f209..3679fa7e5b6e288b191cc79fb168bd712c19235b 100644 (file)
--- a/help/PostgresDoc70.php
+++ b/help/PostgresDoc70.php
@@ -3,7 +3,7 @@
 /**
  * Help links for PostgreSQL 7.0 documentation
  *
- * $Id: PostgresDoc70.php,v 1.3 2004/11/15 17:25:03 soranzo Exp $
+ * $Id: PostgresDoc70.php,v 1.2.2.1 2004/12/02 02:28:54 chriskl Exp $
  */
 
 $this->help_base = 'http://www.postgresql.org/docs/7/interactive/';

diff --git a/help/PostgresDoc71.php b/help/PostgresDoc71.php
index 5d983db2f9628eaf4781f428d7267bd95a1d4521..249c372619eaa9f778ecc5f123c1f3eff6eeac3c 100644 (file)
--- a/help/PostgresDoc71.php
+++ b/help/PostgresDoc71.php
@@ -3,7 +3,7 @@
 /**
  * Help links for PostgreSQL 7.1 documentation
  *
- * $Id: PostgresDoc71.php,v 1.3 2004/11/15 17:25:03 soranzo Exp $
+ * $Id: PostgresDoc71.php,v 1.2.2.1 2004/12/02 02:28:54 chriskl Exp $
  */
 
 include('./help/PostgresDoc70.php');

diff --git a/help/PostgresDoc72.php b/help/PostgresDoc72.php
index de6412cec1ccd381610dd256829552b94e279abb..6d04995a2accc03c5237461131ad52bde86b6371 100644 (file)
--- a/help/PostgresDoc72.php
+++ b/help/PostgresDoc72.php
@@ -3,7 +3,7 @@
 /**
  * Help links for PostgreSQL 7.2 documentation
  *
- * $Id: PostgresDoc72.php,v 1.3 2004/11/15 17:25:03 soranzo Exp $
+ * $Id: PostgresDoc72.php,v 1.2.2.1 2004/12/02 02:28:54 chriskl Exp $
  */
 
 include('./help/PostgresDoc71.php');

diff --git a/help/PostgresDoc74.php b/help/PostgresDoc74.php
index da640d990ede00276b9e29875edcccb79a04a66d..79342ae24481a6d45a48f01e9af753bca91b1e8b 100644 (file)
--- a/help/PostgresDoc74.php
+++ b/help/PostgresDoc74.php
@@ -3,7 +3,7 @@
 /**
  * Help links for PostgreSQL 7.4 documentation
  *
- * $Id: PostgresDoc74.php,v 1.3 2004/11/15 17:25:03 soranzo Exp $
+ * $Id: PostgresDoc74.php,v 1.2.2.1 2004/12/02 02:28:54 chriskl Exp $
  */
  
 include('./help/PostgresDoc73.php');

diff --git a/help/PostgresDoc80.php b/help/PostgresDoc80.php
index ee1368062bfb5903420cb1f0948d5cce9d779a70..f9d36a4a44c16918102efe338dc14c88736f5d92 100644 (file)
--- a/help/PostgresDoc80.php
+++ b/help/PostgresDoc80.php
@@ -3,7 +3,7 @@
 /**
  * Help links for PostgreSQL 8.0 documentation
  *
- * $Id: PostgresDoc80.php,v 1.2.2.1 2004/11/30 01:45:59 chriskl Exp $
+ * $Id: PostgresDoc80.php,v 1.2.2.2 2004/12/02 02:28:54 chriskl Exp $
  */
 
 include('./help/PostgresDoc74.php');

diff --git a/lang/italian.php b/lang/italian.php
index 5ed8db54aa0c63b1a96f6b759c3c7acff6a2dffe..b88e2de0942474bb28ef559399b6a167b49f8142 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.38 2004/11/02 11:39:52 soranzo Exp $
+        * $Id: italian.php,v 1.38.2.1 2004/12/02 02:28:54 chriskl Exp $
         */
 
        // Language and character set - Lingua e set di caratteri
@@ -199,6 +199,7 @@
        $lang['strtabbed'] = 'Tabulato';
        $lang['strauto'] = 'Auto';
        $lang['strconfvacuumtable'] = 'Sei sicuro di voler effettuare il vacuum su "%s"?';
+       $lang['strestimatedrowcount'] = 'Numero stimato di righe';
 
        // Users - Utenti
        $lang['struser'] = 'Utente';
@@ -380,6 +381,7 @@
        $lang['strruledroppedbad'] = 'Eliminazione della regola fallita.';
 
        // Constraints - Vincoli
+       $lang['strconstraint'] = 'Vincolo';
        $lang['strconstraints'] = 'Vincoli';
        $lang['strshowallconstraints'] = 'Mostra tutti i vincoli';
        $lang['strnoconstraints'] = 'Nessun vincolo trovato.';

diff --git a/lang/recoded/italian.php b/lang/recoded/italian.php
index 78eff6be5197d1a9bb87f9649d0cda7aba1a784d..b1b01fe603e170c2b5f3ed9ce5c79593335c00bf 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.33 2004/11/02 11:39:52 soranzo Exp $
+        * $Id: italian.php,v 1.33.2.1 2004/12/02 02:28:54 chriskl Exp $
         */
 
        // Language and character set - Lingua e set di caratteri
@@ -199,6 +199,7 @@
        $lang['strtabbed'] = 'Tabulato';
        $lang['strauto'] = 'Auto';
        $lang['strconfvacuumtable'] = 'Sei sicuro di voler effettuare il vacuum su "%s"?';
+       $lang['strestimatedrowcount'] = 'Numero stimato di righe';
 
        // Users - Utenti
        $lang['struser'] = 'Utente';
@@ -380,6 +381,7 @@
        $lang['strruledroppedbad'] = 'Eliminazione della regola fallita.';
 
        // Constraints - Vincoli
+       $lang['strconstraint'] = 'Vincolo';
        $lang['strconstraints'] = 'Vincoli';
        $lang['strshowallconstraints'] = 'Mostra tutti i vincoli';
        $lang['strnoconstraints'] = 'Nessun vincolo trovato.';

diff --git a/lang/recoded/romanian.php b/lang/recoded/romanian.php
index 9ba39ec08ce7c1c297eb255793f7c9da37b950f2..4d99b2a359719c513b02dbbf0c618414cc3fd56e 100644 (file)
--- a/lang/recoded/romanian.php
+++ b/lang/recoded/romanian.php
@@ -3,7 +3,7 @@
        * Romanian language file, based on the english language file for phpPgAdmin.
        * Alin Vaida [alin.vaida@gmail.com]
        *
-       * $Id: romanian.php,v 1.2 2004/11/16 01:25:44 chriskl Exp $
+       * $Id: romanian.php,v 1.1.2.1 2004/12/02 02:28:54 chriskl Exp $
        */
 
        // Language and character set

diff --git a/lang/romanian.php b/lang/romanian.php
index 070f7ac6b9e35d51bb60180d5f58a9b54204e5b5..bc40f4017a2c6cbd3879238139a911dc64390579 100644 (file)
--- a/lang/romanian.php
+++ b/lang/romanian.php
@@ -3,7 +3,7 @@
        * Romanian language file, based on the english language file for phpPgAdmin.
        * Alin Vaida [alin.vaida@gmail.com]
        *
-       * $Id: romanian.php,v 1.2 2004/11/16 01:25:43 chriskl Exp $
+       * $Id: romanian.php,v 1.1.2.1 2004/12/02 02:28:54 chriskl Exp $
        */
 
        // Language and character set