14 May
2010
14 May
'10
2:48 p.m.
The branch, master has been updated
via b05a903dc32e99365775b29fa101ce087ba2f64e (commit)
from d904da4fd4eb04cfdb52fbc99b08cca070e8f42b (commit)
- Log -----------------------------------------------------------------
commit b05a903dc32e99365775b29fa101ce087ba2f64e
Author: Marc Delisle <marc(a)infomarc.info>
Date: Fri May 14 07:47:50 2010 -0400
gettext conversion
-----------------------------------------------------------------------
Summary of changes:
import.php | 2 +-
libraries/Message.class.php | 10 ++++----
libraries/common.inc.php | 2 +-
libraries/export/codegen.php | 4 +-
libraries/export/csv.php | 18 +++++++-------
libraries/export/excel.php | 12 +++++-----
libraries/export/htmlword.php | 12 +++++-----
libraries/export/latex.php | 32 +++++++++++++-------------
libraries/export/mediawiki.php | 4 +-
libraries/export/ods.php | 8 +++---
libraries/export/odt.php | 18 +++++++-------
libraries/export/pdf.php | 8 +++---
libraries/export/php_array.php | 4 +-
libraries/export/sql.php | 49 ++++++++++++++++++++-------------------
libraries/export/texytext.php | 12 +++++-----
libraries/export/xls.php | 8 +++---
libraries/export/xlsx.php | 8 +++---
libraries/export/xml.php | 18 +++++++-------
libraries/export/yaml.php | 2 +-
libraries/import/csv.php | 20 ++++++++--------
libraries/import/docsql.php | 6 ++--
libraries/import/ldi.php | 20 ++++++++--------
libraries/import/ods.php | 12 +++++-----
libraries/import/sql.php | 8 +++---
libraries/import/xls.php | 6 ++--
libraries/import/xlsx.php | 6 ++--
libraries/import/xml.php | 4 +-
libraries/relation.lib.php | 18 +++++++-------
libraries/session.inc.php | 2 +-
pmd_display_field.php | 2 +-
pmd_relation_new.php | 10 ++++----
pmd_relation_upd.php | 2 +-
pmd_save_pos.php | 2 +-
sql.php | 2 +-
34 files changed, 176 insertions(+), 175 deletions(-)
diff --git a/import.php b/import.php
index 88ffc47..0fb559b 100644
--- a/import.php
+++ b/import.php
@@ -423,7 +423,7 @@ if (!empty($id_bookmark) && $action_bookmark == 2) {
if ($timeout_passed) {
$message = PMA_Message::error(__('Script timeout passed, if you want to finish
import, please resubmit same file and import will resume.'));
if ($offset == 0 || (isset($original_skip) && $original_skip == $offset)) {
- $message->addString('strTimeoutNothingParsed');
+ $message->addString(__('However on last run no data has been parsed, this
usually means phpMyAdmin won't be able to finish this import unless you increase php
time limits.'));
}
}
diff --git a/libraries/Message.class.php b/libraries/Message.class.php
index c31d353..ffddb87 100644
--- a/libraries/Message.class.php
+++ b/libraries/Message.class.php
@@ -182,13 +182,13 @@ class PMA_Message
* @static
* @uses PMA_Message as returned object
* @uses PMA_Message::SUCCESS
- * @param string $string a localized string e.g. 'strSuccess'
+ * @param string $string a localized string e.g. __('Your SQL query has been
executed successfully')
* @return PMA_Message
*/
static public function success($string = '')
{
if (empty($string)) {
- $string = 'strSuccess';
+ $string = __('Your SQL query has been executed successfully');
}
return new PMA_Message($string, PMA_Message::SUCCESS);
@@ -202,13 +202,13 @@ class PMA_Message
* @static
* @uses PMA_Message as returned object
* @uses PMA_Message::ERROR
- * @param string $string a localized string e.g. 'strError'
+ * @param string $string a localized string e.g. __('Error')
* @return PMA_Message
*/
static public function error($string = '')
{
if (empty($string)) {
- $string = 'strError';
+ $string = __('Error');
}
return new PMA_Message($string, PMA_Message::ERROR);
@@ -238,7 +238,7 @@ class PMA_Message
* @static
* @uses PMA_Message as returned object
* @uses PMA_Message::NOTICE
- * @param string $string a localized string e.g. 'strRelationNotWorking'
+ * @param string $string a localized string e.g. __('The additional features
for working with linked tables have been deactivated. To find out why click
%shere%s.')
* @return PMA_Message
*/
static public function notice($string)
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index f53caef..710ecdf 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -923,7 +923,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
* - > 5.0.15
*/
if (PMA_MYSQL_INT_VERSION < 50015) {
- PMA_fatalError('strUpgrade', array('MySQL',
'5.0.15'));
+ PMA_fatalError(__('You should upgrade to %s %s or later.'),
array('MySQL', '5.0.15'));
}
/**
diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php
index e234f78..506240c 100644
--- a/libraries/export/codegen.php
+++ b/libraries/export/codegen.php
@@ -34,9 +34,9 @@ if (isset($plugin_list)) {
'mime_type' => 'text/cs',
'options' => array(
array('type' => 'hidden', 'name' =>
'data'),
- array('type' => 'select', 'name' =>
'format', 'text' => 'strFormat', 'values' =>
$CG_FORMATS),
+ array('type' => 'select', 'name' =>
'format', 'text' => __('Format'), 'values' =>
$CG_FORMATS),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
} else {
diff --git a/libraries/export/csv.php b/libraries/export/csv.php
index 7573836..5bc490d 100644
--- a/libraries/export/csv.php
+++ b/libraries/export/csv.php
@@ -14,20 +14,20 @@ if (! defined('PHPMYADMIN')) {
if (isset($plugin_list)) {
$plugin_list['csv'] = array(
- 'text' => 'strCSV',
+ 'text' => __('CSV'),
'extension' => 'csv',
'mime_type' => 'text/comma-separated-values',
'options' => array(
- array('type' => 'text', 'name' =>
'separator', 'text' => 'strFieldsTerminatedBy'),
- array('type' => 'text', 'name' =>
'enclosed', 'text' => 'strFieldsEnclosedBy'),
- array('type' => 'text', 'name' =>
'escaped', 'text' => 'strFieldsEscapedBy'),
- array('type' => 'text', 'name' =>
'terminated', 'text' => 'strLinesTerminatedBy'),
- array('type' => 'text', 'name' =>
'null', 'text' => 'strReplaceNULLBy'),
- array('type' => 'bool', 'name' =>
'removeCRLF', 'text' => 'strRemoveCRLF'),
- array('type' => 'bool', 'name' =>
'columns', 'text' => 'strPutColNames'),
+ array('type' => 'text', 'name' =>
'separator', 'text' => __('Fields terminated by')),
+ array('type' => 'text', 'name' =>
'enclosed', 'text' => __('Fields enclosed by')),
+ array('type' => 'text', 'name' =>
'escaped', 'text' => __('Fields escaped by')),
+ array('type' => 'text', 'name' =>
'terminated', 'text' => __('Lines terminated by')),
+ array('type' => 'text', 'name' =>
'null', 'text' => __('Replace NULL by')),
+ array('type' => 'bool', 'name' =>
'removeCRLF', 'text' => __('Remove CRLF characters within
fields')),
+ array('type' => 'bool', 'name' =>
'columns', 'text' => __('Put fields names in the first row')),
array('type' => 'hidden', 'name' =>
'data'),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
} else {
diff --git a/libraries/export/excel.php b/libraries/export/excel.php
index d4b8e1a..92d0bce 100644
--- a/libraries/export/excel.php
+++ b/libraries/export/excel.php
@@ -15,13 +15,13 @@ if (! defined('PHPMYADMIN')) {
*/
if (isset($plugin_list)) {
$plugin_list['excel'] = array(
- 'text' => 'strStrucExcelCSV',
+ 'text' => __('CSV for MS Excel'),
'extension' => 'csv',
'mime_type' => 'text/comma-separated-values',
'options' => array(
- array('type' => 'text', 'name' =>
'null', 'text' => 'strReplaceNULLBy'),
- array('type' => 'bool', 'name' =>
'removeCRLF', 'text' => 'strRemoveCRLF'),
- array('type' => 'bool', 'name' =>
'columns', 'text' => 'strPutColNames'),
+ array('type' => 'text', 'name' =>
'null', 'text' => __('Replace NULL by')),
+ array('type' => 'bool', 'name' =>
'removeCRLF', 'text' => __('Remove CRLF characters within
fields')),
+ array('type' => 'bool', 'name' =>
'columns', 'text' => __('Put fields names in the first row')),
array(
'type' => 'select',
'name' => 'edition',
@@ -29,10 +29,10 @@ if (isset($plugin_list)) {
'win' => 'Windows',
'mac_excel2003' => 'Excel 2003 / Macintosh',
'mac_excel2008' => 'Excel 2008 / Macintosh'),
- 'text' => 'strExcelEdition'),
+ 'text' => __('Excel edition')),
array('type' => 'hidden', 'name' =>
'data'),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
} else {
/* Everything rest is coded in csv plugin */
diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php
index b0ea10b..2f4441a 100644
--- a/libraries/export/htmlword.php
+++ b/libraries/export/htmlword.php
@@ -15,18 +15,18 @@ if (! defined('PHPMYADMIN')) {
*/
if (isset($plugin_list)) {
$plugin_list['htmlword'] = array(
- 'text' => 'strHTMLWord',
+ 'text' => __('Microsoft Word 2000'),
'extension' => 'doc',
'mime_type' => 'application/vnd.ms-word',
'force_file' => true,
'options' => array(
- array('type' => 'bool', 'name' =>
'structure', 'text' => 'strStructure', 'force' =>
'data'),
- array('type' => 'bgroup', 'name' =>
'data', 'text' => 'strData', 'force' =>
'structure'),
- array('type' => 'text', 'name' =>
'null', 'text' => 'strReplaceNULLBy'),
- array('type' => 'bool', 'name' =>
'columns', 'text' => 'strPutColNames'),
+ array('type' => 'bool', 'name' =>
'structure', 'text' => __('Structure'), 'force' =>
'data'),
+ array('type' => 'bgroup', 'name' =>
'data', 'text' => __('Data'), 'force' =>
'structure'),
+ array('type' => 'text', 'name' =>
'null', 'text' => __('Replace NULL by')),
+ array('type' => 'bool', 'name' =>
'columns', 'text' => __('Put fields names in the first row')),
array('type' => 'egroup'),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
} else {
diff --git a/libraries/export/latex.php b/libraries/export/latex.php
index e11af47..232d378 100644
--- a/libraries/export/latex.php
+++ b/libraries/export/latex.php
@@ -19,50 +19,50 @@ if (isset($plugin_list)) {
$hide_structure = true;
}
$plugin_list['latex'] = array(
- 'text' => 'strLaTeX',
+ 'text' => __('LaTeX'),
'extension' => 'tex',
'mime_type' => 'application/x-tex',
'options' => array(
- array('type' => 'bool', 'name' =>
'caption', 'text' => 'strLatexIncludeCaption'),
+ array('type' => 'bool', 'name' =>
'caption', 'text' => __('Include table caption')),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
/* Structure options */
if (!$hide_structure) {
$plugin_list['latex']['options'][] =
- array('type' => 'bgroup', 'name' =>
'structure', 'text' => 'strStructure', 'force' =>
'data');
+ array('type' => 'bgroup', 'name' =>
'structure', 'text' => __('Structure'), 'force' =>
'data');
$plugin_list['latex']['options'][] =
- array('type' => 'text', 'name' =>
'structure_caption', 'text' => 'strLatexCaption');
+ array('type' => 'text', 'name' =>
'structure_caption', 'text' => __('Table caption'));
$plugin_list['latex']['options'][] =
- array('type' => 'text', 'name' =>
'structure_continued_caption', 'text' =>
'strLatexContinuedCaption');
+ array('type' => 'text', 'name' =>
'structure_continued_caption', 'text' => __('Continued table
caption'));
$plugin_list['latex']['options'][] =
- array('type' => 'text', 'name' =>
'structure_label', 'text' => 'strLatexLabel');
+ array('type' => 'text', 'name' =>
'structure_label', 'text' => __('Label key'));
if (!empty($GLOBALS['cfgRelation']['relation'])) {
$plugin_list['latex']['options'][] =
- array('type' => 'bool', 'name' =>
'relation', 'text' => 'strRelations');
+ array('type' => 'bool', 'name' =>
'relation', 'text' => __('Relations'));
}
$plugin_list['latex']['options'][] =
- array('type' => 'bool', 'name' =>
'comments', 'text' => 'strComments');
+ array('type' => 'bool', 'name' =>
'comments', 'text' => __('Comments'));
if (!empty($GLOBALS['cfgRelation']['mimework'])) {
$plugin_list['latex']['options'][] =
- array('type' => 'bool', 'name' =>
'mime', 'text' => 'strMIME_MIMEtype');
+ array('type' => 'bool', 'name' =>
'mime', 'text' => __('MIME type'));
}
$plugin_list['latex']['options'][] =
array('type' => 'egroup');
}
/* Data */
$plugin_list['latex']['options'][] =
- array('type' => 'bgroup', 'name' => 'data',
'text' => 'strData', 'force' => 'structure');
+ array('type' => 'bgroup', 'name' => 'data',
'text' => __('Data'), 'force' => 'structure');
$plugin_list['latex']['options'][] =
- array('type' => 'bool', 'name' =>
'columns', 'text' => 'strPutColNames');
+ array('type' => 'bool', 'name' =>
'columns', 'text' => __('Put fields names in the first row'));
$plugin_list['latex']['options'][] =
- array('type' => 'text', 'name' =>
'data_caption', 'text' => 'strLatexCaption');
+ array('type' => 'text', 'name' =>
'data_caption', 'text' => __('Table caption'));
$plugin_list['latex']['options'][] =
- array('type' => 'text', 'name' =>
'data_continued_caption', 'text' =>
'strLatexContinuedCaption');
+ array('type' => 'text', 'name' =>
'data_continued_caption', 'text' => __('Continued table
caption'));
$plugin_list['latex']['options'][] =
- array('type' => 'text', 'name' =>
'data_label', 'text' => 'strLatexLabel');
+ array('type' => 'text', 'name' =>
'data_label', 'text' => __('Label key'));
$plugin_list['latex']['options'][] =
- array('type' => 'text', 'name' => 'null',
'text' => 'strReplaceNULLBy');
+ array('type' => 'text', 'name' => 'null',
'text' => __('Replace NULL by'));
$plugin_list['latex']['options'][] =
array('type' => 'egroup');
} else {
diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php
index d1369cb..7e19b83 100644
--- a/libraries/export/mediawiki.php
+++ b/libraries/export/mediawiki.php
@@ -12,13 +12,13 @@ if (! defined('PHPMYADMIN')) {
if (isset($plugin_list)) {
$plugin_list['mediawiki'] = array(
- 'text' => 'strMediaWiki',
+ 'text' => __('MediaWiki Table'),
'extension' => 'txt',
'mime_type' => 'text/plain',
'options' => array(
array('type' => 'hidden', 'name' =>
'data'),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
} else {
diff --git a/libraries/export/ods.php b/libraries/export/ods.php
index 50d7393..c8dee56 100644
--- a/libraries/export/ods.php
+++ b/libraries/export/ods.php
@@ -15,16 +15,16 @@ if (! defined('PHPMYADMIN')) {
*/
if (isset($plugin_list)) {
$plugin_list['ods'] = array(
- 'text' => 'strOpenDocumentSpreadsheet',
+ 'text' => __('Open Document Spreadsheet'),
'extension' => 'ods',
'mime_type' =>
'application/vnd.oasis.opendocument.spreadsheet',
'force_file' => true,
'options' => array(
- array('type' => 'text', 'name' =>
'null', 'text' => 'strReplaceNULLBy'),
- array('type' => 'bool', 'name' =>
'columns', 'text' => 'strPutColNames'),
+ array('type' => 'text', 'name' =>
'null', 'text' => __('Replace NULL by')),
+ array('type' => 'bool', 'name' =>
'columns', 'text' => __('Put fields names in the first row')),
array('type' => 'hidden', 'name' =>
'data'),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
} else {
diff --git a/libraries/export/odt.php b/libraries/export/odt.php
index a63d4c5..9b3239b 100644
--- a/libraries/export/odt.php
+++ b/libraries/export/odt.php
@@ -19,37 +19,37 @@ if (isset($plugin_list)) {
$hide_structure = true;
}
$plugin_list['odt'] = array(
- 'text' => 'strOpenDocumentText',
+ 'text' => __('Open Document Text'),
'extension' => 'odt',
'mime_type' => 'application/vnd.oasis.opendocument.text',
'force_file' => true,
'options' => array(), /* Filled later */
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
/* Structure options */
if (!$hide_structure) {
$plugin_list['odt']['options'][] =
- array('type' => 'bgroup', 'name' =>
'structure', 'text' => 'strStructure', 'force' =>
'data');
+ array('type' => 'bgroup', 'name' =>
'structure', 'text' => __('Structure'), 'force' =>
'data');
if (!empty($GLOBALS['cfgRelation']['relation'])) {
$plugin_list['odt']['options'][] =
- array('type' => 'bool', 'name' =>
'relation', 'text' => 'strRelations');
+ array('type' => 'bool', 'name' =>
'relation', 'text' => __('Relations'));
}
$plugin_list['odt']['options'][] =
- array('type' => 'bool', 'name' =>
'comments', 'text' => 'strComments');
+ array('type' => 'bool', 'name' =>
'comments', 'text' => __('Comments'));
if (!empty($GLOBALS['cfgRelation']['mimework'])) {
$plugin_list['odt']['options'][] =
- array('type' => 'bool', 'name' =>
'mime', 'text' => 'strMIME_MIMEtype');
+ array('type' => 'bool', 'name' =>
'mime', 'text' => __('MIME type'));
}
$plugin_list['odt']['options'][] =
array('type' => 'egroup');
}
/* Data */
$plugin_list['odt']['options'][] =
- array('type' => 'bgroup', 'name' => 'data',
'text' => 'strData', 'force' => 'structure');
+ array('type' => 'bgroup', 'name' => 'data',
'text' => __('Data'), 'force' => 'structure');
$plugin_list['odt']['options'][] =
- array('type' => 'bool', 'name' =>
'columns', 'text' => 'strPutColNames');
+ array('type' => 'bool', 'name' =>
'columns', 'text' => __('Put fields names in the first row'));
$plugin_list['odt']['options'][] =
- array('type' => 'text', 'name' => 'null',
'text' => 'strReplaceNULLBy');
+ array('type' => 'text', 'name' => 'null',
'text' => __('Replace NULL by'));
$plugin_list['odt']['options'][] =
array('type' => 'egroup');
} else {
diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php
index 437e760..c4111e2 100644
--- a/libraries/export/pdf.php
+++ b/libraries/export/pdf.php
@@ -15,16 +15,16 @@ if (! defined('PHPMYADMIN')) {
*/
if (isset($plugin_list)) {
$plugin_list['pdf'] = array(
- 'text' => 'strPDF',
+ 'text' => __('PDF'),
'extension' => 'pdf',
'mime_type' => 'application/pdf',
'force_file' => true,
'options' => array(
- array('type' => 'message_only', 'name' =>
'explanation', 'text' => 'strPDFReportExplanation'),
- array('type' => 'text', 'name' =>
'report_title', 'text' => 'strPDFReportTitle'),
+ array('type' => 'message_only', 'name' =>
'explanation', 'text' => __('(Generates a report containing the
data of a single table)')),
+ array('type' => 'text', 'name' =>
'report_title', 'text' => __('Report title')),
array('type' => 'hidden', 'name' =>
'data'),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
} else {
diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php
index f1f3a87..7d1fb5e 100644
--- a/libraries/export/php_array.php
+++ b/libraries/export/php_array.php
@@ -13,7 +13,7 @@ if (! defined('PHPMYADMIN')) {
*/
if (isset($plugin_list)) {
$plugin_list['php_array'] = array(
- 'text' => 'strPhpArray',
+ 'text' => __('PHP array'),
'extension' => 'php',
'mime_type' => 'text/plain',
'options' => array(
@@ -22,7 +22,7 @@ if (isset($plugin_list)) {
'name' => 'data',
),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
} else {
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index 47f9003..1b2b1d1 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -22,16 +22,17 @@ if (isset($plugin_list)) {
}
if (!$hide_sql) {
$plugin_list['sql'] = array(
- 'text' => 'strSQL',
+ 'text' => __('SQL'),
'extension' => 'sql',
'mime_type' => 'text/x-sql',
'options' => array(
- array('type' => 'text', 'name' =>
'header_comment', 'text' => 'strAddHeaderComment'),
- array('type' => 'bool', 'name' =>
'include_comments', 'text' => 'strComments'),
- array('type' => 'bool', 'name' =>
'use_transaction', 'text' => 'strEncloseInTransaction'),
- array('type' => 'bool', 'name' =>
'disable_fk', 'text' => 'strDisableForeignChecks'),
+ array('type' => 'text', 'name' =>
'header_comment', 'text' => __('Add custom comment into header (
+ splits lines)')),
+ array('type' => 'bool', 'name' =>
'include_comments', 'text' => __('Comments')),
+ array('type' => 'bool', 'name' =>
'use_transaction', 'text' => __('Enclose export in a
transaction')),
+ array('type' => 'bool', 'name' =>
'disable_fk', 'text' => __('Disable foreign key checks')),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
$compats = PMA_DBI_getCompatibilities();
if (count($compats) > 0) {
@@ -40,14 +41,14 @@ if (isset($plugin_list)) {
$values[$val] = $val;
}
$plugin_list['sql']['options'][] =
- array('type' => 'select', 'name' =>
'compatibility', 'text' => 'strSQLCompatibility',
'values' => $values, 'doc' =>
array('manual_MySQL_Database_Administration', 'Server_SQL_mode'));
+ array('type' => 'select', 'name' =>
'compatibility', 'text' => __('SQL compatibility mode'),
'values' => $values, 'doc' =>
array('manual_MySQL_Database_Administration', 'Server_SQL_mode'));
unset($values);
}
/* Server export options */
if ($plugin_param['export_type'] == 'server') {
$plugin_list['sql']['options'][] =
- array('type' => 'bgroup', 'text' =>
'strDatabaseExportOptions');
+ array('type' => 'bgroup', 'text' =>
__('Database export options'));
$plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' =>
'drop_database', 'text' => sprintf(__('Add %s'), 'DROP
DATABASE'));
$plugin_list['sql']['options'][] =
@@ -57,7 +58,7 @@ if (isset($plugin_list)) {
/* Structure options */
if (!$hide_structure) {
$plugin_list['sql']['options'][] =
- array('type' => 'bgroup', 'name' =>
'structure', 'text' => 'strStructure', 'force' =>
'data');
+ array('type' => 'bgroup', 'name' =>
'structure', 'text' => __('Structure'), 'force' =>
'data');
if ($plugin_param['export_type'] == 'table') {
if (PMA_Table::isView($GLOBALS['db'], $GLOBALS['table']))
{
$drop_clause = 'DROP VIEW';
@@ -75,24 +76,24 @@ if (isset($plugin_list)) {
$plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' =>
'if_not_exists', 'text' => sprintf(__('Add %s'), 'IF NOT
EXISTS'));
$plugin_list['sql']['options'][] =
- array('type' => 'bool', 'name' =>
'auto_increment', 'text' => 'strAddAutoIncrement');
+ array('type' => 'bool', 'name' =>
'auto_increment', 'text' => __('Add AUTO_INCREMENT value'));
$plugin_list['sql']['options'][] =
- array('type' => 'bool', 'name' =>
'backquotes', 'text' => 'strUseBackquotes');
+ array('type' => 'bool', 'name' =>
'backquotes', 'text' => __('Enclose table and field names with
backquotes'));
$plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' =>
'procedure_function', 'text' => sprintf(__('Add %s'),
'CREATE PROCEDURE / FUNCTION' . (PMA_MYSQL_INT_VERSION > 50100 ? ' /
EVENT' : '')));
/* MIME stuff etc. */
$plugin_list['sql']['options'][] =
- array('type' => 'bgroup', 'text' =>
'strAddIntoComments');
+ array('type' => 'bgroup', 'text' =>
__('Add into comments'));
$plugin_list['sql']['options'][] =
- array('type' => 'bool', 'name' =>
'dates', 'text' => 'strCreationDates');
+ array('type' => 'bool', 'name' =>
'dates', 'text' => __('Creation/Update/Check dates'));
if (!empty($GLOBALS['cfgRelation']['relation'])) {
$plugin_list['sql']['options'][] =
- array('type' => 'bool', 'name' =>
'relation', 'text' => 'strRelations');
+ array('type' => 'bool', 'name' =>
'relation', 'text' => __('Relations'));
}
if (!empty($GLOBALS['cfgRelation']['mimework'])) {
$plugin_list['sql']['options'][] =
- array('type' => 'bool', 'name' =>
'mime', 'text' => 'strMIME_MIMEtype');
+ array('type' => 'bool', 'name' =>
'mime', 'text' => __('MIME type'));
}
$plugin_list['sql']['options'][] =
array('type' => 'egroup');
@@ -103,23 +104,23 @@ if (isset($plugin_list)) {
/* Data */
$plugin_list['sql']['options'][] =
- array('type' => 'bgroup', 'name' =>
'data', 'text' => 'strData', 'force' =>
'structure');
+ array('type' => 'bgroup', 'name' =>
'data', 'text' => __('Data'), 'force' =>
'structure');
$plugin_list['sql']['options'][] =
- array('type' => 'bool', 'name' =>
'columns', 'text' => 'strCompleteInserts', 'doc' =>
array('programs', 'mysqldump',
'option_mysqldump_complete-insert-option'));
+ array('type' => 'bool', 'name' =>
'columns', 'text' => __('Complete inserts'), 'doc'
=> array('programs', 'mysqldump',
'option_mysqldump_complete-insert-option'));
$plugin_list['sql']['options'][] =
- array('type' => 'bool', 'name' =>
'extended', 'text' => 'strExtendedInserts', 'doc' =>
array('programs', 'mysqldump',
'option_mysqldump_extended-insert-option'));
+ array('type' => 'bool', 'name' =>
'extended', 'text' => __('Extended inserts'), 'doc'
=> array('programs', 'mysqldump',
'option_mysqldump_extended-insert-option'));
$plugin_list['sql']['options'][] =
- array('type' => 'text', 'name' =>
'max_query_size', 'text' => 'strMaximalQueryLength');
+ array('type' => 'text', 'name' =>
'max_query_size', 'text' => __('Maximal length of created
query'));
$plugin_list['sql']['options'][] =
- array('type' => 'bool', 'name' =>
'delayed', 'text' => 'strDelayedInserts');
+ array('type' => 'bool', 'name' =>
'delayed', 'text' => __('Use delayed inserts'));
$plugin_list['sql']['options'][] =
- array('type' => 'bool', 'name' =>
'ignore', 'text' => 'strIgnoreInserts');
+ array('type' => 'bool', 'name' =>
'ignore', 'text' => __('Use ignore inserts'));
$plugin_list['sql']['options'][] =
- array('type' => 'bool', 'name' =>
'hex_for_blob', 'text' => 'strHexForBLOB');
+ array('type' => 'bool', 'name' =>
'hex_for_blob', 'text' => __('Use hexadecimal for BLOB'));
$plugin_list['sql']['options'][] =
- array('type' => 'bool', 'name' =>
'utc_time', 'text' => 'strSQLExportUTC');
+ array('type' => 'bool', 'name' =>
'utc_time', 'text' => __('Export time in UTC'));
$plugin_list['sql']['options'][] =
- array('type' => 'select', 'name' =>
'type', 'text' => 'strSQLExportType', 'values' =>
array('INSERT' => 'INSERT', 'UPDATE' => 'UPDATE',
'REPLACE' => 'REPLACE'));
+ array('type' => 'select', 'name' =>
'type', 'text' => __('Export type'), 'values' =>
array('INSERT' => 'INSERT', 'UPDATE' => 'UPDATE',
'REPLACE' => 'REPLACE'));
$plugin_list['sql']['options'][] =
array('type' => 'egroup');
}
diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php
index fbe6580..4eeba65 100644
--- a/libraries/export/texytext.php
+++ b/libraries/export/texytext.php
@@ -14,27 +14,27 @@ if (! defined('PHPMYADMIN')) {
*/
if (isset($plugin_list)) {
$plugin_list['texytext'] = array(
- 'text' => 'strTexyText',
+ 'text' => __('Texy! text'),
'extension' => 'txt',
'mime_type' => 'text/plain',
'options' => array(
array('type' => 'bool',
'name' => 'structure',
- 'text' => 'strStructure',
+ 'text' => __('Structure'),
'force' => 'data'),
array('type' => 'bgroup',
'name' => 'data',
- 'text' => 'strData',
+ 'text' => __('Data'),
'force' => 'structure'),
array('type' => 'text',
'name' => 'null',
- 'text' => 'strReplaceNULLBy'),
+ 'text' => __('Replace NULL by')),
array('type' => 'bool',
'name' => 'columns',
- 'text' => 'strPutColNames'),
+ 'text' => __('Put fields names in the first row')),
array('type' => 'egroup'),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
} else {
diff --git a/libraries/export/xls.php b/libraries/export/xls.php
index efbb481..ed13c15 100644
--- a/libraries/export/xls.php
+++ b/libraries/export/xls.php
@@ -15,16 +15,16 @@ if (! defined('PHPMYADMIN')) {
*/
if (isset($plugin_list)) {
$plugin_list['xls'] = array(
- 'text' => 'strImportXLS',
+ 'text' => __('Excel 97-2003 XLS Workbook'),
'extension' => 'xls',
'mime_type' => 'application/vnd.ms-excel',
'force_file' => true,
'options' => array(
- array('type' => 'text', 'name' =>
'null', 'text' => 'strReplaceNULLBy'),
- array('type' => 'bool', 'name' =>
'columns', 'text' => 'strPutColNames'),
+ array('type' => 'text', 'name' =>
'null', 'text' => __('Replace NULL by')),
+ array('type' => 'bool', 'name' =>
'columns', 'text' => __('Put fields names in the first row')),
array('type' => 'hidden', 'name' =>
'data'),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
} else {
diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php
index 1b24c4c..fb323bf 100644
--- a/libraries/export/xlsx.php
+++ b/libraries/export/xlsx.php
@@ -15,16 +15,16 @@ if (! defined('PHPMYADMIN')) {
*/
if (isset($plugin_list)) {
$plugin_list['xlsx'] = array(
- 'text' => 'strImportXLSX',
+ 'text' => __('Excel 2007 XLSX Workbook'),
'extension' => 'xlsx',
'mime_type' =>
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
'force_file' => true,
'options' => array(
- array('type' => 'text', 'name' =>
'null', 'text' => 'strReplaceNULLBy'),
- array('type' => 'bool', 'name' =>
'columns', 'text' => 'strPutColNames'),
+ array('type' => 'text', 'name' =>
'null', 'text' => __('Replace NULL by')),
+ array('type' => 'bool', 'name' =>
'columns', 'text' => __('Put fields names in the first row')),
array('type' => 'hidden', 'name' =>
'data'),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
} else {
diff --git a/libraries/export/xml.php b/libraries/export/xml.php
index 2930f70..be005bf 100644
--- a/libraries/export/xml.php
+++ b/libraries/export/xml.php
@@ -15,34 +15,34 @@ if (strlen($GLOBALS['db'])) { /* Can't do server export
*/
if (isset($plugin_list)) {
$plugin_list['xml'] = array(
- 'text' => 'strXML',
+ 'text' => __('XML'),
'extension' => 'xml',
'mime_type' => 'text/xml',
'options' => array(
array('type' => 'hidden', 'name' =>
'data'),
),
- 'options_text' => 'strOptions'
+ 'options_text' => __('Options')
);
/* Export structure */
$plugin_list['xml']['options'][] =
- array('type' => 'bgroup', 'name' =>
'export_struc', 'text' => 'strXMLExportStructs');
+ array('type' => 'bgroup', 'name' =>
'export_struc', 'text' => __('Export Structure Schemas
(recommended)'));
$plugin_list['xml']['options'][] =
- array('type' => 'bool', 'name' =>
'export_functions', 'text' => 'strXMLExportFunctions');
+ array('type' => 'bool', 'name' =>
'export_functions', 'text' => __('Export functions'));
$plugin_list['xml']['options'][] =
- array('type' => 'bool', 'name' =>
'export_procedures', 'text' => 'strXMLExportProcedures');
+ array('type' => 'bool', 'name' =>
'export_procedures', 'text' => __('Export procedures'));
$plugin_list['xml']['options'][] =
- array('type' => 'bool', 'name' =>
'export_tables', 'text' => 'strXMLExportTables');
+ array('type' => 'bool', 'name' =>
'export_tables', 'text' => __('Export tables'));
$plugin_list['xml']['options'][] =
- array('type' => 'bool', 'name' =>
'export_triggers', 'text' => 'strXMLExportTriggers');
+ array('type' => 'bool', 'name' =>
'export_triggers', 'text' => __('Export triggers'));
$plugin_list['xml']['options'][] =
- array('type' => 'bool', 'name' =>
'export_views', 'text' => 'strXMLExportViews');
+ array('type' => 'bool', 'name' =>
'export_views', 'text' => __('Export views'));
$plugin_list['xml']['options'][] =
array('type' => 'egroup');
/* Data */
$plugin_list['xml']['options'][] =
- array('type' => 'bool', 'name' =>
'export_contents', 'text' => 'strXMLExportContents');
+ array('type' => 'bool', 'name' =>
'export_contents', 'text' => __('Export contents'));
} else {
/**
diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php
index d1ba38e..7091272 100644
--- a/libraries/export/yaml.php
+++ b/libraries/export/yaml.php
@@ -25,7 +25,7 @@ if (isset($plugin_list)) {
'name' => 'data',
),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
} else {
diff --git a/libraries/import/csv.php b/libraries/import/csv.php
index ee25739..d10d6df 100644
--- a/libraries/import/csv.php
+++ b/libraries/import/csv.php
@@ -19,25 +19,25 @@ if ($plugin_param !== 'table') {
if (isset($plugin_list)) {
$plugin_list['csv'] = array(
- 'text' => 'strCSV',
+ 'text' => __('CSV'),
'extension' => 'csv',
'options' => array(
- array('type' => 'bool', 'name' =>
'replace', 'text' => 'strReplaceTable'),
- array('type' => 'bool', 'name' =>
'ignore', 'text' => 'strIgnoreDuplicates'),
- array('type' => 'text', 'name' =>
'terminated', 'text' => 'strFieldsTerminatedBy', 'size'
=> 2, 'len' => 2),
- array('type' => 'text', 'name' =>
'enclosed', 'text' => 'strFieldsEnclosedBy', 'size'
=> 2, 'len' => 2),
- array('type' => 'text', 'name' =>
'escaped', 'text' => 'strFieldsEscapedBy', 'size' =>
2, 'len' => 2),
- array('type' => 'text', 'name' =>
'new_line', 'text' => 'strLinesTerminatedBy', 'size'
=> 2),
+ array('type' => 'bool', 'name' =>
'replace', 'text' => __('Replace table data with file')),
+ array('type' => 'bool', 'name' =>
'ignore', 'text' => __('Ignore duplicate rows')),
+ array('type' => 'text', 'name' =>
'terminated', 'text' => __('Fields terminated by'),
'size' => 2, 'len' => 2),
+ array('type' => 'text', 'name' =>
'enclosed', 'text' => __('Fields enclosed by'), 'size'
=> 2, 'len' => 2),
+ array('type' => 'text', 'name' =>
'escaped', 'text' => __('Fields escaped by'), 'size'
=> 2, 'len' => 2),
+ array('type' => 'text', 'name' =>
'new_line', 'text' => __('Lines terminated by'), 'size'
=> 2),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
if ($plugin_param !== 'table') {
$plugin_list['csv']['options'][] =
- array('type' => 'bool', 'name' =>
'col_names', 'text' => 'strImportColNames');
+ array('type' => 'bool', 'name' =>
'col_names', 'text' => __('Column names in first row'));
} else {
$plugin_list['csv']['options'][] =
- array('type' => 'text', 'name' =>
'columns', 'text' => 'strColumnNames');
+ array('type' => 'text', 'name' =>
'columns', 'text' => __('Column names'));
}
/* We do not define function when plugin is just queried for information above */
diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php
index 6a1ee0b..fa458ac 100644
--- a/libraries/import/docsql.php
+++ b/libraries/import/docsql.php
@@ -26,12 +26,12 @@ if ($plugin_param !== 'database' ||
$GLOBALS['num_tables'] < 1
if (isset($plugin_list)) {
$plugin_list['docsql'] = array( // set name of your plugin
- 'text' => 'strDocSQL', // text to be displayed
as choice
+ 'text' => __('DocSQL'), // text to be displayed
as choice
'extension' => '', // extension this plugin
can handle
'options' => array( // array of options for your
plugin (optional)
- array('type' => 'text', 'name' =>
'table', 'text' => 'strTableName'),
+ array('type' => 'text', 'name' =>
'table', 'text' => __('Table name')),
),
- 'options_text' => 'strOptions', // text to describe plugin
options (must be set if options are used)
+ 'options_text' => __('Options'), // text to describe plugin
options (must be set if options are used)
);
/* We do not define function when plugin is just queried for information above */
return;
diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php
index 4124ca2..47516aa 100644
--- a/libraries/import/ldi.php
+++ b/libraries/import/ldi.php
@@ -32,19 +32,19 @@ if (isset($plugin_list)) {
unset($result);
}
$plugin_list['ldi'] = array(
- 'text' => 'strLDI',
+ 'text' => __('CSV using LOAD DATA'),
'extension' => 'ldi', // This is nonsense, however we want to
default to our parser for csv
'options' => array(
- array('type' => 'bool', 'name' =>
'replace', 'text' => 'strReplaceTable'),
- array('type' => 'bool', 'name' =>
'ignore', 'text' => 'strIgnoreDuplicates'),
- array('type' => 'text', 'name' =>
'terminated', 'text' => 'strFieldsTerminatedBy', 'size'
=> 2, 'len' => 2),
- array('type' => 'text', 'name' =>
'enclosed', 'text' => 'strFieldsEnclosedBy', 'size'
=> 2, 'len' => 2),
- array('type' => 'text', 'name' =>
'escaped', 'text' => 'strFieldsEscapedBy', 'size' =>
2, 'len' => 2),
- array('type' => 'text', 'name' =>
'new_line', 'text' => 'strLinesTerminatedBy', 'size'
=> 2),
- array('type' => 'text', 'name' =>
'columns', 'text' => 'strColumnNames'),
- array('type' => 'bool', 'name' =>
'local_option', 'text' => 'strLDILocal'),
+ array('type' => 'bool', 'name' =>
'replace', 'text' => __('Replace table data with file')),
+ array('type' => 'bool', 'name' =>
'ignore', 'text' => __('Ignore duplicate rows')),
+ array('type' => 'text', 'name' =>
'terminated', 'text' => __('Fields terminated by'),
'size' => 2, 'len' => 2),
+ array('type' => 'text', 'name' =>
'enclosed', 'text' => __('Fields enclosed by'), 'size'
=> 2, 'len' => 2),
+ array('type' => 'text', 'name' =>
'escaped', 'text' => __('Fields escaped by'), 'size'
=> 2, 'len' => 2),
+ array('type' => 'text', 'name' =>
'new_line', 'text' => __('Lines terminated by'), 'size'
=> 2),
+ array('type' => 'text', 'name' =>
'columns', 'text' => __('Column names')),
+ array('type' => 'bool', 'name' =>
'local_option', 'text' => __('Use LOCAL keyword')),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
/* We do not define function when plugin is just queried for information above */
return;
diff --git a/libraries/import/ods.php b/libraries/import/ods.php
index 81aed5e..729c55e 100644
--- a/libraries/import/ods.php
+++ b/libraries/import/ods.php
@@ -19,15 +19,15 @@ if (! defined('PHPMYADMIN')) {
if (isset($plugin_list)) {
$plugin_list['ods'] = array(
- 'text' => 'strImportODS',
+ 'text' => __('Open Document Spreadsheet'),
'extension' => 'ods',
'options' => array(
- array('type' => 'bool', 'name' =>
'col_names', 'text' => 'strImportColNames'),
- array('type' => 'bool', 'name' =>
'empty_rows', 'text' => 'strImportEmptyRows'),
- array('type' => 'bool', 'name' =>
'recognize_percentages', 'text' => 'strImportODSPercents'),
- array('type' => 'bool', 'name' =>
'recognize_currency', 'text' => 'strImportODSCurrency'),
+ array('type' => 'bool', 'name' =>
'col_names', 'text' => __('Column names in first row')),
+ array('type' => 'bool', 'name' =>
'empty_rows', 'text' => __('Do not import empty rows')),
+ array('type' => 'bool', 'name' =>
'recognize_percentages', 'text' => __('Import percentages as proper
decimals (12.00% to .12)')),
+ array('type' => 'bool', 'name' =>
'recognize_currency', 'text' => __('Import currencies (.00 to
5.00)')),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
/* We do not define function when plugin is just queried for information above */
return;
diff --git a/libraries/import/sql.php b/libraries/import/sql.php
index d736bbe..0241d71 100644
--- a/libraries/import/sql.php
+++ b/libraries/import/sql.php
@@ -15,9 +15,9 @@ if (! defined('PHPMYADMIN')) {
*/
if (isset($plugin_list)) {
$plugin_list['sql'] = array(
- 'text' => 'strSQL',
+ 'text' => __('SQL'),
'extension' => 'sql',
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
$compats = PMA_DBI_getCompatibilities();
if (count($compats) > 0) {
@@ -29,7 +29,7 @@ if (isset($plugin_list)) {
array(
'type' => 'select',
'name' => 'compatibility',
- 'text' => 'strSQLCompatibility',
+ 'text' => __('SQL compatibility mode'),
'values' => $values,
'doc' => array(
'manual_MySQL_Database_Administration',
@@ -39,7 +39,7 @@ if (isset($plugin_list)) {
array(
'type' => 'bool',
'name' => 'no_auto_value_on_zero',
- 'text' => 'strDoNotAutoIncrementZeroValues',
+ 'text' => __('Do not use AUTO_INCREMENT for zero
values'),
'doc' => array(
'manual_MySQL_Database_Administration',
'Server_SQL_mode',
diff --git a/libraries/import/xls.php b/libraries/import/xls.php
index 3fc9c32..ca4778f 100644
--- a/libraries/import/xls.php
+++ b/libraries/import/xls.php
@@ -18,12 +18,12 @@ if (! defined('PHPMYADMIN')) {
if (isset($plugin_list)) {
$plugin_list['xls'] = array(
- 'text' => 'strImportXLS',
+ 'text' => __('Excel 97-2003 XLS Workbook'),
'extension' => 'xls',
'options' => array(
- array('type' => 'bool', 'name' =>
'col_names', 'text' => 'strImportColNames'),
+ array('type' => 'bool', 'name' =>
'col_names', 'text' => __('Column names in first row')),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
/* We do not define function when plugin is just queried for information above */
return;
diff --git a/libraries/import/xlsx.php b/libraries/import/xlsx.php
index 82cb1ea..80d79e5 100644
--- a/libraries/import/xlsx.php
+++ b/libraries/import/xlsx.php
@@ -18,12 +18,12 @@ if (! defined('PHPMYADMIN')) {
if (isset($plugin_list)) {
$plugin_list['xlsx'] = array(
- 'text' => 'strImportXLSX',
+ 'text' => __('Excel 2007 XLSX Workbook'),
'extension' => 'xlsx',
'options' => array(
- array('type' => 'bool', 'name' =>
'col_names', 'text' => 'strImportColNames'),
+ array('type' => 'bool', 'name' =>
'col_names', 'text' => __('Column names in first row')),
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
/* We do not define function when plugin is just queried for information above */
return;
diff --git a/libraries/import/xml.php b/libraries/import/xml.php
index a4c873b..4984e45 100644
--- a/libraries/import/xml.php
+++ b/libraries/import/xml.php
@@ -18,11 +18,11 @@ if (! defined('PHPMYADMIN')) {
if (isset($plugin_list)) {
$plugin_list['xml'] = array(
- 'text' => 'strXML',
+ 'text' => __('XML'),
'extension' => 'xml',
'options' => array(
),
- 'options_text' => 'strOptions',
+ 'options_text' => __('Options'),
);
/* We do not define function when plugin is just queried for information above */
return;
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index c02a8b1..205bb7a 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -116,23 +116,23 @@ function PMA_printRelationsParamDiagnostic($cfgRelation)
PMA_printDiagMessageForParameter('relation',
isset($cfgRelation['relation']), $messages, 'relation');
- PMA_printDiagMessageForFeature('strGeneralRelationFeat', 'relwork',
$messages);
+ PMA_printDiagMessageForFeature(__('General relation features'),
'relwork', $messages);
PMA_printDiagMessageForParameter('table_info',
isset($cfgRelation['table_info']), $messages, 'table_info');
- PMA_printDiagMessageForFeature('strDisplayFeat', 'displaywork',
$messages);
+ PMA_printDiagMessageForFeature(__('Display Features'), 'displaywork',
$messages);
PMA_printDiagMessageForParameter('table_coords',
isset($cfgRelation['table_coords']), $messages, 'table_coords');
PMA_printDiagMessageForParameter('pdf_pages',
isset($cfgRelation['pdf_pages']), $messages, 'table_coords');
- PMA_printDiagMessageForFeature('strCreatePdfFeat', 'pdfwork',
$messages);
+ PMA_printDiagMessageForFeature(__('Creation of PDFs'), 'pdfwork',
$messages);
PMA_printDiagMessageForParameter('column_info',
isset($cfgRelation['column_info']), $messages, 'col_com');
- PMA_printDiagMessageForFeature('strColComFeat', 'commwork',
$messages, false);
+ PMA_printDiagMessageForFeature(__('Displaying Column Comments'),
'commwork', $messages, false);
- PMA_printDiagMessageForFeature('strMIME_transformation', 'mimework',
$messages);
+ PMA_printDiagMessageForFeature(__('Browser transformation'),
'mimework', $messages);
if ($cfgRelation['commwork'] && ! $cfgRelation['mimework'])
{
echo '<tr><td colspan=2 align="left">' .
__('Please see the documentation on how to update your column_comments table') .
'</td></tr>' . "\n";
@@ -140,19 +140,19 @@ function PMA_printRelationsParamDiagnostic($cfgRelation)
PMA_printDiagMessageForParameter('bookmarktable',
isset($cfgRelation['bookmark']), $messages, 'bookmark');
- PMA_printDiagMessageForFeature('strBookmarkQuery', 'bookmarkwork',
$messages);
+ PMA_printDiagMessageForFeature(__('Bookmarked SQL query'),
'bookmarkwork', $messages);
PMA_printDiagMessageForParameter('history',
isset($cfgRelation['history']), $messages, 'history');
- PMA_printDiagMessageForFeature('strQuerySQLHistory', 'historywork',
$messages);
+ PMA_printDiagMessageForFeature(__('SQL history'), 'historywork',
$messages);
PMA_printDiagMessageForParameter('designer_coords',
isset($cfgRelation['designer_coords']), $messages, 'designer_coords');
- PMA_printDiagMessageForFeature('strDesigner', 'designerwork',
$messages);
+ PMA_printDiagMessageForFeature(__('Designer'), 'designerwork',
$messages);
PMA_printDiagMessageForParameter('tracking',
isset($cfgRelation['tracking']), $messages, 'tracking');
- PMA_printDiagMessageForFeature('strTracking', 'trackingwork',
$messages);
+ PMA_printDiagMessageForFeature(__('Tracking'), 'trackingwork',
$messages);
echo '</table>' . "\n";
diff --git a/libraries/session.inc.php b/libraries/session.inc.php
index 8b92f37..372c1ad 100644
--- a/libraries/session.inc.php
+++ b/libraries/session.inc.php
@@ -81,7 +81,7 @@ if (! isset($_COOKIE[$session_name])) {
$r = session_start();
if ($r !== true || $orig_error_count !=
$GLOBALS['error_handler']->countErrors()) {
setcookie($session_name, '', 1);
- PMA_fatalError('strSessionStartupErrorGeneral');
+ PMA_fatalError(__('Cannot start session without errors, please check errors
given in your PHP and/or webserver log file and configure your PHP installation
properly.'));
}
unset($orig_error_count);
} else {
diff --git a/pmd_display_field.php b/pmd_display_field.php
index 9e55e09..fc4f540 100644
--- a/pmd_display_field.php
+++ b/pmd_display_field.php
@@ -45,5 +45,5 @@ if ($cfgRelation['displaywork']) {
header("Content-Type: text/xml; charset=utf-8");
header("Cache-Control: no-cache");
-die("<root act='save_pos'
return='strModifications'></root>");
+die("<root act='save_pos' return=__('Modifications have been
saved')></root>");
?>
diff --git a/pmd_relation_new.php b/pmd_relation_new.php
index 4d77ef6..5dc8754 100644
--- a/pmd_relation_new.php
+++ b/pmd_relation_new.php
@@ -28,7 +28,7 @@ if (PMA_foreignkey_supported($type_T1) &&
PMA_foreignkey_supported($type_T2) &&
$existrel_foreign = PMA_getForeigners($db, $T2, '', 'foreign');
if (isset($existrel_foreign[$F2])
&& isset($existrel_foreign[$F2]['constraint'])) {
- PMD_return_new(0,'strErrorRelationExists');
+ PMD_return_new(0,__('Error: relation already exists.'));
}
// note: in InnoDB, the index does not requires to be on a PRIMARY
// or UNIQUE key
@@ -60,8 +60,8 @@ if (PMA_foreignkey_supported($type_T1) &&
PMA_foreignkey_supported($type_T2) &&
if ($on_update != 'nix') {
$upd_query .= ' ON UPDATE ' . $on_update;
}
- PMA_DBI_try_query($upd_query) or
PMD_return_new(0,'strErrorRelationAdded');
- PMD_return_new(1,'strForeignKeyRelationAdded');
+ PMA_DBI_try_query($upd_query) or PMD_return_new(0,__('Error: Relation not
added.'));
+ PMD_return_new(1,__('FOREIGN KEY relation added'));
}
// internal (pmadb) relation
@@ -83,9 +83,9 @@ if (PMA_foreignkey_supported($type_T1) &&
PMA_foreignkey_supported($type_T2) &&
. '\'' . PMA_sqlAddslashes($F1) .
'\')';
if (PMA_query_as_controluser($q , false, PMA_DBI_QUERY_STORE)) {
- PMD_return_new(1, 'strInternalRelationAdded');
+ PMD_return_new(1, __('Internal relation added'));
} else {
- PMD_return_new(0, 'strErrorRelationAdded');
+ PMD_return_new(0, __('Error: Relation not added.'));
}
}
}
diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php
index 98f145c..eb4e17b 100644
--- a/pmd_relation_upd.php
+++ b/pmd_relation_upd.php
@@ -46,7 +46,7 @@ if (PMA_foreignkey_supported($type_T1) &&
PMA_foreignkey_supported($type_T2) &&
. ' AND foreign_field = \'' . PMA_sqlAddslashes($F1) .
'\''
, FALSE, PMA_DBI_QUERY_STORE);
}
-PMD_return_upd(1, 'strRelationDeleted');
+PMD_return_upd(1, __('Relation deleted'));
function PMD_return_upd($b,$ret)
{
diff --git a/pmd_save_pos.php b/pmd_save_pos.php
index 90c20cc..63e19e5 100644
--- a/pmd_save_pos.php
+++ b/pmd_save_pos.php
@@ -51,7 +51,7 @@ if(! empty($die_save_pos)) {
header("Content-Type: text/xml; charset=utf-8");
header("Cache-Control: no-cache");
?>
-<root act='save_pos' return='<?php echo 'strModifications';
?>'></root>
+<root act='save_pos' return='<?php echo __('Modifications have been
saved'); ?>'></root>
<?php
}
?>
diff --git a/sql.php b/sql.php
index ccc7729..288f150 100644
--- a/sql.php
+++ b/sql.php
@@ -623,7 +623,7 @@ else {
}
if (isset($label)) {
- $message = PMA_message::success('strBookmarkCreated');
+ $message = PMA_message::success(__('Bookmark %s created'));
$message->addParam($label);
$message->display();
}
hooks/post-receive
--
phpMyAdmin