[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-3743-ga04e9ab

[Michal Čihař]

The branch, master has been updated
       via  a04e9abd3f3cf92dc167a7ea341e9a3cade8a727 (commit)
       via  e0118af1e396b6fbe18d0cfad3db35b65ea778f5 (commit)
      from  6d73f7b4264333225a73e20e025a54f0893213c4 (commit)


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

    Revert messages back to original form.

commit e0118af1e396b6fbe18d0cfad3db35b65ea778f5
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon May 24 10:50:50 2010 +0200

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

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

Summary of changes:
 libraries/display_export.lib.php |    6 ++--
 libraries/messages.inc.php       |   51 --------------------------------------
 2 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index a3ba84e..ec7affc 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -244,19 +244,19 @@ if ($is_zip || $is_gzip || $is_bzip) { ?>
             id="radio_compression_zip"
             onclick="document.getElementById('checkbox_dump_asfile').checked = true;"
             <?php PMA_exportIsActive('compression', 'zip'); ?> />
-        <label for="radio_compression_zip"><?php echo __('zipped'); ?></label>
+        <label for="radio_compression_zip"><?php echo __('"zipped"'); ?></label>
     <?php } if ($is_gzip) { ?>
         <input type="radio" name="compression" value="gzip"
             id="radio_compression_gzip"
             onclick="document.getElementById('checkbox_dump_asfile').checked = true;"
             <?php PMA_exportIsActive('compression', 'gzip'); ?> />
-        <label for="radio_compression_gzip"><?php echo __('gzipped'); ?></label>
+        <label for="radio_compression_gzip"><?php echo __('"gzipped"'); ?></label>
     <?php } if ($is_bzip) { ?>
         <input type="radio" name="compression" value="bzip"
             id="radio_compression_bzip"
             onclick="document.getElementById('checkbox_dump_asfile').checked = true;"
             <?php PMA_exportIsActive('compression', 'bzip2'); ?> />
-        <label for="radio_compression_bzip"><?php echo __('bzipped'); ?></label>
+        <label for="radio_compression_bzip"><?php echo __('"bzipped"'); ?></label>
     <?php } ?>
     </div>
 <?php } else { ?>
diff --git a/libraries/messages.inc.php b/libraries/messages.inc.php
index cfdd4b6..223aea2 100644
--- a/libraries/messages.inc.php
+++ b/libraries/messages.inc.php
@@ -18,57 +18,6 @@ $charset = 'utf-8';
 /* l10n: Text direction, use either ltr or rtl */
 $text_dir = __('ltr');
 
-$strAbortedClients = __('Aborted');
-$strAccessDenied = __('Access denied');
-$strAction = __('Action');
-$strActions = __('Actions');
-$strAddAutoIncrement = __('Add AUTO_INCREMENT value');
-$strAddClause = __('Add %s');
-$strAddConstraints = __('Add constraints');
-$strAddDeleteColumn = __('Add/Delete Field Columns');
-$strAddDeleteRow = __('Add/Delete Criteria Row');
-$strAddFields = __('Add %s field(s)');
-$strAddHeaderComment = __('Add custom comment into header (\\n splits lines)');
-$strAddIntoComments = __('Add into comments');
-$strAddNewField = __('Add new field');
-$strAddPrivilegesOnDb = __('Add privileges on the following database');
-$strAddPrivilegesOnTbl = __('Add privileges on the following table');
-$strAddSearchConditions = __('Add search conditions (body of the "where" clause):');
-$strAddToIndex = __('Add to index  %s column(s)');
-$strAddUser = __('Add a new User');
-$strAddUserMessage = __('You have added a new user.');
-$strAdministration = __('Administration');
-$strAfter = __('After %s');
-$strAfterInsertBack = __('Go back to previous page');
-$strAfterInsertNewInsert = __('Insert another new row');
-$strAfterInsertNext = __('Edit next row');
-$strAfterInsertSame = __('Go back to this page');
-$strAll = __('All');
-$strAllowInterrupt = __('Allow the interruption of an import in case the script detects it is close to the PHP timeout limit. This might be good way to import large files, however it can break transactions.');
-$strAllTableSameWidth = __('Display all tables with the same width');
-$strAlterOrderBy = __('Alter table order by');
-$strAnalyze = __('Analyze');
-$strAnalyzeTable = __('Analyze table');
-$strAnd = __('And');
-$strAndSmall = __('and');
-$strAndThen = __('and then');
-$strAngularLinks = __('Angular links');
-$strAnIndex = __('An index has been added on %s');
-$strAny = __('Any');
-$strAnyHost = __('Any host');
-$strAnyUser = __('Any user');
-$strApplyChanges = __('Apply Selected Changes');
-$strApproximateCount = __('May be approximate. See [a at ./Documentation.html#faq3_11 at Documentation]FAQ 3.11[/a]');
-$strAPrimaryKey = __('A primary key has been added on %s');
-$strArabic = __('Arabic');
-$strArmenian = __('Armenian');
-$strAscending = __('Ascending');
-$strAsDefined = __('As defined:');
-$strAtBeginningOfTable = __('At Beginning of Table');
-$strAtEndOfTable = __('At End of Table');
-$strAttr = __('Attributes');
-$strAutomaticLayout = __('Automatic layout');
-
 $strBack = __('Back');
 $strBaltic = __('Baltic');
 $strBeginCut = __('BEGIN CUT');


hooks/post-receive
-- 
phpMyAdmin