From 812748a50d622ef30aca0d44cb022d4676708698 Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Mon, 26 Jul 2010 20:34:31 +0200
Subject: [PATCH] Changes to conform to latest merge: - use require instead if
 require_once for footer.inc.php - rename pmadb to phpMyAdmin configuration
 storage

---
 libraries/config/messages.inc.php | 10 +++++-----
 prefs_forms.php                   |  2 +-
 prefs_manage.php                  |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 351f7186b..1c0a8aa1b 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -200,8 +200,8 @@ $strConfigForm_Server_auth_desc = __('Authentication settings');
 $strConfigForm_Server_config = __('Server configuration');
 $strConfigForm_Server_config_desc = __('Advanced server configuration, do not change these options unless you know what they are for');
 $strConfigForm_Server_desc = __('Enter server connection parameters');
-$strConfigForm_Server_pmadb = __('PMA database');
-$strConfigForm_Server_pmadb_desc = __('Configure phpMyAdmin database to gain access to additional features, see [a@Documentation.html#linked-tables]linked-tables infrastructure[/a] in documentation');
+$strConfigForm_Server_pmadb = __('Configuration storage');
+$strConfigForm_Server_pmadb_desc = __('Configure phpMyAdmin configuration storage to gain access to additional features, see [a@Documentation.html#linked-tables]phpMyAdmin configuration storage[/a] in documentation');
 $strConfigForm_Server_tracking = __('Changes tracking');
 $strConfigForm_Server_tracking_desc = __('Tracking of changes made in database. Requires configured PMA database.');
 $strConfigForm_Warnings = __('Warnings');
@@ -325,12 +325,12 @@ $strConfigOrder_name = __('Default sorting order');
 $strConfigPersistentConnections_desc = __('Use persistent connections to MySQL databases');
 $strConfigPersistentConnections_name = __('Persistent connections');
 $strConfigPmaNoRelation_DisableWarning_desc = __('Disable the default warning that is displayed on the database details Structure page if any of the required tables for the relation features could not be found');
-$strConfigPmaNoRelation_DisableWarning_name = __('Missing relation tables (pmadb)');
+$strConfigPmaNoRelation_DisableWarning_name = __('Missing phpMyAdmin configuration storage tables');
 $strConfigPropertiesIconic_desc = __('Use only icons, only text or both');
 $strConfigPropertiesIconic_name = __('Iconic table operations');
 $strConfigProtectBinary_desc = __('Disallow BLOB and BINARY columns from editing');
 $strConfigProtectBinary_name = __('Protect binary columns');
-$strConfigQueryHistoryDB_desc = __('Enable if you want DB-based query history (requires pmadb). If disabled, this utilizes JS-routines to display query history (lost by window close).');
+$strConfigQueryHistoryDB_desc = __('Enable if you want DB-based query history (requires phpMyAdmin configuration storage). If disabled, this utilizes JS-routines to display query history (lost by window close).');
 $strConfigQueryHistoryDB_name = __('Permanent query history');
 $strConfigQueryHistoryMax_cmt = __('Users cannot set a higher value');
 $strConfigQueryHistoryMax_desc = __('How many queries are kept in history');
@@ -397,7 +397,7 @@ $strConfigServers_password_name = __('Password for config auth');
 $strConfigServers_pdf_pages_desc = __('Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]');
 $strConfigServers_pdf_pages_name = __('PDF schema: pages table');
 $strConfigServers_pmadb_desc = __('Database used for relations, bookmarks, and PDF features. See [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for no support. Suggested: [kbd]phpmyadmin[/kbd]');
-$strConfigServers_pmadb_name = __('PMA database');
+$strConfigServers_pmadb_name = __('Database name');
 $strConfigServers_port_desc = __('Port on which MySQL server is listening, leave empty for default');
 $strConfigServers_port_name = __('Server port');
 $strConfigServers_relation_desc = __('Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links[/a] support, suggested: [kbd]pma_relation[/kbd]');
diff --git a/prefs_forms.php b/prefs_forms.php
index 28d3fce5c..3db7a1682 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -74,5 +74,5 @@ if (!$form_display->process(false)) {
 /**
  * Displays the footer
  */
-require_once './libraries/footer.inc.php';
+require './libraries/footer.inc.php';
 ?>
\ No newline at end of file
diff --git a/prefs_manage.php b/prefs_manage.php
index da2fa09ed..bcef4bef8 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -126,7 +126,7 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
                 <input type="submit" name="submit_ignore" value="<?php echo __('No') ?>" />
             </form>
             <?php
-            require_once './libraries/footer.inc.php';
+            require './libraries/footer.inc.php';
             return;
         }
 
@@ -304,5 +304,5 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: __DATE__'));
 /**
  * Displays the footer
  */
-require_once './libraries/footer.inc.php';
+require './libraries/footer.inc.php';
 ?>
\ No newline at end of file