[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2818-gf8f4754
Marc Delisle
lem9 at users.sourceforge.net
Thu May 6 18:49:18 CEST 2010
The branch, master has been updated
via f8f475419d6609d5d0730c1e79d6a919a7df1e36 (commit)
from 2586524b03e16e78b1109ea31c638b8b465f38cb (commit)
- Log -----------------------------------------------------------------
commit f8f475419d6609d5d0730c1e79d6a919a7df1e36
Author: Marc Delisle <marc at infomarc.info>
Date: Thu May 6 12:49:07 2010 -0400
gettext conversion
-----------------------------------------------------------------------
Summary of changes:
libraries/display_tbl.lib.php | 2 +-
pmd_help.php | 4 ++--
querywindow.php | 39 +++++++++++++++++++--------------------
server_privileges.php | 16 ++++++++--------
4 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 43b74b0..08d2e28 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -604,7 +604,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// per SQL query, and at the same time have a default that displays
// the transformations.
echo '<div class="formelement">';
- PMA_display_html_checkbox('hide_transformation', $GLOBALS['strHide'] . ' ' . __('Browser transformation'), ! empty($_SESSION['tmp_user_values']['hide_transformation']), false);
+ PMA_display_html_checkbox('hide_transformation', __('Hide') . ' ' . __('Browser transformation'), ! empty($_SESSION['tmp_user_values']['hide_transformation']), false);
echo '</div>';
echo '<div class="clearfloat"></div>';
diff --git a/pmd_help.php b/pmd_help.php
index 4a1e407..328645b 100644
--- a/pmd_help.php
+++ b/pmd_help.php
@@ -24,9 +24,9 @@ require_once 'pmd_common.php';
<body>
<?php
- echo '<p>' . $GLOBALS['strToSelectRelation'] . '<br />';
+ echo '<p>' . __('To select relation, click :') . '<br />';
echo '<img src="pmd/images/help_relation.png" border="1"></p>';
- echo '<p>' . $GLOBALS['strDesignerHelpDisplayField'] . '</p>';
+ echo '<p>' . __('The display field is shown in pink. To set/unset a field as the display field, click the "Choose field to display" icon, then click on the appropriate field name.') . '</p>';
?>
</body>
</html>
diff --git a/querywindow.php b/querywindow.php
index 6c69e41..0d15de5 100644
--- a/querywindow.php
+++ b/querywindow.php
@@ -1,7 +1,7 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
- * this file is register_globals save
+ * this file is register_globals safe
*
* @todo move JavaScript out of here into .js files
* @uses $cfg['QueryWindowDefTab']
@@ -12,16 +12,15 @@
* @uses $cfg['Confirm']
* @uses $GLOBALS['db']
* @uses $GLOBALS['table']
- * @uses $GLOBALS['strSQL']
- * @uses $GLOBALS['strImportFiles']
- * @uses $GLOBALS['strQuerySQLHistory']
- * @uses $GLOBALS['strAll']
- * @uses $GLOBALS['strChange']
- * @uses $GLOBALS['strFormEmpty']
- * @uses $GLOBALS['strNotNumber']
- * @uses $GLOBALS['strNoDropDatabases']
- * @uses $GLOBALS['strDoYouReally']
- * @uses $GLOBALS['strQuerySQLHistory']
+ * @uses __('SQL')
+ * @uses __('Import files')
+ * @uses __('SQL history')
+ * @uses __('All')
+ * @uses __('Change')
+ * @uses __('Missing value in the form!')
+ * @uses __('This is not a number!')
+ * @uses __('"DROP DATABASE" statements are disabled.')
+ * @uses __('Do you really want to ')
* @uses PMA_isSuperuser()
* @uses PMA_outBufferPre()
* @uses PMA_getRelationsParam()
@@ -97,23 +96,23 @@ if ($no_js) {
} else {
$tabs = array();
$tabs['sql']['icon'] = 'b_sql.png';
- $tabs['sql']['text'] = $GLOBALS['strSQL'];
+ $tabs['sql']['text'] = __('SQL');
$tabs['sql']['fragment'] = '#';
$tabs['sql']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'sql\');return false;"';
$tabs['sql']['active'] = (bool) ($querydisplay_tab == 'sql');
$tabs['import']['icon'] = 'b_import.png';
- $tabs['import']['text'] = $GLOBALS['strImportFiles'];
+ $tabs['import']['text'] = __('Import files');
$tabs['import']['fragment'] = '#';
$tabs['import']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'files\');return false;"';
$tabs['import']['active'] = (bool) ($querydisplay_tab == 'files');
$tabs['history']['icon'] = 'b_bookmark.png';
- $tabs['history']['text'] = $GLOBALS['strQuerySQLHistory'];
+ $tabs['history']['text'] = __('SQL history');
$tabs['history']['fragment'] = '#';
$tabs['history']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'history\');return false;"';
$tabs['history']['active'] = (bool) ($querydisplay_tab == 'history');
if ($GLOBALS['cfg']['QueryWindowDefTab'] == 'full') {
- $tabs['all']['text'] = $GLOBALS['strAll'];
+ $tabs['all']['text'] = __('All');
$tabs['all']['fragment'] = '#';
$tabs['all']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'full\');return false;"';
$tabs['all']['active'] = (bool) ($querydisplay_tab == 'full');
@@ -123,14 +122,14 @@ if ($no_js) {
if ($GLOBALS['cfg']['PropertiesIconic']) {
$titles['Change'] =
'<img class="icon" width="16" height="16" src="' . $pmaThemeImage
- . 'b_edit.png" alt="' . $GLOBALS['strChange'] . '" title="' . $GLOBALS['strChange']
+ . 'b_edit.png" alt="' . __('Change') . '" title="' . __('Change')
. '" />';
if ('both' === $GLOBALS['cfg']['PropertiesIconic']) {
- $titles['Change'] .= $GLOBALS['strChange'];
+ $titles['Change'] .= __('Change');
}
} else {
- $titles['Change'] = $GLOBALS['strChange'];
+ $titles['Change'] = __('Change');
}
$url_query = PMA_generate_common_url($db, $table);
@@ -215,8 +214,8 @@ $_sql_history = PMA_getHistory($GLOBALS['cfg']['Server']['user']);
if (! empty($_sql_history)
&& ($querydisplay_tab == 'history' || $querydisplay_tab == 'full')) {
$tab = $querydisplay_tab != 'full' ? 'sql' : 'full';
- echo $GLOBALS['strQuerySQLHistory'] . ':<br />' . "\n"
- .'<ul>';
+ echo __('SQL history') . ':<br />'
+ . '<ul>';
foreach ($_sql_history as $query) {
echo '<li>' . "\n";
diff --git a/server_privileges.php b/server_privileges.php
index 2bd67bd..4c87f98 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -2000,7 +2000,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
'2' => __('Grant all privileges on wildcard name (username\\_%)'));
if ( !empty($dbname) ) {
- $choices['3'] = sprintf($GLOBALS['strCreateUserDatabasePrivileges'], htmlspecialchars($dbname));
+ $choices['3'] = sprintf( __('Grant all privileges on database "%s"'), htmlspecialchars($dbname));
$default_choice = 3;
echo '<input type="hidden" name="dbname" value="' . htmlspecialchars($dbname) . '" />' . "\n";
}
@@ -2023,15 +2023,15 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
echo '<table id="tablespecificuserrights" class="data">' . "\n"
. '<caption class="tblHeaders">' . "\n"
. PMA_getIcon('b_usrcheck.png')
- . ' ' . sprintf($GLOBALS['strUsersHavingAccessToDb'], '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($checkprivs) . '">' . htmlspecialchars($checkprivs) . '</a>') . "\n"
+ . ' ' . sprintf(__('Users having access to "%s"'), '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($checkprivs) . '">' . htmlspecialchars($checkprivs) . '</a>') . "\n"
. '</caption>' . "\n"
. '<thead>' . "\n"
- . ' <tr><th>' . $GLOBALS['strUser'] . '</th>' . "\n"
- . ' <th>' . $GLOBALS['strHost'] . '</th>' . "\n"
- . ' <th>' . $GLOBALS['strType'] . '</th>' . "\n"
- . ' <th>' . $GLOBALS['strPrivileges'] . '</th>' . "\n"
- . ' <th>' . $GLOBALS['strGrantOption'] . '</th>' . "\n"
- . ' <th>' . $GLOBALS['strAction'] . '</th>' . "\n"
+ . ' <tr><th>' . __('User') . '</th>' . "\n"
+ . ' <th>' . __('Host') . '</th>' . "\n"
+ . ' <th>' . __('Type') . '</th>' . "\n"
+ . ' <th>' . __('Privileges') . '</th>' . "\n"
+ . ' <th>' . __('Grant') . '</th>' . "\n"
+ . ' <th>' . __('Action') . '</th>' . "\n"
. ' </tr>' . "\n"
. '</thead>' . "\n"
. '<tbody>' . "\n";
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list