From caa98445d818b85f0fbec0e76c64b5774b32ca22 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 31 May 2010 14:33:21 -0400 Subject: [PATCH] conform to relational terminology regarding columns and rows --- Documentation.html | 170 +++++++++--------- db_datadict.php | 6 +- db_printview.php | 2 +- db_qbe.php | 6 +- db_search.php | 2 +- js/messages.php | 2 +- libraries/Index.class.php | 2 +- libraries/db_structure.lib.php | 4 +- libraries/display_create_table.lib.php | 4 +- libraries/display_export.lib.php | 2 +- libraries/display_import.lib.php | 2 +- libraries/display_tbl.lib.php | 4 +- libraries/export/csv.php | 10 +- libraries/export/excel.php | 4 +- libraries/export/htmlword.php | 4 +- libraries/export/latex.php | 4 +- libraries/export/ods.php | 2 +- libraries/export/odt.php | 4 +- libraries/export/sql.php | 2 +- libraries/export/texytext.php | 4 +- libraries/export/xls.php | 2 +- libraries/export/xlsx.php | 2 +- libraries/import/csv.php | 14 +- libraries/import/ldi.php | 6 +- libraries/sql_query_form.lib.php | 2 +- libraries/tbl_properties.inc.php | 10 +- .../application_octetstream__download.inc.php | 2 +- .../text_plain__dateformat.inc.php | 2 +- .../text_plain__external.inc.php | 2 +- .../text_plain__formatted.inc.php | 2 +- .../text_plain__imagelink.inc.php | 2 +- .../transformations/text_plain__link.inc.php | 2 +- pdf_schema.php | 4 +- pmd_general.php | 2 +- pmd_help.php | 2 +- setup/lib/messages.inc.php | 18 +- tbl_alter.php | 4 +- tbl_change.php | 4 +- tbl_indexes.php | 2 +- tbl_printview.php | 2 +- tbl_relation.php | 4 +- tbl_select.php | 4 +- tbl_structure.php | 10 +- tbl_tracking.php | 4 +- 44 files changed, 176 insertions(+), 172 deletions(-) diff --git a/Documentation.html b/Documentation.html index 3a97d2726..659cd68c7 100644 --- a/Documentation.html +++ b/Documentation.html @@ -101,8 +101,8 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78

Currently phpMyAdmin can:

-

- 6.7 How can I use the "display field" feature?

+ 6.7 How can I use the "display column" feature?

Starting from the previous example, create the pma_table_info as explained in the configuration section, then browse your persons table, and move the mouse over a town code or country code.

- See also FAQ 6.21 for an additional feature that "display field" + See also FAQ 6.21 for an additional feature that "display column" enables: drop-down list of possible values.

@@ -4093,8 +4097,8 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal'); different structure.
  • "Add AUTO_INCREMENT value" ensures that AUTO_INCREMENT value (if any) will be included in backup.
    • -
  • "Enclose table and field names with backquotes" ensures that - field and table names formed with special characters are protected.
    • +
  • "Enclose table and column names with backquotes" ensures that + column and table names formed with special characters are protected.
  • "Add into comments" includes column comments, relations, and MIME types set in the pmadb in the dump as SQL comments (/* xxx */). @@ -4151,15 +4155,15 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal'); We utilize it as free SOAP service.

    - 6.15 I want to add a BLOB field and put an index on + 6.15 I want to add a BLOB column and put an index on it, but MySQL says "BLOB column '...' used in key specification without a key length".

    -

    The right way to do this, is to create the field without any indexes, +

    The right way to do this, is to create the column without any indexes, then display the table structure and use the "Create an index" - dialog. On this page, you will be able to choose your BLOB field, and + dialog. On this page, you will be able to choose your BLOB column, and set a size to the index, which is the condition to create an index on - a BLOB field.

    + a BLOB column.

    6.16 How can I simply move in page with plenty @@ -4178,7 +4182,7 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal'); WTF is this feature then useful for?

    Slow down :). Defining mimetypes is of no use, if you can't put transformations - on them. Otherwise you could just put a comment on the field. Because entering + on them. Otherwise you could just put a comment on the column. Because entering your own mimetype will cause serious syntax checking issues and validation, this introduces a high-risk false-user-input situation. Instead you have to initialize mimetypes using functions or empty mimetype definitions.
    @@ -4268,17 +4272,17 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal');

    6.21 In edit/insert mode, how can I see a list of - possible values for a field, based on some foreign table?

    + possible values for a column, based on some foreign table?

    You have to setup appropriate links between the tables, and also - setup the "display field" in the foreign table. See + setup the "display column" in the foreign table. See FAQ 6.6 for an example. Then, if there are 100 values or less in the foreign table, a drop-down list of values will be available. You will see two lists of values, the first list containing the key - and the display field, the second list containing the display field + and the display column, the second list containing the display column and the key. The reason for this is to be able to type the first - letter of either the key or the display field.

    + letter of either the key or the display column.

    For 100 values or more, a distinct window will appear, to browse foreign key values and choose one. To change the default limit of 100, see @@ -4862,7 +4866,7 @@ Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, "Manuzhai". also contributed the French translation.

  • Alexandr Bravo <abravo_at_hq.admiral.ru> who contributed - tbl_select.php3, a feature to display only some fields from a table. + tbl_select.php3, a feature to display only some columns from a table.
  • Chris Jackson <chrisj_at_ctel.net> added support for MySQL functions in tbl_change.php3. He also added the diff --git a/db_datadict.php b/db_datadict.php index a38b35b16..7af533c94 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -125,9 +125,9 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { /** - * Gets fields properties + * Gets columns properties */ - $result = PMA_DBI_query('SHOW FIELDS FROM ' . PMA_backquote($table) . ';', null, PMA_DBI_QUERY_STORE); + $result = PMA_DBI_query('SHOW COLUMNS FROM ' . PMA_backquote($table) . ';', null, PMA_DBI_QUERY_STORE); $fields_cnt = PMA_DBI_num_rows($result); if (PMA_MYSQL_INT_VERSION < 50025) { @@ -171,7 +171,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { ?> - +*/ ?> diff --git a/db_printview.php b/db_printview.php index e91c04c8f..a6d66f7b5 100644 --- a/db_printview.php +++ b/db_printview.php @@ -102,7 +102,7 @@ else { - +
    - + - + diff --git a/js/messages.php b/js/messages.php index 30969d636..8eb745ac1 100644 --- a/js/messages.php +++ b/js/messages.php @@ -60,7 +60,7 @@ $js_messages['strGeneralRelationFeat:strDisabled'] = __('General relation featur $js_messages['strSelectReferencedKey'] = __('Select referenced key'); $js_messages['strSelectForeignKey'] = __('Select Foreign Key'); $js_messages['strPleaseSelectPrimaryOrUniqueKey'] = __('Please select the primary key or a unique key'); -$js_messages['strChangeDisplay'] = __('Choose field to display'); +$js_messages['strChangeDisplay'] = __('Choose column to display'); echo "var PMA_messages = new Array();\n"; foreach ($js_messages as $name => $js_message) { diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 23306423b..66a2114ba 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -443,7 +443,7 @@ class PMA_Index $r .= ''; $r .= ''; $r .= ''; - $r .= ''; + $r .= ''; $r .= ''; $r .= ''; $r .= ''; diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php index 7a6dff7d8..2b6f42034 100644 --- a/libraries/db_structure.lib.php +++ b/libraries/db_structure.lib.php @@ -19,7 +19,7 @@ if (! defined('PHPMYADMIN')) { * @uses $GLOBALS['is_show_stats'] * @uses __('Table') * @uses __('Action') - * @uses __('Records') + * @uses __('Rows') * @uses __('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]') * @uses __('Type') * @uses __('Collation') @@ -53,7 +53,7 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false .' ' . __('Action') . "\n" .' ' // larger values are more interesting so default sort order is DESC - .' ' . "\n"; if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)) { diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php index 19512b108..8f1b740a6 100644 --- a/libraries/display_create_table.lib.php +++ b/libraries/display_create_table.lib.php @@ -38,7 +38,7 @@ $is_create_table_priv = true; ?> + onsubmit="return (emptyFormElements(this, 'table') && checkFormElementInRange(this, 'num_fields', '', 1))">
    - : + :
    diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index ec7affcc6..54867f503 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -104,7 +104,7 @@ echo PMA_pluginGetJavascript($export_list); '; - echo sprintf(__('Dump %s row(s) starting at record # %s'), + echo sprintf(__('Dump %s row(s) starting at row # %s'), '', diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index d30619db3..923d9622d 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -236,7 +236,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { if (! (isset($timeout_passed) && $timeout_passed)) { ?>
    - +
    " /> - +
    '; $choices = array( 'K' => __('Relational key'), - 'D' => __('Relational display field') + 'D' => __('Relational display column') ); PMA_display_html_radio('relational_display', $choices, $_SESSION['tmp_user_values']['relational_display']); echo ''; diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 5bc490dd3..e3d78f2b8 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -18,13 +18,13 @@ if (isset($plugin_list)) { 'extension' => 'csv', 'mime_type' => 'text/comma-separated-values', 'options' => array( - 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' => 'separator', 'text' => __('Columns terminated by')), + array('type' => 'text', 'name' => 'enclosed', 'text' => __('Columns enclosed by')), + array('type' => 'text', 'name' => 'escaped', 'text' => __('Columns 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' => 'bool', 'name' => 'removeCRLF', 'text' => __('Remove CRLF characters within columns')), + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')), array('type' => 'hidden', 'name' => 'data'), ), 'options_text' => __('Options'), diff --git a/libraries/export/excel.php b/libraries/export/excel.php index 92d0bce7d..768fa3d30 100644 --- a/libraries/export/excel.php +++ b/libraries/export/excel.php @@ -20,8 +20,8 @@ if (isset($plugin_list)) { 'mime_type' => 'text/comma-separated-values', 'options' => array( 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' => 'bool', 'name' => 'removeCRLF', 'text' => __('Remove CRLF characters within columns')), + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')), array( 'type' => 'select', 'name' => 'edition', diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index 2f4441a19..5f36dc95a 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -23,7 +23,7 @@ if (isset($plugin_list)) { 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' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')), array('type' => 'egroup'), ), 'options_text' => __('Options'), @@ -241,7 +241,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals } $schema_insert = '
    '; - $schema_insert .= ''; + $schema_insert .= ''; $schema_insert .= ''; $schema_insert .= ''; $schema_insert .= ''; diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 232d3787f..cba335abc 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -54,7 +54,7 @@ if (isset($plugin_list)) { $plugin_list['latex']['options'][] = array('type' => 'bgroup', 'name' => 'data', 'text' => __('Data'), 'force' => 'structure'); $plugin_list['latex']['options'][] = - array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')); + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')); $plugin_list['latex']['options'][] = array('type' => 'text', 'name' => 'data_caption', 'text' => __('Table caption')); $plugin_list['latex']['options'][] = @@ -357,7 +357,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $buffer = $alignment . '} ' . $crlf ; $header = ' \\hline '; - $header .= '\\multicolumn{1}{|c|}{\\textbf{' . __('Field') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Type') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Null') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Default') . '}}'; + $header .= '\\multicolumn{1}{|c|}{\\textbf{' . __('Column') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Type') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Null') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Default') . '}}'; if ($do_relation && $have_rel) { $header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . __('Links to') . '}}'; } diff --git a/libraries/export/ods.php b/libraries/export/ods.php index c8dee56c1..78fd6f235 100644 --- a/libraries/export/ods.php +++ b/libraries/export/ods.php @@ -21,7 +21,7 @@ if (isset($plugin_list)) { 'force_file' => true, 'options' => array( array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')), - array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')), + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')), array('type' => 'hidden', 'name' => 'data'), ), 'options_text' => __('Options'), diff --git a/libraries/export/odt.php b/libraries/export/odt.php index 9b3239bfb..157fc43d6 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -47,7 +47,7 @@ if (isset($plugin_list)) { $plugin_list['odt']['options'][] = array('type' => 'bgroup', 'name' => 'data', 'text' => __('Data'), 'force' => 'structure'); $plugin_list['odt']['options'][] = - array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')); + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')); $plugin_list['odt']['options'][] = array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')); $plugin_list['odt']['options'][] = @@ -291,7 +291,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals /* Header */ $GLOBALS['odt_buffer'] .= ''; $GLOBALS['odt_buffer'] .= '' - . '' . htmlspecialchars(__('Field')) . '' + . '' . htmlspecialchars(__('Column')) . '' . ''; $GLOBALS['odt_buffer'] .= '' . '' . htmlspecialchars(__('Type')) . '' diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 31f35c460..4c42a91c2 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -77,7 +77,7 @@ if (isset($plugin_list)) { $plugin_list['sql']['options'][] = array('type' => 'bool', 'name' => 'auto_increment', 'text' => __('Add AUTO_INCREMENT value')); $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'backquotes', 'text' => __('Enclose table and field names with backquotes')); + array('type' => 'bool', 'name' => 'backquotes', 'text' => __('Enclose table and column 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' : ''))); diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index 4eeba6558..eeb1615bf 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -31,7 +31,7 @@ if (isset($plugin_list)) { 'text' => __('Replace NULL by')), array('type' => 'bool', 'name' => 'columns', - 'text' => __('Put fields names in the first row')), + 'text' => __('Put columns names in the first row')), array('type' => 'egroup'), ), 'options_text' => __('Options'), @@ -230,7 +230,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals } $text_output = "|------\n"; - $text_output .= '|' . htmlspecialchars(__('Field')); + $text_output .= '|' . htmlspecialchars(__('Column')); $text_output .= '|' . htmlspecialchars(__('Type')); $text_output .= '|' . htmlspecialchars(__('Null')); $text_output .= '|' . htmlspecialchars(__('Default')); diff --git a/libraries/export/xls.php b/libraries/export/xls.php index ed13c15a2..d23890322 100644 --- a/libraries/export/xls.php +++ b/libraries/export/xls.php @@ -21,7 +21,7 @@ if (isset($plugin_list)) { 'force_file' => true, 'options' => array( array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')), - array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')), + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')), array('type' => 'hidden', 'name' => 'data'), ), 'options_text' => __('Options'), diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index fb323bfbd..b59c78cc8 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -21,7 +21,7 @@ if (isset($plugin_list)) { 'force_file' => true, 'options' => array( array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')), - array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')), + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')), array('type' => 'hidden', 'name' => 'data'), ), 'options_text' => __('Options'), diff --git a/libraries/import/csv.php b/libraries/import/csv.php index d10d6df4a..170fb96bb 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -24,9 +24,9 @@ if (isset($plugin_list)) { 'options' => array( 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' => 'terminated', 'text' => __('Columns terminated by'), 'size' => 2, 'len' => 2), + array('type' => 'text', 'name' => 'enclosed', 'text' => __('Columns enclosed by'), 'size' => 2, 'len' => 2), + array('type' => 'text', 'name' => 'escaped', 'text' => __('Columns escaped by'), 'size' => 2, 'len' => 2), array('type' => 'text', 'name' => 'new_line', 'text' => __('Lines terminated by'), 'size' => 2), ), 'options_text' => __('Options'), @@ -56,7 +56,7 @@ $csv_new_line = strtr($csv_new_line, $replacements); if (strlen($csv_terminated) != 1) { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); - $message->addParam(__('Fields terminated by'), false); + $message->addParam(__('Columns terminated by'), false); $error = TRUE; // The default dialog of MS Excel when generating a CSV produces a // semi-colon-separated file with no chance of specifying the @@ -68,11 +68,11 @@ if (strlen($csv_terminated) != 1) { // one character. } elseif (strlen($csv_enclosed) > 1) { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); - $message->addParam(__('Fields enclosed by'), false); + $message->addParam(__('Columns enclosed by'), false); $error = TRUE; } elseif (strlen($csv_escaped) != 1) { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); - $message->addParam(__('Fields escaped by'), false); + $message->addParam(__('Columns escaped by'), false); $error = TRUE; } elseif (strlen($csv_new_line) != 1 && $csv_new_line != 'auto') { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); @@ -309,7 +309,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { if ($values[count($values) - 1] == ';') { unset($values[count($values) - 1]); } else { - $message = PMA_Message::error(__('Invalid field count in CSV input on line %d.')); + $message = PMA_Message::error(__('Invalid column count in CSV input on line %d.')); $message->addParam($line); $error = TRUE; break; diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php index 47516aa88..2c8702af3 100644 --- a/libraries/import/ldi.php +++ b/libraries/import/ldi.php @@ -37,9 +37,9 @@ if (isset($plugin_list)) { 'options' => array( 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' => 'terminated', 'text' => __('Columns terminated by'), 'size' => 2, 'len' => 2), + array('type' => 'text', 'name' => 'enclosed', 'text' => __('Columns enclosed by'), 'size' => 2, 'len' => 2), + array('type' => 'text', 'name' => 'escaped', 'text' => __('Columns 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')), diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index eeee6713a..6a4b6e9a1 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -314,7 +314,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter if (count($fields_list)) { echo '
    ' . "\n" - .'' . "\n" + .'' . "\n" .''; @@ -777,11 +777,11 @@ if ($action == 'tbl_create.php') { onclick="return checkTableEditForm(this.form, )" /> - '); ?> + '); ?> - onclick="return checkFormElementInRange(this.form, 'added_fields', '', 1)" + onclick="return checkFormElementInRange(this.form, 'added_fields', '', 1)" /> diff --git a/libraries/transformations/application_octetstream__download.inc.php b/libraries/transformations/application_octetstream__download.inc.php index 369126ddc..4fbc24dd3 100644 --- a/libraries/transformations/application_octetstream__download.inc.php +++ b/libraries/transformations/application_octetstream__download.inc.php @@ -7,7 +7,7 @@ function PMA_transformation_application_octetstream__download_info() { return array( - 'info' => __('Displays a link to download the binary data of the field. You can use the first option to specify the filename, or use the second option as the name of a field which contains the filename. If you use the second option, you need to set the first option to the empty string.'), + 'info' => __('Displays a link to download the binary data of the column. You can use the first option to specify the filename, or use the second option as the name of a column which contains the filename. If you use the second option, you need to set the first option to the empty string.'), ); } diff --git a/libraries/transformations/text_plain__dateformat.inc.php b/libraries/transformations/text_plain__dateformat.inc.php index 3f11fa902..cf3c2b02f 100644 --- a/libraries/transformations/text_plain__dateformat.inc.php +++ b/libraries/transformations/text_plain__dateformat.inc.php @@ -7,7 +7,7 @@ function PMA_transformation_text_plain__dateformat_info() { return array( - 'info' => __('Displays a TIME, TIMESTAMP, DATETIME or numeric unix timestamp field as formatted date. The first option is the offset (in hours) which will be added to the timestamp (Default: 0). Use second option to specify a different date/time format string. Third option determines whether you want to see local date or UTC one (use "local" or "utc" strings) for that. According to that, date format has different value - for "local" see the documentation for PHP\'s strftime() function and for "utc" it is done using gmdate() function.'), + 'info' => __('Displays a TIME, TIMESTAMP, DATETIME or numeric unix timestamp column as formatted date. The first option is the offset (in hours) which will be added to the timestamp (Default: 0). Use second option to specify a different date/time format string. Third option determines whether you want to see local date or UTC one (use "local" or "utc" strings) for that. According to that, date format has different value - for "local" see the documentation for PHP\'s strftime() function and for "utc" it is done using gmdate() function.'), ); } diff --git a/libraries/transformations/text_plain__external.inc.php b/libraries/transformations/text_plain__external.inc.php index 981faecff..8c35a4eb9 100644 --- a/libraries/transformations/text_plain__external.inc.php +++ b/libraries/transformations/text_plain__external.inc.php @@ -7,7 +7,7 @@ function PMA_transformation_text_plain__external_info() { return array( - 'info' => __('LINUX ONLY: Launches an external application and feeds it the field data via standard input. Returns the standard output of the application. The default is Tidy, to pretty-print HTML code. For security reasons, you have to manually edit the file libraries/transformations/text_plain__external.inc.php and list the tools you want to make available. The first option is then the number of the program you want to use and the second option is the parameters for the program. The third option, if set to 1, will convert the output using htmlspecialchars() (Default 1). The fourth option, if set to 1, will prevent wrapping and ensure that the output appears all on one line (Default 1).'), + 'info' => __('LINUX ONLY: Launches an external application and feeds it the column data via standard input. Returns the standard output of the application. The default is Tidy, to pretty-print HTML code. For security reasons, you have to manually edit the file libraries/transformations/text_plain__external.inc.php and list the tools you want to make available. The first option is then the number of the program you want to use and the second option is the parameters for the program. The third option, if set to 1, will convert the output using htmlspecialchars() (Default 1). The fourth option, if set to 1, will prevent wrapping and ensure that the output appears all on one line (Default 1).'), ); } diff --git a/libraries/transformations/text_plain__formatted.inc.php b/libraries/transformations/text_plain__formatted.inc.php index 7a1e8f87f..add22e148 100644 --- a/libraries/transformations/text_plain__formatted.inc.php +++ b/libraries/transformations/text_plain__formatted.inc.php @@ -7,7 +7,7 @@ function PMA_transformation_text_plain__formatted_info() { return array( - 'info' => __('Displays the contents of the field as-is, without running it through htmlspecialchars(). That is, the field is assumed to contain valid HTML.'), + 'info' => __('Displays the contents of the column as-is, without running it through htmlspecialchars(). That is, the column is assumed to contain valid HTML.'), ); } diff --git a/libraries/transformations/text_plain__imagelink.inc.php b/libraries/transformations/text_plain__imagelink.inc.php index d743a16b5..cb62067ec 100644 --- a/libraries/transformations/text_plain__imagelink.inc.php +++ b/libraries/transformations/text_plain__imagelink.inc.php @@ -7,7 +7,7 @@ function PMA_transformation_text_plain__imagelink_info() { return array( - 'info' => __('Displays an image and a link; the field contains the filename. The first option is a URL prefix like "http://www.example.com/". The second and third options are the width and the height in pixels.'), + 'info' => __('Displays an image and a link; the column contains the filename. The first option is a URL prefix like "http://www.example.com/". The second and third options are the width and the height in pixels.'), ); } diff --git a/libraries/transformations/text_plain__link.inc.php b/libraries/transformations/text_plain__link.inc.php index f9e2bf180..579deda78 100644 --- a/libraries/transformations/text_plain__link.inc.php +++ b/libraries/transformations/text_plain__link.inc.php @@ -7,7 +7,7 @@ function PMA_transformation_text_plain__link_info() { return array( - 'info' => __('Displays a link; the field contains the filename. The first option is a URL prefix like "http://www.example.com/". The second option is a title for the link.'), + 'info' => __('Displays a link; the column contains the filename. The first option is a URL prefix like "http://www.example.com/". The second option is a title for the link.'), ); } diff --git a/pdf_schema.php b/pdf_schema.php index 3156d2196..598c9a4b5 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -1259,7 +1259,7 @@ function PMA_RT_DOC($alltables) $pdf->SetFont('', 'B'); if (isset($orientation) && $orientation == 'L') { - $pdf->Cell(25, 8, ucfirst(__('Field')), 1, 0, 'C'); + $pdf->Cell(25, 8, ucfirst(__('Column')), 1, 0, 'C'); $pdf->Cell(20, 8, ucfirst(__('Type')), 1, 0, 'C'); $pdf->Cell(20, 8, ucfirst(__('Attributes')), 1, 0, 'C'); $pdf->Cell(10, 8, ucfirst(__('Null')), 1, 0, 'C'); @@ -1280,7 +1280,7 @@ function PMA_RT_DOC($alltables) $pdf->Cell(45, 8, 'MIME', 1, 1, 'C'); $pdf->SetWidths(array(25, 20, 20, 10, 20, 25, 45, $comments_width, 45)); } else { - $pdf->Cell(20, 8, ucfirst(__('Field')), 1, 0, 'C'); + $pdf->Cell(20, 8, ucfirst(__('Column')), 1, 0, 'C'); $pdf->Cell(20, 8, ucfirst(__('Type')), 1, 0, 'C'); $pdf->Cell(20, 8, ucfirst(__('Attributes')), 1, 0, 'C'); $pdf->Cell(10, 8, ucfirst(__('Null')), 1, 0, 'C'); diff --git a/pmd_general.php b/pmd_general.php index 5a4e9d994..89988ddfa 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -74,7 +74,7 @@ echo $script_tabs . $script_contr . $script_display_field; >' . __('To select relation, click :') . '
    '; echo '

    '; - echo '

    ' . __('The display field is shown in pink. To set/unset a field as the display field, click the "Choose field to display" icon, then click on the appropriate field name.') . '

    '; + echo '

    ' . __('The display column is shown in pink. To set/unset a column as the display column, click the "Choose column to display" icon, then click on the appropriate column name.') . '

    '; ?> diff --git a/setup/lib/messages.inc.php b/setup/lib/messages.inc.php index b9ec8b3ab..1defa2d82 100644 --- a/setup/lib/messages.inc.php +++ b/setup/lib/messages.inc.php @@ -32,8 +32,8 @@ $strSetupBZipDump_name = __('Bzip2'); $strSetupBZipDumpWarning = __('[a@?page=form&formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.'); $strSetupCannotLoadConfig = __('Cannot load or save configuration'); $strSetupCannotLoadConfigMsg = __('Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@../Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.'); -$strSetupCharEditing_desc = __('Defines which type of editing controls should be used for CHAR and VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in fields'); -$strSetupCharEditing_name = __('CHAR fields editing'); +$strSetupCharEditing_desc = __('Defines which type of editing controls should be used for CHAR and VARCHAR columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in columns'); +$strSetupCharEditing_name = __('CHAR columns editing'); $strSetupCharTextareaCols_desc = __('Number of columns for CHAR/VARCHAR textareas'); $strSetupCharTextareaCols_name = __('CHAR textarea columns'); $strSetupCharTextareaRows_desc = __('Number of rows for CHAR/VARCHAR textareas'); @@ -158,7 +158,7 @@ $strSetupImport_allow_interrupt_desc = __('Allow interrupt of import in case scr $strSetupImport_allow_interrupt_name = __('Partial import: allow interrupt'); $strSetupImport_format_desc = __('Default format; be aware that this list depends on location (database, table) and only SQL is always available'); $strSetupImport_format_name = __('Format of imported file'); -$strSetupImport_skip_queries_desc = __('Number of records (queries) to skip from start'); +$strSetupImport_skip_queries_desc = __('Number of queries to skip from start'); $strSetupImport_skip_queries_name = __('Partial import: skip queries'); $strSetupInsecureConnection = __('Insecure connection'); $strSetupInsecureConnectionMsg1 = __('You are not using a secure connection; all data (including potentially sensitive information, like passwords) is transferred unencrypted!'); @@ -214,15 +214,15 @@ $strSetupNoServers = __('There are no configured servers'); $strSetupOBGzip_desc = __('use GZip output buffering for increased speed in HTTP transfers'); $strSetupOBGzip_name = __('GZip output buffering'); $strSetupOptionNone = __('- none -'); -$strSetupOrder_desc = __('[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, DATETIME and TIMESTAMP, ascending order otherwise'); +$strSetupOrder_desc = __('[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, DATETIME and TIMESTAMP, ascending order otherwise'); $strSetupOrder_name = __('Default sorting order'); $strSetupOverview = __('Overview'); $strSetupPersistentConnections_desc = __('Use persistent connections to MySQL databases'); $strSetupPersistentConnections_name = __('Persistent connections'); $strSetupPropertiesIconic_desc = __('Use only icons, only text or both'); $strSetupPropertiesIconic_name = __('Iconic table operations'); -$strSetupProtectBinary_desc = __('Disallow BLOB and BINARY fields from editing'); -$strSetupProtectBinary_name = __('Protect binary fields'); +$strSetupProtectBinary_desc = __('Disallow BLOB and BINARY columns from editing'); +$strSetupProtectBinary_name = __('Protect binary columns'); $strSetupQueryHistoryDB_desc = __('Enable if you want DB-based query history (requires pmadb). If disabled, this utilizes JS-routines to display query history (lost by window close).'); $strSetupQueryHistoryDB_name = __('Permanent query history'); $strSetupQueryHistoryMax_desc = __('How many queries are kept in history'); @@ -317,8 +317,8 @@ $strSetupServers_ssl_desc = __('Enable SSL for connection to MySQL server'); $strSetupServers_ssl_name = __('Use SSL'); $strSetupServers_table_coords_desc = __('Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]'); $strSetupServers_table_coords_name = __('PDF schema: table coordinates'); -$strSetupServers_table_info_desc = __('Table to describe the display fields, leave blank for no support; suggested: [kbd]pma_table_info[/kbd]'); -$strSetupServers_table_info_name = __('Display fields table'); +$strSetupServers_table_info_desc = __('Table to describe the display columns, leave blank for no support; suggested: [kbd]pma_table_info[/kbd]'); +$strSetupServers_table_info_name = __('Display columns table'); $strSetupServers_user_desc = __('Leave empty if not using config auth'); $strSetupServers_user_name = __('User for config auth'); $strSetupServers_verbose_check_desc = __('Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance'); @@ -326,7 +326,7 @@ $strSetupServers_verbose_check_name = __('Verbose check'); $strSetupServers_verbose_desc = __('A user-friendly description of this server. Leave blank to display the hostname instead.'); $strSetupServers_verbose_name = __('Verbose name of this server'); $strSetupSetValue = __('Set value: %s'); -$strSetupShowAll_desc = __('Whether a user should be displayed a "show all (records)" button'); +$strSetupShowAll_desc = __('Whether a user should be displayed a "show all (rows)" button'); $strSetupShowAll_name = __('Allow to display all the rows'); $strSetupShowChgPassword_desc = __('Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly'); $strSetupShowChgPassword_name = __('Show password change form'); diff --git a/tbl_alter.php b/tbl_alter.php index 4a2a208c0..92c9fedda 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -1,7 +1,7 @@ $vrow) {
    ::
    - : + :  : + :
    -
    ' . __('Type') . '' . __('Unique') . '' . __('Packed') . '' . __('Field') . '' . __('Column') . '' . __('Cardinality') . '' . __('Collation') . '' . __('Null') . '' . PMA_SortableTableHeader(__('Records'), 'records', 'DESC') + .' ' . PMA_SortableTableHeader(__('Rows'), 'records', 'DESC') .PMA_showHint(PMA_sanitize(__('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]'))) . "\n" .'
    ' . htmlspecialchars(__('Field')) . '' . htmlspecialchars(__('Column')) . '' . htmlspecialchars(__('Type')) . '' . htmlspecialchars(__('Null')) . '' . htmlspecialchars(__('Default')) . '
    - + $vrow) { echo "\n"; if (strlen($special_chars) > 32000) { echo " \n"; - echo ' - + diff --git a/tbl_printview.php b/tbl_printview.php index fc1c2bba6..88c9a6bd9 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -139,7 +139,7 @@ foreach ($the_tables as $key => $table) {
    ' . __(' Because of its length,
    this field might not be editable '); + echo '     		' . __(' Because of its length,
    this column might not be editable '); } } elseif ($field['pma_type'] == 'enum') { if (! isset($table_fields[$i]['values'])) { diff --git a/tbl_indexes.php b/tbl_indexes.php index 1d05e2092..470cd04f6 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -186,7 +186,7 @@ PMA_Message::warning(__('("PRIMARY" must be the name of and only of
    - + diff --git a/tbl_relation.php b/tbl_relation.php index c9dbc434f..5ca5ed54e 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -399,7 +399,7 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) {
    - + ' . __('Internal relation'); @@ -545,7 +545,7 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) { $disp = PMA_getDisplayField($db, $table); ?>
    - +
    - + @@ -267,7 +267,7 @@ $(function() { PMA_generate_slider_effect('searchoptions', __('Options')); ?>
    - +
    - + @@ -371,7 +371,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { @@ -533,13 +533,13 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
    + onsubmit="return checkFormElementInRange(this, 'num_fields', '', 1)"> '; + echo '' . __('Add field') . ''; } - echo sprintf(__('Add %s field(s)'), ''); + echo sprintf(__('Add %s column(s)'), ''); // I tried displaying the drop-down inside the label but with Firefox // the drop-down was blinking diff --git a/tbl_tracking.php b/tbl_tracking.php index 5f2b9057c..3e761f8b1 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -270,7 +270,7 @@ if (isset($_REQUEST['snapshot'])) {
    # -
    - + @@ -321,7 +321,7 @@ if (isset($_REQUEST['snapshot'])) { - +