nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gettext conversion

Browse Source
This commit is contained in:
Marc Delisle
2010-05-14 07:47:50 -04:00
parent d904da4fd4
commit b05a903dc3
34 changed files with 176 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
import.php
View File

@@ -423,7 +423,7 @@ if (!empty($id_bookmark) && $action_bookmark == 2) {
if ($timeout_passed) { if ($timeout_passed) {
$message = PMA_Message::error(__('Script timeout passed, if you want to finish import, please resubmit same file and import will resume.')); $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)) { 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.'));
} }
} }

10
libraries/Message.class.php
View File

@@ -182,13 +182,13 @@ class PMA_Message
* @static * @static
* @uses PMA_Message as returned object * @uses PMA_Message as returned object
* @uses PMA_Message::SUCCESS * @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 * @return PMA_Message
*/ */
static public function success($string = '') static public function success($string = '')
{ {
if (empty($string)) { if (empty($string)) {
$string = 'strSuccess'; $string = __('Your SQL query has been executed successfully');
} }
return new PMA_Message($string, PMA_Message::SUCCESS); return new PMA_Message($string, PMA_Message::SUCCESS);
@@ -202,13 +202,13 @@ class PMA_Message
* @static * @static
* @uses PMA_Message as returned object * @uses PMA_Message as returned object
* @uses PMA_Message::ERROR * @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 * @return PMA_Message
*/ */
static public function error($string = '') static public function error($string = '')
{ {
if (empty($string)) { if (empty($string)) {
$string = 'strError'; $string = __('Error');
} }
return new PMA_Message($string, PMA_Message::ERROR); return new PMA_Message($string, PMA_Message::ERROR);
@@ -238,7 +238,7 @@ class PMA_Message
* @static * @static
* @uses PMA_Message as returned object * @uses PMA_Message as returned object
* @uses PMA_Message::NOTICE * @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 * @return PMA_Message
*/ */
static public function notice($string) static public function notice($string)

2
libraries/common.inc.php
View File

@@ -923,7 +923,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
* - > 5.0.15 * - > 5.0.15
*/ */
if (PMA_MYSQL_INT_VERSION < 50015) { 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'));
} }
/** /**

4
libraries/export/codegen.php
View File

@@ -34,9 +34,9 @@ if (isset($plugin_list)) {
'mime_type' => 'text/cs', 'mime_type' => 'text/cs',
'options' => array( 'options' => array(
array('type' => 'hidden', 'name' => 'data'), 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 { } else {

18
libraries/export/csv.php
View File

@@ -14,20 +14,20 @@ if (! defined('PHPMYADMIN')) {
if (isset($plugin_list)) { if (isset($plugin_list)) {
$plugin_list['csv'] = array( $plugin_list['csv'] = array(
'text' => 'strCSV', 'text' => __('CSV'),
'extension' => 'csv', 'extension' => 'csv',
'mime_type' => 'text/comma-separated-values', 'mime_type' => 'text/comma-separated-values',
'options' => array( 'options' => array(
array('type' => 'text', 'name' => 'separator', 'text' => 'strFieldsTerminatedBy'), array('type' => 'text', 'name' => 'separator', 'text' => __('Fields terminated by')),
array('type' => 'text', 'name' => 'enclosed', 'text' => 'strFieldsEnclosedBy'), array('type' => 'text', 'name' => 'enclosed', 'text' => __('Fields enclosed by')),
array('type' => 'text', 'name' => 'escaped', 'text' => 'strFieldsEscapedBy'), array('type' => 'text', 'name' => 'escaped', 'text' => __('Fields escaped by')),
array('type' => 'text', 'name' => 'terminated', 'text' => 'strLinesTerminatedBy'), array('type' => 'text', 'name' => 'terminated', 'text' => __('Lines terminated by')),
array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'), array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')),
array('type' => 'bool', 'name' => 'removeCRLF', 'text' => 'strRemoveCRLF'), array('type' => 'bool', 'name' => 'removeCRLF', 'text' => __('Remove CRLF characters within fields')),
array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'), array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')),
array('type' => 'hidden', 'name' => 'data'), array('type' => 'hidden', 'name' => 'data'),
), ),
'options_text' => 'strOptions', 'options_text' => __('Options'),
); );
} else { } else {

12
libraries/export/excel.php
View File

@@ -15,13 +15,13 @@ if (! defined('PHPMYADMIN')) {
*/ */
if (isset($plugin_list)) { if (isset($plugin_list)) {
$plugin_list['excel'] = array( $plugin_list['excel'] = array(
'text' => 'strStrucExcelCSV', 'text' => __('CSV for MS Excel'),
'extension' => 'csv', 'extension' => 'csv',
'mime_type' => 'text/comma-separated-values', 'mime_type' => 'text/comma-separated-values',
'options' => array( 'options' => array(
array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'), array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')),
array('type' => 'bool', 'name' => 'removeCRLF', 'text' => 'strRemoveCRLF'), array('type' => 'bool', 'name' => 'removeCRLF', 'text' => __('Remove CRLF characters within fields')),
array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'), array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')),
array( array(
'type' => 'select', 'type' => 'select',
'name' => 'edition', 'name' => 'edition',
@@ -29,10 +29,10 @@ if (isset($plugin_list)) {
'win' => 'Windows', 'win' => 'Windows',
'mac_excel2003' => 'Excel 2003 / Macintosh', 'mac_excel2003' => 'Excel 2003 / Macintosh',
'mac_excel2008' => 'Excel 2008 / Macintosh'), 'mac_excel2008' => 'Excel 2008 / Macintosh'),
'text' => 'strExcelEdition'), 'text' => __('Excel edition')),
array('type' => 'hidden', 'name' => 'data'), array('type' => 'hidden', 'name' => 'data'),
), ),
'options_text' => 'strOptions', 'options_text' => __('Options'),
); );
} else { } else {
/* Everything rest is coded in csv plugin */ /* Everything rest is coded in csv plugin */

12
libraries/export/htmlword.php
View File

@@ -15,18 +15,18 @@ if (! defined('PHPMYADMIN')) {
*/ */
if (isset($plugin_list)) { if (isset($plugin_list)) {
$plugin_list['htmlword'] = array( $plugin_list['htmlword'] = array(
'text' => 'strHTMLWord', 'text' => __('Microsoft Word 2000'),
'extension' => 'doc', 'extension' => 'doc',
'mime_type' => 'application/vnd.ms-word', 'mime_type' => 'application/vnd.ms-word',
'force_file' => true, 'force_file' => true,
'options' => array( 'options' => array(
array('type' => 'bool', 'name' => 'structure', 'text' => 'strStructure', 'force' => 'data'), array('type' => 'bool', 'name' => 'structure', 'text' => __('Structure'), 'force' => 'data'),
array('type' => 'bgroup', 'name' => 'data', 'text' => 'strData', 'force' => 'structure'), array('type' => 'bgroup', 'name' => 'data', 'text' => __('Data'), 'force' => 'structure'),
array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'), array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')),
array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'), array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')),
array('type' => 'egroup'), array('type' => 'egroup'),
), ),
'options_text' => 'strOptions', 'options_text' => __('Options'),
); );
} else { } else {

32
libraries/export/latex.php
View File

@@ -19,50 +19,50 @@ if (isset($plugin_list)) {
$hide_structure = true; $hide_structure = true;
} }
$plugin_list['latex'] = array( $plugin_list['latex'] = array(
'text' => 'strLaTeX', 'text' => __('LaTeX'),
'extension' => 'tex', 'extension' => 'tex',
'mime_type' => 'application/x-tex', 'mime_type' => 'application/x-tex',
'options' => array( '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 */ /* Structure options */
if (!$hide_structure) { if (!$hide_structure) {
$plugin_list['latex']['options'][] = $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'][] = $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'][] = $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'][] = $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'])) { if (!empty($GLOBALS['cfgRelation']['relation'])) {
$plugin_list['latex']['options'][] = $plugin_list['latex']['options'][] =
array('type' => 'bool', 'name' => 'relation', 'text' => 'strRelations'); array('type' => 'bool', 'name' => 'relation', 'text' => __('Relations'));
} }
$plugin_list['latex']['options'][] = $plugin_list['latex']['options'][] =
array('type' => 'bool', 'name' => 'comments', 'text' => 'strComments'); array('type' => 'bool', 'name' => 'comments', 'text' => __('Comments'));
if (!empty($GLOBALS['cfgRelation']['mimework'])) { if (!empty($GLOBALS['cfgRelation']['mimework'])) {
$plugin_list['latex']['options'][] = $plugin_list['latex']['options'][] =
array('type' => 'bool', 'name' => 'mime', 'text' => 'strMIME_MIMEtype'); array('type' => 'bool', 'name' => 'mime', 'text' => __('MIME type'));
} }
$plugin_list['latex']['options'][] = $plugin_list['latex']['options'][] =
array('type' => 'egroup'); array('type' => 'egroup');
} }
/* Data */ /* Data */
$plugin_list['latex']['options'][] = $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'][] = $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'][] = $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'][] = $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'][] = $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'][] = $plugin_list['latex']['options'][] =
array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'); array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by'));
$plugin_list['latex']['options'][] = $plugin_list['latex']['options'][] =
array('type' => 'egroup'); array('type' => 'egroup');
} else { } else {

4
libraries/export/mediawiki.php
View File

@@ -12,13 +12,13 @@ if (! defined('PHPMYADMIN')) {
if (isset($plugin_list)) { if (isset($plugin_list)) {
$plugin_list['mediawiki'] = array( $plugin_list['mediawiki'] = array(
'text' => 'strMediaWiki', 'text' => __('MediaWiki Table'),
'extension' => 'txt', 'extension' => 'txt',
'mime_type' => 'text/plain', 'mime_type' => 'text/plain',
'options' => array( 'options' => array(
array('type' => 'hidden', 'name' => 'data'), array('type' => 'hidden', 'name' => 'data'),
), ),
'options_text' => 'strOptions', 'options_text' => __('Options'),
); );
} else { } else {

8
libraries/export/ods.php
View File

@@ -15,16 +15,16 @@ if (! defined('PHPMYADMIN')) {
*/ */
if (isset($plugin_list)) { if (isset($plugin_list)) {
$plugin_list['ods'] = array( $plugin_list['ods'] = array(
'text' => 'strOpenDocumentSpreadsheet', 'text' => __('Open Document Spreadsheet'),
'extension' => 'ods', 'extension' => 'ods',
'mime_type' => 'application/vnd.oasis.opendocument.spreadsheet', 'mime_type' => 'application/vnd.oasis.opendocument.spreadsheet',
'force_file' => true, 'force_file' => true,
'options' => array( 'options' => array(
array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'), array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')),
array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'), array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')),
array('type' => 'hidden', 'name' => 'data'), array('type' => 'hidden', 'name' => 'data'),
), ),
'options_text' => 'strOptions', 'options_text' => __('Options'),
); );
} else { } else {

18
libraries/export/odt.php
View File

@@ -19,37 +19,37 @@ if (isset($plugin_list)) {
$hide_structure = true; $hide_structure = true;
} }
$plugin_list['odt'] = array( $plugin_list['odt'] = array(
'text' => 'strOpenDocumentText', 'text' => __('Open Document Text'),
'extension' => 'odt', 'extension' => 'odt',
'mime_type' => 'application/vnd.oasis.opendocument.text', 'mime_type' => 'application/vnd.oasis.opendocument.text',
'force_file' => true, 'force_file' => true,
'options' => array(), /* Filled later */ 'options' => array(), /* Filled later */
'options_text' => 'strOptions', 'options_text' => __('Options'),
); );
/* Structure options */ /* Structure options */
if (!$hide_structure) { if (!$hide_structure) {
$plugin_list['odt']['options'][] = $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'])) { if (!empty($GLOBALS['cfgRelation']['relation'])) {
$plugin_list['odt']['options'][] = $plugin_list['odt']['options'][] =
array('type' => 'bool', 'name' => 'relation', 'text' => 'strRelations'); array('type' => 'bool', 'name' => 'relation', 'text' => __('Relations'));
} }
$plugin_list['odt']['options'][] = $plugin_list['odt']['options'][] =
array('type' => 'bool', 'name' => 'comments', 'text' => 'strComments'); array('type' => 'bool', 'name' => 'comments', 'text' => __('Comments'));
if (!empty($GLOBALS['cfgRelation']['mimework'])) { if (!empty($GLOBALS['cfgRelation']['mimework'])) {
$plugin_list['odt']['options'][] = $plugin_list['odt']['options'][] =
array('type' => 'bool', 'name' => 'mime', 'text' => 'strMIME_MIMEtype'); array('type' => 'bool', 'name' => 'mime', 'text' => __('MIME type'));
} }
$plugin_list['odt']['options'][] = $plugin_list['odt']['options'][] =
array('type' => 'egroup'); array('type' => 'egroup');
} }
/* Data */ /* Data */
$plugin_list['odt']['options'][] = $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'][] = $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'][] = $plugin_list['odt']['options'][] =
array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'); array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by'));
$plugin_list['odt']['options'][] = $plugin_list['odt']['options'][] =
array('type' => 'egroup'); array('type' => 'egroup');
} else { } else {

8
libraries/export/pdf.php
View File

@@ -15,16 +15,16 @@ if (! defined('PHPMYADMIN')) {
*/ */
if (isset($plugin_list)) { if (isset($plugin_list)) {
$plugin_list['pdf'] = array( $plugin_list['pdf'] = array(
'text' => 'strPDF', 'text' => __('PDF'),
'extension' => 'pdf', 'extension' => 'pdf',
'mime_type' => 'application/pdf', 'mime_type' => 'application/pdf',
'force_file' => true, 'force_file' => true,
'options' => array( 'options' => array(
array('type' => 'message_only', 'name' => 'explanation', 'text' => 'strPDFReportExplanation'), array('type' => 'message_only', 'name' => 'explanation', 'text' => __('(Generates a report containing the data of a single table)')),
array('type' => 'text', 'name' => 'report_title', 'text' => 'strPDFReportTitle'), array('type' => 'text', 'name' => 'report_title', 'text' => __('Report title')),
array('type' => 'hidden', 'name' => 'data'), array('type' => 'hidden', 'name' => 'data'),
), ),
'options_text' => 'strOptions', 'options_text' => __('Options'),
); );
} else { } else {

4
libraries/export/php_array.php
View File

@@ -13,7 +13,7 @@ if (! defined('PHPMYADMIN')) {
*/ */
if (isset($plugin_list)) { if (isset($plugin_list)) {
$plugin_list['php_array'] = array( $plugin_list['php_array'] = array(
'text' => 'strPhpArray', 'text' => __('PHP array'),
'extension' => 'php', 'extension' => 'php',
'mime_type' => 'text/plain', 'mime_type' => 'text/plain',
'options' => array( 'options' => array(
@@ -22,7 +22,7 @@ if (isset($plugin_list)) {
'name' => 'data', 'name' => 'data',
), ),
), ),
'options_text' => 'strOptions', 'options_text' => __('Options'),
); );
} else { } else {

49
libraries/export/sql.php
View File

@@ -22,16 +22,17 @@ if (isset($plugin_list)) {
} }
if (!$hide_sql) { if (!$hide_sql) {
$plugin_list['sql'] = array( $plugin_list['sql'] = array(
'text' => 'strSQL', 'text' => __('SQL'),
'extension' => 'sql', 'extension' => 'sql',
'mime_type' => 'text/x-sql', 'mime_type' => 'text/x-sql',
'options' => array( 'options' => array(
array('type' => 'text', 'name' => 'header_comment', 'text' => 'strAddHeaderComment'), array('type' => 'text', 'name' => 'header_comment', 'text' => __('Add custom comment into header (
array('type' => 'bool', 'name' => 'include_comments', 'text' => 'strComments'), splits lines)')),
array('type' => 'bool', 'name' => 'use_transaction', 'text' => 'strEncloseInTransaction'), array('type' => 'bool', 'name' => 'include_comments', 'text' => __('Comments')),
array('type' => 'bool', 'name' => 'disable_fk', 'text' => 'strDisableForeignChecks'), 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(); $compats = PMA_DBI_getCompatibilities();
if (count($compats) > 0) { if (count($compats) > 0) {
@@ -40,14 +41,14 @@ if (isset($plugin_list)) {
$values[$val] = $val; $values[$val] = $val;
} }
$plugin_list['sql']['options'][] = $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); unset($values);
} }
/* Server export options */ /* Server export options */
if ($plugin_param['export_type'] == 'server') { if ($plugin_param['export_type'] == 'server') {
$plugin_list['sql']['options'][] = $plugin_list['sql']['options'][] =
array('type' => 'bgroup', 'text' => 'strDatabaseExportOptions'); array('type' => 'bgroup', 'text' => __('Database export options'));
$plugin_list['sql']['options'][] = $plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'drop_database', 'text' => sprintf(__('Add %s'), 'DROP DATABASE')); array('type' => 'bool', 'name' => 'drop_database', 'text' => sprintf(__('Add %s'), 'DROP DATABASE'));
$plugin_list['sql']['options'][] = $plugin_list['sql']['options'][] =
@@ -57,7 +58,7 @@ if (isset($plugin_list)) {
/* Structure options */ /* Structure options */
if (!$hide_structure) { if (!$hide_structure) {
$plugin_list['sql']['options'][] = $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 ($plugin_param['export_type'] == 'table') {
if (PMA_Table::isView($GLOBALS['db'], $GLOBALS['table'])) { if (PMA_Table::isView($GLOBALS['db'], $GLOBALS['table'])) {
$drop_clause = 'DROP VIEW'; $drop_clause = 'DROP VIEW';
@@ -75,24 +76,24 @@ if (isset($plugin_list)) {
$plugin_list['sql']['options'][] = $plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'if_not_exists', 'text' => sprintf(__('Add %s'), 'IF NOT EXISTS')); array('type' => 'bool', 'name' => 'if_not_exists', 'text' => sprintf(__('Add %s'), 'IF NOT EXISTS'));
$plugin_list['sql']['options'][] = $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'][] = $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'][] = $plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'procedure_function', 'text' => sprintf(__('Add %s'), 'CREATE PROCEDURE / FUNCTION' . (PMA_MYSQL_INT_VERSION > 50100 ? ' / EVENT' : ''))); array('type' => 'bool', 'name' => 'procedure_function', 'text' => sprintf(__('Add %s'), 'CREATE PROCEDURE / FUNCTION' . (PMA_MYSQL_INT_VERSION > 50100 ? ' / EVENT' : '')));
/* MIME stuff etc. */ /* MIME stuff etc. */
$plugin_list['sql']['options'][] = $plugin_list['sql']['options'][] =
array('type' => 'bgroup', 'text' => 'strAddIntoComments'); array('type' => 'bgroup', 'text' => __('Add into comments'));
$plugin_list['sql']['options'][] = $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'])) { if (!empty($GLOBALS['cfgRelation']['relation'])) {
$plugin_list['sql']['options'][] = $plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'relation', 'text' => 'strRelations'); array('type' => 'bool', 'name' => 'relation', 'text' => __('Relations'));
} }
if (!empty($GLOBALS['cfgRelation']['mimework'])) { if (!empty($GLOBALS['cfgRelation']['mimework'])) {
$plugin_list['sql']['options'][] = $plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'mime', 'text' => 'strMIME_MIMEtype'); array('type' => 'bool', 'name' => 'mime', 'text' => __('MIME type'));
} }
$plugin_list['sql']['options'][] = $plugin_list['sql']['options'][] =
array('type' => 'egroup'); array('type' => 'egroup');
@@ -103,23 +104,23 @@ if (isset($plugin_list)) {
/* Data */ /* Data */
$plugin_list['sql']['options'][] = $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'][] = $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'][] = $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'][] = $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'][] = $plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'delayed', 'text' => 'strDelayedInserts'); array('type' => 'bool', 'name' => 'delayed', 'text' => __('Use delayed inserts'));
$plugin_list['sql']['options'][] = $plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'ignore', 'text' => 'strIgnoreInserts'); array('type' => 'bool', 'name' => 'ignore', 'text' => __('Use ignore inserts'));
$plugin_list['sql']['options'][] = $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'][] = $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'][] = $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'][] = $plugin_list['sql']['options'][] =
array('type' => 'egroup'); array('type' => 'egroup');
} }

12
libraries/export/texytext.php
View File

@@ -14,27 +14,27 @@ if (! defined('PHPMYADMIN')) {
*/ */
if (isset($plugin_list)) { if (isset($plugin_list)) {
$plugin_list['texytext'] = array( $plugin_list['texytext'] = array(
'text' => 'strTexyText', 'text' => __('Texy! text'),
'extension' => 'txt', 'extension' => 'txt',
'mime_type' => 'text/plain', 'mime_type' => 'text/plain',
'options' => array( 'options' => array(
array('type' => 'bool', array('type' => 'bool',
'name' => 'structure', 'name' => 'structure',
'text' => 'strStructure', 'text' => __('Structure'),
'force' => 'data'), 'force' => 'data'),
array('type' => 'bgroup', array('type' => 'bgroup',
'name' => 'data', 'name' => 'data',
'text' => 'strData', 'text' => __('Data'),
'force' => 'structure'), 'force' => 'structure'),
array('type' => 'text', array('type' => 'text',
'name' => 'null', 'name' => 'null',
'text' => 'strReplaceNULLBy'), 'text' => __('Replace NULL by')),
array('type' => 'bool', array('type' => 'bool',
'name' => 'columns', 'name' => 'columns',
'text' => 'strPutColNames'), 'text' => __('Put fields names in the first row')),
array('type' => 'egroup'), array('type' => 'egroup'),
), ),
'options_text' => 'strOptions', 'options_text' => __('Options'),
); );
} else { } else {

8
libraries/export/xls.php
View File

@@ -15,16 +15,16 @@ if (! defined('PHPMYADMIN')) {
*/ */
if (isset($plugin_list)) { if (isset($plugin_list)) {
$plugin_list['xls'] = array( $plugin_list['xls'] = array(
'text' => 'strImportXLS', 'text' => __('Excel 97-2003 XLS Workbook'),
'extension' => 'xls', 'extension' => 'xls',
'mime_type' => 'application/vnd.ms-excel', 'mime_type' => 'application/vnd.ms-excel',
'force_file' => true, 'force_file' => true,
'options' => array( 'options' => array(
array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'), array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')),
array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'), array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')),
array('type' => 'hidden', 'name' => 'data'), array('type' => 'hidden', 'name' => 'data'),
), ),
'options_text' => 'strOptions', 'options_text' => __('Options'),
); );
} else { } else {

8
libraries/export/xlsx.php
View File

@@ -15,16 +15,16 @@ if (! defined('PHPMYADMIN')) {
*/ */
if (isset($plugin_list)) { if (isset($plugin_list)) {
$plugin_list['xlsx'] = array( $plugin_list['xlsx'] = array(
'text' => 'strImportXLSX', 'text' => __('Excel 2007 XLSX Workbook'),
'extension' => 'xlsx', 'extension' => 'xlsx',
'mime_type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'mime_type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
'force_file' => true, 'force_file' => true,
'options' => array( 'options' => array(
array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'), array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')),
array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'), array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')),
array('type' => 'hidden', 'name' => 'data'), array('type' => 'hidden', 'name' => 'data'),
), ),
'options_text' => 'strOptions', 'options_text' => __('Options'),
); );
} else { } else {

18
libraries/export/xml.php
View File

@@ -15,34 +15,34 @@ if (strlen($GLOBALS['db'])) { /* Can't do server export */
if (isset($plugin_list)) { if (isset($plugin_list)) {
$plugin_list['xml'] = array( $plugin_list['xml'] = array(
'text' => 'strXML', 'text' => __('XML'),
'extension' => 'xml', 'extension' => 'xml',
'mime_type' => 'text/xml', 'mime_type' => 'text/xml',
'options' => array( 'options' => array(
array('type' => 'hidden', 'name' => 'data'), array('type' => 'hidden', 'name' => 'data'),
), ),
'options_text' => 'strOptions' 'options_text' => __('Options')
); );
/* Export structure */ /* Export structure */
$plugin_list['xml']['options'][] = $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'][] = $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'][] = $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'][] = $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'][] = $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'][] = $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'][] = $plugin_list['xml']['options'][] =
array('type' => 'egroup'); array('type' => 'egroup');
/* Data */ /* Data */
$plugin_list['xml']['options'][] = $plugin_list['xml']['options'][] =
array('type' => 'bool', 'name' => 'export_contents', 'text' => 'strXMLExportContents'); array('type' => 'bool', 'name' => 'export_contents', 'text' => __('Export contents'));
} else { } else {
/** /**

2
libraries/export/yaml.php
View File

@@ -25,7 +25,7 @@ if (isset($plugin_list)) {
'name' => 'data', 'name' => 'data',
), ),
), ),
'options_text' => 'strOptions', 'options_text' => __('Options'),
); );
} else { } else {

20
libraries/import/csv.php
View File

@@ -19,25 +19,25 @@ if ($plugin_param !== 'table') {
if (isset($plugin_list)) { if (isset($plugin_list)) {
$plugin_list['csv'] = array( $plugin_list['csv'] = array(
'text' => 'strCSV', 'text' => __('CSV'),
'extension' => 'csv', 'extension' => 'csv',
'options' => array( 'options' => array(
array('type' => 'bool', 'name' => 'replace', 'text' => 'strReplaceTable'), array('type' => 'bool', 'name' => 'replace', 'text' => __('Replace table data with file')),
array('type' => 'bool', 'name' => 'ignore', 'text' => 'strIgnoreDuplicates'), array('type' => 'bool', 'name' => 'ignore', 'text' => __('Ignore duplicate rows')),
array('type' => 'text', 'name' => 'terminated', 'text' => 'strFieldsTerminatedBy', 'size' => 2, 'len' => 2), array('type' => 'text', 'name' => 'terminated', 'text' => __('Fields terminated by'), 'size' => 2, 'len' => 2),
array('type' => 'text', 'name' => 'enclosed', 'text' => 'strFieldsEnclosedBy', 'size' => 2, 'len' => 2), array('type' => 'text', 'name' => 'enclosed', 'text' => __('Fields enclosed by'), 'size' => 2, 'len' => 2),
array('type' => 'text', 'name' => 'escaped', 'text' => 'strFieldsEscapedBy', 'size' => 2, 'len' => 2), array('type' => 'text', 'name' => 'escaped', 'text' => __('Fields escaped by'), 'size' => 2, 'len' => 2),
array('type' => 'text', 'name' => 'new_line', 'text' => 'strLinesTerminatedBy', 'size' => 2), array('type' => 'text', 'name' => 'new_line', 'text' => __('Lines terminated by'), 'size' => 2),
), ),
'options_text' => 'strOptions', 'options_text' => __('Options'),
); );
if ($plugin_param !== 'table') { if ($plugin_param !== 'table') {
$plugin_list['csv']['options'][] = $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 { } else {
$plugin_list['csv']['options'][] = $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 */ /* We do not define function when plugin is just queried for information above */

6
libraries/import/docsql.php
View File

@@ -26,12 +26,12 @@ if ($plugin_param !== 'database' || $GLOBALS['num_tables'] < 1
if (isset($plugin_list)) { if (isset($plugin_list)) {
$plugin_list['docsql'] = array( // set name of your plugin $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 'extension' => '', // extension this plugin can handle
'options' => array( // array of options for your plugin (optional) '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 */ /* We do not define function when plugin is just queried for information above */
return; return;

20
libraries/import/ldi.php
View File

@@ -32,19 +32,19 @@ if (isset($plugin_list)) {
unset($result); unset($result);
} }
$plugin_list['ldi'] = array( $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 'extension' => 'ldi', // This is nonsense, however we want to default to our parser for csv
'options' => array( 'options' => array(
array('type' => 'bool', 'name' => 'replace', 'text' => 'strReplaceTable'), array('type' => 'bool', 'name' => 'replace', 'text' => __('Replace table data with file')),
array('type' => 'bool', 'name' => 'ignore', 'text' => 'strIgnoreDuplicates'), array('type' => 'bool', 'name' => 'ignore', 'text' => __('Ignore duplicate rows')),
array('type' => 'text', 'name' => 'terminated', 'text' => 'strFieldsTerminatedBy', 'size' => 2, 'len' => 2), array('type' => 'text', 'name' => 'terminated', 'text' => __('Fields terminated by'), 'size' => 2, 'len' => 2),
array('type' => 'text', 'name' => 'enclosed', 'text' => 'strFieldsEnclosedBy', 'size' => 2, 'len' => 2), array('type' => 'text', 'name' => 'enclosed', 'text' => __('Fields enclosed by'), 'size' => 2, 'len' => 2),
array('type' => 'text', 'name' => 'escaped', 'text' => 'strFieldsEscapedBy', 'size' => 2, 'len' => 2), array('type' => 'text', 'name' => 'escaped', 'text' => __('Fields escaped by'), 'size' => 2, 'len' => 2),
array('type' => 'text', 'name' => 'new_line', 'text' => 'strLinesTerminatedBy', 'size' => 2), array('type' => 'text', 'name' => 'new_line', 'text' => __('Lines terminated by'), 'size' => 2),
array('type' => 'text', 'name' => 'columns', 'text' => 'strColumnNames'), array('type' => 'text', 'name' => 'columns', 'text' => __('Column names')),
array('type' => 'bool', 'name' => 'local_option', 'text' => 'strLDILocal'), 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 */ /* We do not define function when plugin is just queried for information above */
return; return;

12
libraries/import/ods.php
View File

@@ -19,15 +19,15 @@ if (! defined('PHPMYADMIN')) {
if (isset($plugin_list)) { if (isset($plugin_list)) {
$plugin_list['ods'] = array( $plugin_list['ods'] = array(
'text' => 'strImportODS', 'text' => __('Open Document Spreadsheet'),
'extension' => 'ods', 'extension' => 'ods',
'options' => array( 'options' => array(
array('type' => 'bool', 'name' => 'col_names', 'text' => 'strImportColNames'), array('type' => 'bool', 'name' => 'col_names', 'text' => __('Column names in first row')),
array('type' => 'bool', 'name' => 'empty_rows', 'text' => 'strImportEmptyRows'), array('type' => 'bool', 'name' => 'empty_rows', 'text' => __('Do not import empty rows')),
array('type' => 'bool', 'name' => 'recognize_percentages', 'text' => 'strImportODSPercents'), array('type' => 'bool', 'name' => 'recognize_percentages', 'text' => __('Import percentages as proper decimals (12.00% to .12)')),
array('type' => 'bool', 'name' => 'recognize_currency', 'text' => 'strImportODSCurrency'), 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 */ /* We do not define function when plugin is just queried for information above */
return; return;

8
libraries/import/sql.php
View File

@@ -15,9 +15,9 @@ if (! defined('PHPMYADMIN')) {
*/ */
if (isset($plugin_list)) { if (isset($plugin_list)) {
$plugin_list['sql'] = array( $plugin_list['sql'] = array(
'text' => 'strSQL', 'text' => __('SQL'),
'extension' => 'sql', 'extension' => 'sql',
'options_text' => 'strOptions', 'options_text' => __('Options'),
); );
$compats = PMA_DBI_getCompatibilities(); $compats = PMA_DBI_getCompatibilities();
if (count($compats) > 0) { if (count($compats) > 0) {
@@ -29,7 +29,7 @@ if (isset($plugin_list)) {
array( array(
'type' => 'select', 'type' => 'select',
'name' => 'compatibility', 'name' => 'compatibility',
'text' => 'strSQLCompatibility', 'text' => __('SQL compatibility mode'),
'values' => $values, 'values' => $values,
'doc' => array( 'doc' => array(
'manual_MySQL_Database_Administration', 'manual_MySQL_Database_Administration',
@@ -39,7 +39,7 @@ if (isset($plugin_list)) {
array( array(
'type' => 'bool', 'type' => 'bool',
'name' => 'no_auto_value_on_zero', 'name' => 'no_auto_value_on_zero',
'text' => 'strDoNotAutoIncrementZeroValues', 'text' => __('Do not use AUTO_INCREMENT for zero values'),
'doc' => array( 'doc' => array(
'manual_MySQL_Database_Administration', 'manual_MySQL_Database_Administration',
'Server_SQL_mode', 'Server_SQL_mode',

6
libraries/import/xls.php
View File

@@ -18,12 +18,12 @@ if (! defined('PHPMYADMIN')) {
if (isset($plugin_list)) { if (isset($plugin_list)) {
$plugin_list['xls'] = array( $plugin_list['xls'] = array(
'text' => 'strImportXLS', 'text' => __('Excel 97-2003 XLS Workbook'),
'extension' => 'xls', 'extension' => 'xls',
'options' => array( '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 */ /* We do not define function when plugin is just queried for information above */
return; return;

6
libraries/import/xlsx.php
View File

@@ -18,12 +18,12 @@ if (! defined('PHPMYADMIN')) {
if (isset($plugin_list)) { if (isset($plugin_list)) {
$plugin_list['xlsx'] = array( $plugin_list['xlsx'] = array(
'text' => 'strImportXLSX', 'text' => __('Excel 2007 XLSX Workbook'),
'extension' => 'xlsx', 'extension' => 'xlsx',
'options' => array( '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 */ /* We do not define function when plugin is just queried for information above */
return; return;

4
libraries/import/xml.php
View File

@@ -18,11 +18,11 @@ if (! defined('PHPMYADMIN')) {
if (isset($plugin_list)) { if (isset($plugin_list)) {
$plugin_list['xml'] = array( $plugin_list['xml'] = array(
'text' => 'strXML', 'text' => __('XML'),
'extension' => 'xml', 'extension' => 'xml',
'options' => array( 'options' => array(
), ),
'options_text' => 'strOptions', 'options_text' => __('Options'),
); );
/* We do not define function when plugin is just queried for information above */ /* We do not define function when plugin is just queried for information above */
return; return;

18
libraries/relation.lib.php
View File

@@ -116,23 +116,23 @@ function PMA_printRelationsParamDiagnostic($cfgRelation)
PMA_printDiagMessageForParameter('relation', isset($cfgRelation['relation']), $messages, 'relation'); 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_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('table_coords', isset($cfgRelation['table_coords']), $messages, 'table_coords');
PMA_printDiagMessageForParameter('pdf_pages', isset($cfgRelation['pdf_pages']), $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_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']) { 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"; 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_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_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_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_printDiagMessageForParameter('tracking', isset($cfgRelation['tracking']), $messages, 'tracking');
PMA_printDiagMessageForFeature('strTracking', 'trackingwork', $messages); PMA_printDiagMessageForFeature(__('Tracking'), 'trackingwork', $messages);
echo '</table>' . "\n"; echo '</table>' . "\n";

2
libraries/session.inc.php
View File

@@ -81,7 +81,7 @@ if (! isset($_COOKIE[$session_name])) {
$r = session_start(); $r = session_start();
if ($r !== true || $orig_error_count != $GLOBALS['error_handler']->countErrors()) { if ($r !== true || $orig_error_count != $GLOBALS['error_handler']->countErrors()) {
setcookie($session_name, '', 1); 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); unset($orig_error_count);
} else { } else {

2
pmd_display_field.php
View File

@@ -45,5 +45,5 @@ if ($cfgRelation['displaywork']) {
header("Content-Type: text/xml; charset=utf-8"); header("Content-Type: text/xml; charset=utf-8");
header("Cache-Control: no-cache"); header("Cache-Control: no-cache");
die("<root act='save_pos' return='strModifications'></root>"); die("<root act='save_pos' return=__('Modifications have been saved')></root>");
?> ?>

10
pmd_relation_new.php
View File

@@ -28,7 +28,7 @@ if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) &&
$existrel_foreign = PMA_getForeigners($db, $T2, '', 'foreign'); $existrel_foreign = PMA_getForeigners($db, $T2, '', 'foreign');
if (isset($existrel_foreign[$F2]) if (isset($existrel_foreign[$F2])
&& isset($existrel_foreign[$F2]['constraint'])) { && 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 // note: in InnoDB, the index does not requires to be on a PRIMARY
// or UNIQUE key // or UNIQUE key
@@ -60,8 +60,8 @@ if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) &&
if ($on_update != 'nix') { if ($on_update != 'nix') {
$upd_query .= ' ON UPDATE ' . $on_update; $upd_query .= ' ON UPDATE ' . $on_update;
} }
PMA_DBI_try_query($upd_query) or PMD_return_new(0,'strErrorRelationAdded'); PMA_DBI_try_query($upd_query) or PMD_return_new(0,__('Error: Relation not added.'));
PMD_return_new(1,'strForeignKeyRelationAdded'); PMD_return_new(1,__('FOREIGN KEY relation added'));
} }
// internal (pmadb) relation // internal (pmadb) relation
@@ -83,9 +83,9 @@ if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) &&
. '\'' . PMA_sqlAddslashes($F1) . '\')'; . '\'' . PMA_sqlAddslashes($F1) . '\')';
if (PMA_query_as_controluser($q , false, PMA_DBI_QUERY_STORE)) { if (PMA_query_as_controluser($q , false, PMA_DBI_QUERY_STORE)) {
PMD_return_new(1, 'strInternalRelationAdded'); PMD_return_new(1, __('Internal relation added'));
} else { } else {
PMD_return_new(0, 'strErrorRelationAdded'); PMD_return_new(0, __('Error: Relation not added.'));
} }
} }
} }

2
pmd_relation_upd.php
View File

@@ -46,7 +46,7 @@ if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) &&
. ' AND foreign_field = \'' . PMA_sqlAddslashes($F1) . '\'' . ' AND foreign_field = \'' . PMA_sqlAddslashes($F1) . '\''
, FALSE, PMA_DBI_QUERY_STORE); , FALSE, PMA_DBI_QUERY_STORE);
} }
PMD_return_upd(1, 'strRelationDeleted'); PMD_return_upd(1, __('Relation deleted'));
function PMD_return_upd($b,$ret) function PMD_return_upd($b,$ret)
{ {

2
pmd_save_pos.php
View File

@@ -51,7 +51,7 @@ if(! empty($die_save_pos)) {
header("Content-Type: text/xml; charset=utf-8"); header("Content-Type: text/xml; charset=utf-8");
header("Cache-Control: no-cache"); 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 <?php
} }
?> ?>

2
sql.php
View File

@@ -623,7 +623,7 @@ else {
} }
if (isset($label)) { if (isset($label)) {
$message = PMA_message::success('strBookmarkCreated'); $message = PMA_message::success(__('Bookmark %s created'));
$message->addParam($label); $message->addParam($label);
$message->display(); $message->display();
} }