[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-3745-gff00107

[Michal Čihař]

The branch, master has been updated
       via  ff00107f1e744aad9f839461cbe6f1bb76a03a4b (commit)
       via  72c82d8acff71035b7f7cd4a81ec31ad00f2e24a (commit)
      from  a04e9abd3f3cf92dc167a7ea341e9a3cade8a727 (commit)


- Log -----------------------------------------------------------------
commit ff00107f1e744aad9f839461cbe6f1bb76a03a4b
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon May 24 10:57:30 2010 +0200

    Remove unused message strings from messages.inc.php (B).

commit 72c82d8acff71035b7f7cd4a81ec31ad00f2e24a
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon May 24 10:55:18 2010 +0200

    Convert to gettext and adjust coding style.

-----------------------------------------------------------------------

Summary of changes:
 import_status.php          |    9 +++++--
 libraries/messages.inc.php |   46 --------------------------------------------
 2 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/import_status.php b/import_status.php
index dccd41f..4125ead 100644
--- a/import_status.php
+++ b/import_status.php
@@ -18,14 +18,17 @@ if (isset($GLOBALS["message"]) && $GLOBALS["message"]) {
 
     header('Content-type: text/html');
 
-	usleep(300000); // wait 0.3 sec before we check for $_SESSION variable, which is set inside import.php 
-    while ($_SESSION['Import_message']['message'] == null) { // wait until message is available 
+    // wait 0.3 sec before we check for $_SESSION variable, which is set inside import.php
+	usleep(300000);
+
+    // wait until message is available
+    while ($_SESSION['Import_message']['message'] == null) {
         usleep(250000); // 0.25 sec
     }
 
     echo $_SESSION['Import_message']['message'];
     echo '<fieldset class="tblFooters">' . "\n";
-    echo '	[ <a href="' . $_SESSION['Import_message']['go_back_url'] . '">' . $GLOBALS["strBack"] . '</a> ]' . "\n";
+    echo '	[ <a href="' . $_SESSION['Import_message']['go_back_url'] . '">' . __('Back') . '</a> ]' . "\n";
     echo '</fieldset>'."\n";
 
 } else {
diff --git a/libraries/messages.inc.php b/libraries/messages.inc.php
index 223aea2..873e7d2 100644
--- a/libraries/messages.inc.php
+++ b/libraries/messages.inc.php
@@ -18,52 +18,6 @@ $charset = 'utf-8';
 /* l10n: Text direction, use either ltr or rtl */
 $text_dir = __('ltr');
 
-$strBack = __('Back');
-$strBaltic = __('Baltic');
-$strBeginCut = __('BEGIN CUT');
-$strBeginRaw = __('BEGIN RAW');
-$strBinary = __('Binary');
-$strBinaryDoNotEdit = __('Binary - do not edit');
-$strBinaryLog = __('Binary log');
-$strBinLogEventType = __('Event type');
-$strBinLogInfo = __('Information');
-$strBinLogName = __('Log name');
-$strBinLogOriginalPosition = __('Original position');
-$strBinLogPosition = __('Position');
-$strBinLogServerId = __('Server ID');
-$strBLOBRepository = __('BLOB Repository');
-$strBLOBRepositoryDamaged = __('Damaged');
-$strBLOBRepositoryDisableAreYouSure = __('Are you sure you want to disable all BLOB references for database %s?');
-$strBLOBRepositoryDisabled = _pgettext('$strBLOBRepositoryDisabled', 'Disabled');
-$strBLOBRepositoryDisable = __('Disable');
-$strBLOBRepositoryDisableStrongWarning = __('You are about to DISABLE a BLOB Repository!');
-$strBLOBRepositoryEnabled = _pgettext('$strBLOBRepositoryEnabled', 'Enabled');
-$strBLOBRepositoryEnable = __('Enable');
-$strBLOBRepositoryRemove = __('Remove BLOB Repository Reference');
-$strBLOBRepositoryRepair = _pgettext('$strBLOBRepositoryRepair', 'Repair');
-$strBLOBRepositoryUpload = __('Upload to BLOB repository');
-$strBookmarkAllUsers = __('Let every user access this bookmark');
-$strBookmarkCreated = __('Bookmark %s created');
-$strBookmarkDeleted = __('The bookmark has been deleted.');
-$strBookmarkLabel = __('Label');
-$strBookmarkQuery = __('Bookmarked SQL query');
-$strBookmarkReplace = __('Replace existing bookmark of same name');
-$strBookmarkThis = __('Bookmark this SQL query');
-$strBookmarkView = __('View only');
-$strBrowse = __('Browse');
-$strBrowseDistinctValues = __('Browse distinct values');
-$strBrowseForeignValues = __('Browse foreign values');
-$strBufferPoolActivity = __('Buffer Pool Activity');
-$strBufferPool = __('Buffer Pool');
-$strBufferPoolUsage = __('Buffer Pool Usage');
-$strBufferReadMissesInPercent = __('Read misses in %');
-$strBufferReadMisses = __('Read misses');
-$strBufferWriteWaitsInPercent = __('Write waits in %');
-$strBufferWriteWaits = __('Write waits');
-$strBulgarian = __('Bulgarian');
-$strBusyPages = __('Busy pages');
-$strBzip = __('"bzipped"');
-
 $strCalendar = __('Calendar');
 $strCancel = __('Cancel');
 $strCanNotLoadExportPlugins = __('Could not load export plugins, please check your installation!');


hooks/post-receive
-- 
phpMyAdmin