").append(data);
+ $temp_div.find("#index_columns").appendTo("#index_edit_fields");
}) // end $.post()
}) // end insert table button "Go"
@@ -394,7 +352,7 @@ function changeColumns(action,url) {
if ($('#change_column_dialog').length != 0) {
$('#change_column_dialog').remove();
}
- var div = $('
');
+ var $div = $('
');
/**
* @var button_options Object that stores the options passed to jQueryUI
@@ -411,7 +369,7 @@ function changeColumns(action,url) {
$.get( action , url , function(data) {
//in the case of an error, show the error message returned.
if (data.success != undefined && data.success == false) {
- div
+ $div
.append(data.error)
.dialog({
title: PMA_messages['strChangeTbl'],
@@ -422,7 +380,7 @@ function changeColumns(action,url) {
buttons : button_options_error
})// end dialog options
} else {
- div
+ $div
.append(data)
.dialog({
title: PMA_messages['strChangeTbl'],
diff --git a/libraries/Index.class.php b/libraries/Index.class.php
index 1800aee33d..7cc47991e3 100644
--- a/libraries/Index.class.php
+++ b/libraries/Index.class.php
@@ -194,9 +194,10 @@ class PMA_Index
// $columns[names][]
// $columns[sub_parts][]
foreach ($columns['names'] as $key => $name) {
+ $sub_part = isset($columns['sub_parts'][$key]) ? $columns['sub_parts'][$key] : '';
$_columns[] = array(
'Column_name' => $name,
- 'Sub_part' => $columns['sub_parts'][$key],
+ 'Sub_part' => $sub_part,
);
}
} else {
diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php
index bb4510a480..d60785c062 100644
--- a/libraries/export/codegen.php
+++ b/libraries/export/codegen.php
@@ -46,18 +46,6 @@ if (isset($plugin_list)) {
* Set of functions used to build exports of tables
*/
-/**
- * Outputs comment
- *
- * @param string Text of comment
- *
- * @return bool Whether it suceeded
- */
-function PMA_exportComment($text)
-{
- return true;
-}
-
/**
* Outputs export footer
*
@@ -85,8 +73,7 @@ function PMA_exportHeader()
/**
* Outputs database header
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -99,8 +86,7 @@ function PMA_exportDBHeader($db)
/**
* Outputs database footer
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -111,10 +97,9 @@ function PMA_exportDBFooter($db)
}
/**
- * Outputs create database database
- *
- * @param string Database name
+ * Outputs CREATE DATABASE statement
*
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -127,12 +112,11 @@ function PMA_exportDBCreate($db)
/**
* Outputs the content of a table in NHibernate format
*
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param string SQL query for obtaining data
- *
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param string $sql_query SQL query for obtaining data
* @return bool Whether it suceeded
*
* @access public
diff --git a/libraries/export/csv.php b/libraries/export/csv.php
index 62b1537375..0240e9b396 100644
--- a/libraries/export/csv.php
+++ b/libraries/export/csv.php
@@ -35,17 +35,6 @@ if (isset($plugin_list)) {
);
} else {
-/**
- * Outputs comment
- *
- * @param string Text of comment
- *
- * @return bool Whether it suceeded
- */
-function PMA_exportComment($text) {
- return true;
-}
-
/**
* Outputs export footer
*
@@ -107,8 +96,7 @@ function PMA_exportHeader() {
/**
* Outputs database header
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -120,8 +108,7 @@ function PMA_exportDBHeader($db) {
/**
* Outputs database footer
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -131,10 +118,9 @@ function PMA_exportDBFooter($db) {
}
/**
- * Outputs create database database
- *
- * @param string Database name
+ * Outputs CREATE DATABASE statement
*
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -146,12 +132,11 @@ function PMA_exportDBCreate($db) {
/**
* Outputs the content of a table in CSV format
*
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param string SQL query for obtaining data
- *
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param string $sql_query SQL query for obtaining data
* @return bool Whether it suceeded
*
* @access public
diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php
index af5af76546..c840e932f6 100644
--- a/libraries/export/htmlword.php
+++ b/libraries/export/htmlword.php
@@ -34,17 +34,6 @@ if (isset($plugin_list)) {
);
} else {
-/**
- * Outputs comment
- *
- * @param string Text of comment
- *
- * @return bool Whether it suceeded
- */
-function PMA_exportComment($text) {
- return true;
-}
-
/**
* Outputs export footer
*
@@ -80,8 +69,7 @@ xmlns="http://www.w3.org/TR/REC-html40">
/**
* Outputs database header
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -93,8 +81,7 @@ function PMA_exportDBHeader($db) {
/**
* Outputs database footer
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -104,10 +91,9 @@ function PMA_exportDBFooter($db) {
}
/**
- * Outputs create database database
- *
- * @param string Database name
+ * Outputs CREATE DATABASE statement
*
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -117,14 +103,13 @@ function PMA_exportDBCreate($db) {
}
/**
- * Outputs the content of a table in CSV format
- *
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param string SQL query for obtaining data
+ * Outputs the content of a table in HTML (Microsoft Word) format
*
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param string $sql_query SQL query for obtaining data
* @return bool Whether it suceeded
*
* @access public
@@ -182,7 +167,28 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
return true;
}
-function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $dummy)
+/**
+ * Outputs table's structure
+ *
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param bool $do_relation whether to include relation comments
+ * @param bool $do_comments whether to include the pmadb-style column comments
+ * as comments in the structure; this is deprecated
+ * but the parameter is left here because export.php
+ * calls PMA_exportStructure() also for other export
+ * types which use this parameter
+ * @param bool $do_mime whether to include mime comments
+ * @param bool $dates whether to include creation/update/check dates
+ * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in'
+ * @param string $export_type 'server', 'database', 'table'
+ * @return bool Whether it suceeded
+ *
+ * @access public
+ */
+function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
{
global $cfgRelation;
diff --git a/libraries/export/json.php b/libraries/export/json.php
index 9c836e136f..86e2e89d31 100644
--- a/libraries/export/json.php
+++ b/libraries/export/json.php
@@ -34,19 +34,6 @@ if (isset($plugin_list)) {
* Set of functions used to build exports of tables
*/
-/**
- * Outputs comment
- *
- * @param string Text of comment
- *
- * @return bool Whether it suceeded
- */
-function PMA_exportComment($text)
-{
- PMA_exportOutputHandler('/* ' . $text . ' */' . $GLOBALS['crlf']);
- return true;
-}
-
/**
* Outputs export footer
*
@@ -80,8 +67,7 @@ function PMA_exportHeader()
/**
* Outputs database header
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -95,8 +81,7 @@ function PMA_exportDBHeader($db)
/**
* Outputs database footer
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -107,10 +92,9 @@ function PMA_exportDBFooter($db)
}
/**
- * Outputs create database database
- *
- * @param string Database name
+ * Outputs CREATE DATABASE statement
*
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -121,14 +105,13 @@ function PMA_exportDBCreate($db)
}
/**
- * Outputs the content of a table in YAML format
- *
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param string SQL query for obtaining data
+ * Outputs the content of a table in JSON format
*
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param string $sql_query SQL query for obtaining data
* @return bool Whether it suceeded
*
* @access public
diff --git a/libraries/export/latex.php b/libraries/export/latex.php
index 565c29cba2..96be53681f 100644
--- a/libraries/export/latex.php
+++ b/libraries/export/latex.php
@@ -100,17 +100,6 @@ function PMA_texEscape($string) {
return $string;
}
-/**
- * Outputs comment
- *
- * @param string Text of comment
- *
- * @return bool Whether it suceeded
- */
-function PMA_exportComment($text) {
- return PMA_exportOutputHandler('% ' . $text . $GLOBALS['crlf']);
-}
-
/**
* Outputs export footer
*
@@ -143,7 +132,7 @@ function PMA_exportHeader() {
}
$head .= $crlf
. '% ' . __('Generation Time') . ': ' . PMA_localisedDate() . $crlf
- . '% ' . __('Server version') . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3) . $crlf
+ . '% ' . __('Server version') . ': ' . PMA_MYSQL_STR_VERSION . $crlf
. '% ' . __('PHP Version') . ': ' . phpversion() . $crlf;
return PMA_exportOutputHandler($head);
}
@@ -151,8 +140,7 @@ function PMA_exportHeader() {
/**
* Outputs database header
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -168,8 +156,7 @@ function PMA_exportDBHeader($db) {
/**
* Outputs database footer
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -179,10 +166,9 @@ function PMA_exportDBFooter($db) {
}
/**
- * Outputs create database database
- *
- * @param string Database name
+ * Outputs CREATE DATABASE statement
*
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -194,12 +180,11 @@ function PMA_exportDBCreate($db) {
/**
* Outputs the content of a table in LaTeX table/sideways table environment
*
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param string SQL query for obtaining data
- *
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param string $sql_query SQL query for obtaining data
* @return bool Whether it suceeded
*
* @access public
@@ -290,23 +275,27 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
} // end getTableLaTeX
/**
- * Returns $table's structure as LaTeX
+ * Outputs table's structure
*
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param boolean whether to include relation comments
- * @param boolean whether to include column comments
- * @param boolean whether to include mime comments
- * @param string future feature: support view dependencies
- *
- * @return bool Whether it suceeded
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param bool $do_relation whether to include relation comments
+ * @param bool $do_comments whether to include the pmadb-style column comments
+ * as comments in the structure; this is deprecated
+ * but the parameter is left here because export.php
+ * calls PMA_exportStructure() also for other export
+ * types which use this parameter
+ * @param bool $do_mime whether to include mime comments
+ * @param bool $dates whether to include creation/update/check dates
+ * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in'
+ * @param string $export_type 'server', 'database', 'table'
+ * @return bool Whether it suceeded
*
* @access public
*/
- // @@@ Table structure
-function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $dummy)
+function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
{
global $cfgRelation;
diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php
index 538c31c533..76c8b2a716 100644
--- a/libraries/export/mediawiki.php
+++ b/libraries/export/mediawiki.php
@@ -24,17 +24,6 @@ if (isset($plugin_list)) {
);
} else {
-/**
- * Outputs comment
- *
- * @param string Text of comment
- *
- * @return bool Whether it suceeded
- */
-function PMA_exportComment($text) {
- return true;
-}
-
/**
* Outputs export footer
*
@@ -60,8 +49,7 @@ function PMA_exportHeader() {
/**
* Outputs database header
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -73,8 +61,7 @@ function PMA_exportDBHeader($db) {
/**
* Outputs database footer
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -84,10 +71,9 @@ function PMA_exportDBFooter($db) {
}
/**
- * Outputs create database database
- *
- * @param string Database name
+ * Outputs CREATE DATABASE statement
*
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -99,12 +85,11 @@ function PMA_exportDBCreate($db) {
/**
* Outputs the content of a table in MediaWiki format
*
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param string SQL query for obtaining data
- *
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param string $sql_query SQL query for obtaining data
* @return bool Whether it suceeded
*
* @access public
diff --git a/libraries/export/ods.php b/libraries/export/ods.php
index 699aa0fa2e..9d9ff1309b 100644
--- a/libraries/export/ods.php
+++ b/libraries/export/ods.php
@@ -33,17 +33,6 @@ if (isset($plugin_list)) {
$GLOBALS['ods_buffer'] = '';
require_once './libraries/opendocument.lib.php';
-/**
- * Outputs comment
- *
- * @param string Text of comment
- *
- * @return bool Whether it suceeded
- */
-function PMA_exportComment($text) {
- return true;
-}
-
/**
* Outputs export footer
*
@@ -113,8 +102,7 @@ function PMA_exportHeader() {
/**
* Outputs database header
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -126,8 +114,7 @@ function PMA_exportDBHeader($db) {
/**
* Outputs database footer
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -137,10 +124,9 @@ function PMA_exportDBFooter($db) {
}
/**
- * Outputs create database database
- *
- * @param string Database name
+ * Outputs CREATE DATABASE statement
*
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -150,14 +136,13 @@ function PMA_exportDBCreate($db) {
}
/**
- * Outputs the content of a table in CSV format
- *
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param string SQL query for obtaining data
+ * Outputs the content of a table in ODS format
*
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param string $sql_query SQL query for obtaining data
* @return bool Whether it suceeded
*
* @access public
diff --git a/libraries/export/odt.php b/libraries/export/odt.php
index d3c42de6b1..b640ca34ae 100644
--- a/libraries/export/odt.php
+++ b/libraries/export/odt.php
@@ -65,17 +65,6 @@ if (isset($plugin_list)) {
$GLOBALS['odt_buffer'] = '';
require_once './libraries/opendocument.lib.php';
-/**
- * Outputs comment
- *
- * @param string Text of comment
- *
- * @return bool Whether it suceeded
- */
-function PMA_exportComment($text) {
- return true;
-}
-
/**
* Outputs export footer
*
@@ -111,8 +100,7 @@ function PMA_exportHeader() {
/**
* Outputs database header
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -125,8 +113,7 @@ function PMA_exportDBHeader($db) {
/**
* Outputs database footer
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -136,10 +123,9 @@ function PMA_exportDBFooter($db) {
}
/**
- * Outputs create database database
- *
- * @param string Database name
+ * Outputs CREATE DATABASE statement
*
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -149,14 +135,13 @@ function PMA_exportDBCreate($db) {
}
/**
- * Outputs the content of a table in CSV format
- *
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param string SQL query for obtaining data
+ * Outputs the content of a table in ODT format
*
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param string $sql_query SQL query for obtaining data
* @return bool Whether it suceeded
*
* @access public
@@ -222,23 +207,27 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
}
/**
- * Returns $table's structure as Open Document Text
+ * Outputs table's structure
*
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param boolean whether to include relation comments
- * @param boolean whether to include column comments
- * @param boolean whether to include mime comments
- * @param string future feature: support view dependencies
- *
- * @return bool Whether it suceeded
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param bool $do_relation whether to include relation comments
+ * @param bool $do_comments whether to include the pmadb-style column comments
+ * as comments in the structure; this is deprecated
+ * but the parameter is left here because export.php
+ * calls PMA_exportStructure() also for other export
+ * types which use this parameter
+ * @param bool $do_mime whether to include mime comments
+ * @param bool $dates whether to include creation/update/check dates
+ * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in'
+ * @param string $export_type 'server', 'database', 'table'
+ * @return bool Whether it suceeded
*
* @access public
*/
- // @@@ Table structure
-function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $dummy)
+function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
{
global $cfgRelation;
diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php
index e864454b64..bb89fda34a 100644
--- a/libraries/export/pdf.php
+++ b/libraries/export/pdf.php
@@ -358,18 +358,6 @@ class PMA_PDF extends TCPDF
$pdf = new PMA_PDF('L', 'pt', 'A3');
-/**
- * Outputs comment
- *
- * @param string Text of comment
- *
- * @return bool Whether it suceeded
- */
-function PMA_exportComment($text)
-{
- return true;
-}
-
/**
* Finalize the pdf.
*
@@ -420,8 +408,7 @@ function PMA_exportHeader()
/**
* Outputs database header
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -434,8 +421,7 @@ function PMA_exportDBHeader($db)
/**
* Outputs database footer
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -446,10 +432,9 @@ function PMA_exportDBFooter($db)
}
/**
- * Outputs create database database
- *
- * @param string Database name
+ * Outputs CREATE DATABASE statement
*
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -462,13 +447,11 @@ function PMA_exportDBCreate($db)
/**
* Outputs the content of a table in PDF format
*
- * @todo user-defined page orientation, paper size
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param string SQL query for obtaining data
- *
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param string $sql_query SQL query for obtaining data
* @return bool Whether it suceeded
*
* @access public
diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php
index 66a0aa6070..1996e6fbfc 100644
--- a/libraries/export/php_array.php
+++ b/libraries/export/php_array.php
@@ -34,19 +34,6 @@ if (isset($plugin_list)) {
* Set of functions used to build exports of tables
*/
-/**
- * Outputs comment
- *
- * @param string Text of comment
- *
- * @return bool Whether it suceeded
- */
-function PMA_exportComment($text)
-{
- PMA_exportOutputHandler('// ' . $text . $GLOBALS['crlf']);
- return true;
-}
-
/**
* Outputs export footer
*
@@ -81,8 +68,7 @@ function PMA_exportHeader()
/**
* Outputs database header
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -96,8 +82,7 @@ function PMA_exportDBHeader($db)
/**
* Outputs database footer
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -108,10 +93,9 @@ function PMA_exportDBFooter($db)
}
/**
- * Outputs create database database
- *
- * @param string Database name
+ * Outputs CREATE DATABASE statement
*
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -122,14 +106,13 @@ function PMA_exportDBCreate($db)
}
/**
- * Outputs the content of a table in YAML format
- *
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param string SQL query for obtaining data
+ * Outputs the content of a table as a fragment of PHP code
*
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param string $sql_query SQL query for obtaining data
* @return bool Whether it suceeded
*
* @access public
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index 3b0d968c38..32309574d6 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -297,9 +297,10 @@ if (! isset($sql_backquotes)) {
/**
* Exports routines (procedures and functions)
*
- * @param string $db
+ * @param string $db
+ * @return bool Whether it suceeded
*
- * @return bool Whether it suceeded
+ * @access public
*/
function PMA_exportRoutines($db) {
global $crlf;
@@ -357,9 +358,10 @@ function PMA_exportRoutines($db) {
/**
* Possibly outputs comment
*
- * @param string Text of comment
- *
+ * @param string $text Text of comment
* @return string The formatted comment
+ *
+ * @access private
*/
function PMA_exportComment($text = '')
{
@@ -375,10 +377,11 @@ function PMA_exportComment($text = '')
* Possibly outputs CRLF
*
* @return string $crlf or nothing
+ *
+ * @access private
*/
function PMA_possibleCRLF()
{
-
if (isset($GLOBALS['sql_include_comments']) && $GLOBALS['sql_include_comments']) {
return $GLOBALS['crlf'];
} else {
@@ -457,7 +460,7 @@ function PMA_exportHeader()
$head .= PMA_exportComment($host_string);
$head .= PMA_exportComment(__('Generation Time')
. ': ' . PMA_localisedDate())
- . PMA_exportComment(__('Server version') . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3))
+ . PMA_exportComment(__('Server version') . ': ' . PMA_MYSQL_STR_VERSION)
. PMA_exportComment(__('PHP Version') . ': ' . phpversion())
. PMA_possibleCRLF();
@@ -518,10 +521,9 @@ function PMA_exportHeader()
}
/**
- * Outputs CREATE DATABASE database
- *
- * @param string Database name
+ * Outputs CREATE DATABASE statement
*
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -557,8 +559,7 @@ function PMA_exportDBCreate($db)
/**
* Outputs database header
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -574,8 +575,7 @@ function PMA_exportDBHeader($db)
/**
* Outputs database footer
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -626,15 +626,13 @@ function PMA_exportDBFooter($db)
return $result;
}
-
/**
* Returns a stand-in CREATE definition to resolve view dependencies
*
- * @param string the database name
- * @param string the view name
- * @param string the end of line sequence
- *
- * @return string resulting definition
+ * @param string $db the database name
+ * @param string $view the view name
+ * @param string $crlf the end of line sequence
+ * @return string resulting definition
*
* @access public
*/
@@ -662,20 +660,15 @@ function PMA_getTableDefStandIn($db, $view, $crlf) {
/**
* Returns $table's CREATE definition
*
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param boolean whether to include creation/update/check dates
- * @param boolean whether to add semicolon and end-of-line at the end
- * @param boolean whether we're handling view
- *
+ * @param string $db the database name
+ * @param string $table the table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param bool $show_dates whether to include creation/update/check dates
+ * @param bool $add_semicolon whether to add semicolon and end-of-line at the end
+ * @param bool $view whether we're handling a view
* @return string resulting schema
*
- * @global boolean whether to add 'drop' statements or not
- * @global boolean whether to use backquotes to allow the use of special
- * characters in database, table and fields names or not
- *
* @access public
*/
function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $add_semicolon = true, $view = false)
@@ -869,21 +862,19 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a
return $schema_create . ($add_semicolon ? ';' . $crlf : '');
} // end of the 'PMA_getTableDef()' function
-
/**
* Returns $table's comments, relations etc.
*
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param boolean whether to include relation comments
- * @param boolean whether to include mime comments
- *
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf end of line sequence
+ * @param bool $do_relation whether to include relation comments
+ * @param bool $do_mime whether to include mime comments
* @return string resulting comments
*
- * @access public
+ * @access private
*/
-function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mime = false)
+function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mime = false)
{
global $cfgRelation;
global $sql_backquotes;
@@ -943,21 +934,21 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mim
/**
* Outputs table's structure
*
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param boolean whether to include relation comments
- * @param boolean whether to include the pmadb-style column comments
- * as comments in the structure; this is deprecated
- * but the parameter is left here because export.php
- * calls PMA_exportStructure() also for other export
- * types which use this parameter
- * @param boolean whether to include mime comments
- * @param string 'stand_in', 'create_table', 'create_view'
- * @param string 'server', 'database', 'table'
- *
- * @return bool Whether it suceeded
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param bool $relation whether to include relation comments
+ * @param bool $comments whether to include the pmadb-style column comments
+ * as comments in the structure; this is deprecated
+ * but the parameter is left here because export.php
+ * calls PMA_exportStructure() also for other export
+ * types which use this parameter
+ * @param bool $mime whether to include mime comments
+ * @param bool $dates whether to include creation/update/check dates
+ * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in'
+ * @param string $export_type 'server', 'database', 'table'
+ * @return bool Whether it suceeded
*
* @access public
*/
@@ -1019,26 +1010,16 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = false,
}
/**
- * Dispatches between the versions of 'getTableContent' to use depending
- * on the php version
- *
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param string SQL query for obtaining data
+ * Outputs the content of a table in SQL format
*
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param string $sql_query SQL query for obtaining data
* @return bool Whether it suceeded
*
- * @global boolean whether to use backquotes to allow the use of special
- * characters in database, table and fields names or not
- * @global integer the number of records
- * @global integer the current record position
- *
* @access public
- *
- * @see PMA_getTableContentFast(), PMA_getTableContentOld()
- *
*/
function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
{
diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php
index 2b290f1725..ceffe4d018 100644
--- a/libraries/export/texytext.php
+++ b/libraries/export/texytext.php
@@ -32,17 +32,6 @@ if (isset($plugin_list)) {
);
} else {
-/**
- * Outputs comment
- *
- * @param string Text of comment
- *
- * @return bool Whether it suceeded
- */
-function PMA_exportComment($text) {
- return true;
-}
-
/**
* Outputs export footer
*
@@ -68,8 +57,7 @@ function PMA_exportHeader() {
/**
* Outputs database header
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -81,8 +69,7 @@ function PMA_exportDBHeader($db) {
/**
* Outputs database footer
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -92,10 +79,9 @@ function PMA_exportDBFooter($db) {
}
/**
- * Outputs create database database
- *
- * @param string Database name
+ * Outputs CREATE DATABASE statement
*
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -105,14 +91,13 @@ function PMA_exportDBCreate($db) {
}
/**
- * Outputs the content of a table in CSV format
- *
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param string SQL query for obtaining data
+ * Outputs the content of a table in Texy format
*
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param string $sql_query SQL query for obtaining data
* @return bool Whether it suceeded
*
* @access public
@@ -164,7 +149,28 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
return true;
}
-function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $dummy)
+/**
+ * Outputs table's structure
+ *
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param bool $do_relation whether to include relation comments
+ * @param bool $do_comments whether to include the pmadb-style column comments
+ * as comments in the structure; this is deprecated
+ * but the parameter is left here because export.php
+ * calls PMA_exportStructure() also for other export
+ * types which use this parameter
+ * @param bool $do_mime whether to include mime comments
+ * @param bool $dates whether to include creation/update/check dates
+ * @param string $export_mode 'create_table', 'triggers', 'create_view', 'stand_in'
+ * @param string $export_type 'server', 'database', 'table'
+ * @return bool Whether it suceeded
+ *
+ * @access public
+ */
+function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
{
global $cfgRelation;
diff --git a/libraries/export/xls.php b/libraries/export/xls.php
index 2a1f2192a7..6116e2a2e1 100644
--- a/libraries/export/xls.php
+++ b/libraries/export/xls.php
@@ -36,17 +36,6 @@ set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PH
require_once './libraries/PHPExcel/PHPExcel.php';
require_once './libraries/PHPExcel/PHPExcel/Writer/Excel5.php';
-/**
- * Outputs comment
- *
- * @param string Text of comment
- *
- * @return bool Whether it suceeded
- */
-function PMA_exportComment($text) {
- return true;
-}
-
/**
* Outputs export footer
*
@@ -102,8 +91,7 @@ function PMA_exportHeader() {
/**
* Outputs database header
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -117,8 +105,7 @@ function PMA_exportDBHeader($db) {
/**
* Outputs database footer
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -128,10 +115,9 @@ function PMA_exportDBFooter($db) {
}
/**
- * Outputs create database database
- *
- * @param string Database name
+ * Outputs CREATE DATABASE statement
*
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -143,12 +129,11 @@ function PMA_exportDBCreate($db) {
/**
* Outputs the content of a table in XLS format
*
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param string SQL query for obtaining data
- *
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param string $sql_query SQL query for obtaining data
* @return bool Whether it suceeded
*
* @access public
diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php
index 487c2dfb59..758d98dffe 100644
--- a/libraries/export/xlsx.php
+++ b/libraries/export/xlsx.php
@@ -36,17 +36,6 @@ set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PH
require_once './libraries/PHPExcel/PHPExcel.php';
require_once './libraries/PHPExcel/PHPExcel/Writer/Excel2007.php';
-/**
- * Outputs comment
- *
- * @param string Text of comment
- *
- * @return bool Whether it suceeded
- */
-function PMA_exportComment($text) {
- return true;
-}
-
/**
* Outputs export footer
*
@@ -101,8 +90,7 @@ function PMA_exportHeader() {
/**
* Outputs database header
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -116,8 +104,7 @@ function PMA_exportDBHeader($db) {
/**
* Outputs database footer
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -127,10 +114,9 @@ function PMA_exportDBFooter($db) {
}
/**
- * Outputs create database database
- *
- * @param string Database name
+ * Outputs CREATE DATABASE statement
*
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -142,12 +128,11 @@ function PMA_exportDBCreate($db) {
/**
* Outputs the content of a table in XLSX format
*
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param string SQL query for obtaining data
- *
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param string $sql_query SQL query for obtaining data
* @return bool Whether it suceeded
*
* @access public
diff --git a/libraries/export/xml.php b/libraries/export/xml.php
index ba1e4fa12f..26650513d2 100644
--- a/libraries/export/xml.php
+++ b/libraries/export/xml.php
@@ -48,17 +48,6 @@ if (isset($plugin_list)) {
$plugin_list['xml']['options'][] = array('type' => 'end_group');
} else {
-/**
- * Outputs comment
- *
- * @param string Text of comment
- *
- * @return bool Whether it suceeded
- */
-function PMA_exportComment($text) {
- return PMA_exportOutputHandler('' . $GLOBALS['crlf']);
-}
-
/**
* Outputs export footer
*
@@ -108,7 +97,7 @@ function PMA_exportHeader() {
}
$head .= $crlf
. '- ' . __('Generation Time') . ': ' . PMA_localisedDate() . $crlf
- . '- ' . __('Server version') . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3) . $crlf
+ . '- ' . __('Server version') . ': ' . PMA_MYSQL_STR_VERSION . $crlf
. '- ' . __('PHP Version') . ': ' . phpversion() . $crlf
. '-->' . $crlf . $crlf;
@@ -243,8 +232,7 @@ function PMA_exportHeader() {
/**
* Outputs database header
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -270,8 +258,7 @@ function PMA_exportDBHeader($db) {
/**
* Outputs database footer
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -290,10 +277,9 @@ function PMA_exportDBFooter($db) {
}
/**
- * Outputs create database database
- *
- * @param string Database name
+ * Outputs CREATE DATABASE statement
*
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -302,16 +288,14 @@ function PMA_exportDBCreate($db) {
return true;
}
-
/**
- * Outputs the content of a table
- *
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param string SQL query for obtaining data
+ * Outputs the content of a table in XML format
*
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param string $sql_query SQL query for obtaining data
* @return bool Whether it suceeded
*
* @access public
diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php
index 8c3fad045d..017cae6d18 100644
--- a/libraries/export/yaml.php
+++ b/libraries/export/yaml.php
@@ -35,19 +35,6 @@ if (isset($plugin_list)) {
* Set of functions used to build exports of tables
*/
-/**
- * Outputs comment
- *
- * @param string Text of comment
- *
- * @return bool Whether it suceeded
- */
-function PMA_exportComment($text)
-{
- PMA_exportOutputHandler('# ' . $text . $GLOBALS['crlf']);
- return true;
-}
-
/**
* Outputs export footer
*
@@ -77,8 +64,7 @@ function PMA_exportHeader()
/**
* Outputs database header
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -91,8 +77,7 @@ function PMA_exportDBHeader($db)
/**
* Outputs database footer
*
- * @param string Database name
- *
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -103,10 +88,9 @@ function PMA_exportDBFooter($db)
}
/**
- * Outputs create database database
- *
- * @param string Database name
+ * Outputs CREATE DATABASE statement
*
+ * @param string $db Database name
* @return bool Whether it suceeded
*
* @access public
@@ -119,12 +103,11 @@ function PMA_exportDBCreate($db)
/**
* Outputs the content of a table in YAML format
*
- * @param string the database name
- * @param string the table name
- * @param string the end of line sequence
- * @param string the url to go back in case of error
- * @param string SQL query for obtaining data
- *
+ * @param string $db database name
+ * @param string $table table name
+ * @param string $crlf the end of line sequence
+ * @param string $error_url the url to go back in case of error
+ * @param string $sql_query SQL query for obtaining data
* @return bool Whether it suceeded
*
* @access public
diff --git a/po/br.po b/po/br.po
index 6d92660791..a501c6e488 100644
--- a/po/br.po
+++ b/po/br.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-07 15:16+0200\n"
-"PO-Revision-Date: 2011-07-10 19:45+0200\n"
+"PO-Revision-Date: 2011-07-11 20:39+0200\n"
"Last-Translator:
\n"
"Language-Team: LANGUAGE \n"
"Language: br\n"
@@ -2825,7 +2825,7 @@ msgstr "Bannoù gronnet gant"
#: libraries/config/messages.inc.php:249 libraries/import/csv.php:81
#: libraries/import/ldi.php:43
msgid "Columns escaped by"
-msgstr ""
+msgstr "Arouezenn dec'hout"
#: libraries/config/messages.inc.php:77 libraries/config/messages.inc.php:83
#: libraries/config/messages.inc.php:90 libraries/config/messages.inc.php:99
@@ -2833,38 +2833,38 @@ msgstr ""
#: libraries/config/messages.inc.php:142 libraries/config/messages.inc.php:145
#: libraries/config/messages.inc.php:147 libraries/export/texytext.php:27
msgid "Replace NULL by"
-msgstr ""
+msgstr "Erlec'hiañ NULL gant"
#: libraries/config/messages.inc.php:78 libraries/config/messages.inc.php:84
msgid "Remove CRLF characters within columns"
-msgstr ""
+msgstr "Tennañ an arouezennoù dibenn linenn e dibarzh ar bannoù"
#: libraries/config/messages.inc.php:79 libraries/config/messages.inc.php:245
#: libraries/config/messages.inc.php:253 libraries/import/csv.php:63
#: libraries/import/ldi.php:41
msgid "Columns terminated by"
-msgstr ""
+msgstr "Bannoù a echu gant"
#: libraries/config/messages.inc.php:80 libraries/config/messages.inc.php:240
#: libraries/import/csv.php:86 libraries/import/ldi.php:44
msgid "Lines terminated by"
-msgstr ""
+msgstr "Linennoù a echu gant"
#: libraries/config/messages.inc.php:82
msgid "Excel edition"
-msgstr ""
+msgstr "Stumm Excel"
#: libraries/config/messages.inc.php:85
msgid "Database name template"
-msgstr ""
+msgstr "Patrom anv diaz roadennoù"
#: libraries/config/messages.inc.php:86
msgid "Server name template"
-msgstr ""
+msgstr "Patrom anv servijer"
#: libraries/config/messages.inc.php:87
msgid "Table name template"
-msgstr ""
+msgstr "Patrom anv taolenn"
#: libraries/config/messages.inc.php:91 libraries/config/messages.inc.php:104
#: libraries/config/messages.inc.php:113 libraries/config/messages.inc.php:137
@@ -2872,74 +2872,74 @@ msgstr ""
#: libraries/export/latex.php:40 libraries/export/odt.php:32
#: libraries/export/sql.php:116 libraries/export/texytext.php:23
msgid "Dump table"
-msgstr ""
+msgstr "Ezporzhiañ an daolenn"
#: libraries/config/messages.inc.php:92 libraries/export/latex.php:32
msgid "Include table caption"
-msgstr ""
+msgstr "Enklozañ an istitloù"
#: libraries/config/messages.inc.php:95 libraries/config/messages.inc.php:101
#: libraries/export/latex.php:50 libraries/export/latex.php:74
msgid "Table caption"
-msgstr ""
+msgstr "Istitl eus an daolenn"
#: libraries/config/messages.inc.php:96 libraries/config/messages.inc.php:102
msgid "Continued table caption"
-msgstr ""
+msgstr "Enklozañ an istitloù"
#: libraries/config/messages.inc.php:97 libraries/config/messages.inc.php:103
#: libraries/export/latex.php:54 libraries/export/latex.php:78
msgid "Label key"
-msgstr ""
+msgstr "Alc'hwez an dikedenn"
#: libraries/config/messages.inc.php:98 libraries/config/messages.inc.php:110
#: libraries/config/messages.inc.php:134 libraries/export/odt.php:326
#: libraries/tbl_properties.inc.php:145
msgid "MIME type"
-msgstr ""
+msgstr "Seurt MIME"
#: libraries/config/messages.inc.php:100 libraries/config/messages.inc.php:112
#: libraries/config/messages.inc.php:136 tbl_relation.php:396
msgid "Relations"
-msgstr ""
+msgstr "Darempredoù"
#: libraries/config/messages.inc.php:105
msgid "Export method"
-msgstr ""
+msgstr "Doare ezporzhiañ"
#: libraries/config/messages.inc.php:114 libraries/config/messages.inc.php:116
msgid "Save on server"
-msgstr ""
+msgstr "Enrollañ war ar servijer"
#: libraries/config/messages.inc.php:115 libraries/config/messages.inc.php:117
#: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214
msgid "Overwrite existing file(s)"
-msgstr ""
+msgstr "Frikañ ar restroù zo c'hoazh"
#: libraries/config/messages.inc.php:118
msgid "Remember file name template"
-msgstr ""
+msgstr "Derc'hel soñj eus patrom anv ar restr"
#: libraries/config/messages.inc.php:120
msgid "Enclose table and column names with backquotes"
-msgstr ""
+msgstr "Lakaat krochedoù stouet a bep tu da anvioù an taolennoù hag ar bannoù"
#: libraries/config/messages.inc.php:121 libraries/config/messages.inc.php:260
#: libraries/display_export.lib.php:346
msgid "SQL compatibility mode"
-msgstr ""
+msgstr "Mod kenglotañ gant SQL"
#: libraries/config/messages.inc.php:122 libraries/export/sql.php:176
msgid "CREATE TABLE options:"
-msgstr ""
+msgstr "Dibarzhioù evit CREATE TABLE :"
#: libraries/config/messages.inc.php:123
msgid "Creation/Update/Check dates"
-msgstr ""
+msgstr "Deiziad krouiñ/hizivaat/gwiriañ"
#: libraries/config/messages.inc.php:124
msgid "Use delayed inserts"
-msgstr ""
+msgstr "Ensoc'hadennoù gant dale"
#: libraries/config/messages.inc.php:125 libraries/export/sql.php:79
msgid "Disable foreign key checks"
diff --git a/po/da.po b/po/da.po
index 6ee49126ff..65f4e7f5a4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-07 15:16+0200\n"
-"PO-Revision-Date: 2011-07-11 14:02+0200\n"
+"PO-Revision-Date: 2011-07-11 15:49+0200\n"
"Last-Translator: \n"
"Language-Team: danish \n"
"Language: da\n"
@@ -2373,7 +2373,7 @@ msgstr "Der er ikke nogen filer at uploade"
#: libraries/common.lib.php:2849 libraries/common.lib.php:2850
msgid "Execute"
-msgstr ""
+msgstr "Udfør"
#: libraries/config.values.php:45 libraries/config.values.php:47
#: libraries/config.values.php:51
@@ -2411,12 +2411,11 @@ msgstr "struktur"
#: libraries/export/latex.php:42 libraries/export/odt.php:34
#: libraries/export/sql.php:123 libraries/export/texytext.php:24
msgid "data"
-msgstr ""
+msgstr "data"
#: libraries/config.values.php:98 libraries/export/htmlword.php:25
#: libraries/export/latex.php:42 libraries/export/odt.php:34
#: libraries/export/sql.php:124 libraries/export/texytext.php:24
-#, fuzzy
#| msgid "Structure and data"
msgid "structure and data"
msgstr "Struktur og data"
@@ -2622,7 +2621,7 @@ msgstr ""
#: libraries/config/messages.inc.php:31
msgid "Bzip2"
-msgstr ""
+msgstr "Bzip2"
#: libraries/config/messages.inc.php:32
msgid ""
@@ -2830,7 +2829,6 @@ msgstr "Komprimering"
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
-#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
msgstr "Indsæt feltnavne i første række"
@@ -2844,10 +2842,9 @@ msgstr "Felter skal adskilles med"
#: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:242
#: libraries/config/messages.inc.php:249 libraries/import/csv.php:81
#: libraries/import/ldi.php:43
-#, fuzzy
#| msgid "Fields escaped by"
msgid "Columns escaped by"
-msgstr "Felter escaped med"
+msgstr "Kolonner escapes med"
#: libraries/config/messages.inc.php:77 libraries/config/messages.inc.php:83
#: libraries/config/messages.inc.php:90 libraries/config/messages.inc.php:99
@@ -2859,21 +2856,20 @@ msgstr "Erstat NULL med"
#: libraries/config/messages.inc.php:78 libraries/config/messages.inc.php:84
msgid "Remove CRLF characters within columns"
-msgstr "Fjern karakterer for linjeskift i felterne"
+msgstr "Fjern CRLF-karakterer i kolonnerne"
#: libraries/config/messages.inc.php:79 libraries/config/messages.inc.php:245
#: libraries/config/messages.inc.php:253 libraries/import/csv.php:63
#: libraries/import/ldi.php:41
msgid "Columns terminated by"
-msgstr "Felter afsluttes med"
+msgstr "Kolonner afsluttes med"
#: libraries/config/messages.inc.php:80 libraries/config/messages.inc.php:240
#: libraries/import/csv.php:86 libraries/import/ldi.php:44
msgid "Lines terminated by"
-msgstr "Linjer afsluttet med"
+msgstr "Linjer afsluttes med"
#: libraries/config/messages.inc.php:82
-#, fuzzy
#| msgid "Excel edition"
msgid "Excel edition"
msgstr "Excel-udgave"
@@ -2884,11 +2880,11 @@ msgstr "Skabelon for databasenavn"
#: libraries/config/messages.inc.php:86
msgid "Server name template"
-msgstr "Maske for servernavn"
+msgstr "Skabelon for servernavn"
#: libraries/config/messages.inc.php:87
msgid "Table name template"
-msgstr "Maske for tabelnavn"
+msgstr "Skabelon for tabelnavn"
#: libraries/config/messages.inc.php:91 libraries/config/messages.inc.php:104
#: libraries/config/messages.inc.php:113 libraries/config/messages.inc.php:137
@@ -2900,7 +2896,7 @@ msgstr "Dump tabel"
#: libraries/config/messages.inc.php:92 libraries/export/latex.php:32
msgid "Include table caption"
-msgstr "Inkluder tabeloverskrift"
+msgstr "Inkludér tabeloverskrift"
#: libraries/config/messages.inc.php:95 libraries/config/messages.inc.php:101
#: libraries/export/latex.php:50 libraries/export/latex.php:74
@@ -2913,6 +2909,7 @@ msgstr "Fortsat tabeloverskrift"
#: libraries/config/messages.inc.php:97 libraries/config/messages.inc.php:103
#: libraries/export/latex.php:54 libraries/export/latex.php:78
+#, fuzzy
msgid "Label key"
msgstr "Mærke nøgle"
@@ -2928,10 +2925,9 @@ msgid "Relations"
msgstr "Relationer"
#: libraries/config/messages.inc.php:105
-#, fuzzy
#| msgid "Export type"
msgid "Export method"
-msgstr "Eksporttype"
+msgstr "Eksport-type"
#: libraries/config/messages.inc.php:114 libraries/config/messages.inc.php:116
msgid "Save on server"
@@ -2944,7 +2940,7 @@ msgstr "Overskriv eksisterende fil(er)"
#: libraries/config/messages.inc.php:118
msgid "Remember file name template"
-msgstr "Husk maske for filnavn"
+msgstr "Husk skabelon for filnavn"
#: libraries/config/messages.inc.php:120
msgid "Enclose table and column names with backquotes"
@@ -2953,11 +2949,11 @@ msgstr "Brug \"backquotes\" omkring tabel -og feltnavne"
#: libraries/config/messages.inc.php:121 libraries/config/messages.inc.php:260
#: libraries/display_export.lib.php:346
msgid "SQL compatibility mode"
-msgstr "SQL-kompatibilitetsmodus"
+msgstr "SQL-kompatibilitets-tilstand"
#: libraries/config/messages.inc.php:122 libraries/export/sql.php:176
msgid "CREATE TABLE options:"
-msgstr "Muligheder for CREATE TABLE:"
+msgstr "Indstillinger til CREATE TABLE:"
#: libraries/config/messages.inc.php:123
msgid "Creation/Update/Check dates"
@@ -2981,7 +2977,7 @@ msgstr "Brug ignorér inserts"
#: libraries/config/messages.inc.php:132
msgid "Syntax to use when inserting data"
-msgstr "Syntaks som skal bruges, når der indsættes data"
+msgstr "Syntaks der bruges, når der indsættes data"
#: libraries/config/messages.inc.php:133 libraries/export/sql.php:268
msgid "Maximal length of created query"
@@ -3012,16 +3008,16 @@ msgid ""
"Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is "
"the referenced data, [kbd]id[/kbd] is the key value"
msgstr ""
-"Sorteringsrækkefølge for elementer i valgboks med fremmede nøgler; [kbd]"
-"content[/kbd] er de refererede data, [kbd]id[/kbd] er nøglens værdi"
+"Sorteringsrækkefølge for elementer i valgboks med fremmede nøgler; "
+"[kbd]content[/kbd] er de refererede data, [kbd]id[/kbd] er nøglens værdi"
#: libraries/config/messages.inc.php:151
msgid "Foreign key dropdown order"
-msgstr "Sortër fremmede nøgler i valgboks på:"
+msgstr "Sortér fremmede nøgler i valgboks"
#: libraries/config/messages.inc.php:152
msgid "A dropdown will be used if fewer items are present"
-msgstr "Der vil blive brugt en valgboks, hvis der er færre elementer til stede"
+msgstr "Der vil blive brugt en valgboks, hvis der er få elementer til stede"
#: libraries/config/messages.inc.php:153
msgid "Foreign key limit"
@@ -3064,7 +3060,7 @@ msgstr "Redigeringstilstand"
#: libraries/config/messages.inc.php:163
msgid "Customize edit mode"
-msgstr "Tilpas redigerinstilstand"
+msgstr "Tilpas redigeringstilstand"
#: libraries/config/messages.inc.php:165
msgid "Export defaults"
@@ -3091,7 +3087,7 @@ msgstr "Bestem indstillinger for nogle af de mest anvendte valgmuligheder"
#: libraries/server_links.inc.php:69 libraries/tbl_links.inc.php:89
#: prefs_manage.php:231 setup/frames/menu.inc.php:20
msgid "Import"
-msgstr "Import"
+msgstr "Importér"
#: libraries/config/messages.inc.php:171
msgid "Import defaults"
@@ -3146,13 +3142,12 @@ msgstr "Hovedramme"
#: libraries/config/messages.inc.php:186
msgid "Microsoft Office"
-msgstr ""
+msgstr "Microsoft Office"
#: libraries/config/messages.inc.php:188
-#, fuzzy
#| msgid "Open Document Text"
msgid "Open Document"
-msgstr "Open Document tekst"
+msgstr "Open Document"
#: libraries/config/messages.inc.php:190
msgid "Other core settings"
@@ -3171,14 +3166,17 @@ msgid ""
"Specify browser's title bar text. Refer to [a@Documentation."
"html#cfg_TitleTable]documentation[/a] for magic strings that can be used to "
"get special values."
-msgstr "Angiv browserens titeltekst. "
+msgstr ""
+"Angiv browserens tekst i titelbaren. Se "
+"[a@Documentation.html#cfg_TitleTable]dokumentationen[/a] for tekststrenge "
+"der indeholder særlige værdier."
#: libraries/config/messages.inc.php:194
#: libraries/navigation_header.inc.php:83
#: libraries/navigation_header.inc.php:86
#: libraries/navigation_header.inc.php:89
msgid "Query window"
-msgstr "Foresp. vindue"
+msgstr "Forespørgselsvindue"
#: libraries/config/messages.inc.php:195
msgid "Customize query window options"
@@ -3193,8 +3191,8 @@ msgid ""
"Please note that phpMyAdmin is just a user interface and its features do not "
"limit MySQL"
msgstr ""
-"Bemærk venligst at phpMyAdmin blot er en brugerflade, hvis egenskaber ikke "
-"begrænser MySQL"
+"Bemærk venligst at phpMyAdmin blot er en brugerflade og at den ikke "
+"begrænser mulighederne i MySQL"
#: libraries/config/messages.inc.php:198
msgid "Basic settings"
@@ -3218,7 +3216,7 @@ msgid ""
"what they are for"
msgstr ""
"Avanceret serverkonfiguration. Lad være med at ændre disse indstillinger med "
-"mindre, du ved, hvad de betyder"
+"mindre du ved hvad de betyder"
#: libraries/config/messages.inc.php:203
msgid "Enter server connection parameters"
@@ -3234,16 +3232,21 @@ msgid ""
"features, see [a@Documentation.html#linked-tables]phpMyAdmin configuration "
"storage[/a] in documentation"
msgstr ""
+"Konfigurér phpMyAdmin configuration storage for at få adgang til flere "
+"funktioner. Se dokumentationen for [a@Documentation.html#linked-"
+"tables]phpMyAdmin configuration storage[/a]."
#: libraries/config/messages.inc.php:206
msgid "Changes tracking"
-msgstr ""
+msgstr "Ændrer sporing"
#: libraries/config/messages.inc.php:207
msgid ""
"Tracking of changes made in database. Requires the phpMyAdmin configuration "
"storage."
msgstr ""
+"Sporing af ændringer i databasen er udført. phpMyAdmin configuration storage "
+"er krævet."
#: libraries/config/messages.inc.php:208
msgid "Customize export options"
@@ -3264,11 +3267,11 @@ msgstr ""
#: libraries/config/messages.inc.php:213 libraries/config/messages.inc.php:218
#: setup/frames/menu.inc.php:17
msgid "SQL queries"
-msgstr ""
+msgstr "SQL-forespørgsler"
#: libraries/config/messages.inc.php:215
msgid "SQL Query box"
-msgstr ""
+msgstr "SQL Query-boks"
#: libraries/config/messages.inc.php:216
msgid "Customize links shown in SQL Query boxes"
@@ -3296,7 +3299,7 @@ msgstr ""
#: libraries/config/messages.inc.php:222
msgid "Startup"
-msgstr ""
+msgstr "Opstart"
#: libraries/config/messages.inc.php:223
msgid "Customize startup page"
@@ -3304,7 +3307,7 @@ msgstr ""
#: libraries/config/messages.inc.php:224
msgid "Tabs"
-msgstr ""
+msgstr "Faner"
#: libraries/config/messages.inc.php:225
msgid "Choose how you want tabs to work"
@@ -3328,7 +3331,7 @@ msgstr ""
#: libraries/config/messages.inc.php:230
msgid "Warnings"
-msgstr ""
+msgstr "Advarsler"
#: libraries/config/messages.inc.php:231
msgid "Disable some of the warnings shown by phpMyAdmin"
diff --git a/po/de.po b/po/de.po
index c75838e48d..ba4c35bfee 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-07 15:16+0200\n"
-"PO-Revision-Date: 2011-07-11 09:26+0200\n"
+"PO-Revision-Date: 2011-07-12 23:07+0200\n"
"Last-Translator: \n"
"Language-Team: german \n"
"Language: de\n"
@@ -957,10 +957,11 @@ msgstr ""
msgid "The web server does not have permission to save the file %s."
msgstr "Der Webserver hat keine Schreibrechte um die Datei %s zu speichern."
+# Schema is not the right word for it, because a dump contains also data, and NOT just the scheme.
#: export.php:673
#, php-format
msgid "Dump has been saved to file %s."
-msgstr "Dump (Schema) wurde in Datei %s gespeichert."
+msgstr "Dump wurde in Datei %s gespeichert."
#: import.php:57
#, php-format
@@ -3411,7 +3412,7 @@ msgstr "Prozentwerte als Dezimalzahlen importieren (12.00% wird zu 0.12)"
#: libraries/config/messages.inc.php:258
msgid "Number of queries to skip from start"
-msgstr "Anzahl der am Anfang zu überspringenden Einträge (Abfragen)"
+msgstr "Anzahl der am Anfang zu überspringenden Abfragen"
#: libraries/config/messages.inc.php:259
msgid "Partial import: skip queries"
@@ -4056,10 +4057,10 @@ msgid ""
"alphabetical order."
msgstr ""
"MySQL Wildcard-Symbole (% und _) sind möglich, mit \\ wird die urspüngliche "
-"Bedeutung wiederhergestellt, d.h. 'my\\_db' und nicht 'my_db'. Mit dieser "
-"Optionen können Datenbanklisten sortiert werden; geben Sie ihre Namen "
-"sortiert ein und nutzen Sie am Ende [kbd]*[/kbd], um die übrigen in "
-"alphabetischer Reihenfolge anzuzeigen."
+"Bedeutung wiederhergestellt, d.h. [kbd]'my\\_db'[/kbd] und nicht "
+"[kbd]'my_db'[/kbd]. Mit dieser Optionen können Datenbanklisten sortiert "
+"werden; geben Sie ihre Namen sortiert ein und nutzen Sie am Ende "
+"[kbd]*[/kbd], um die übrigen in alphabetischer Reihenfolge anzuzeigen."
#: libraries/config/messages.inc.php:400
msgid "Show only listed databases"
@@ -5561,7 +5562,7 @@ msgstr "Unbenutzte Seiten"
#: libraries/engines/innodb.lib.php:176
msgid "Dirty pages"
-msgstr "Inkonsistente Seiten ("dirty")"
+msgstr "Inkonsistente Seiten"
#: libraries/engines/innodb.lib.php:182
msgid "Pages containing data"
@@ -7298,7 +7299,7 @@ msgstr ""
"können. In der ersten Möglichkeit benennen Sie den Dateinamen. Als zweite "
"Option wird ein Spaltenname durch den Dateinamen gesetzt. Sollte die zweite "
"Option gesetzt sein, ist es notwendig, die erste Option auf einen Leerstring "
-"zu setzen ('')."
+"zu setzen."
#: libraries/transformations/application_octetstream__hex.inc.php:9
msgid ""
@@ -7315,8 +7316,8 @@ msgid ""
"Displays a clickable thumbnail. The options are the maximum width and height "
"in pixels. The original aspect ratio is preserved."
msgstr ""
-"Ein klickbares Vorschaubild anzeigen. Optionen: Breite, Höhe in Pixeln "
-"(berücksichtigt das ursprüngliche Seitenverhältnis)."
+"Ein klickbares Vorschaubild anzeigen. Optionen: Breite und Höhe in Pixeln, "
+"wobei das ursprüngliche Seitenverhältnis berücksichtigt wird."
#: libraries/transformations/image_jpeg__link.inc.php:9
msgid "Displays a link to download this image."
@@ -8704,7 +8705,7 @@ msgstr "Transaktions-Koordinator"
#: server_status.php:285
msgid "Flush (close) all tables"
-msgstr "Alle Tabellen aktualisieren und schließen"
+msgstr "Alle Tabellen aktualisieren (und schließen)"
#: server_status.php:287
msgid "Show open tables"
@@ -8826,8 +8827,8 @@ msgid ""
"On a busy server, the byte counters may overrun, so those statistics as "
"reported by the MySQL server may be incorrect."
msgstr ""
-"Auf stark frequentierten Server können die Byte-Zähler überlaufen (wieder "
-"bei 0 beginnen), deshalb können diese Werte, wie sie vom MySQL Server "
+"Auf stark frequentierten Server können die Byte-Zähler überlaufen, d.h. "
+"wieder bei 0 beginnen, deshalb können diese Werte, wie sie vom MySQL Server "
"ausgegeben werden, falsch sein."
#: server_status.php:681
diff --git a/po/el.po b/po/el.po
index 6ad5b3e058..0e34a18589 100644
--- a/po/el.po
+++ b/po/el.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-07 15:16+0200\n"
-"PO-Revision-Date: 2011-07-07 12:37+0200\n"
+"PO-Revision-Date: 2011-07-13 09:17+0200\n"
"Last-Translator: Panagiotis Papazoglou \n"
"Language-Team: greek \n"
"Language: el\n"
@@ -5375,10 +5375,10 @@ msgid "vertical"
msgstr "κάθετη"
#: libraries/display_tbl.lib.php:452
-#, fuzzy, php-format
+#, php-format
#| msgid "Headers every"
msgid "Headers every %s rows"
-msgstr "Κεφαλίδες κάθε"
+msgstr "Κεφαλίδες κάθε %s εγγραφές"
#: libraries/display_tbl.lib.php:546
msgid "Sort by key"
diff --git a/po/sl.po b/po/sl.po
index fa62c87e5b..c960c51c83 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,15 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-07 15:16+0200\n"
-"PO-Revision-Date: 2011-07-07 11:50+0200\n"
+"PO-Revision-Date: 2011-07-11 21:13+0200\n"
"Last-Translator: Domen \n"
"Language-Team: slovenian \n"
"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
"X-Generator: Pootle 2.0.5\n"
#: browse_foreigners.php:35 browse_foreigners.php:53
@@ -5319,10 +5319,10 @@ msgid "vertical"
msgstr "navpičnem"
#: libraries/display_tbl.lib.php:452
-#, fuzzy, php-format
+#, php-format
#| msgid "Headers every"
msgid "Headers every %s rows"
-msgstr "Glave vsakih"
+msgstr "Glave vsakih %s vrstic"
#: libraries/display_tbl.lib.php:546
msgid "Sort by key"