Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Delisle <marc@infomarc.info>2007-02-10 18:58:46 +0300
committerMarc Delisle <marc@infomarc.info>2007-02-10 18:58:46 +0300
commit42ac66ad749fdeee60cf402bc3ae3dda920dbcd6 (patch)
tree47f19903fa1be65528f038ee55c3abf0f57b6ca2
parentf0ba262783294df4ea1eae97c72ce3474e52f69a (diff)
get rid of propicon
-rw-r--r--ChangeLog104
-rw-r--r--Documentation.html14
-rw-r--r--README2
-rw-r--r--browse_foreigners.php2
-rw-r--r--js/querywindow.js49
-rw-r--r--lang/afrikaans-iso-8859-1.inc.php10
-rw-r--r--lang/afrikaans-utf-8.inc.php10
-rw-r--r--lang/albanian-iso-8859-1.inc.php10
-rw-r--r--lang/albanian-utf-8.inc.php10
-rw-r--r--lang/arabic-utf-8.inc.php10
-rw-r--r--lang/arabic-windows-1256.inc.php10
-rw-r--r--lang/azerbaijani-iso-8859-9.inc.php10
-rw-r--r--lang/azerbaijani-utf-8.inc.php10
-rw-r--r--lang/basque-iso-8859-1.inc.php10
-rw-r--r--lang/basque-utf-8.inc.php10
-rw-r--r--lang/belarusian_cyrillic-utf-8.inc.php10
-rw-r--r--lang/belarusian_cyrillic-windows-1251.inc.php10
-rw-r--r--lang/belarusian_latin-utf-8.inc.php10
-rw-r--r--lang/bosnian-utf-8.inc.php10
-rw-r--r--lang/bosnian-windows-1250.inc.php10
-rw-r--r--lang/brazilian_portuguese-iso-8859-1.inc.php10
-rw-r--r--lang/brazilian_portuguese-utf-8.inc.php10
-rw-r--r--lang/bulgarian-koi8-r.inc.php10
-rw-r--r--lang/bulgarian-utf-8.inc.php10
-rw-r--r--lang/bulgarian-windows-1251.inc.php10
-rw-r--r--lang/catalan-iso-8859-1.inc.php111
-rw-r--r--lang/catalan-utf-8.inc.php111
-rw-r--r--lang/chinese_simplified-gb2312.inc.php10
-rw-r--r--lang/chinese_simplified-utf-8.inc.php10
-rw-r--r--lang/chinese_traditional-big5.inc.php10
-rw-r--r--lang/chinese_traditional-utf-8.inc.php10
-rw-r--r--lang/croatian-iso-8859-2.inc.php10
-rw-r--r--lang/croatian-utf-8.inc.php10
-rw-r--r--lang/croatian-windows-1250.inc.php10
-rw-r--r--lang/czech-iso-8859-2.inc.php10
-rw-r--r--lang/czech-utf-8.inc.php10
-rw-r--r--lang/czech-windows-1250.inc.php10
-rw-r--r--lang/danish-iso-8859-1.inc.php10
-rw-r--r--lang/danish-utf-8.inc.php10
-rw-r--r--lang/dutch-iso-8859-1.inc.php10
-rw-r--r--lang/dutch-iso-8859-15.inc.php10
-rw-r--r--lang/dutch-utf-8.inc.php10
-rw-r--r--lang/english-iso-8859-1.inc.php10
-rw-r--r--lang/english-iso-8859-15.inc.php10
-rw-r--r--lang/english-utf-8.inc.php10
-rw-r--r--lang/estonian-iso-8859-1.inc.php10
-rw-r--r--lang/estonian-utf-8.inc.php10
-rw-r--r--lang/finnish-iso-8859-1.inc.php10
-rw-r--r--lang/finnish-iso-8859-15.inc.php10
-rw-r--r--lang/finnish-utf-8.inc.php10
-rw-r--r--lang/french-iso-8859-1.inc.php10
-rw-r--r--lang/french-iso-8859-15.inc.php10
-rw-r--r--lang/french-utf-8.inc.php10
-rw-r--r--lang/galician-iso-8859-1.inc.php10
-rw-r--r--lang/galician-utf-8.inc.php10
-rw-r--r--lang/georgian-utf-8.inc.php10
-rw-r--r--lang/german-iso-8859-1.inc.php86
-rw-r--r--lang/german-iso-8859-15.inc.php86
-rw-r--r--lang/german-utf-8.inc.php86
-rw-r--r--lang/greek-iso-8859-7.inc.php10
-rw-r--r--lang/greek-utf-8.inc.php10
-rw-r--r--lang/hebrew-iso-8859-8-i.inc.php10
-rw-r--r--lang/hebrew-utf-8.inc.php10
-rw-r--r--lang/hindi-utf-8.inc.php10
-rw-r--r--lang/hungarian-iso-8859-2.inc.php10
-rw-r--r--lang/hungarian-utf-8.inc.php10
-rw-r--r--lang/indonesian-iso-8859-1.inc.php10
-rw-r--r--lang/indonesian-utf-8.inc.php10
-rw-r--r--lang/italian-iso-8859-1.inc.php10
-rw-r--r--lang/italian-iso-8859-15.inc.php10
-rw-r--r--lang/italian-utf-8.inc.php10
-rw-r--r--lang/japanese-euc.inc.php1344
-rw-r--r--lang/japanese-sjis.inc.php1378
-rw-r--r--lang/japanese-utf-8.inc.php1314
-rw-r--r--lang/korean-euc-kr.inc.php10
-rw-r--r--lang/korean-utf-8.inc.php10
-rw-r--r--lang/latvian-utf-8.inc.php10
-rw-r--r--lang/latvian-windows-1257.inc.php10
-rw-r--r--lang/lithuanian-utf-8.inc.php10
-rw-r--r--lang/lithuanian-windows-1257.inc.php10
-rw-r--r--lang/malay-iso-8859-1.inc.php10
-rw-r--r--lang/malay-utf-8.inc.php10
-rw-r--r--lang/mongolian-utf-8.inc.php10
-rw-r--r--lang/norwegian-iso-8859-1.inc.php10
-rw-r--r--lang/norwegian-utf-8.inc.php10
-rw-r--r--lang/persian-utf-8.inc.php10
-rw-r--r--lang/persian-windows-1256.inc.php10
-rw-r--r--lang/polish-iso-8859-2.inc.php10
-rw-r--r--lang/polish-utf-8.inc.php10
-rw-r--r--lang/polish-windows-1250.inc.php10
-rw-r--r--lang/portuguese-iso-8859-1.inc.php10
-rw-r--r--lang/portuguese-iso-8859-15.inc.php10
-rw-r--r--lang/portuguese-utf-8.inc.php10
-rw-r--r--lang/romanian-iso-8859-1.inc.php10
-rw-r--r--lang/romanian-utf-8.inc.php10
-rw-r--r--lang/russian-cp-866.inc.php10
-rw-r--r--lang/russian-koi8-r.inc.php10
-rw-r--r--lang/russian-utf-8.inc.php10
-rw-r--r--lang/russian-windows-1251.inc.php10
-rw-r--r--lang/serbian_cyrillic-utf-8.inc.php10
-rw-r--r--lang/serbian_cyrillic-windows-1251.inc.php10
-rw-r--r--lang/serbian_latin-utf-8.inc.php10
-rw-r--r--lang/serbian_latin-windows-1250.inc.php10
-rw-r--r--lang/slovak-iso-8859-2.inc.php10
-rw-r--r--lang/slovak-utf-8.inc.php10
-rw-r--r--lang/slovak-windows-1250.inc.php10
-rw-r--r--lang/slovenian-iso-8859-2.inc.php10
-rw-r--r--lang/slovenian-utf-8.inc.php10
-rw-r--r--lang/slovenian-windows-1250.inc.php10
-rw-r--r--lang/spanish-iso-8859-1.inc.php120
-rw-r--r--lang/spanish-iso-8859-15.inc.php120
-rw-r--r--lang/spanish-utf-8.inc.php120
-rw-r--r--lang/swedish-iso-8859-1.inc.php10
-rw-r--r--lang/swedish-utf-8.inc.php10
-rw-r--r--lang/tatarish-iso-8859-9.inc.php10
-rw-r--r--lang/tatarish-utf-8.inc.php10
-rw-r--r--lang/thai-tis-620.inc.php10
-rw-r--r--lang/thai-utf-8.inc.php10
-rw-r--r--lang/turkish-iso-8859-9.inc.php10
-rw-r--r--lang/turkish-utf-8.inc.php10
-rw-r--r--lang/ukrainian-utf-8.inc.php10
-rw-r--r--lang/ukrainian-windows-1251.inc.php10
-rw-r--r--libraries/Config.class.php2
-rw-r--r--libraries/PMA_Sql.class.php2493
-rw-r--r--libraries/Theme.class.php134
-rw-r--r--libraries/auth/http.auth.lib.php5
-rw-r--r--libraries/auth/signon.auth.lib.php11
-rw-r--r--libraries/common.lib.php401
-rw-r--r--libraries/config.default.php2557
-rw-r--r--libraries/database_interface.lib.php17
-rw-r--r--libraries/display_tbl.lib.php43
-rw-r--r--libraries/header_meta_style.inc.php4
-rw-r--r--libraries/header_printview.inc.php2
-rw-r--r--libraries/import.lib.php3
-rw-r--r--libraries/js_escape.lib.php64
-rw-r--r--libraries/navigation_header.inc.php11
-rw-r--r--libraries/select_lang.lib.php111
-rw-r--r--libraries/session.inc.php42
-rw-r--r--libraries/sqlparser.lib.php2
-rw-r--r--libraries/tbl_replace_fields.inc.php41
-rw-r--r--main.php4
-rw-r--r--navigation.php2
-rw-r--r--phpmyadmin.css.php (renamed from css/phpmyadmin.css.php)57
-rw-r--r--pmd/scripts/move.js1
-rw-r--r--pmd_general.php102
-rw-r--r--pmd_pdf.php16
-rw-r--r--pmd_save_pos.php14
-rw-r--r--print.css (renamed from css/print.css)0
-rw-r--r--tbl_change.php203
-rw-r--r--tbl_indexes.php10
-rw-r--r--tbl_replace.php22
-rw-r--r--test/core.lib.php67
-rw-r--r--test/escape_js_string.php39
-rw-r--r--test/theme.php5
-rw-r--r--themes/darkblue_orange/css/theme_right.css.php64
-rw-r--r--themes/darkblue_orange/img/logo_left.pngbin4432 -> 6854 bytes
-rw-r--r--themes/darkblue_orange/layout.inc.php4
-rw-r--r--themes/original/css/theme_left.css.php2
-rw-r--r--themes/original/css/theme_right.css.php64
-rw-r--r--themes/original/img/logo_left.pngbin4424 -> 6854 bytes
-rw-r--r--themes/original/layout.inc.php2
-rw-r--r--translators.html16
-rw-r--r--view_create.php141
163 files changed, 9448 insertions, 3437 deletions
diff --git a/ChangeLog b/ChangeLog
index 5799778441..2ed1a944f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,102 @@ phpMyAdmin - ChangeLog
$Id$
$HeadURL$
+2007-02-10 Marc Delisle <lem9@users.sourceforge.net>
+ * lang/spanish update, thanks to Daniel Hinostroza
+ * tbl_change.php, tbl_indexes.php, libraries/common.lib.php:
+ get rid of $propicon
+
+2007-02-09 Marc Delisle <lem9@users.sourceforge.net>
+ * main.php: some links should open a new page
+ * Documentation.html, libraries/navigation_header.inc.php,
+ libraries/config.default.php: $cfg['LeftLogoLinkWindow'] to decide
+ in which window the logo-linked page will appear
+
+2007-02-09 Michal Čihař <michal@cihar.com>
+ * lang/czech: Fix syntax error (sorry for that).
+
+2007-02-08 Marc Delisle <lem9@users.sourceforge.net>
+ * themes/darkblue_orange/img/logo_left.png,
+ themes/original/img/logo_left.png: smaller PMA logo for navi
+ * libraries/navigation_header.inc.php, libraries/config.default.php:
+ navi logo now links to main page by default, with still the possibility
+ of having an external URL
+
+2007-02-08 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+ * themes/*/css/theme_right.css.php: bug #1653769 browsing highlight disabling
+ doesn't work
+
+2007-02-06 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+ * pmd_general.php, pmd_pdf.php, pmd_save_pos.php: fixed short open tags
+ patch #1652886 thanks to Martin Thielecke - mthie
+ * tbl_change.php: fixed escaping of field names in HTML and JavaScript
+ * libraries/common.lib.php: PMA_backquote() did not quote 0
+ * tbl_change.php: bug #1652810 - slashes are not escaped properly
+
+2007-02-05 Michal Čihař <michal@cihar.com>
+ * lang/czech: Updated.
+
+2007-02-05 Marc Delisle <lem9@users.sourceforge.net>
+ * lang/japanese: Update, thanks to Ishigaki Kenichi - tcool.
+
+2007-02-05 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+ * lang/german: updated
+
+2007-02-04 Marc Delisle <lem9@users.sourceforge.net>
+ * js/querywindow.js: query window icon did not work,
+ thanks to Jürgen Wind
+
+2007-02-03 Marc Delisle <lem9@users.sourceforge.net>
+ * view_create.php, libraries/display_tbl.lib.php, lang/*:
+ support for CREATE VIEW from query results
+ * pmd/scripts/move.js: display problems in Opera, thanks to Maxim Bulygin
+
+2007-02-02 Marc Delisle <lem9@users.sourceforge.net>
+ * tbl_replace.php: Calendar icon does not work on "Insert another new row"
+
+2007-02-01 Marc Delisle <lem9@users.sourceforge.net>
+ * libraries/import.lib.php: bug #1626064, too much quoting on import
+
+2007-02-01 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+ * libraries/display_tbl.lib.php: bug #1644740 - $cfg['Order'] = 'SMART'
+ overwritten
+ * libraries/Theme.class.php: removed __wakeup() due to some requirements are
+ not fulfilled at this point - also thanks to Jürgen Wind - windkiel
+
+2007-01-31 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+ * libraries/session.inc.php:
+ bug #1630871 - Detecting a missing write permission on sessions directory
+ * libraries/select_lang.lib.php: globalized variables to be usable inside
+ function, documentation
+ * libraries/auth/http.auth.lib.php, libraries/auth/signon.auth.lib.php
+ libraries/common.lib.php, libraries/database_interface.lib.php
+ libraries/select_lang.lib.php, libraries/session.inc.php:
+ added PMA_fatalError() and made use of it
+
+2007-01-30 Marc Delisle <lem9@users.sourceforge.net>
+ * libraries/tbl_replace_fields.inc.php: undefined variable
+
+2007-01-30 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+ * libraries/sqlparser.lib.php PMA_SQP_analyze():
+ bug #1647785 - do not pass variables by reference
+
+2007-01-29 Marc Delisle <lem9@users.sourceforge.net>
+ * lang/catalan update, thanks to Xavier Navarro (xavin)
+ * pmd_general.php: possibility of quotes in Designer messages,
+ thanks to Ivan Kirillov
+
+2007-01-29 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+ * tbl_replace.php, libraries/tbl_replace_fields.inc.php: print out error
+ messages if upload failed (bug #1615530)
+ * js/querywindow.js: fixed bug #1541147 - # in database names
+
+2007-01-26 Michal Čihař <michal@cihar.com>
+ * libraries/common.lib.php, libraries/js_escape.lib.php,
+ test/escape_js_string.php, test/core.lib.php: Move java script escaping
+ to separate library, make it safer on </script> escaping and add
+ testcase for it.
+ * test/theme.php: Move to test package.
+
2007-01-22 Marc Delisle <lem9@users.sourceforge.net>
* pmd/*: button for direct/angular links, thanks to Ivan Kirillov
@@ -65,7 +161,7 @@ $HeadURL$
session.save_handler to 'files'
* pmd_general.php: patch #1627831,
English language improvements, thanks to Isaac Bennetch
- * pmd_general.php, pmd_relation_new.php, lang/*: abstract messages
+ * pmd_general.php, pmd_relation_new.php, lang/*: abstract messages
2007-01-04 Marc Delisle <lem9@users.sourceforge.net>
* pmd/scripts/move.js: avoid text selection when moving a table object
@@ -93,7 +189,7 @@ $HeadURL$
so by default, row count is not done for views
2006-12-30 Marc Delisle <lem9@users.sourceforge.net>
- * libraries/Config.class.php: bug #1590083,
+ * libraries/Config.class.php: bug #1590083,
$cfg['DefaultConnectionCollation'] ignored in config.inc.php
2006-12-30 Michal Čihař <michal@cihar.com>
@@ -118,11 +214,11 @@ $HeadURL$
* libraries/export/sql.php: bug #1619647, export of query results
should not contain procedure definitions
* navigation.php, test/theme.php, browse_foreigners.php,
- libraries/header_printview.inc.php: patch #1611684 part 2, client
+ libraries/header_printview.inc.php: patch #1611684 part 2, client
caching of phpmyadmin.css.php, thanks to Christian Schmidt
2006-12-19 Sebastian Mendel <cybot_tm@users.sourceforge.net>
- * tbl_change.php, tbl_replace.php, include/tbl_replace_fields.inc.php:
+ * tbl_change.php, tbl_replace.php, libarsies/tbl_replace_fields.inc.php:
refactored: made register_globals independent; added documentation;
removed unused code; fixed bug #1597686 last insert id message wrong;
much more i don't remember ...
diff --git a/Documentation.html b/Documentation.html
index f86a60661a..793859a4d2 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -11,7 +11,7 @@
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <title>phpMyAdmin 2.10.0-dev - Documentation</title>
+ <title>phpMyAdmin 2.11.0-dev - Documentation</title>
<link rel="stylesheet" type="text/css" href="docs.css" />
</head>
@@ -33,7 +33,7 @@
<li><a href="#glossary">Glossary</a></li>
</ul>
-<h1>phpMyAdmin 2.10.0-dev Documentation</h1>
+<h1>phpMyAdmin 2.11.0-dev Documentation</h1>
<ul><li><a href="http://www.phpmyadmin.net/">
phpMyAdmin homepage</a></li>
@@ -1213,8 +1213,14 @@ ALTER TABLE `pma_column_comments`
<dd>Defines whether or not to display the phpMyAdmin logo at the top of the left frame.
Defaults to <tt>TRUE</tt>.</dd>
<dt id="cfg_LeftLogoLink">$cfg['LeftLogoLink'] string</dt>
- <dd>Enter URL where logo in left frame will point to. For use especially
- with self made theme which changes this.</dd>
+ <dd>Enter URL where logo in the navigation frame will point to.
+ For use especially with self made theme which changes this.
+ The default value for this is <tt>main.php</tt>.</dd>
+
+ <dt id="cfg_LeftLogoLinkWindow">$cfg['LeftLogoLinkWindow'] string</dt>
+ <dd>Whether to open the linked page in the main window (<tt>main</tt>)
+ or in a new one (<tt>new</tt>).</dd>
+
<dt id="cfg_LeftDisplayServers">$cfg['LeftDisplayServers'] boolean</dt>
<dd>Defines whether or not to display a server choice at the top of the left frame.
Defaults to FALSE.</dd>
diff --git a/README b/README
index 4946e458b5..c3bf3b8b20 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ phpMyAdmin - Readme
A set of PHP-scripts to manage MySQL over the web.
- Version 2.10.0-dev
+ Version 2.11.0-dev
------------------
http://www.phpmyadmin.net/
diff --git a/browse_foreigners.php b/browse_foreigners.php
index aae0a740ea..22c3ab057b 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -93,7 +93,7 @@ if (isset($disp_row) && is_array($disp_row)) {
<title>phpMyAdmin</title>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
<link rel="stylesheet" type="text/css"
- href="./css/phpmyadmin.css.php?<?php echo PMA_generate_common_url( '', '' ); ?>&amp;js_frame=right&amp;nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" />
+ href="phpmyadmin.css.php?<?php echo PMA_generate_common_url( '', '' ); ?>&amp;js_frame=right&amp;nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" />
<script src="./js/functions.js" type="text/javascript" language="javascript"></script>
<script type="text/javascript" language="javascript">
//<![CDATA[
diff --git a/js/querywindow.js b/js/querywindow.js
index dfd2a0f3b3..6fc799d96d 100644
--- a/js/querywindow.js
+++ b/js/querywindow.js
@@ -63,6 +63,19 @@ function setTable(new_table) {
}
}
+/**
+ * reloads mian frame
+ *
+ * @uses goTo()
+ * @uses opendb_url
+ * @uses db
+ * @uses server
+ * @uses table
+ * @uses lang
+ * @uses collation_connection
+ * @uses encodeURIComponent()
+ * @param string url name of page to be loaded
+ */
function refreshMain(url) {
if (! url) {
if (db) {
@@ -71,20 +84,31 @@ function refreshMain(url) {
url = 'main.php';
}
}
- goTo( url + '?server=' + server +
- '&db=' + db +
- '&table=' + table +
- '&lang=' + lang +
- '&collation_connection=' + collation_connection,
- 'main' );
+ goTo(url + '?server=' + encodeURIComponent(server) +
+ '&db=' + encodeURIComponent(db) +
+ '&table=' + encodeURIComponent(table) +
+ '&lang=' + encodeURIComponent(lang) +
+ '&collation_connection=' + encodeURIComponent(collation_connection),
+ 'main');
}
+/**
+ * reloads navigation frame
+ *
+ * @uses goTo()
+ * @uses db
+ * @uses server
+ * @uses table
+ * @uses lang
+ * @uses collation_connection
+ * @uses encodeURIComponent()
+ */
function refreshNavigation() {
- goTo('navigation.php?server=' + server +
- '&db=' + db +
- '&table=' + table +
- '&lang=' + lang +
- '&collation_connection=' + collation_connection
+ goTo('navigation.php?server=' + encodeURIComponent(server) +
+ '&db=' + encodeURIComponent(db) +
+ '&table=' + encodeURIComponent(table) +
+ '&lang=' + encodeURIComponent(lang) +
+ '&collation_connection=' + encodeURIComponent(collation_connection)
);
}
@@ -247,7 +271,7 @@ function insertQuery() {
function open_querywindow( url ) {
if ( ! url ) {
- url = 'querywindow.php?' + common_query + '&db=' + db + '&table=' + table;
+ url = 'querywindow.php?' + encodeURIComponent(common_query) + '&db=' + encodeURIComponent(db) + '&table=' + encodeURIComponent(table);
}
if (!querywindow.closed && querywindow.location) {
@@ -290,7 +314,6 @@ function refreshQuerywindow( url ) {
* @param string target frame where to load the new url
*/
function goTo(targeturl, target) {
- //alert('goto');
if ( target == 'main' ) {
target = window.frame_content;
} else if ( target == 'query' ) {
diff --git a/lang/afrikaans-iso-8859-1.inc.php b/lang/afrikaans-iso-8859-1.inc.php
index 02f87c5822..1b2a8c1c84 100644
--- a/lang/afrikaans-iso-8859-1.inc.php
+++ b/lang/afrikaans-iso-8859-1.inc.php
@@ -1052,4 +1052,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php
index 61d2a537de..955e239014 100644
--- a/lang/afrikaans-utf-8.inc.php
+++ b/lang/afrikaans-utf-8.inc.php
@@ -1053,4 +1053,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/albanian-iso-8859-1.inc.php b/lang/albanian-iso-8859-1.inc.php
index e635501a83..ed21ad88e7 100644
--- a/lang/albanian-iso-8859-1.inc.php
+++ b/lang/albanian-iso-8859-1.inc.php
@@ -1051,4 +1051,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php
index 3782966692..6a96dbcdfc 100644
--- a/lang/albanian-utf-8.inc.php
+++ b/lang/albanian-utf-8.inc.php
@@ -1052,4 +1052,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php
index ed2e4ce681..259b021b3e 100644
--- a/lang/arabic-utf-8.inc.php
+++ b/lang/arabic-utf-8.inc.php
@@ -1054,4 +1054,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/arabic-windows-1256.inc.php b/lang/arabic-windows-1256.inc.php
index db270b2d4f..e00e81b221 100644
--- a/lang/arabic-windows-1256.inc.php
+++ b/lang/arabic-windows-1256.inc.php
@@ -1053,4 +1053,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/azerbaijani-iso-8859-9.inc.php b/lang/azerbaijani-iso-8859-9.inc.php
index bfb50d2733..cd22f3426d 100644
--- a/lang/azerbaijani-iso-8859-9.inc.php
+++ b/lang/azerbaijani-iso-8859-9.inc.php
@@ -1048,4 +1048,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php
index 6a5785ea87..2ac51d5266 100644
--- a/lang/azerbaijani-utf-8.inc.php
+++ b/lang/azerbaijani-utf-8.inc.php
@@ -1049,4 +1049,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/basque-iso-8859-1.inc.php b/lang/basque-iso-8859-1.inc.php
index 1d07f139b3..741df6656b 100644
--- a/lang/basque-iso-8859-1.inc.php
+++ b/lang/basque-iso-8859-1.inc.php
@@ -1045,4 +1045,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php
index e8050813aa..e1dfd40772 100644
--- a/lang/basque-utf-8.inc.php
+++ b/lang/basque-utf-8.inc.php
@@ -1046,4 +1046,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php
index dc453682c3..308e151f0b 100644
--- a/lang/belarusian_cyrillic-utf-8.inc.php
+++ b/lang/belarusian_cyrillic-utf-8.inc.php
@@ -1029,4 +1029,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/belarusian_cyrillic-windows-1251.inc.php b/lang/belarusian_cyrillic-windows-1251.inc.php
index d527d3243b..24ad7537ee 100644
--- a/lang/belarusian_cyrillic-windows-1251.inc.php
+++ b/lang/belarusian_cyrillic-windows-1251.inc.php
@@ -1028,4 +1028,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php
index 83f8529df6..4d029195b7 100644
--- a/lang/belarusian_latin-utf-8.inc.php
+++ b/lang/belarusian_latin-utf-8.inc.php
@@ -1028,4 +1028,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php
index 656c01d118..81a8183f76 100644
--- a/lang/bosnian-utf-8.inc.php
+++ b/lang/bosnian-utf-8.inc.php
@@ -1052,4 +1052,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/bosnian-windows-1250.inc.php b/lang/bosnian-windows-1250.inc.php
index 41d521c868..931d034135 100644
--- a/lang/bosnian-windows-1250.inc.php
+++ b/lang/bosnian-windows-1250.inc.php
@@ -1051,4 +1051,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php b/lang/brazilian_portuguese-iso-8859-1.inc.php
index 679953708c..47d6e484be 100644
--- a/lang/brazilian_portuguese-iso-8859-1.inc.php
+++ b/lang/brazilian_portuguese-iso-8859-1.inc.php
@@ -1031,4 +1031,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php
index e43a37ca41..3c2a4a0e7c 100644
--- a/lang/brazilian_portuguese-utf-8.inc.php
+++ b/lang/brazilian_portuguese-utf-8.inc.php
@@ -1032,4 +1032,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/bulgarian-koi8-r.inc.php b/lang/bulgarian-koi8-r.inc.php
index 52325dfe79..282ceba985 100644
--- a/lang/bulgarian-koi8-r.inc.php
+++ b/lang/bulgarian-koi8-r.inc.php
@@ -1048,4 +1048,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php
index 049fb9d8e5..bce150f02b 100644
--- a/lang/bulgarian-utf-8.inc.php
+++ b/lang/bulgarian-utf-8.inc.php
@@ -1049,4 +1049,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/bulgarian-windows-1251.inc.php b/lang/bulgarian-windows-1251.inc.php
index d6ffeb4258..eeabf507b7 100644
--- a/lang/bulgarian-windows-1251.inc.php
+++ b/lang/bulgarian-windows-1251.inc.php
@@ -1048,4 +1048,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/catalan-iso-8859-1.inc.php b/lang/catalan-iso-8859-1.inc.php
index 5a5c8d944a..a4f738f12c 100644
--- a/lang/catalan-iso-8859-1.inc.php
+++ b/lang/catalan-iso-8859-1.inc.php
@@ -49,6 +49,7 @@ $strAlterOrderBy = 'Altera la taula i ordena per';
$strAnalyzeTable = 'Analitza la taula';
$strAnd = 'I';
$strAndThen = 'i llavors';
+$strAngularLinks = 'Enllaos angulars';
$strAnIndex = 'S\'ha afegit un ndex a %s';
$strAnyHost = 'Qualsevol servidor';
$strAny = 'Qualsevol';
@@ -101,6 +102,7 @@ $strBzError = 'phpMyAdmin s incapa de comprimir el bolcat degut a una extensi
$strBzip = '"comprimit amb bzip"';
$strCalendar = 'Calendari';
+$strCancel = 'Cancel.lar';
$strCanNotLoadExportPlugins = 'No es poden carregar les extensions d\'exportaci, comprova l\'instal.laci!';
$strCanNotLoadImportPlugins = 'No es poden carregar les extensions d\'importaci, comprova l\'instal.laci!';
$strCannotLogin = 'No podem connectar amb el servidor MySQL';
@@ -164,6 +166,8 @@ $strCreateNewDatabase = 'Crea una nova base de dades';
$strCreateNewTable = 'Crear una taula nova a la base de dades %s';
$strCreatePage = 'Crea una nova Pgina';
$strCreatePdfFeat = 'Creaci de PDFs';
+$strCreateRelation = 'Crear relaci';
+$strCreateTable = 'Crear taula';
$strCreateUserDatabase = 'Base de dades per usuari';
$strCreateUserDatabaseName = 'Crear base de dades amb el mateix nom i atorgar tots els permissos';
$strCreateUserDatabaseNone = 'Cap';
@@ -196,6 +200,7 @@ $strDataOnly = 'Noms dades';
$strDataPages = 'Pgines contenint dades';
$strDBComment = 'Comentaris de la Base de Dades: ';
$strDBCopy = 'Copiar base de dades a';
+$strDbIsEmpty = 'La base de dades sembla buida!';
$strDbPrivileges = 'Permissos especifics de Base de dades';
$strDBRename = 'Reanomenar base de dades a';
$strDbSpecific = 'especfic de la base de dades';
@@ -210,12 +215,16 @@ $strDeletedRows = 'Files esborrades:';
$strDeleted = 'S\'ha esborrat la fila';
$strDelete = 'Esborrar';
$strDeleteNoUsersSelected = 'No s\han triat usuaris per esborrar!';
+$strDeleteRelation = 'Esborrar relaci';
$strDeleting = 'Esborrant %s';
$strDelimiter = 'Separador';
$strDelOld = 'La pgina actual t referncies a taules que no existeixen. Vols esborrar aquestes referncies?';
$strDescending = 'Descendent';
$strDescription = 'Descripci';
+$strDesigner = 'Dissenyador';
+$strDesignerHelpDisplayField = 'El camp a visualitzar es mostra en rosa. Per establir/treure un camp com a camp de visualitzaci, clica la icona "Tria camp a visualitzar", i clica tamb en el nom de camp adient.';
$strDictionary = 'diccionari';
+$strDirectLinks = 'Enllaos directes';
$strDirtyPages = 'Pgines brutes';
$strDisabled = 'Desactivat';
$strDisableForeignChecks = 'Desactivar comprovacions de claus externes';
@@ -223,6 +232,8 @@ $strDisplayFeat = 'Mostrar caracterstiques';
$strDisplayOrder = 'Ordre del llistat:';
$strDisplayPDF = 'Mostrar esquema PDF';
$strDoAQuery = 'Fer una "petici segons exemple" (comod: "%")';
+$strDocSQL = 'DocSQL';
+$strDocSQLOptions = 'Opcions de DocSQL';
$strDocu = 'Documentaci';
$strDoYouReally = 'Realment vols fer?';
$strDropDatabaseStrongWarning = 'Ets a punt d\' ELIMINAR completament una base de dades!';
@@ -252,7 +263,10 @@ $strEnglish = 'Angls';
$strEnglishPrivileges = ' Nota: Els noms dels privilegis del MySQL sn en idioma angls ';
$strError = 'Errada';
$strErrorInZipFile = 'Error en arxiu ZIP:';
+$strErrorRelationAdded = 'Error: La relaci no s\'ha afegit.';
+$strErrorRelationExists = 'Error: La relaci ja existeix.';
$strErrorRenamingTable = 'Error reanomenant la taula %1$s a %2$s';
+$strErrorSaveTable = 'Error desant coordenades per al Dissenyador.';
$strEscapeWildcards = 'Els comodins _ i % han de marcar-se amb una \ per usar-los literalment';
$strEsperanto = 'Esperanto';
$strEstonian = 'Estoni ';
@@ -261,6 +275,7 @@ $strExcelOptions = 'Opcions d\'Excel';
$strExecuteBookmarked = 'Executa una consulta desada';
$strExplain = 'Explicaci de l\'SQL';
$strExport = 'Exportar';
+$strExportImportToScale = 'Exporta/Importa a escala';
$strExportMustBeFile = 'El tipus d\'exportaci triat s\'ha de desar en un arxiu!';
$strExtendedInserts = 'Insercions ampliades';
$strExtra = 'Extra';
@@ -288,6 +303,7 @@ $strFlushQueryCache = 'Buidar la memria intermdia de consultes';
$strFlushTable = 'Buidar la memria cau de la taula ("FLUSH")';
$strFlushTables = 'Sincronitzar (tancar) totes les taules';
$strFontSize = 'Tamany de lletra';
+$strForeignKeyError = 'Error creant clau externa (comprova els tipus de dades)';
$strFormat = 'Format';
$strFormEmpty = 'Falta un valor al formulari !';
$strFreePages = 'Pgines lliures';
@@ -315,7 +331,11 @@ $strHasBeenAltered = 'ha estat alterada.';
$strHasBeenCreated = 'ha estat creada.';
$strHaveToShow = 'Has de triar al menys una columna per mostrar';
$strHebrew = 'Hebreu';
+$strHelp = 'Ajuda';
$strHexForBinary = 'Usa hexadecimal per camps binaris';
+$strHide = 'Amaga';
+$strHideShowAll = 'Amaga/Mostra tot';
+$strHideShowNoRelation = 'Amaga/Mostra taules sense relacions';
$strHome = 'Inici';
$strHomepageOfficial = 'Pgina oficial del phpMyAdmin';
$strHostEmpty = 'El nom del servidor s buit!';
@@ -329,9 +349,11 @@ $strHungarian = 'Hngar';
$strIcelandic = 'Islands';
$strId = 'ID';
$strIdxFulltext = 'Text sencer';
+$strIEUnsupported = 'Internet Explorer no suporta aquesta funci.';
$strIgnoreDuplicates = 'Ignorar files duplicades';
$strIgnore = 'Ignora';
$strIgnoreInserts = 'Utilitzar "ignore inserts"';
+$strImportExportCoords = 'Importa/Exporta coordenades per a esquema PDF';
$strImportFiles = 'Importar arxius';
$strImportFormat = 'Format de l\'arxiu importat';
$strImport = 'Importar';
@@ -353,6 +375,7 @@ $strInnoDBDataFilePath = 'Arxius de dades';
$strInnoDBDataHomeDirDesc = 'La part comuna de la ruta al directori per tots els arxius de dades InnoDB.';
$strInnoDBDataHomeDir = 'Directori local de dades';
$strInnoDBPages = 'pgines';
+$strInnoDBRelationAdded = 'Afegida relaci InnoDB';
$strInnodbStat = 'Estat InnoDB';
$strInsecureMySQL = 'El vostre arxiu de configuraci t parmetres (root sense contrasenya) que corresponen al compte privilegiat predetermitat de MySQL. El servidor MySQL est funcionant amb aquests valors, el que significa un forat de seguretat, i s\'exposa a intrusions, pel que recomanem la reparaci urgent d\'aquest forat de seguretat.';
$strInsertAsNewRow = 'Inserir com a nova fila';
@@ -360,6 +383,7 @@ $strInsertedRowId = 'Id de la fila inserida:';
$strInsertedRows = 'Files Inserides:';
$strInsert = 'Insereix';
$strInternalNotNecessary = '* No es necessita una relaci interna si ja existeix a InnoDB.';
+$strInternalRelationAdded = 'Afegida relaci interna';
$strInternalRelations = 'Relacions internes';
$strInUse = 'en s';
$strInvalidAuthMethod = 'Mtode d\'identificaci incorrecte establert a la configuraci:';
@@ -387,6 +411,7 @@ $strKeepPass = 'No canvis la contrasenya';
$strKeyCache = 'Memria intermdia de claus';
$strKeyname = 'Nom Clau';
$strKill = 'Finalitzar';
+$strKnownExternalBug = 'La funcionalitat %s es veu afectada per un error conegut, veieu %s';
$strKorean = 'Core';
$strLandscape = 'Horitzontal';
@@ -442,6 +467,7 @@ $strMIME_without = 'Els tipus MIME en cursiva no tenen funcions de transformaci
$strModifications = 'Les modificacions han estat desades';
$strModifyIndexTopic = 'Modifica un ndex';
$strModify = 'Modificar';
+$strMoveMenu = 'Men Mou';
$strMoveTable = 'Mou taula a (base-de-dades<b>.</b>taula):';
$strMoveTableOK = 'Taula %s moguda a %s.';
$strMoveTableSameNames = 'No es pot moure la taula sobre ella mateixa!';
@@ -500,6 +526,7 @@ $strNoUsersFound = 'No s\'han trobat usuaris.';
$strNoValidateSQL = 'Saltar la Validaci de l\'SQL';
$strNull = 'Nul';
$strNumberOfFields = 'Nombre de camps';
+$strNumberOfTables = 'Nombre de taules';
$strNumSearchResultsInTable = '%s resultat(s) a la taula <i>%s</i>';
$strNumSearchResultsTotal = '<b>Total:</b> <i>%s</i> resultat(s)';
$strNumTables = 'Taules';
@@ -542,8 +569,10 @@ $strPhoneBook = 'Libreta d\' adreces';
$strPHP40203 = 'S\'est fent servir la versi 4.2.3 de PHP, que t un serios error amb cadenes de multi-byte (mbstring). Mira l\'informe d\'error 19404 de PHP. No es recomana aquesta versi de PHP per treballar amb phpMyAdmin.';
$strPhp = 'Crear codi PHP';
$strPHPVersion = 'PHP versi';
+$strPleaseSelectPrimaryOrUniqueKey = 'Tria la clau principal o una clau nica';
$strPmaDocumentation = 'Documentaci de phpMyAdmin';
$strPmaUriError = 'La directiva <tt>$cfg[\'PmaAbsoluteUri\']</tt> HA d\'estar a l\'arxiu de configuraci!';
+$strPmaWiki = 'wiki del phpMyAdmin';
$strPolish = 'Polac';
$strPortrait = 'Vertical';
$strPos1 = 'Inici';
@@ -614,16 +643,19 @@ $strQueryWindowLock = 'No sobreescriure aquesta consulta des de fora de la fines
$strReadRequests = 'Peticions de lectura';
$strReceived = 'Rebut';
+$strRecommended = 'recomanat';
$strRecords = 'Registres';
$strReferentialIntegrity = 'Comprova la integritat referencial:';
$strRefresh = 'Actualitzar';
$strRelationalSchema = 'Esquema Relacional';
+$strRelationDeleted = 'Relaci esborrada';
$strRelationNotWorking = 'Les caracterstiques addicionals per treballar amb taules enllaades s\'han desactivat. Per saber perqu prem a %saqu%s.';
$strRelationsForTable = 'RELACIONS DE LA TAULA';
$strRelations = 'Relacions';
$strRelationView = 'Vista de Relacions';
$strReloadingThePrivileges = 'Recarregant permissos';
$strReloadPrivileges = 'Recarregar permissos';
+$strReload = 'Recarregar';
$strRemoveSelectedUsers = 'Treure els usuaris triats';
$strRenameDatabaseOK = 'Base de dades %s reanomenada a %s';
$strRenameTableOK = 'La taula %s ha canviat de nom. Ara es diu %s';
@@ -657,6 +689,7 @@ $strRussian = 'Rus';
$strSave = 'Desar';
$strSaveOnServer = 'Desar al servidor al directori %s';
+$strSavePosition = 'Desar posici';
$strScaleFactorSmall = 'El factor de l\'escala s massa petit per posar l\'esquema en una pgina';
$strSearch = 'Cercar';
$strSearchFormTitle = 'Cercar a la base de dades';
@@ -673,7 +706,9 @@ $strSelectADb = 'Tria una Base de Dades';
$strSelectAll = 'Tria Tot';
$strSelectBinaryLog = 'Tria el registre binari per veure';
$strSelectFields = 'Tria els camps (un com a mnim):';
+$strSelectForeignKey = 'Triar clau externa';
$strSelectNumRows = 'en consulta';
+$strSelectReferencedKey = 'Tria la clau referenciada';
$strSelectTables = 'Tria Taules';
$strSend = 'enviar';
$strSent = 'Enviat';
@@ -695,8 +730,11 @@ $strShowColor = 'Mostra color';
$strShowDatadictAs = 'Format del Diccionari de Dades';
$strShowFullQueries = 'Mostra Consultes completes';
$strShowGrid = 'Mostra graella';
+$strShowHideLeftMenu = 'Men esquerre Mostra/Amaga';
$strShowingBookmark = 'Mostrant consultes desades';
+$strShowingPhp = 'Mostrant com a codi PHP';
$strShowingRecords = 'Mostrant registres: ';
+$strShowingSQL = 'Mostrant consulta SQL';
$strShow = 'Mostra';
$strShowOpenTables = 'Mostrar taules obertes';
$strShowPHPInfo = 'Mostra informaci de PHP';
@@ -818,6 +856,8 @@ $strSize = 'Mida';
$strSkipQueries = 'Nombre de registres(consultes) a saltar des de l\'inici';
$strSlovak = 'Eslovac';
$strSlovenian = 'Eslov';
+$strSmallBigAll = 'Tot Petit/Gran';
+$strSnapToGrid = 'Aliniar a la graella';
$strSocketProblem = '(o el scol del servidor local MySQL no est configurat correctament)';
$strSortByKey = 'Classifica per la clau';
$strSort = 'Classificaci';
@@ -837,6 +877,7 @@ $strSQL = 'SQL';
$strSQPBugInvalidIdentifer = 'Identificador Incorrecte';
$strSQPBugUnclosedQuote = 'Cometa no tancada';
$strSQPBugUnknownPunctuation = 'Signe de puntuaci desconegut';
+$strStandInStructureForView = 'Stand-in estructura per a vista';
$strStatCheckTime = 'Darrera comprovaci';
$strStatCreateTime = 'Creaci';
$strStatement = 'Sentncies';
@@ -853,6 +894,7 @@ $strStrucNativeExcelOptions = 'Opcions d\'exportaci natives d\'Excel';
$strStrucOnly = 'Noms l\'estructura';
$strStructPropose = 'Proposa una estructura de taula';
$strStructure = 'Estructura';
+$strStructureForView = 'Estructura per a vista';
$strSubmit = 'Enviar';
$strSuccess = 'La vostra comanda SQL ha estat executada amb xit';
$strSum = 'Suma';
@@ -866,7 +908,9 @@ $strTableEmpty = 'El nom de la taula s buit!';
$strTableHasBeenDropped = 'S\'ha esborrat la taula %s';
$strTableHasBeenEmptied = 'S\'ha buidat la taula %s';
$strTableHasBeenFlushed = 'S\'ha buidat la memria cau de la taula %s';
+$strTableIsEmpty = 'La taula sembla buida!';
$strTableMaintenance = 'Manteniment de la taula';
+$strTableName = 'Nom de taula';
$strTableOfContents = 'Taula de continguts';
$strTableOptions = 'Opcions de Taula';
$strTables = '%s taula(es)';
@@ -890,7 +934,10 @@ $strTimeoutInfo = 'La darrera importaci ha esgotat el temps, desprs de reenvia
$strTimeoutNothingParsed = 'Per a la darrera importaci no s\'han processat dades, el que normalment indica que phpMyAdmin no ha pogut finalitzar aquesta importaci a menys que incrementeu els lmits de temps de php.';
$strTimeoutPassed = 'Temps exaurit de l\'arxiu d\'ordres, si voleu finalitzar l\'importaci, torneu a enviar el mateix arxiu a importar i el procs continuar.';
$strTime = 'Temps';
+$strToFromPage = 'plana a/de';
$strToggleScratchboard = 'Canvia l\' scratchboard';
+$strToggleSmallBig = 'Canviar petit/gran';
+$strToSelectRelation = 'Per triar una relaci, clica :';
$strTotal = 'total';
$strTotalUC = 'Total';
$strTraditionalChinese = 'Xins Tradicional';
@@ -902,6 +949,7 @@ $strTransformation_application_octetstream__hex = 'Mostra la representaci hexad
$strTransformation_image_jpeg__inline = 'Mostra una miniatura amb enlla; opcions: ample,alt en pixels (respecta la proporci original)';
$strTransformation_image_jpeg__link = 'Es mostra com a enlla a la imatge.';
$strTransformation_image_png__inline = 'Veure image/jpeg: en linia';
+$strTransformation_text_plain__dateformat = 'Mostra un camp TIME, TIMESTAMP, DATETIME o camp de data unix com a data formatejada. La primera opci s la diferncia (en hores) que s\'afegirn a la data (Defecte: 0). Usa la segona opci per indicar un format diferent de data/hora. La tercera opci determina si es vol visualitzar l\'hora local o UTC (usant els texts "local" o "utc"). Segons aix, el format de data t diferent valor - per a "local" veieu la documentaci de la funci strftime() de PHP i per a "utc" s\'obt amb l\'s de la funci gmdate().';
$strTransformation_text_plain__external = 'NOMS LINUX: Llena una aplicaci externa i facilita el camp de dades via standard input. Retorna per standard output de l\'aplicaci. El defecte s Tidy, per interpretar codi HTML. Per raons de seguretat, has d\' editar manualment l\'arxiu libraries/transformations/text_plain__external.inc.php i afegir les eines que vulguis fer servir. La primera opci s, llavors, el numero del programa que vols fer servir i la segona opci sn els parmetres per el programa. El tercer parmetre, si es posa a 1, convertir la sortida fent servir htmlspecialchars() (El defecte s 1). El quart parmetre, si val 1, posar un NOWRAP al contingut de les cel.les de forma que la sortida sencera es mostrar sense reformatejar (Per defecte 1)';
$strTransformation_text_plain__formatted = 'Conserva el format original del camp. No es fa cap canvi.';
$strTransformation_text_plain__imagelink = 'Mostra una imatge i un enlla, el camp cont el nom de l\'arxiu; la primera opci s un prefixe com "http://domini.com/", la segona opci s l\'amplada en pixels, la tercera s l\'alada.';
@@ -970,55 +1018,20 @@ $strXML = 'XML';
$strYes = 'Si';
-$strZeroRemovesTheLimit = 'Nota: Establint aquestes opcions a 0 (zero) treu el limit.';
+$strZeroRemovesTheLimit = 'Nota: Es treu el limit establint aquestes opcions a 0 (zero).';
$strZip = '"comprimit amb zip"';
-$strPmaWiki = 'phpMyAdmin wiki'; //to translate
-$strTransformation_text_plain__dateformat = '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.'; //to translate
-$strDocSQL = 'DocSQL'; //to translate
-$strDocSQLOptions = 'DocSQL options'; //to translate
-$strTableName = 'Table name'; //to translate
-$strTableIsEmpty = 'Table seems to be empty!'; //to translate
-$strDbIsEmpty = 'Database seems to be empty!'; //to translate
-$strShowingPhp = 'Showing as PHP code'; //to translate
-$strShowingSQL = 'Showing SQL query'; //to translate
-$strDesigner = 'Designer'; //to translate
-$strNumberOfTables = 'Number of tables'; //to translate
-$strCreateTable = 'Create table'; //to translate
-$strCreateRelation = 'Create relation'; //to translate
-$strSavePosition = 'Save position'; //to translate
-$strSelectForeignKey = 'Select Foreign Key'; //to translate
-$strHide = 'Hide'; //to translate
-$strShowHideLeftMenu = 'Show/Hide left menu'; //to translate
-$strReload = 'Reload'; //to translate
-$strSmallBigAll = 'Small/Big All'; //to translate
-$strImportExportCoords = 'Import/Export coordinates for PDF schema'; //to translate
-$strMoveMenu = 'Move Menu'; //to translate
-$strAngularLinks = 'Angular links'; //to translate
-$strDirectLinks = 'Direct links'; //to translate
-$strHideShowAll = 'Hide/Show all'; //to translate
-$strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate
-$strInternalRelationAdded = 'Internal relation added'; //to translate
-$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate
-$strRelationDeleted = 'Relation deleted'; //to translate
-$strToSelectRelation = 'To select relation, click :'; //to translate
-$strExportImportToScale = 'Export/Import to scale'; //to translate
-$strRecommended = 'recommended'; //to translate
-$strToFromPage = 'to/from page'; //to translate
-$strSelectReferencedKey = 'Select referenced key'; //to translate
-$strPleaseSelectPrimaryOrUniqueKey = 'Please select the primary key or a unique key'; //to translate
-$strForeignKeyError = 'Error creating foreign key (check data types)'; //to translate
-$strHelp = 'Help'; //to translate
-$strCancel = 'Cancel'; //to translate
-$strDeleteRelation = 'Delete relation'; //to translate
-$strKnownExternalBug = 'The %s functionality is affected by a known bug, see %s'; //to translate
-$strStructureForView = 'Structure for view'; //to translate
-$strStandInStructureForView = 'Stand-in structure for view'; //to translate
-$strToggleSmallBig = 'Toggle small/big'; //to translate
-$strIEUnsupported = 'Internet Explorer does not support this function.'; //to translate
-$strErrorRelationAdded = 'Error: Relation not added.'; //to translate
-$strErrorRelationExists = 'Error: relation already exists.'; //to translate
-$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
-$strSnapToGrid = 'Snap to grid'; //to translate
-$strDesignerHelpDisplayField = '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.'; //to translate
+// To translate:
+
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php
index c2c6be920b..6a3e781a33 100644
--- a/lang/catalan-utf-8.inc.php
+++ b/lang/catalan-utf-8.inc.php
@@ -50,6 +50,7 @@ $strAlterOrderBy = 'Altera la taula i ordena per';
$strAnalyzeTable = 'Analitza la taula';
$strAnd = 'I';
$strAndThen = 'i llavors';
+$strAngularLinks = 'Enllaços angulars';
$strAnIndex = 'S\'ha afegit un índex a %s';
$strAnyHost = 'Qualsevol servidor';
$strAny = 'Qualsevol';
@@ -102,6 +103,7 @@ $strBzError = 'phpMyAdmin és incapaç de comprimir el bolcat degut a una extens
$strBzip = '"comprimit amb bzip"';
$strCalendar = 'Calendari';
+$strCancel = 'Cancel.lar';
$strCanNotLoadExportPlugins = 'No es poden carregar les extensions d\'exportació, comprova l\'instal.lació!';
$strCanNotLoadImportPlugins = 'No es poden carregar les extensions d\'importació, comprova l\'instal.lació!';
$strCannotLogin = 'No podem connectar amb el servidor MySQL';
@@ -165,6 +167,8 @@ $strCreateNewDatabase = 'Crea una nova base de dades';
$strCreateNewTable = 'Crear una taula nova a la base de dades %s';
$strCreatePage = 'Crea una nova Pàgina';
$strCreatePdfFeat = 'Creació de PDFs';
+$strCreateRelation = 'Crear relació';
+$strCreateTable = 'Crear taula';
$strCreateUserDatabase = 'Base de dades per usuari';
$strCreateUserDatabaseName = 'Crear base de dades amb el mateix nom i atorgar tots els permissos';
$strCreateUserDatabaseNone = 'Cap';
@@ -197,6 +201,7 @@ $strDataOnly = 'Només dades';
$strDataPages = 'Pàgines contenint dades';
$strDBComment = 'Comentaris de la Base de Dades: ';
$strDBCopy = 'Copiar base de dades a';
+$strDbIsEmpty = 'La base de dades sembla buida!';
$strDbPrivileges = 'Permissos especifics de Base de dades';
$strDBRename = 'Reanomenar base de dades a';
$strDbSpecific = 'específic de la base de dades';
@@ -211,12 +216,16 @@ $strDeletedRows = 'Files esborrades:';
$strDeleted = 'S\'ha esborrat la fila';
$strDelete = 'Esborrar';
$strDeleteNoUsersSelected = 'No s\han triat usuaris per esborrar!';
+$strDeleteRelation = 'Esborrar relació';
$strDeleting = 'Esborrant %s';
$strDelimiter = 'Separador';
$strDelOld = 'La pàgina actual té referències a taules que no existeixen. Vols esborrar aquestes referències?';
$strDescending = 'Descendent';
$strDescription = 'Descripció';
+$strDesigner = 'Dissenyador';
+$strDesignerHelpDisplayField = 'El camp a visualitzar es mostra en rosa. Per establir/treure un camp com a camp de visualització, clica la icona "Tria camp a visualitzar", i clica també en el nom de camp adient.';
$strDictionary = 'diccionari';
+$strDirectLinks = 'Enllaços directes';
$strDirtyPages = 'Pàgines brutes';
$strDisabled = 'Desactivat';
$strDisableForeignChecks = 'Desactivar comprovacions de claus externes';
@@ -224,6 +233,8 @@ $strDisplayFeat = 'Mostrar característiques';
$strDisplayOrder = 'Ordre del llistat:';
$strDisplayPDF = 'Mostrar esquema PDF';
$strDoAQuery = 'Fer una "petició segons exemple" (comodí: "%")';
+$strDocSQL = 'DocSQL';
+$strDocSQLOptions = 'Opcions de DocSQL';
$strDocu = 'Documentació';
$strDoYouReally = 'Realment vols fer?';
$strDropDatabaseStrongWarning = 'Ets a punt d\' ELIMINAR completament una base de dades!';
@@ -253,7 +264,10 @@ $strEnglish = 'Anglès';
$strEnglishPrivileges = ' Nota: Els noms dels privilegis del MySQL són en idioma anglès ';
$strError = 'Errada';
$strErrorInZipFile = 'Error en arxiu ZIP:';
+$strErrorRelationAdded = 'Error: La relació no s\'ha afegit.';
+$strErrorRelationExists = 'Error: La relació ja existeix.';
$strErrorRenamingTable = 'Error reanomenant la taula %1$s a %2$s';
+$strErrorSaveTable = 'Error desant coordenades per al Dissenyador.';
$strEscapeWildcards = 'Els comodins _ i % han de marcar-se amb una \ per usar-los literalment';
$strEsperanto = 'Esperanto';
$strEstonian = 'Estonià ';
@@ -262,6 +276,7 @@ $strExcelOptions = 'Opcions d\'Excel';
$strExecuteBookmarked = 'Executa una consulta desada';
$strExplain = 'Explicació de l\'SQL';
$strExport = 'Exportar';
+$strExportImportToScale = 'Exporta/Importa a escala';
$strExportMustBeFile = 'El tipus d\'exportació triat s\'ha de desar en un arxiu!';
$strExtendedInserts = 'Insercions ampliades';
$strExtra = 'Extra';
@@ -289,6 +304,7 @@ $strFlushQueryCache = 'Buidar la memòria intermèdia de consultes';
$strFlushTable = 'Buidar la memòria cau de la taula ("FLUSH")';
$strFlushTables = 'Sincronitzar (tancar) totes les taules';
$strFontSize = 'Tamany de lletra';
+$strForeignKeyError = 'Error creant clau externa (comprova els tipus de dades)';
$strFormat = 'Format';
$strFormEmpty = 'Falta un valor al formulari !';
$strFreePages = 'Pàgines lliures';
@@ -316,7 +332,11 @@ $strHasBeenAltered = 'ha estat alterada.';
$strHasBeenCreated = 'ha estat creada.';
$strHaveToShow = 'Has de triar al menys una columna per mostrar';
$strHebrew = 'Hebreu';
+$strHelp = 'Ajuda';
$strHexForBinary = 'Usa hexadecimal per camps binaris';
+$strHide = 'Amaga';
+$strHideShowAll = 'Amaga/Mostra tot';
+$strHideShowNoRelation = 'Amaga/Mostra taules sense relacions';
$strHome = 'Inici';
$strHomepageOfficial = 'Pàgina oficial del phpMyAdmin';
$strHostEmpty = 'El nom del servidor és buit!';
@@ -330,9 +350,11 @@ $strHungarian = 'Húngar';
$strIcelandic = 'Islandès';
$strId = 'ID';
$strIdxFulltext = 'Text sencer';
+$strIEUnsupported = 'Internet Explorer no suporta aquesta funció.';
$strIgnoreDuplicates = 'Ignorar files duplicades';
$strIgnore = 'Ignora';
$strIgnoreInserts = 'Utilitzar "ignore inserts"';
+$strImportExportCoords = 'Importa/Exporta coordenades per a esquema PDF';
$strImportFiles = 'Importar arxius';
$strImportFormat = 'Format de l\'arxiu importat';
$strImport = 'Importar';
@@ -354,6 +376,7 @@ $strInnoDBDataFilePath = 'Arxius de dades';
$strInnoDBDataHomeDirDesc = 'La part comuna de la ruta al directori per tots els arxius de dades InnoDB.';
$strInnoDBDataHomeDir = 'Directori local de dades';
$strInnoDBPages = 'pàgines';
+$strInnoDBRelationAdded = 'Afegida relació InnoDB';
$strInnodbStat = 'Estat InnoDB';
$strInsecureMySQL = 'El vostre arxiu de configuració té paràmetres (root sense contrasenya) que corresponen al compte privilegiat predetermitat de MySQL. El servidor MySQL està funcionant amb aquests valors, el que significa un forat de seguretat, i s\'exposa a intrusions, pel que recomanem la reparació urgent d\'aquest forat de seguretat.';
$strInsertAsNewRow = 'Inserir com a nova fila';
@@ -361,6 +384,7 @@ $strInsertedRowId = 'Id de la fila inserida:';
$strInsertedRows = 'Files Inserides:';
$strInsert = 'Insereix';
$strInternalNotNecessary = '* No es necessita una relació interna si ja existeix a InnoDB.';
+$strInternalRelationAdded = 'Afegida relació interna';
$strInternalRelations = 'Relacions internes';
$strInUse = 'en ús';
$strInvalidAuthMethod = 'Mètode d\'identificació incorrecte establert a la configuració:';
@@ -388,6 +412,7 @@ $strKeepPass = 'No canviïs la contrasenya';
$strKeyCache = 'Memòria intermèdia de claus';
$strKeyname = 'Nom Clau';
$strKill = 'Finalitzar';
+$strKnownExternalBug = 'La funcionalitat %s es veu afectada per un error conegut, veieu %s';
$strKorean = 'Coreà';
$strLandscape = 'Horitzontal';
@@ -443,6 +468,7 @@ $strMIME_without = 'Els tipus MIME en cursiva no tenen funcions de transformaci
$strModifications = 'Les modificacions han estat desades';
$strModifyIndexTopic = 'Modifica un índex';
$strModify = 'Modificar';
+$strMoveMenu = 'Menú Mou';
$strMoveTable = 'Mou taula a (base-de-dades<b>.</b>taula):';
$strMoveTableOK = 'Taula %s moguda a %s.';
$strMoveTableSameNames = 'No es pot moure la taula sobre ella mateixa!';
@@ -501,6 +527,7 @@ $strNoUsersFound = 'No s\'han trobat usuaris.';
$strNoValidateSQL = 'Saltar la Validació de l\'SQL';
$strNull = 'Nul';
$strNumberOfFields = 'Nombre de camps';
+$strNumberOfTables = 'Nombre de taules';
$strNumSearchResultsInTable = '%s resultat(s) a la taula <i>%s</i>';
$strNumSearchResultsTotal = '<b>Total:</b> <i>%s</i> resultat(s)';
$strNumTables = 'Taules';
@@ -543,8 +570,10 @@ $strPhoneBook = 'Libreta d\' adreces';
$strPHP40203 = 'S\'està fent servir la versió 4.2.3 de PHP, que té un serios error amb cadenes de multi-byte (mbstring). Mira l\'informe d\'error 19404 de PHP. No es recomana aquesta versió de PHP per treballar amb phpMyAdmin.';
$strPhp = 'Crear codi PHP';
$strPHPVersion = 'PHP versió';
+$strPleaseSelectPrimaryOrUniqueKey = 'Tria la clau principal o una clau única';
$strPmaDocumentation = 'Documentació de phpMyAdmin';
$strPmaUriError = 'La directiva <tt>$cfg[\'PmaAbsoluteUri\']</tt> HA d\'estar a l\'arxiu de configuració!';
+$strPmaWiki = 'wiki del phpMyAdmin';
$strPolish = 'Polac';
$strPortrait = 'Vertical';
$strPos1 = 'Inici';
@@ -615,16 +644,19 @@ $strQueryWindowLock = 'No sobreescriure aquesta consulta des de fora de la fines
$strReadRequests = 'Peticions de lectura';
$strReceived = 'Rebut';
+$strRecommended = 'recomanat';
$strRecords = 'Registres';
$strReferentialIntegrity = 'Comprova la integritat referencial:';
$strRefresh = 'Actualitzar';
$strRelationalSchema = 'Esquema Relacional';
+$strRelationDeleted = 'Relació esborrada';
$strRelationNotWorking = 'Les característiques addicionals per treballar amb taules enllaçades s\'han desactivat. Per saber perquè prem a %saquí%s.';
$strRelationsForTable = 'RELACIONS DE LA TAULA';
$strRelations = 'Relacions';
$strRelationView = 'Vista de Relacions';
$strReloadingThePrivileges = 'Recarregant permissos';
$strReloadPrivileges = 'Recarregar permissos';
+$strReload = 'Recarregar';
$strRemoveSelectedUsers = 'Treure els usuaris triats';
$strRenameDatabaseOK = 'Base de dades %s reanomenada a %s';
$strRenameTableOK = 'La taula %s ha canviat de nom. Ara es diu %s';
@@ -658,6 +690,7 @@ $strRussian = 'Rus';
$strSave = 'Desar';
$strSaveOnServer = 'Desar al servidor al directori %s';
+$strSavePosition = 'Desar posició';
$strScaleFactorSmall = 'El factor de l\'escala és massa petit per posar l\'esquema en una pàgina';
$strSearch = 'Cercar';
$strSearchFormTitle = 'Cercar a la base de dades';
@@ -674,7 +707,9 @@ $strSelectADb = 'Tria una Base de Dades';
$strSelectAll = 'Tria Tot';
$strSelectBinaryLog = 'Tria el registre binari per veure';
$strSelectFields = 'Tria els camps (un com a mínim):';
+$strSelectForeignKey = 'Triar clau externa';
$strSelectNumRows = 'en consulta';
+$strSelectReferencedKey = 'Tria la clau referenciada';
$strSelectTables = 'Tria Taules';
$strSend = 'enviar';
$strSent = 'Enviat';
@@ -696,8 +731,11 @@ $strShowColor = 'Mostra color';
$strShowDatadictAs = 'Format del Diccionari de Dades';
$strShowFullQueries = 'Mostra Consultes completes';
$strShowGrid = 'Mostra graella';
+$strShowHideLeftMenu = 'Menú esquerre Mostra/Amaga';
$strShowingBookmark = 'Mostrant consultes desades';
+$strShowingPhp = 'Mostrant com a codi PHP';
$strShowingRecords = 'Mostrant registres: ';
+$strShowingSQL = 'Mostrant consulta SQL';
$strShow = 'Mostra';
$strShowOpenTables = 'Mostrar taules obertes';
$strShowPHPInfo = 'Mostra informació de PHP';
@@ -819,6 +857,8 @@ $strSize = 'Mida';
$strSkipQueries = 'Nombre de registres(consultes) a saltar des de l\'inici';
$strSlovak = 'Eslovac';
$strSlovenian = 'Eslové';
+$strSmallBigAll = 'Tot Petit/Gran';
+$strSnapToGrid = 'Aliniar a la graella';
$strSocketProblem = '(o el sòcol del servidor local MySQL no està configurat correctament)';
$strSortByKey = 'Classifica per la clau';
$strSort = 'Classificació';
@@ -838,6 +878,7 @@ $strSQL = 'SQL';
$strSQPBugInvalidIdentifer = 'Identificador Incorrecte';
$strSQPBugUnclosedQuote = 'Cometa no tancada';
$strSQPBugUnknownPunctuation = 'Signe de puntuació desconegut';
+$strStandInStructureForView = 'Stand-in estructura per a vista';
$strStatCheckTime = 'Darrera comprovació';
$strStatCreateTime = 'Creació';
$strStatement = 'Sentències';
@@ -854,6 +895,7 @@ $strStrucNativeExcelOptions = 'Opcions d\'exportació natives d\'Excel';
$strStrucOnly = 'Només l\'estructura';
$strStructPropose = 'Proposa una estructura de taula';
$strStructure = 'Estructura';
+$strStructureForView = 'Estructura per a vista';
$strSubmit = 'Enviar';
$strSuccess = 'La vostra comanda SQL ha estat executada amb èxit';
$strSum = 'Suma';
@@ -867,7 +909,9 @@ $strTableEmpty = 'El nom de la taula és buit!';
$strTableHasBeenDropped = 'S\'ha esborrat la taula %s';
$strTableHasBeenEmptied = 'S\'ha buidat la taula %s';
$strTableHasBeenFlushed = 'S\'ha buidat la memòria cau de la taula %s';
+$strTableIsEmpty = 'La taula sembla buida!';
$strTableMaintenance = 'Manteniment de la taula';
+$strTableName = 'Nom de taula';
$strTableOfContents = 'Taula de continguts';
$strTableOptions = 'Opcions de Taula';
$strTables = '%s taula(es)';
@@ -891,7 +935,10 @@ $strTimeoutInfo = 'La darrera importació ha esgotat el temps, després de reenv
$strTimeoutNothingParsed = 'Però a la darrera importació no s\'han processat dades, el que normalment indica que phpMyAdmin no ha pogut finalitzar aquesta importació a menys que incrementeu els límits de temps de php.';
$strTimeoutPassed = 'Temps exaurit de l\'arxiu d\'ordres, si voleu finalitzar l\'importació, torneu a enviar el mateix arxiu a importar i el procés continuarà.';
$strTime = 'Temps';
+$strToFromPage = 'plana a/de';
$strToggleScratchboard = 'Canvia l\' scratchboard';
+$strToggleSmallBig = 'Canviar petit/gran';
+$strToSelectRelation = 'Per triar una relació, clica :';
$strTotal = 'total';
$strTotalUC = 'Total';
$strTraditionalChinese = 'Xinés Tradicional';
@@ -903,6 +950,7 @@ $strTransformation_application_octetstream__hex = 'Mostra la representació hexa
$strTransformation_image_jpeg__inline = 'Mostra una miniatura amb enllaç; opcions: ample,alt en pixels (respecta la proporció original)';
$strTransformation_image_jpeg__link = 'Es mostra com a enllaç a la imatge.';
$strTransformation_image_png__inline = 'Veure image/jpeg: en linia';
+$strTransformation_text_plain__dateformat = 'Mostra un camp TIME, TIMESTAMP, DATETIME o camp de data unix com a data formatejada. La primera opció és la diferéncia (en hores) que s\'afegiràn a la data (Defecte: 0). Usa la segona opció per indicar un format diferent de data/hora. La tercera opció determina si es vol visualitzar l\'hora local o UTC (usant els texts "local" o "utc"). Segons aixó, el format de data té diferent valor - per a "local" veieu la documentació de la funció strftime() de PHP i per a "utc" s\'obté amb l\'ús de la funció gmdate().';
$strTransformation_text_plain__external = 'NOMÉS LINUX: Llença una aplicació externa i facilita el camp de dades via standard input. Retorna per standard output de l\'aplicació. El defecte és Tidy, per interpretar codi HTML. Per raons de seguretat, has d\' editar manualment l\'arxiu libraries/transformations/text_plain__external.inc.php i afegir les eines que vulguis fer servir. La primera opció és, llavors, el numero del programa que vols fer servir i la segona opció són els paràmetres per el programa. El tercer paràmetre, si es posa a 1, convertirà la sortida fent servir htmlspecialchars() (El defecte és 1). El quart paràmetre, si val 1, posarà un NOWRAP al contingut de les cel.les de forma que la sortida sencera es mostrarà sense reformatejar (Per defecte 1)';
$strTransformation_text_plain__formatted = 'Conserva el format original del camp. No es fa cap canvi.';
$strTransformation_text_plain__imagelink = 'Mostra una imatge i un enllaç, el camp conté el nom de l\'arxiu; la primera opció és un prefixe com "http://domini.com/", la segona opció és l\'amplada en pixels, la tercera és l\'alçada.';
@@ -971,55 +1019,20 @@ $strXML = 'XML';
$strYes = 'Si';
-$strZeroRemovesTheLimit = 'Nota: Establint aquestes opcions a 0 (zero) treu el limit.';
+$strZeroRemovesTheLimit = 'Nota: Es treu el limit establint aquestes opcions a 0 (zero).';
$strZip = '"comprimit amb zip"';
-$strPmaWiki = 'phpMyAdmin wiki'; //to translate
-$strTransformation_text_plain__dateformat = '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.'; //to translate
-$strDocSQL = 'DocSQL'; //to translate
-$strDocSQLOptions = 'DocSQL options'; //to translate
-$strTableName = 'Table name'; //to translate
-$strTableIsEmpty = 'Table seems to be empty!'; //to translate
-$strDbIsEmpty = 'Database seems to be empty!'; //to translate
-$strShowingPhp = 'Showing as PHP code'; //to translate
-$strShowingSQL = 'Showing SQL query'; //to translate
-$strDesigner = 'Designer'; //to translate
-$strNumberOfTables = 'Number of tables'; //to translate
-$strCreateTable = 'Create table'; //to translate
-$strCreateRelation = 'Create relation'; //to translate
-$strSavePosition = 'Save position'; //to translate
-$strSelectForeignKey = 'Select Foreign Key'; //to translate
-$strHide = 'Hide'; //to translate
-$strShowHideLeftMenu = 'Show/Hide left menu'; //to translate
-$strReload = 'Reload'; //to translate
-$strSmallBigAll = 'Small/Big All'; //to translate
-$strImportExportCoords = 'Import/Export coordinates for PDF schema'; //to translate
-$strMoveMenu = 'Move Menu'; //to translate
-$strAngularLinks = 'Angular links'; //to translate
-$strDirectLinks = 'Direct links'; //to translate
-$strHideShowAll = 'Hide/Show all'; //to translate
-$strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate
-$strInternalRelationAdded = 'Internal relation added'; //to translate
-$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate
-$strRelationDeleted = 'Relation deleted'; //to translate
-$strToSelectRelation = 'To select relation, click :'; //to translate
-$strExportImportToScale = 'Export/Import to scale'; //to translate
-$strRecommended = 'recommended'; //to translate
-$strToFromPage = 'to/from page'; //to translate
-$strSelectReferencedKey = 'Select referenced key'; //to translate
-$strPleaseSelectPrimaryOrUniqueKey = 'Please select the primary key or a unique key'; //to translate
-$strForeignKeyError = 'Error creating foreign key (check data types)'; //to translate
-$strHelp = 'Help'; //to translate
-$strCancel = 'Cancel'; //to translate
-$strDeleteRelation = 'Delete relation'; //to translate
-$strKnownExternalBug = 'The %s functionality is affected by a known bug, see %s'; //to translate
-$strStructureForView = 'Structure for view'; //to translate
-$strStandInStructureForView = 'Stand-in structure for view'; //to translate
-$strToggleSmallBig = 'Toggle small/big'; //to translate
-$strIEUnsupported = 'Internet Explorer does not support this function.'; //to translate
-$strErrorRelationAdded = 'Error: Relation not added.'; //to translate
-$strErrorRelationExists = 'Error: relation already exists.'; //to translate
-$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
-$strSnapToGrid = 'Snap to grid'; //to translate
-$strDesignerHelpDisplayField = '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.'; //to translate
+// To translate:
+
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/chinese_simplified-gb2312.inc.php b/lang/chinese_simplified-gb2312.inc.php
index 407b214568..3610f5a4c7 100644
--- a/lang/chinese_simplified-gb2312.inc.php
+++ b/lang/chinese_simplified-gb2312.inc.php
@@ -1053,4 +1053,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php
index f137f4b7eb..7f8036914b 100644
--- a/lang/chinese_simplified-utf-8.inc.php
+++ b/lang/chinese_simplified-utf-8.inc.php
@@ -1054,4 +1054,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/chinese_traditional-big5.inc.php b/lang/chinese_traditional-big5.inc.php
index e97e2d2821..69d7b556b1 100644
--- a/lang/chinese_traditional-big5.inc.php
+++ b/lang/chinese_traditional-big5.inc.php
@@ -1032,4 +1032,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php
index 187be9abec..9141ed0047 100644
--- a/lang/chinese_traditional-utf-8.inc.php
+++ b/lang/chinese_traditional-utf-8.inc.php
@@ -1033,4 +1033,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/croatian-iso-8859-2.inc.php b/lang/croatian-iso-8859-2.inc.php
index b8ed9109b6..9bd83298f4 100644
--- a/lang/croatian-iso-8859-2.inc.php
+++ b/lang/croatian-iso-8859-2.inc.php
@@ -1026,4 +1026,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php
index adfcc840df..ae78b76fb3 100644
--- a/lang/croatian-utf-8.inc.php
+++ b/lang/croatian-utf-8.inc.php
@@ -1027,4 +1027,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/croatian-windows-1250.inc.php b/lang/croatian-windows-1250.inc.php
index 6ab63d16a6..68b341322a 100644
--- a/lang/croatian-windows-1250.inc.php
+++ b/lang/croatian-windows-1250.inc.php
@@ -1026,4 +1026,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/czech-iso-8859-2.inc.php b/lang/czech-iso-8859-2.inc.php
index 13dcaef832..dd7bf238a3 100644
--- a/lang/czech-iso-8859-2.inc.php
+++ b/lang/czech-iso-8859-2.inc.php
@@ -288,6 +288,7 @@ $strExtra = 'Extra';
$strFailedAttempts = 'Nepovedench pokus';
$strFieldHasBeenDropped = 'Sloupec %s byl odstrann';
+$strFieldInsertFromFileTempDirNotExists = 'Chyba pi pejmenovn nahrtho soubory, viz FAQ 1.11';
$strFieldsEmpty = ' Nebyl zadn poet sloupc! ';
$strFieldsEnclosedBy = 'Nzvy sloupc uzaven';
$strFieldsEscapedBy = 'Nzvy sloupc escapovny';
@@ -729,6 +730,7 @@ $strServerTabVariables = 'Promnn';
$strServerTrafficNotes = '<b>Provoz serveru</b>: Informace o&nbsp;sovm provozu MySQL serveru od jeho sputn.';
$strServerVars = 'Promnn a nastaven serveru';
$strServerVersion = 'Verze MySQL';
+$strSessionStartupErrorGeneral = 'Nepodailo se zapnout sezen bez chyby, prosm zkontrolujte chyby v logu PHP a/nebo webserveru a peliv nastavte podporu sezen v PHP.';
$strSessionValue = 'Hodnota sezen';
$strSetEnumVal = 'Pokud je sloupec typu &bdquo;enum&ldquo; nebo &bdquo;set", zadvejte hodnoty v&nbsp;nsledujcm formtu: \'a\',\'b\',\'c\'...<br />Pokud potebujete zadat zptn lomtko (&bdquo;\&ldquo;) nebo jednoduch uvozovky (&bdquo;\'&ldquo;) mezi tmito hodnotami, napite ped n zptn lomtko (pklad: \'\\\\xyz\' nebo \'a\\\'b\').';
$strShowAll = 'Zobrazit ve';
@@ -978,6 +980,13 @@ $strUpdateProfileMessage = 'Pstup byl zmnn.';
$strUpdateQuery = 'Aktualizovat dotaz';
$strUpdComTab = 'Podvejte se prosm do dokumentace, jak aktualizovat tabulku s&nbsp;informacemi o&nbsp;sloupcch (tabulka column_comments)';
$strUpgrade = 'Mli byste aktualizovat %s na verzi %s nebo vy.';
+$strUploadErrorCantWrite = 'Chyba pi zapisovn souboru na disk.';
+$strUploadErrorExtension = 'Nahrvn souboru zastaveno rozenm.';
+$strUploadErrorFormSize = 'Velikost nahranho souboru pesahuje hodnotu MAX_FILE_SIZE, kter byla zadna v HTML formuli.';
+$strUploadErrorIniSize = 'Velikost nahranho souboru pesahuje nastaven upload_max_filesize v php.ini.';
+$strUploadErrorNoTempDir = 'Chybjc adres pro doasn soubory.';
+$strUploadErrorPartial = 'Soubor byl nahrn jen sten.';
+$strUploadErrorUnknown = 'Neznm chyba pi nahrvn souboru.';
$strUploadLimit = 'Pravdpodobn jste se pokusili nahrt pli velk soubor. Pette si prosm %sdokumentaci%s, jak toto omezen obejt.';
$strUploadsNotAllowed = 'Upload soubor nen na tomto serveru povolen.';
$strUsage = 'Pouv';
@@ -1007,6 +1016,7 @@ $strViewDumpDB = 'Export databze';
$strViewDump = 'Export tabulky';
$strViewHasBeenDropped = 'Pohled %s byl odstrann';
$strViewMaxExactCount = 'Tento pohled m vce ne %d zznam. Viz %sdokumentace%s.';
+$strViewName = 'Jmno pohledu';
$strView = 'Pohled';
$strWebServerUploadDirectoryError = 'Adres uren pro upload soubor nemohl bt oteven';
diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php
index 78b9760f5f..7844759210 100644
--- a/lang/czech-utf-8.inc.php
+++ b/lang/czech-utf-8.inc.php
@@ -289,6 +289,7 @@ $strExtra = 'Extra';
$strFailedAttempts = 'Nepovedených pokusů';
$strFieldHasBeenDropped = 'Sloupec %s byl odstraněn';
+$strFieldInsertFromFileTempDirNotExists = 'Chyba při přejmenování nahrátého soubory, viz FAQ 1.11';
$strFieldsEmpty = ' Nebyl zadán počet sloupců! ';
$strFieldsEnclosedBy = 'Názvy sloupců uzavřené';
$strFieldsEscapedBy = 'Názvy sloupců escapovány';
@@ -730,6 +731,7 @@ $strServerTabVariables = 'Proměnné';
$strServerTrafficNotes = '<b>Provoz serveru</b>: Informace o&nbsp;síťovém provozu MySQL serveru od jeho spuštění.';
$strServerVars = 'Proměnné a nastavení serveru';
$strServerVersion = 'Verze MySQL';
+$strSessionStartupErrorGeneral = 'Nepodařilo se zapnout sezení bez chyby, prosím zkontrolujte chyby v logu PHP a/nebo webserveru a pečlivě nastavte podporu sezení v PHP.';
$strSessionValue = 'Hodnota sezení';
$strSetEnumVal = 'Pokud je sloupec typu &bdquo;enum&ldquo; nebo &bdquo;set", zadávejte hodnoty v&nbsp;následujícím formátu: \'a\',\'b\',\'c\'...<br />Pokud potřebujete zadat zpětné lomítko (&bdquo;\&ldquo;) nebo jednoduché uvozovky (&bdquo;\'&ldquo;) mezi těmito hodnotami, napište před ně zpětné lomítko (příklad: \'\\\\xyz\' nebo \'a\\\'b\').';
$strShowAll = 'Zobrazit vše';
@@ -979,6 +981,13 @@ $strUpdateProfileMessage = 'Přístup byl změněn.';
$strUpdateQuery = 'Aktualizovat dotaz';
$strUpdComTab = 'Podívejte se prosím do dokumentace, jak aktualizovat tabulku s&nbsp;informacemi o&nbsp;sloupcích (tabulka column_comments)';
$strUpgrade = 'Měli byste aktualizovat %s na verzi %s nebo vyšší.';
+$strUploadErrorCantWrite = 'Chyba při zapisování souboru na disk.';
+$strUploadErrorExtension = 'Nahrávání souboru zastaveno rozšířením.';
+$strUploadErrorFormSize = 'Velikost nahraného souboru přesahuje hodnotu MAX_FILE_SIZE, která byla zadána v HTML formuláři.';
+$strUploadErrorIniSize = 'Velikost nahraného souboru přesahuje nastavení upload_max_filesize v php.ini.';
+$strUploadErrorNoTempDir = 'Chybějící adresář pro dočasné soubory.';
+$strUploadErrorPartial = 'Soubor byl nahrán jen částečně.';
+$strUploadErrorUnknown = 'Neznámá chyba při nahrávání souboru.';
$strUploadLimit = 'Pravděpodobně jste se pokusili nahrát příliš velký soubor. Přečtěte si prosím %sdokumentaci%s, jak toto omezení obejít.';
$strUploadsNotAllowed = 'Upload souborů není na tomto serveru povolen.';
$strUsage = 'Používá';
@@ -1008,6 +1017,7 @@ $strViewDumpDB = 'Export databáze';
$strViewDump = 'Export tabulky';
$strViewHasBeenDropped = 'Pohled %s byl odstraněn';
$strViewMaxExactCount = 'Tento pohled má více než %d záznamů. Viz %sdokumentace%s.';
+$strViewName = 'Jméno pohledu';
$strView = 'Pohled';
$strWebServerUploadDirectoryError = 'Adresář určený pro upload souborů nemohl být otevřen';
diff --git a/lang/czech-windows-1250.inc.php b/lang/czech-windows-1250.inc.php
index fcfe9a7101..3e3060ea64 100644
--- a/lang/czech-windows-1250.inc.php
+++ b/lang/czech-windows-1250.inc.php
@@ -288,6 +288,7 @@ $strExtra = 'Extra';
$strFailedAttempts = 'Nepovedench pokus';
$strFieldHasBeenDropped = 'Sloupec %s byl odstrann';
+$strFieldInsertFromFileTempDirNotExists = 'Chyba pi pejmenovn nahrtho soubory, viz FAQ 1.11';
$strFieldsEmpty = ' Nebyl zadn poet sloupc! ';
$strFieldsEnclosedBy = 'Nzvy sloupc uzaven';
$strFieldsEscapedBy = 'Nzvy sloupc escapovny';
@@ -729,6 +730,7 @@ $strServerTabVariables = 'Promnn';
$strServerTrafficNotes = '<b>Provoz serveru</b>: Informace o&nbsp;sovm provozu MySQL serveru od jeho sputn.';
$strServerVars = 'Promnn a nastaven serveru';
$strServerVersion = 'Verze MySQL';
+$strSessionStartupErrorGeneral = 'Nepodailo se zapnout sezen bez chyby, prosm zkontrolujte chyby v logu PHP a/nebo webserveru a peliv nastavte podporu sezen v PHP.';
$strSessionValue = 'Hodnota sezen';
$strSetEnumVal = 'Pokud je sloupec typu &bdquo;enum&ldquo; nebo &bdquo;set", zadvejte hodnoty v&nbsp;nsledujcm formtu: \'a\',\'b\',\'c\'...<br />Pokud potebujete zadat zptn lomtko (&bdquo;\&ldquo;) nebo jednoduch uvozovky (&bdquo;\'&ldquo;) mezi tmito hodnotami, napite ped n zptn lomtko (pklad: \'\\\\xyz\' nebo \'a\\\'b\').';
$strShowAll = 'Zobrazit ve';
@@ -978,6 +980,13 @@ $strUpdateProfileMessage = 'Pstup byl zmnn.';
$strUpdateQuery = 'Aktualizovat dotaz';
$strUpdComTab = 'Podvejte se prosm do dokumentace, jak aktualizovat tabulku s&nbsp;informacemi o&nbsp;sloupcch (tabulka column_comments)';
$strUpgrade = 'Mli byste aktualizovat %s na verzi %s nebo vy.';
+$strUploadErrorCantWrite = 'Chyba pi zapisovn souboru na disk.';
+$strUploadErrorExtension = 'Nahrvn souboru zastaveno rozenm.';
+$strUploadErrorFormSize = 'Velikost nahranho souboru pesahuje hodnotu MAX_FILE_SIZE, kter byla zadna v HTML formuli.';
+$strUploadErrorIniSize = 'Velikost nahranho souboru pesahuje nastaven upload_max_filesize v php.ini.';
+$strUploadErrorNoTempDir = 'Chybjc adres pro doasn soubory.';
+$strUploadErrorPartial = 'Soubor byl nahrn jen sten.';
+$strUploadErrorUnknown = 'Neznm chyba pi nahrvn souboru.';
$strUploadLimit = 'Pravdpodobn jste se pokusili nahrt pli velk soubor. Pette si prosm %sdokumentaci%s, jak toto omezen obejt.';
$strUploadsNotAllowed = 'Upload soubor nen na tomto serveru povolen.';
$strUsage = 'Pouv';
@@ -1007,6 +1016,7 @@ $strViewDumpDB = 'Export databze';
$strViewDump = 'Export tabulky';
$strViewHasBeenDropped = 'Pohled %s byl odstrann';
$strViewMaxExactCount = 'Tento pohled m vce ne %d zznam. Viz %sdokumentace%s.';
+$strViewName = 'Jmno pohledu';
$strView = 'Pohled';
$strWebServerUploadDirectoryError = 'Adres uren pro upload soubor nemohl bt oteven';
diff --git a/lang/danish-iso-8859-1.inc.php b/lang/danish-iso-8859-1.inc.php
index 0066bce28d..43b50a2898 100644
--- a/lang/danish-iso-8859-1.inc.php
+++ b/lang/danish-iso-8859-1.inc.php
@@ -1027,4 +1027,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php
index 303538c223..e801a044be 100644
--- a/lang/danish-utf-8.inc.php
+++ b/lang/danish-utf-8.inc.php
@@ -1028,4 +1028,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/dutch-iso-8859-1.inc.php b/lang/dutch-iso-8859-1.inc.php
index 31f2bbc73d..8836d7fc2b 100644
--- a/lang/dutch-iso-8859-1.inc.php
+++ b/lang/dutch-iso-8859-1.inc.php
@@ -1049,4 +1049,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/dutch-iso-8859-15.inc.php b/lang/dutch-iso-8859-15.inc.php
index 7f34d9185a..24bf16956e 100644
--- a/lang/dutch-iso-8859-15.inc.php
+++ b/lang/dutch-iso-8859-15.inc.php
@@ -1049,4 +1049,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php
index 8d5ed842b2..4045d2c5f9 100644
--- a/lang/dutch-utf-8.inc.php
+++ b/lang/dutch-utf-8.inc.php
@@ -1050,4 +1050,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/english-iso-8859-1.inc.php b/lang/english-iso-8859-1.inc.php
index bf38553129..f5c1541a46 100644
--- a/lang/english-iso-8859-1.inc.php
+++ b/lang/english-iso-8859-1.inc.php
@@ -289,6 +289,7 @@ $strExtra = 'Extra';
$strFailedAttempts = 'Failed attempts';
$strField = 'Field';
$strFieldHasBeenDropped = 'Field %s has been dropped';
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11';
$strFieldsEmpty = ' The field count is empty! ';
$strFieldsEnclosedBy = 'Fields enclosed by';
$strFieldsEscapedBy = 'Fields escaped by';
@@ -729,6 +730,7 @@ $strServerTabVariables = 'Variables';
$strServerTrafficNotes = '<b>Server traffic</b>: These tables show the network traffic statistics of this MySQL server since its startup.';
$strServerVars = 'Server variables and settings';
$strServerVersion = 'Server version';
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.';
$strSessionValue = 'Session value';
$strSetEnumVal = 'If field type is "enum" or "set", please enter the values using this format: \'a\',\'b\',\'c\'...<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, precede it with a backslash (for example \'\\\\xyz\' or \'a\\\'b\').';
$strShowAll = 'Show all';
@@ -978,6 +980,13 @@ $strUpdateProfileMessage = 'The profile has been updated.';
$strUpdateQuery = 'Update Query';
$strUpdComTab = 'Please see the documentation on how to update your column_comments table';
$strUpgrade = 'You should upgrade to %s %s or later.';
+$strUploadErrorCantWrite = 'Failed to write file to disk.';
+$strUploadErrorExtension = 'File upload stopped by extension.';
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.';
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.';
+$strUploadErrorNoTempDir = 'Missing a temporary folder.';
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.';
+$strUploadErrorUnknown = 'Unknown error in file upload.';
$strUploadLimit = 'You probably tried to upload too large file. Please refer to %sdocumentation%s for ways to workaround this limit.';
$strUploadsNotAllowed = 'File uploads are not allowed on this server.';
$strUsage = 'Usage';
@@ -1007,6 +1016,7 @@ $strViewDumpDB = 'View dump (schema) of database';
$strViewDump = 'View dump (schema) of table';
$strViewHasBeenDropped = 'View %s has been dropped';
$strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.';
+$strViewName = 'VIEW name';
$strView = 'View';
$strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';
diff --git a/lang/english-iso-8859-15.inc.php b/lang/english-iso-8859-15.inc.php
index d925a326aa..e3c9cf86cb 100644
--- a/lang/english-iso-8859-15.inc.php
+++ b/lang/english-iso-8859-15.inc.php
@@ -289,6 +289,7 @@ $strExtra = 'Extra';
$strFailedAttempts = 'Failed attempts';
$strField = 'Field';
$strFieldHasBeenDropped = 'Field %s has been dropped';
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11';
$strFieldsEmpty = ' The field count is empty! ';
$strFieldsEnclosedBy = 'Fields enclosed by';
$strFieldsEscapedBy = 'Fields escaped by';
@@ -729,6 +730,7 @@ $strServerTabVariables = 'Variables';
$strServerTrafficNotes = '<b>Server traffic</b>: These tables show the network traffic statistics of this MySQL server since its startup.';
$strServerVars = 'Server variables and settings';
$strServerVersion = 'Server version';
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.';
$strSessionValue = 'Session value';
$strSetEnumVal = 'If field type is "enum" or "set", please enter the values using this format: \'a\',\'b\',\'c\'...<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, precede it with a backslash (for example \'\\\\xyz\' or \'a\\\'b\').';
$strShowAll = 'Show all';
@@ -978,6 +980,13 @@ $strUpdateProfileMessage = 'The profile has been updated.';
$strUpdateQuery = 'Update Query';
$strUpdComTab = 'Please see the documentation on how to update your column_comments table';
$strUpgrade = 'You should upgrade to %s %s or later.';
+$strUploadErrorCantWrite = 'Failed to write file to disk.';
+$strUploadErrorExtension = 'File upload stopped by extension.';
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.';
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.';
+$strUploadErrorNoTempDir = 'Missing a temporary folder.';
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.';
+$strUploadErrorUnknown = 'Unknown error in file upload.';
$strUploadLimit = 'You probably tried to upload too large file. Please refer to %sdocumentation%s for ways to workaround this limit.';
$strUploadsNotAllowed = 'File uploads are not allowed on this server.';
$strUsage = 'Usage';
@@ -1007,6 +1016,7 @@ $strViewDumpDB = 'View dump (schema) of database';
$strViewDump = 'View dump (schema) of table';
$strViewHasBeenDropped = 'View %s has been dropped';
$strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.';
+$strViewName = 'VIEW name';
$strView = 'View';
$strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';
diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php
index 3140e378ff..62b43c9b7c 100644
--- a/lang/english-utf-8.inc.php
+++ b/lang/english-utf-8.inc.php
@@ -290,6 +290,7 @@ $strExtra = 'Extra';
$strFailedAttempts = 'Failed attempts';
$strField = 'Field';
$strFieldHasBeenDropped = 'Field %s has been dropped';
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11';
$strFieldsEmpty = ' The field count is empty! ';
$strFieldsEnclosedBy = 'Fields enclosed by';
$strFieldsEscapedBy = 'Fields escaped by';
@@ -730,6 +731,7 @@ $strServerTabVariables = 'Variables';
$strServerTrafficNotes = '<b>Server traffic</b>: These tables show the network traffic statistics of this MySQL server since its startup.';
$strServerVars = 'Server variables and settings';
$strServerVersion = 'Server version';
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.';
$strSessionValue = 'Session value';
$strSetEnumVal = 'If field type is "enum" or "set", please enter the values using this format: \'a\',\'b\',\'c\'...<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, precede it with a backslash (for example \'\\\\xyz\' or \'a\\\'b\').';
$strShowAll = 'Show all';
@@ -979,6 +981,13 @@ $strUpdateProfileMessage = 'The profile has been updated.';
$strUpdateQuery = 'Update Query';
$strUpdComTab = 'Please see the documentation on how to update your column_comments table';
$strUpgrade = 'You should upgrade to %s %s or later.';
+$strUploadErrorCantWrite = 'Failed to write file to disk.';
+$strUploadErrorExtension = 'File upload stopped by extension.';
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.';
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.';
+$strUploadErrorNoTempDir = 'Missing a temporary folder.';
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.';
+$strUploadErrorUnknown = 'Unknown error in file upload.';
$strUploadLimit = 'You probably tried to upload too large file. Please refer to %sdocumentation%s for ways to workaround this limit.';
$strUploadsNotAllowed = 'File uploads are not allowed on this server.';
$strUsage = 'Usage';
@@ -1008,6 +1017,7 @@ $strViewDumpDB = 'View dump (schema) of database';
$strViewDump = 'View dump (schema) of table';
$strViewHasBeenDropped = 'View %s has been dropped';
$strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.';
+$strViewName = 'VIEW name';
$strView = 'View';
$strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';
diff --git a/lang/estonian-iso-8859-1.inc.php b/lang/estonian-iso-8859-1.inc.php
index 24e0cf2110..4f7b821d46 100644
--- a/lang/estonian-iso-8859-1.inc.php
+++ b/lang/estonian-iso-8859-1.inc.php
@@ -1033,4 +1033,14 @@ $strToggleSmallBig = 'Toggle small/big'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php
index d4da0d6d16..3ab3dce1bf 100644
--- a/lang/estonian-utf-8.inc.php
+++ b/lang/estonian-utf-8.inc.php
@@ -1034,4 +1034,14 @@ $strToggleSmallBig = 'Toggle small/big'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/finnish-iso-8859-1.inc.php b/lang/finnish-iso-8859-1.inc.php
index a0057efdf3..54e69b0e3e 100644
--- a/lang/finnish-iso-8859-1.inc.php
+++ b/lang/finnish-iso-8859-1.inc.php
@@ -1027,4 +1027,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/finnish-iso-8859-15.inc.php b/lang/finnish-iso-8859-15.inc.php
index 4b8006d429..7c4b1a3ad7 100644
--- a/lang/finnish-iso-8859-15.inc.php
+++ b/lang/finnish-iso-8859-15.inc.php
@@ -1027,4 +1027,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php
index e340b20832..282a97c5f7 100644
--- a/lang/finnish-utf-8.inc.php
+++ b/lang/finnish-utf-8.inc.php
@@ -1028,4 +1028,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/french-iso-8859-1.inc.php b/lang/french-iso-8859-1.inc.php
index f528584e8a..e59736c742 100644
--- a/lang/french-iso-8859-1.inc.php
+++ b/lang/french-iso-8859-1.inc.php
@@ -1024,4 +1024,14 @@ $strYes = 'Oui';
$strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlve la limite.';
$strZip = '"zipp"';
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/french-iso-8859-15.inc.php b/lang/french-iso-8859-15.inc.php
index 503c8a4263..30868b9033 100644
--- a/lang/french-iso-8859-15.inc.php
+++ b/lang/french-iso-8859-15.inc.php
@@ -1024,4 +1024,14 @@ $strYes = 'Oui';
$strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlve la limite.';
$strZip = '"zipp"';
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php
index 724663020d..cbf2e08caa 100644
--- a/lang/french-utf-8.inc.php
+++ b/lang/french-utf-8.inc.php
@@ -1025,4 +1025,14 @@ $strYes = 'Oui';
$strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.';
$strZip = '"zippé"';
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/galician-iso-8859-1.inc.php b/lang/galician-iso-8859-1.inc.php
index bdc6086dfd..1fab10edf0 100644
--- a/lang/galician-iso-8859-1.inc.php
+++ b/lang/galician-iso-8859-1.inc.php
@@ -1030,4 +1030,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php
index c4113709fd..1bc3324499 100644
--- a/lang/galician-utf-8.inc.php
+++ b/lang/galician-utf-8.inc.php
@@ -1031,4 +1031,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php
index c2b13bc8e2..38b960eea7 100644
--- a/lang/georgian-utf-8.inc.php
+++ b/lang/georgian-utf-8.inc.php
@@ -1054,4 +1054,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/german-iso-8859-1.inc.php b/lang/german-iso-8859-1.inc.php
index 819e0b0812..e6eaa1d8d6 100644
--- a/lang/german-iso-8859-1.inc.php
+++ b/lang/german-iso-8859-1.inc.php
@@ -982,52 +982,62 @@ $strYes = 'Ja';
$strZeroRemovesTheLimit = 'Anmerkung: Der Wert 0 (null) entfernt die Beschrnkung.';
$strZip = 'Zip-komprimiert';
-$strPmaWiki = 'phpMyAdmin wiki'; //to translate
+$strPmaWiki = 'phpMyAdmin Wiki';
$strTransformation_text_plain__dateformat = '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.'; //to translate
-$strDocSQL = 'DocSQL'; //to translate
-$strDocSQLOptions = 'DocSQL options'; //to translate
-$strTableName = 'Table name'; //to translate
-$strTableIsEmpty = 'Table seems to be empty!'; //to translate
-$strDbIsEmpty = 'Database seems to be empty!'; //to translate
-$strShowingPhp = 'Showing as PHP code'; //to translate
-$strShowingSQL = 'Showing SQL query'; //to translate
-$strDesigner = 'Designer'; //to translate
-$strNumberOfTables = 'Number of tables'; //to translate
-$strCreateTable = 'Create table'; //to translate
-$strCreateRelation = 'Create relation'; //to translate
-$strSavePosition = 'Save position'; //to translate
-$strSelectForeignKey = 'Select Foreign Key'; //to translate
-$strHide = 'Hide'; //to translate
-$strShowHideLeftMenu = 'Show/Hide left menu'; //to translate
-$strReload = 'Reload'; //to translate
-$strSmallBigAll = 'Small/Big All'; //to translate
-$strImportExportCoords = 'Import/Export coordinates for PDF schema'; //to translate
-$strMoveMenu = 'Move Menu'; //to translate
+$strDocSQL = 'DocSQL';
+$strDocSQLOptions = 'DocSQL Optionen';
+$strTableName = 'Tabellenname';
+$strTableIsEmpty = 'Die Tabelle scheint leer zu sein!';
+$strDbIsEmpty = 'Die Datenbank scheint leer zu sein!';
+$strShowingPhp = 'Ansicht als PHP Code';
+$strShowingSQL = 'Ansicht als SQL Abfrage';
+$strDesigner = 'Designer';
+$strNumberOfTables = 'Anzhal Tabellen';
+$strCreateTable = 'Erzeuge Tabelle';
+$strCreateRelation = 'Erzeuge Verknpfung';
+$strSavePosition = 'Speichere Position';
+$strSelectForeignKey = 'Whle Fremdschlssel';
+$strHide = 'Verstecken';
+$strShowHideLeftMenu = 'Zeige/Verstecke linkes Men';
+$strReload = 'Neuladen';
+$strSmallBigAll = 'Alles klein/gro';
+$strImportExportCoords = 'Import/Export Koordinaten fr das PDF Schema';
+$strMoveMenu = 'Verschiebe Men';
$strAngularLinks = 'Angular links'; //to translate
$strDirectLinks = 'Direct links'; //to translate
-$strHideShowAll = 'Hide/Show all'; //to translate
-$strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate
-$strInternalRelationAdded = 'Internal relation added'; //to translate
-$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate
-$strRelationDeleted = 'Relation deleted'; //to translate
+$strHideShowAll = 'Zeige/Verstecke alles';
+$strHideShowNoRelation = 'Zeige/Verstecke Tabellen ohne Verknpfung';
+$strInternalRelationAdded = 'Interne Verknpfung hinzugefgt';
+$strInnoDBRelationAdded = 'InnoDB Verknpfung hinzugefgt';
+$strRelationDeleted = 'Verknpfung gelscht';
$strToSelectRelation = 'To select relation, click :'; //to translate
$strExportImportToScale = 'Export/Import to scale'; //to translate
-$strRecommended = 'recommended'; //to translate
-$strToFromPage = 'to/from page'; //to translate
+$strRecommended = 'empfohlen';
+$strToFromPage = 'nach/von Seite';
$strSelectReferencedKey = 'Select referenced key'; //to translate
-$strPleaseSelectPrimaryOrUniqueKey = 'Please select the primary key or a unique key'; //to translate
+$strPleaseSelectPrimaryOrUniqueKey = 'Bitte den PRIMARY KEY oder einen UNIQUE KEY whlen';
$strForeignKeyError = 'Error creating foreign key (check data types)'; //to translate
-$strHelp = 'Help'; //to translate
-$strCancel = 'Cancel'; //to translate
-$strDeleteRelation = 'Delete relation'; //to translate
-$strKnownExternalBug = 'The %s functionality is affected by a known bug, see %s'; //to translate
+$strHelp = 'Hilfe';
+$strCancel = 'Abbrechen';
+$strDeleteRelation = 'Verknpfung lschen';
+$strKnownExternalBug = 'Die Funktion "%s" wird durch einen bekannten Fehler beeintrchtigt, siehe %s';
$strStructureForView = 'Structure for view'; //to translate
$strStandInStructureForView = 'Stand-in structure for view'; //to translate
-$strToggleSmallBig = 'Toggle small/big'; //to translate
-$strIEUnsupported = 'Internet Explorer does not support this function.'; //to translate
-$strErrorRelationAdded = 'Error: Relation not added.'; //to translate
-$strErrorRelationExists = 'Error: relation already exists.'; //to translate
-$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
-$strSnapToGrid = 'Snap to grid'; //to translate
+$strToggleSmallBig = 'Wechseln klein/gro';
+$strIEUnsupported = 'Der Internet Explorer untersttzt diese Funktion nicht.';
+$strErrorRelationAdded = 'Fehler: Verknpfung nicht hinzugefgt.';
+$strErrorRelationExists = 'Fehler: Verknpfung existiert bereits.';
+$strErrorSaveTable = 'Fehler beim speichern der Koordinaten fr den Designer.';
+$strSnapToGrid = 'Am Gitter anordnen';
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'Die hochgeladene Datei ist grer als der in der php.ini in upload_max_filesize angegebene Wert.';
+$strUploadErrorFormSize = 'Die hochgeladene Datei ist grer als der in MAX_FILE_SIZE des HTML Formulars angegebene Wert.';
+$strUploadErrorPartial = 'Die Datei wurde teilweise bertragen.';
+$strUploadErrorNoTempDir = 'Kein gltiges Temporres Verzeichnis fr hochgeladene Dateien.';
+$strUploadErrorCantWrite = 'Datei konnte gespeichert werden.';
+$strUploadErrorExtension = 'Dateihochladen durch eine Erweiterung gestoppt.';
+$strUploadErrorUnknown = 'Unbekannter Fehler beim Dateihochladen.';
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Fehler beim verschieben der hochgeladenen Datei, siehe FAQ 1.11';
+$strViewName = 'VIEW Name';
?>
diff --git a/lang/german-iso-8859-15.inc.php b/lang/german-iso-8859-15.inc.php
index 0f9e5c5286..6fd0b18c5a 100644
--- a/lang/german-iso-8859-15.inc.php
+++ b/lang/german-iso-8859-15.inc.php
@@ -982,52 +982,62 @@ $strYes = 'Ja';
$strZeroRemovesTheLimit = 'Anmerkung: Der Wert 0 (null) entfernt die Beschrnkung.';
$strZip = 'Zip-komprimiert';
-$strPmaWiki = 'phpMyAdmin wiki'; //to translate
+$strPmaWiki = 'phpMyAdmin Wiki';
$strTransformation_text_plain__dateformat = '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.'; //to translate
-$strDocSQL = 'DocSQL'; //to translate
-$strDocSQLOptions = 'DocSQL options'; //to translate
-$strTableName = 'Table name'; //to translate
-$strTableIsEmpty = 'Table seems to be empty!'; //to translate
-$strDbIsEmpty = 'Database seems to be empty!'; //to translate
-$strShowingPhp = 'Showing as PHP code'; //to translate
-$strShowingSQL = 'Showing SQL query'; //to translate
-$strDesigner = 'Designer'; //to translate
-$strNumberOfTables = 'Number of tables'; //to translate
-$strCreateTable = 'Create table'; //to translate
-$strCreateRelation = 'Create relation'; //to translate
-$strSavePosition = 'Save position'; //to translate
-$strSelectForeignKey = 'Select Foreign Key'; //to translate
-$strHide = 'Hide'; //to translate
-$strShowHideLeftMenu = 'Show/Hide left menu'; //to translate
-$strReload = 'Reload'; //to translate
-$strSmallBigAll = 'Small/Big All'; //to translate
-$strImportExportCoords = 'Import/Export coordinates for PDF schema'; //to translate
-$strMoveMenu = 'Move Menu'; //to translate
+$strDocSQL = 'DocSQL';
+$strDocSQLOptions = 'DocSQL Optionen';
+$strTableName = 'Tabellenname';
+$strTableIsEmpty = 'Die Tabelle scheint leer zu sein!';
+$strDbIsEmpty = 'Die Datenbank scheint leer zu sein!';
+$strShowingPhp = 'Ansicht als PHP Code';
+$strShowingSQL = 'Ansicht als SQL Abfrage';
+$strDesigner = 'Designer';
+$strNumberOfTables = 'Anzhal Tabellen';
+$strCreateTable = 'Erzeuge Tabelle';
+$strCreateRelation = 'Erzeuge Verknpfung';
+$strSavePosition = 'Speichere Position';
+$strSelectForeignKey = 'Whle Fremdschlssel';
+$strHide = 'Verstecken';
+$strShowHideLeftMenu = 'Zeige/Verstecke linkes Men';
+$strReload = 'Neuladen';
+$strSmallBigAll = 'Alles klein/gro';
+$strImportExportCoords = 'Import/Export Koordinaten fr das PDF Schema';
+$strMoveMenu = 'Verschiebe Men';
$strAngularLinks = 'Angular links'; //to translate
$strDirectLinks = 'Direct links'; //to translate
-$strHideShowAll = 'Hide/Show all'; //to translate
-$strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate
-$strInternalRelationAdded = 'Internal relation added'; //to translate
-$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate
-$strRelationDeleted = 'Relation deleted'; //to translate
+$strHideShowAll = 'Zeige/Verstecke alles';
+$strHideShowNoRelation = 'Zeige/Verstecke Tabellen ohne Verknpfung';
+$strInternalRelationAdded = 'Interne Verknpfung hinzugefgt';
+$strInnoDBRelationAdded = 'InnoDB Verknpfung hinzugefgt';
+$strRelationDeleted = 'Verknpfung gelscht';
$strToSelectRelation = 'To select relation, click :'; //to translate
$strExportImportToScale = 'Export/Import to scale'; //to translate
-$strRecommended = 'recommended'; //to translate
-$strToFromPage = 'to/from page'; //to translate
+$strRecommended = 'empfohlen';
+$strToFromPage = 'nach/von Seite';
$strSelectReferencedKey = 'Select referenced key'; //to translate
-$strPleaseSelectPrimaryOrUniqueKey = 'Please select the primary key or a unique key'; //to translate
+$strPleaseSelectPrimaryOrUniqueKey = 'Bitte den PRIMARY KEY oder einen UNIQUE KEY whlen';
$strForeignKeyError = 'Error creating foreign key (check data types)'; //to translate
-$strHelp = 'Help'; //to translate
-$strCancel = 'Cancel'; //to translate
-$strDeleteRelation = 'Delete relation'; //to translate
-$strKnownExternalBug = 'The %s functionality is affected by a known bug, see %s'; //to translate
+$strHelp = 'Hilfe';
+$strCancel = 'Abbrechen';
+$strDeleteRelation = 'Verknpfung lschen';
+$strKnownExternalBug = 'Die Funktion "%s" wird durch einen bekannten Fehler beeintrchtigt, siehe %s';
$strStructureForView = 'Structure for view'; //to translate
$strStandInStructureForView = 'Stand-in structure for view'; //to translate
-$strToggleSmallBig = 'Toggle small/big'; //to translate
-$strIEUnsupported = 'Internet Explorer does not support this function.'; //to translate
-$strErrorRelationAdded = 'Error: Relation not added.'; //to translate
-$strErrorRelationExists = 'Error: relation already exists.'; //to translate
-$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
-$strSnapToGrid = 'Snap to grid'; //to translate
+$strToggleSmallBig = 'Wechseln klein/gro';
+$strIEUnsupported = 'Der Internet Explorer untersttzt diese Funktion nicht.';
+$strErrorRelationAdded = 'Fehler: Verknpfung nicht hinzugefgt.';
+$strErrorRelationExists = 'Fehler: Verknpfung existiert bereits.';
+$strErrorSaveTable = 'Fehler beim speichern der Koordinaten fr den Designer.';
+$strSnapToGrid = 'Am Gitter anordnen';
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'Die hochgeladene Datei ist grer als der in der php.ini in upload_max_filesize angegebene Wert.';
+$strUploadErrorFormSize = 'Die hochgeladene Datei ist grer als der in MAX_FILE_SIZE des HTML Formulars angegebene Wert.';
+$strUploadErrorPartial = 'Die Datei wurde teilweise bertragen.';
+$strUploadErrorNoTempDir = 'Kein gltiges Temporres Verzeichnis fr hochgeladene Dateien.';
+$strUploadErrorCantWrite = 'Datei konnte gespeichert werden.';
+$strUploadErrorExtension = 'Dateihochladen durch eine Erweiterung gestoppt.';
+$strUploadErrorUnknown = 'Unbekannter Fehler beim Dateihochladen.';
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Fehler beim verschieben der hochgeladenen Datei, siehe FAQ 1.11';
+$strViewName = 'VIEW Name';
?>
diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php
index 516d0f3d10..1de503b03a 100644
--- a/lang/german-utf-8.inc.php
+++ b/lang/german-utf-8.inc.php
@@ -983,52 +983,62 @@ $strYes = 'Ja';
$strZeroRemovesTheLimit = 'Anmerkung: Der Wert 0 (null) entfernt die Beschränkung.';
$strZip = 'Zip-komprimiert';
-$strPmaWiki = 'phpMyAdmin wiki'; //to translate
+$strPmaWiki = 'phpMyAdmin Wiki';
$strTransformation_text_plain__dateformat = '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.'; //to translate
-$strDocSQL = 'DocSQL'; //to translate
-$strDocSQLOptions = 'DocSQL options'; //to translate
-$strTableName = 'Table name'; //to translate
-$strTableIsEmpty = 'Table seems to be empty!'; //to translate
-$strDbIsEmpty = 'Database seems to be empty!'; //to translate
-$strShowingPhp = 'Showing as PHP code'; //to translate
-$strShowingSQL = 'Showing SQL query'; //to translate
-$strDesigner = 'Designer'; //to translate
-$strNumberOfTables = 'Number of tables'; //to translate
-$strCreateTable = 'Create table'; //to translate
-$strCreateRelation = 'Create relation'; //to translate
-$strSavePosition = 'Save position'; //to translate
-$strSelectForeignKey = 'Select Foreign Key'; //to translate
-$strHide = 'Hide'; //to translate
-$strShowHideLeftMenu = 'Show/Hide left menu'; //to translate
-$strReload = 'Reload'; //to translate
-$strSmallBigAll = 'Small/Big All'; //to translate
-$strImportExportCoords = 'Import/Export coordinates for PDF schema'; //to translate
-$strMoveMenu = 'Move Menu'; //to translate
+$strDocSQL = 'DocSQL';
+$strDocSQLOptions = 'DocSQL Optionen';
+$strTableName = 'Tabellenname';
+$strTableIsEmpty = 'Die Tabelle scheint leer zu sein!';
+$strDbIsEmpty = 'Die Datenbank scheint leer zu sein!';
+$strShowingPhp = 'Ansicht als PHP Code';
+$strShowingSQL = 'Ansicht als SQL Abfrage';
+$strDesigner = 'Designer';
+$strNumberOfTables = 'Anzhal Tabellen';
+$strCreateTable = 'Erzeuge Tabelle';
+$strCreateRelation = 'Erzeuge Verknüpfung';
+$strSavePosition = 'Speichere Position';
+$strSelectForeignKey = 'Wähle Fremdschlüssel';
+$strHide = 'Verstecken';
+$strShowHideLeftMenu = 'Zeige/Verstecke linkes Menü';
+$strReload = 'Neuladen';
+$strSmallBigAll = 'Alles klein/groß';
+$strImportExportCoords = 'Import/Export Koordinaten für das PDF Schema';
+$strMoveMenu = 'Verschiebe Menü';
$strAngularLinks = 'Angular links'; //to translate
$strDirectLinks = 'Direct links'; //to translate
-$strHideShowAll = 'Hide/Show all'; //to translate
-$strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate
-$strInternalRelationAdded = 'Internal relation added'; //to translate
-$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate
-$strRelationDeleted = 'Relation deleted'; //to translate
+$strHideShowAll = 'Zeige/Verstecke alles';
+$strHideShowNoRelation = 'Zeige/Verstecke Tabellen ohne Verknüpfung';
+$strInternalRelationAdded = 'Interne Verknüpfung hinzugefügt';
+$strInnoDBRelationAdded = 'InnoDB Verknüpfung hinzugefügt';
+$strRelationDeleted = 'Verknüpfung gelöscht';
$strToSelectRelation = 'To select relation, click :'; //to translate
$strExportImportToScale = 'Export/Import to scale'; //to translate
-$strRecommended = 'recommended'; //to translate
-$strToFromPage = 'to/from page'; //to translate
+$strRecommended = 'empfohlen';
+$strToFromPage = 'nach/von Seite';
$strSelectReferencedKey = 'Select referenced key'; //to translate
-$strPleaseSelectPrimaryOrUniqueKey = 'Please select the primary key or a unique key'; //to translate
+$strPleaseSelectPrimaryOrUniqueKey = 'Bitte den PRIMARY KEY oder einen UNIQUE KEY wählen';
$strForeignKeyError = 'Error creating foreign key (check data types)'; //to translate
-$strHelp = 'Help'; //to translate
-$strCancel = 'Cancel'; //to translate
-$strDeleteRelation = 'Delete relation'; //to translate
-$strKnownExternalBug = 'The %s functionality is affected by a known bug, see %s'; //to translate
+$strHelp = 'Hilfe';
+$strCancel = 'Abbrechen';
+$strDeleteRelation = 'Verknüpfung löschen';
+$strKnownExternalBug = 'Die Funktion "%s" wird durch einen bekannten Fehler beeinträchtigt, siehe %s';
$strStructureForView = 'Structure for view'; //to translate
$strStandInStructureForView = 'Stand-in structure for view'; //to translate
-$strToggleSmallBig = 'Toggle small/big'; //to translate
-$strIEUnsupported = 'Internet Explorer does not support this function.'; //to translate
-$strErrorRelationAdded = 'Error: Relation not added.'; //to translate
-$strErrorRelationExists = 'Error: relation already exists.'; //to translate
-$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
-$strSnapToGrid = 'Snap to grid'; //to translate
+$strToggleSmallBig = 'Wechseln klein/groß';
+$strIEUnsupported = 'Der Internet Explorer unterstützt diese Funktion nicht.';
+$strErrorRelationAdded = 'Fehler: Verknüpfung nicht hinzugefügt.';
+$strErrorRelationExists = 'Fehler: Verknüpfung existiert bereits.';
+$strErrorSaveTable = 'Fehler beim speichern der Koordinaten für den Designer.';
+$strSnapToGrid = 'Am Gitter anordnen';
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'Die hochgeladene Datei ist größer als der in der php.ini in upload_max_filesize angegebene Wert.';
+$strUploadErrorFormSize = 'Die hochgeladene Datei ist größer als der in MAX_FILE_SIZE des HTML Formulars angegebene Wert.';
+$strUploadErrorPartial = 'Die Datei wurde teilweise übertragen.';
+$strUploadErrorNoTempDir = 'Kein gültiges Temporäres Verzeichnis für hochgeladene Dateien.';
+$strUploadErrorCantWrite = 'Datei konnte gespeichert werden.';
+$strUploadErrorExtension = 'Dateihochladen durch eine Erweiterung gestoppt.';
+$strUploadErrorUnknown = 'Unbekannter Fehler beim Dateihochladen.';
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Fehler beim verschieben der hochgeladenen Datei, siehe FAQ 1.11';
+$strViewName = 'VIEW Name';
?>
diff --git a/lang/greek-iso-8859-7.inc.php b/lang/greek-iso-8859-7.inc.php
index ace6f3c5b2..52d9b230a7 100644
--- a/lang/greek-iso-8859-7.inc.php
+++ b/lang/greek-iso-8859-7.inc.php
@@ -1050,4 +1050,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php
index 4a78a48672..35584b8956 100644
--- a/lang/greek-utf-8.inc.php
+++ b/lang/greek-utf-8.inc.php
@@ -1051,4 +1051,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/hebrew-iso-8859-8-i.inc.php b/lang/hebrew-iso-8859-8-i.inc.php
index a1cee2316b..b54d4c7ca6 100644
--- a/lang/hebrew-iso-8859-8-i.inc.php
+++ b/lang/hebrew-iso-8859-8-i.inc.php
@@ -1045,4 +1045,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php
index 382cd3d743..a0b875acb8 100644
--- a/lang/hebrew-utf-8.inc.php
+++ b/lang/hebrew-utf-8.inc.php
@@ -1046,4 +1046,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php
index 514cefa66c..66abef39c5 100644
--- a/lang/hindi-utf-8.inc.php
+++ b/lang/hindi-utf-8.inc.php
@@ -1054,4 +1054,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/hungarian-iso-8859-2.inc.php b/lang/hungarian-iso-8859-2.inc.php
index ff293ebb07..b2a37698f9 100644
--- a/lang/hungarian-iso-8859-2.inc.php
+++ b/lang/hungarian-iso-8859-2.inc.php
@@ -1045,4 +1045,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php
index 688b57b291..31afa69ec9 100644
--- a/lang/hungarian-utf-8.inc.php
+++ b/lang/hungarian-utf-8.inc.php
@@ -1046,4 +1046,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/indonesian-iso-8859-1.inc.php b/lang/indonesian-iso-8859-1.inc.php
index d23db79624..cb09b12d92 100644
--- a/lang/indonesian-iso-8859-1.inc.php
+++ b/lang/indonesian-iso-8859-1.inc.php
@@ -1043,4 +1043,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php
index 11710174ea..b238b2e132 100644
--- a/lang/indonesian-utf-8.inc.php
+++ b/lang/indonesian-utf-8.inc.php
@@ -1044,4 +1044,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/italian-iso-8859-1.inc.php b/lang/italian-iso-8859-1.inc.php
index 05d2416aaf..97ec62a764 100644
--- a/lang/italian-iso-8859-1.inc.php
+++ b/lang/italian-iso-8859-1.inc.php
@@ -1027,4 +1027,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/italian-iso-8859-15.inc.php b/lang/italian-iso-8859-15.inc.php
index 4ab9146874..e52686fddb 100644
--- a/lang/italian-iso-8859-15.inc.php
+++ b/lang/italian-iso-8859-15.inc.php
@@ -1027,4 +1027,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php
index 8b424b0d11..05c1dff797 100644
--- a/lang/italian-utf-8.inc.php
+++ b/lang/italian-utf-8.inc.php
@@ -1028,4 +1028,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/japanese-euc.inc.php b/lang/japanese-euc.inc.php
index be968ee568..81e84bb1ee 100644
--- a/lang/japanese-euc.inc.php
+++ b/lang/japanese-euc.inc.php
@@ -23,161 +23,165 @@ $month = array('1 ','2 ','3 ','4 ','5 ','6 ','7 ','8 ','9 ','1
$datefmt = '%Y ǯ %B %d %H:%M';
$timespanfmt = '%s %s %s ʬ %s ';
-$strAbortedClients = 'Ǥޤ';
-$strAccessDenied = 'ϵݤޤ';
-$strAccessDeniedCreateConfig = '餯ͳϡեƤʤǤ%1$såȥåץץ%2$s ѤƤҤȤĺ뤳ȤǤޤ';
-$strAccessDeniedExplanation = 'MySQL Ф³褦Ȥޤ³䤵ޤconfig.inc.php Υۥȡ桼ӥѥɤMySQL ФδԤͿ줿Ȱפ뤫ǧƤ';
+$strAbortedClients = '';
+$strAccessDenied = 'ϵݤޤ';
+$strAccessDeniedCreateConfig = 'ե뤬ƤʤΤȻפޤ%1$såȥåץץ%2$s ѤեƤ';
+$strAccessDeniedExplanation = 'MySQL Ф³褦Ȥޤݤޤconfig.inc.php Υۥȡ桼̾ѥɤ MySQL ФδԤͿ줿Ȱפ뤫ǧƤ';
$strAction = '';
-$strAddAutoIncrement = 'AUTO_INCREMENTͤɲä';
+$strAddAutoIncrement = 'AUTO_INCREMENT ͤɲä';
$strAddClause = '%sɲ';
-$strAddConstraints = '¤ɲä';
+$strAddConstraints = 'ɲä';
$strAddDeleteColumn = 'եɲá';
$strAddDeleteRow = 'Ԥɲá';
$strAddFields = '%s ĤΥեɤɲä';
-$strAddHeaderComment = 'إåإॳȤɲ (\\n Dz)';
+$strAddHeaderComment = 'إå˥ॳȤɲ (\\n Dz)';
$strAddIntoComments = 'ɲå';
-$strAddNewField = 'եɤɲä';
-$strAddPrivilegesOnDb = 'ǡ١øɲä';
-$strAddPrivilegesOnTbl = 'ơ֥øɲä';
-$strAddSearchConditions = 'ʸɲäƤ("where"ʸ):';
-$strAddToIndex = ' &nbsp;%s&nbsp; 򥤥ǥåɲäޤ';
-$strAddUser = '桼ɲä';
-$strAddUserMessage = '桼ɲäޤ';
+$strAddNewField = 'եɤɲä';
+$strAddPrivilegesOnDb = 'ǡ١øɲ';
+$strAddPrivilegesOnTbl = 'ơ֥øɲ';
+$strAddSearchConditions = '("where")ɲäƤ:';
+$strAddToIndex = 'ǥå&nbsp;%s&nbsp; ɲäޤ';
+$strAddUser = '桼ɲä';
+$strAddUserMessage = '桼ɲäޤ';
$strAdministration = '';
-$strAffectedRows = 'ƶ줿Կ:';
-$strAfter = 'ꥫθ %s';
-$strAfterInsertBack = '';
-$strAfterInsertNewInsert = '쥳ɤɲä';
+$strAffectedRows = 'ѹ줿Կ:';
+$strAfterInsertBack = 'Υڡ';
+$strAfterInsertNewInsert = '쥳ɤɲä';
$strAfterInsertNext = 'ιԤԽ';
$strAfterInsertSame = 'Υڡ';
+$strAfter = 'ꥫθ %s';
$strAll = '';
-$strAllowInterrupt = '»֤ŤƤ뤳Ȥ򥹥ץȤΤ硢ݡȤؤγߤĤޤ礭ʥե򥤥ݡȤΤ褤ʤ⤷ޤ󤬡ϥȥ󥶥Ȥˤʤޤ';
+$strAllowInterrupt = '»֤᤯ʤäȤ˥ץ¦ǥݡȤǤǤ褦ˤޤ礭ʥե򥤥ݡȤˤǤȥ󥶥󤬲뤳Ȥ⤢ޤ';
$strAllTableSameWidth = '٤ƤΥơ֥Ʊɽޤ?';
-$strAlterOrderBy = 'ơ֥֤ξ';
+$strAlterOrderBy = 'ơ֥¤ӽ';
$strAnalyzeTable = 'ơ֥ʬϤ';
$strAnd = 'AND';
-$strAndThen = 'Ƥθ';
-$strAnIndex = 'ǥå%sɲäƤޤ';
+$strAndThen = '³';
+$strAngularLinks = 'ѥ';
+$strAnIndex = '%s ˥ǥåɲäޤ';
$strAny = '٤';
$strAnyHost = '٤ƤΥۥ';
$strAnyUser = '٤ƤΥ桼';
-$strApproximateCount = 'ᤤ⤷ޤFAQ 3.11 򻲾ȤƤ';
-$strAPrimaryKey = '祭 %s ɲäޤ';
+$strApproximateCount = 'ΤʿȤϸ¤ޤFAQ 3.11 ';
+$strAPrimaryKey = '%s ˼祭ɲäޤ';
$strArabic = 'ӥ';
$strArmenian = '˥';
$strAscending = '';
$strAtBeginningOfTable = 'ơ֥Ƭ';
$strAtEndOfTable = 'ơ֥';
-$strAttr = 'ɽ';
+$strAttr = '°';
$strAutodetect = 'ưΤ';
$strAutomaticLayout = 'ư쥤';
$strBack = '';
$strBaltic = 'ХȽ';
-$strBeginCut = 'ڤ곫';
-$strBeginRaw = 'RAW ';
-$strBinary = ' Хʥ ';
-$strBinaryDoNotEdit = ' Хʥ - Ǥޤ';
+$strBeginCut = 'BEGIN CUT';
+$strBeginRaw = 'BEGIN RAW';
+$strBinaryDoNotEdit = ' Хʥ - ԽԲ';
+$strBinary = ' Хʥ';
$strBinaryLog = 'Хʥ';
-$strBinLogEventType = '٥ȥ';
+$strBinLogEventType = '٥ȼ';
$strBinLogInfo = '';
-$strBinLogName = '';
+$strBinLogName = '̾';
$strBinLogOriginalPosition = 'ΰ';
$strBinLogPosition = '';
$strBinLogServerId = ' ID';
-$strBookmarkAllUsers = '٤ƤΥ桼Υ֥åޡ򥢥Ǥ';
+$strBookmarkAllUsers = '٤ƤΥ桼Υ֥åޡѤǤ褦ˤ';
$strBookmarkCreated = '֥åޡ %s ޤ';
-$strBookmarkDeleted = '֥åޡ˺ޤ';
+$strBookmarkDeleted = '֥åޡޤ';
$strBookmarkLabel = '٥';
$strBookmarkQuery = '֥åޡƤ SQL';
-$strBookmarkReplace = '¸ߤƱΥ֥åޡִ';
-$strBookmarkThis = 'SQL ֥åޡ';
-$strBookmarkView = 'ɽΤ';
-$strBrowseDistinctValues = '̤ͤɽ';
+$strBookmarkReplace = 'Ʊ̾Υ֥åޡϺؤ';
+$strBookmarkThis = ' SQL ֥åޡ';
+$strBookmarkView = 'ɽΤ'; // XXX ӥ塼ѡ
+$strBrowseDistinctValues = 'ʣƤͤɽʤ'; // XXX
$strBrowse = 'ɽ';
-$strBrowseForeignValues = 'ɽ';
+$strBrowseForeignValues = 'ȤƤͤɽ';
+$strBufferPoolActivity = 'ХåեסѾ';
$strBufferPool = 'Хåեס';
-$strBufferPoolActivity = 'Хåեסγ';
$strBufferPoolUsage = 'Хåեסλ';
-$strBufferReadMisses = 'ɤ߹ߥߥ';
-$strBufferReadMissesInPercent = '% ɤ߹ߥߥ';
-$strBufferWriteWaits = '񤭹Ԥ';
-$strBufferWriteWaitsInPercent = '% ν񤭹Ԥ';
+$strBufferReadMisses = 'ɤ߹ߥߥ';
+$strBufferReadMissesInPercent = 'ɤ߹ߥߥ()';
+$strBufferWriteWaitsInPercent = '񤭹Ԥ()';
+$strBufferWriteWaits = '񤭹Ԥ';
$strBulgarian = '֥륬ꥢ';
-$strBusyPages = 'ӥʥڡ';
-$strBzError = ' php С Bz2 ĥƤΤ phpMyAdmin ̥פǤޤphpMyAdmin Υե졼ե <code>$cfg[\'BZipDump\']</code> <code>FALSE</code>ꤷƤBz2 ̵ǽȤˤ php ΥС夲Ʋphp Х %s ܺ١';
-$strBzip = '"bzip "';
+$strBusyPages = 'ӥʥڡ'; // XXX
+$strBzError = 'ΥС PHP Bz2 ĥƤΤǥפ򰵽̤ǤޤphpMyAdmin ե <code>$cfg[\'BZipDump\']</code> <code>FALSE</code>ꤹ뤳Ȥ򶯤侩ޤBz2 ̵ǽȤ PHP ΥС夲ƲPHP ΥХݡ %s ⤴';
+$strBzip = '"bzip "';
$strCalendar = '';
+$strCancel = '󥻥';
$strCanNotLoadExportPlugins = 'ݡȥץ饰ɤǤޤ󥹥ȡ뤵Ƥ뤫ǧƤ!';
-$strCanNotLoadImportPlugins = 'ݡȥץ饰ɤ߹ޤ󡣥󥹥ȡǧƤ!';
+$strCanNotLoadImportPlugins = 'ݡȥץ饰ɤǤޤ󥹥ȡ뤵Ƥ뤫ǧƤ!';
$strCannotLogin = 'MySQL Ф˥Ǥޤ';
-$strCantLoad = 'ʤĥҤΥեǤ,<br />PHP åƤ';
-$strCantLoadRecodeIconv = 'ʸåѴԤˤȤ߹ޤƤʤ iconv ޤ GNU recode γĥɬפǤphp ˡγĥԤäƤphpMyAdmin ǤʸåѴ򤷤ʤˤƤ';
-$strCantRenameIdxToPrimary = 'ǥå PRIMARY ѹǤޤ';
-$strCantUseRecodeIconv = 'iconvlibiconvrecode_string ΤδؿѤǤޤphp åƤ';
+$strCantLoad = '[a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] ĥɤǤޤPHP ǧƤ';
+$strCantLoadRecodeIconv = 'ʸåȤѴɬפ iconv ʤ GNU recode ĥɤǤޤPHP ¦Ǥγĥͭˤ뤫phpMyAdmin ¦ʸåȤѴ̵ˤƤ';
+$strCantRenameIdxToPrimary = 'ǥå̾ PRIMARY ѹ뤳ȤϤǤޤ!';
+$strCantUseRecodeIconv = 'ɬפʳĥϥɤƤ褦Ǥiconv libiconvrecode_string δؿѤǤޤPHP ǧƤ';
$strCardinality = 'դͤο';
-$strCaseInsensitive = 'ѻ羮̤ʤ';
-$strCaseSensitive = 'ѻ羮̤';
+$strCaseInsensitive = 'ʸʸ̤ʤ';
+$strCaseSensitive = 'ʸʸ̤';
$strCentralEuropean = '衼åѸ';
+$strChangeCopyMode = 'ƱøĿ桼';
+$strChangeCopyModeCopy = 'Υ桼Ĥ';
+$strChangeCopyModeDeleteAndReload = '桼ơ֥뤫鸵Υ桼øɤ';
+$strChangeCopyModeJustDelete = '桼ơ֥뤫鸵Υ桼';
+$strChangeCopyModeRevoke = 'Υ桼ø򤹤٤̵ˤƤ';
+$strChangeCopyUser = 'ѹ / 桼ʣ';
+$strChangeDisplay = 'ɽեɤ򤷤Ƥ';
$strChange = 'ѹ';
-$strChangeCopyMode = 'ƱøäΥ桼...';
-$strChangeCopyModeCopy = '... ŤΤݻ';
-$strChangeCopyModeDeleteAndReload = ' ... 桼ơ֥뤫ŤΤø˺Ƥӥɤ';
-$strChangeCopyModeJustDelete = ' ... 桼ơ֥뤫ŤΤ';
-$strChangeCopyModeRevoke = ' ... ŤΤͭø򤹤٤̵ˤǺ';
-$strChangeCopyUser = 'ѹ / 桼ԡ';
-$strChangeDisplay = 'ɽեɤDz';
$strChangePassword = 'ѥɤѹ';
$strCharset = 'ʸå';
$strCharsetOfFile = 'եʸå:';
-$strCharsets = 'ʸ';
$strCharsetsAndCollations = 'ʸåȤȾȹ';
+$strCharsets = 'ʸå';
$strCheckAll = '٤ƥå';
-$strCheckOverhead = 'Сإåɤθ򤹤';
-$strCheckPrivs = 'øΥå򤹤';
-$strCheckPrivsLong = 'ǡ١ &quot;%s&quot; øå';
+$strCheckOverhead = 'СإåɤΤơ֥ǧƤ'; // XXX
+$strCheckPrivs = 'øå';
+$strCheckPrivsLong = 'ǡ١ &quot;%s&quot; øǧƤ'; // XXX
$strCheckTable = 'ơ֥å';
-$strChoosePage = 'Խڡ򤷤Ƥ';
-$strColComFeat = '󥳥ɽǽ';
+$strChoosePage = 'Խڡ򤷤Ƥ';
+$strColComFeat = '󥳥ɽǽ'; // XXX
$strCollation = 'ȹ';
-$strColumnNames = '()';
-$strColumnPrivileges = 'ø';
+$strColumnNames = '̾';
+$strColumnPrivileges = 'Υ˸ͭø';
$strCommand = 'ޥ';
$strComments = '';
-$strCommentsForTable = 'COMMENTS FOR TABLE';
+$strCommentsForTable = 'COMMENTS FOR TABLE'; // XXX
$strCompatibleHashing = 'MySQL&nbsp;4.0 ߴ';
$strCompleteInserts = ' INSERT ʸ';
$strCompression = '';
-$strCompressionWillBeDetected = 'ݡȤ줿ե밵̤ϡưŪ˸ΤǤ礦: %s';
-$strConfigDefaultFileError = 'ǥեɤ߹ޤǤ: "%1$s"';
-$strConfigFileError = 'phpMyAdmin եɤ߹ळȤǤޤ! <br />ʸˡ顼ȯե뤬Ĥޤ<br />Υ󥯤եľɤ߹ǡPHP Υ顼åǧƤ¿ξ硢ڤʸ䥻ߥ˺Ƥޤ<br />⤷Υڡ줿餹٤ƤޤԤäƤޤ';
-$strConfigureTableCoord = 'ơ֥%sơ֥ĴƤ';
-$strConnectionError = '³Ǥޤ: ̵Ǥ';
+$strCompressionWillBeDetected = 'ݡȤեΰˡϼ椫鼫ưФޤ: %s';
+$strConfigDefaultFileError = 'ǥեȤɤ߹ޤǤ: "%1$s"';
+$strConfigFileError = 'phpMyAdmin եɤ߹ޤǤ! <br />ʸˡ顼ȯե뤬Ĥޤ<br />Υ󥯤ľեɤ߹ PHP Υ顼åǧƤƤξϤɤ˰䥻ߥȴޤ<br />ΥڡɽʤǤ';
+$strConfigureTableCoord = 'ơ֥ %s κɸꤷƤ';
+$strConnectionError = '³Ǥޤ: ̵꤬Ǥ';
$strConnections = '³';
-$strConstraintsForDumped = '׺ѥơ֥';
-$strConstraintsForTable = 'ơ֥';
-$strCookiesRequired = 'ϥåĤƤɬפޤ';
-$strCopy = 'ԡ';
-$strCopyDatabaseOK = 'ǡ١%sϡ%s˥ԡޤ';
+$strConstraintsForDumped = 'פơ֥';
+$strConstraintsForTable = 'ơ֥';
+$strCookiesRequired = 'åͭˤƤ';
+$strCopy = 'ԡ';
+$strCopyDatabaseOK = 'ǡ١ %s %s ˥ԡޤ';
$strCopyTable = 'ơ֥(database<b>.</b>table)˥ԡ:';
-$strCopyTableOK = 'ơ֥%s%s˥ԡޤ';
-$strCopyTableSameNames = 'Ʊơ֥˥ԡǤޤ!';
-$strCouldNotKill = 'phpMyAdmin å %s λ뤳ȤǤޤǤ餯˽λƤޤ';
-$strCreate = '';
-$strCreateDatabaseBeforeCopying = 'ԡˡCREATE DATABASE';
-$strCreateIndex = '&nbsp;%s&nbsp; Υǥå';
-$strCreateIndexTopic = 'ǥå';
+$strCopyTableOK = 'ơ֥ %s %s ˥ԡޤ';
+$strCopyTableSameNames = 'Ʊơ֥ˤϥԡǤޤ!';
+$strCouldNotKill = 'å %s νλ˼ԤޤǤĤƤ褦Ǥ';
+$strCreateDatabaseBeforeCopying = 'ԡ CREATE DATABASE ';
+$strCreateIndex = '&nbsp;%s&nbsp; Υ˥ǥå';
+$strCreateIndexTopic = 'ǥå';
$strCreateNewDatabase = 'ǡ١';
-$strCreateNewTable = 'ǡ١%s˥ơ֥򿷵';
-$strCreatePage = 'ڡ';
-$strCreatePdfFeat = 'PDF ǽ';
+$strCreateNewTable = 'ǡ١ %s ˿ơ֥';
+$strCreate = '';
+$strCreatePage = 'ڡ';
+$strCreatePdfFeat = 'PDF κ';
+$strCreateRelation = '졼';
+$strCreateTable = 'ơ֥';
$strCreateUserDatabase = '桼ѥǡ١';
-$strCreateUserDatabaseName = 'ƱΥǡ١Ƥ٤ƤøͿޤ';
+$strCreateUserDatabaseName = 'Ʊ̾Υǡ١Ƥ٤ƤøͿ';
$strCreateUserDatabaseNone = 'ʤ';
-$strCreateUserDatabaseWildcard = '磻ɥɤǻꤵ줿ǡ١ˤ٤ƤøͿޤ(桼_%)';
-$strCreationDates = '//դɲä';
-$strCriteria = 'ʹߴ';
+$strCreateUserDatabaseWildcard = '磻ɥ(桼̾_%)˳ǡ١ˤ٤ƤøͿ';
+$strCreationDates = '//';
+$strCriteria = '';
$strCroatian = '';
$strCSV = 'CSV';
$strCSVImportOptions = 'CSV ץ';
@@ -187,128 +191,140 @@ $strCzech = '';
$strCzechSlovak = 'ΥХ';
$strDanish = 'ǥޡ';
-$strData = 'ǡ';
$strDatabase = 'ǡ١';
-$strDatabaseEmpty = 'ǡ١Ǥ!';
+$strDatabaseEmpty = 'ǡ١̾Ǥ!';
$strDatabaseExportOptions = 'ǡ١ݡȥץ';
-$strDatabaseHasBeenDropped = 'ǡ١%s˺ޤ';
-$strDatabaseNoTable = 'Υǡ١ϥơ֥ޤǤޤ!';
+$strDatabaseHasBeenDropped = 'ǡ١ %s ޤ';
+$strDatabaseNoTable = 'Υǡ١ˤϥơ֥뤬ޤ!';
$strDatabases = 'ǡ١';
-$strDatabasesDropped = 'ǡ١%sϺޤ';
+$strDatabasesDropped = 'ǡ١ %s ˺ޤ';
$strDatabasesStats = 'ǡ١';
$strDatabasesStatsDisable = 'פ̵ˤ';
-$strDatabasesStatsEnable = 'פĤ';
-$strDatabasesStatsHeavyTraffic = ': ǡ١פĤ MySQL WEBФδ֤ǽŤȥեåȯ뤫⤷ޤ';
+$strDatabasesStatsEnable = 'פͭˤ';
+$strDatabasesStatsHeavyTraffic = ': ǡ١פͭˤȥ֥Ф MySQL Фδ֤̤̿뤳Ȥޤ';
+$strData = 'ǡ';
$strDataDict = 'ǡ';
$strDataOnly = 'ǡΤ';
-$strDataPages = 'ǡޤڡ';
-$strDBComment = 'ǡ١Υ: ';
-$strDBCopy = 'ǥǡ١򥳥ԡ';
-$strDbPrivileges = 'ǡ١ ø';
-$strDBRename = '˥ǡ١ѹ';
-$strDbSpecific = 'ǡ١';
-$strDefault = '';
-$strDefaultEngine = '%s ϡ MySQL ФΥǥեȥȥ졼󥸥Ǥ';
-$strDefaultValueHelp = 'ǥեͤΤˡХåå奨פʤ 1 ĤͤƲ, ΥեޥåȤ: a';
+$strDataPages = 'ǡޤޤƤڡ';
+$strDBComment = 'ǡ١Υ:';
+$strDBCopy = 'ǡ١Υԡ';
+$strDbIsEmpty = 'ǡ١Τ褦Ǥ!';
+$strDbPrivileges = 'ǡ١˸ͭø';
+$strDBRename = 'ǡ١̾';
+$strDbSpecific = 'ǡ١ͭ';
+$strDefault = 'ǥե';
+$strDefaultEngine = '%s Ϥ MySQL ФΥǥեȥȥ졼󥸥Ǥ';
+$strDefaultValueHelp = 'ǥեͤˤϤҤȤĤͤΤϤƤХååˤ륨פޤ뤳ȤϤǤޤ: a';
$strDefragment = 'ơ֥Υǥե饰';
$strDelayedInserts = 'ٱ䥤󥵡ȤѤ';
-$strDelete = '';
$strDeleteAndFlush = '桼øɤ';
-$strDeleteAndFlushDescr = 'ϥꥢǤøɤΤǾ֤ޤ';
-$strDeleted = '򤷤ޤ';
-$strDeletedRows = '줿Կ:';
-$strDeleteNoUsersSelected = '桼򤷤Ƥޤ!';
+$strDeleteAndFlushDescr = 'ϤäȤ⥯꡼ˡǤøΥɤ˻֤뤳Ȥޤ';
+$strDeleted = 'Ԥޤ';
+$strDeletedRows = 'Կ:';
+$strDeleteNoUsersSelected = '桼򤵤Ƥޤ!';
+$strDelete = '';
+$strDeleteRelation = '졼';
$strDeleting = '%s Ǥ';
$strDelimiter = 'ǥߥ';
-$strDelOld = 'ߤΥڡϡϤ¸ߤʤơ֥˻ȤޤλȤǤ?';
+$strDelOld = 'Υڡˤ¸ߤʤơ֥ؤλȤޤλȤޤ?';
$strDescending = '߽';
$strDescription = '';
+$strDesigner = 'ǥ';
+$strDesignerHelpDisplayField = 'ɽեɤϥԥ󥯿ɽޤɽɽڤؤϡɽեɤ򤹤פȤ򥯥åƤŬڤʥե̾򥯥å';
$strDictionary = '';
-$strDirtyPages = 'ʥڡ';
+$strDirectLinks = 'ľ';
+$strDirtyPages = 'ƥڡ';
$strDisabled = '̵';
-$strDisableForeignChecks = 'θ̵ˤ';
-$strDisplayFeat = 'ơ֥ɽǽ';
-$strDisplayOrder = 'ɽ:';
-$strDisplayPDF = 'PDF ޤɽ򤹤';
-$strDoAQuery = '"QUERY"¹ (磻ɥ: "%")';
+$strDisableForeignChecks = 'Υå̵ˤ';
+$strDisplayFeat = 'ɽǽ';
+$strDisplayOrder = 'ɽ:';
+$strDisplayPDF = 'PDF ޤɽ';
+$strDoAQuery = '"query by example"¹ (磻ɥ: "%")';
+$strDocSQL = 'DocSQL';
+$strDocSQLOptions = 'DocSQL ץ';
$strDocu = 'ɥ';
-$strDoYouReally = '˼¹ԤƤɤǤ?:';
+$strDoYouReally = '˼¹Ԥޤ?';
+$strDropDatabaseStrongWarning = 'ǡ١˺褦ȤƤޤ!';
$strDrop = '';
-$strDropDatabaseStrongWarning = '˥ǡ١˲Ǥ礦!';
-$strDropUsersDb = '桼Ʊĥǡ١';
-$strDumpingData = 'ơ֥Υץǡ';
-$strDumpSaved = 'פե %s ¸ޤ';
-$strDumpXRows = '%s פޤ %s Ǥ';
-$strDynamic = 'ʥߥå';
+$strDropUsersDb = '桼Ʊ̾Υǡ١';
+$strDumpingData = 'ơ֥ΥǡפƤޤ';
+$strDumpSaved = 'פե %s ¸ޤ';
+$strDumpXRows = '%s Ԥפޤ(Ϲ: %s)';
+$strDynamic = 'ưŪ';
-$strEdit = '';
+$strEdit = 'Խ';
$strEditPDFPages = 'PDF ڡԽ';
-$strEditPrivileges = 'ø';
-$strEffective = '¸';
+$strEditPrivileges = 'øԽ';
+$strEffective = '¸'; // XXX
$strEmpty = 'ˤ';
-$strEmptyResultSet = 'MySQL ֤ͤޤ (㤨йԤä)';
+$strEmptyResultSet = '֤ͤǤ(Կ0)';
$strEnabled = 'ͭ';
-$strEncloseInTransaction = 'ȥ󥶥ǥݡȤϤ';
+$strEncloseInTransaction = 'ݡȤȥ󥶥ǰϤ';
$strEncto = '󥳡ǥ󥰤Ѵ'; // encoding convert
+$strEndCut = 'END CUT';
$strEnd = 'Ǹ';
-$strEndCut = 'ڤ꽪λ';
-$strEndRaw = 'RAW λ';
-$strEngineAvailable = '%s ϡ MySQL ФѲǽǤ';
-$strEngineDisabled = '%s ϡ MySQL ФǤ̵ˤƤޤ';
+$strEndRaw = 'END RAW';
+$strEngineAvailable = '%s ͭˤʤäƤޤ';
+$strEngineDisabled = '%s ̵ˤʤäƤޤ';
$strEngines = '󥸥';
-$strEngineUnsupported = ' MySQL Ф %s ȥ졼󥸥򥵥ݡȤƤޤ';
+$strEngineUnsupported = ' MySQL Ф %s ȥ졼󥸥򥵥ݡȤƤޤ';
$strEnglish = 'Ѹ';
-$strEnglishPrivileges = ' : MySQLøϱѸɽƤޤ';
-$strError = '顼';
+$strEnglishPrivileges = ': MySQL ø̾ϱѸɽޤ';
$strErrorInZipFile = 'ZIP ֤˥顼ޤ:';
-$strErrorRenamingTable = 'ơ֥%1$s%2$s˥͡हȤ˥顼ȯޤ';
-$strEscapeWildcards = '磻ɥɡ_ӡ%ʸ̤˻ѤȤϡ\ǥפƤ';
-$strEsperanto = 'ݸ';
+$strErrorRelationAdded = '顼: 졼ɲäǤޤǤ';
+$strErrorRelationExists = '顼: 졼ϤǤ¸ߤƤޤ';
+$strErrorRenamingTable = 'ơ֥ %1$s %2$s ˥͡हȤ˥顼ȯޤ';
+$strErrorSaveTable = 'ǥʤκɸ¸Ȥ˥顼ȯޤ';
+$strError = '顼';
+$strEscapeWildcards = '_ % Ȥ磻ɥɤʸȤƻѤȤ \ ǥפƤ';
+$strEsperanto = 'ڥȸ';
$strEstonian = 'ȥ˥';
-$strExcelEdition = 'Excel μ';
-$strExcelOptions = 'Excel ץ';
-$strExecuteBookmarked = '֥åޡ줿Ȳ¹Ԥ';
-$strExplain = 'SQL ʬϤ';
+$strExcelEdition = 'Excel Υǥ';
+$strExcelOptions = 'Excel Υץ';
+$strExecuteBookmarked = '֥åޡ줿¹Ԥ';
+$strExplain = 'EXPLAIN dzǧ';
+$strExportImportToScale = 'Ψˤ碌ݡ/ݡ';
+$strExportMustBeFile = 'ηΥݡȤϥե¸ɬפޤ!';
$strExport = 'ݡ';
-$strExportMustBeFile = 'Υݡȷϥե¸ɬפޤ!';
-$strExtendedInserts = 'ĥ INSERT ʸ';
+$strExtendedInserts = 'Ĺ INSERT ʸ';
$strExtra = '¾';
-$strFailedAttempts = 'ߤϼԤޤ';
+$strFailedAttempts = 'Բ';
+$strFieldHasBeenDropped = 'ե %s ޤ';
$strField = 'ե';
-$strFieldHasBeenDropped = 'ե %s ˺ޤ';
-$strFields = 'ե';
$strFieldsEmpty = ' եɿǤ ';
$strFieldsEnclosedBy = 'եɰϤߵ';
$strFieldsEscapedBy = 'եɤΥ׵';
+$strFields = 'ե';
$strFieldsTerminatedBy = 'եɶڤ국';
-$strFileAlreadyExists = 'ե%sϴ˥Ф¸ߤޤեѹ뤫񤭥ץǧƤ';
-$strFileCouldNotBeRead = 'եɤޤ';
-$strFileNameTemplate = 'եΥƥץ졼';
-$strFileNameTemplateDescription = 'ͤ %1$sstrftime%2$s ѤơȽǤޤäơֽ񼰤ʸѤ뤳ȤǤޤ˼ʸִǤ礦: %3$sΤޤޤ¾ΥƥȤϰݻǤ礦';
-$strFileNameTemplateDescriptionDatabase = 'ǡ١';
-$strFileNameTemplateDescriptionServer = '';
-$strFileNameTemplateDescriptionTable = 'ơ֥';
-$strFileNameTemplateRemember = 'ƥץ졼ȤФ';
-$strFileToImport = 'ե򥤥ݡȤ';
+$strFileAlreadyExists = 'о˴¸Υե %s ޤե̾ѹ뤫񤭥ץͭˤƤ';
+$strFileCouldNotBeRead = 'եɤ߹ޤǤ';
+$strFileNameTemplateDescription = 'Υƥץ졼Ȥ %1$sstrftime%2$s ȤäƲᤵޤΤᡢ֤νʸѤǤޤޤѴԤޤ%3$s ʳΥƥȤϽޤ';
+$strFileNameTemplateDescriptionDatabase = 'ǡ١̾';
+$strFileNameTemplateDescriptionServer = '̾';
+$strFileNameTemplateDescriptionTable = 'ơ֥̾';
+$strFileNameTemplate = 'ե̾Υƥץ졼';
+$strFileNameTemplateRemember = 'ƥץ졼Ȥ򵭲';
+$strFileToImport = 'ݡȤե';
$strFixed = '';
-$strFlushPrivilegesNote = ': phpMyAdmin MySQL øơ֥뤫ľܤ˥桼øޤ⤷ޥ˥奢øѹƤȡΥơ֥ƤȤϰۤʤ뤫⤷ޤ󡣤ξ硢³ޤ %s ø %s 򤹤ɬפޤ';
-$strFlushQueryCache = 'Ȳ񥭥åեå夹';
-$strFlushTable = 'ơ֥Υåˤ("FLUSH")';
+$strFlushPrivilegesNote = ': phpMyAdmin MySQL øơ֥뤫ľܥ桼øޤȤø򹹿 phpMyAdmin ѤƤơ֥ƤȥФøƤפʤʤ뤳ȤޤΤǡȤ³ %sø%s 򤷤Ƥ';
+$strFlushQueryCache = 'ꥭåեå夹';
+$strFlushTable = 'ơ֥եå夹("FLUSH")';
$strFlushTables = '٤ƤΥơ֥եå夹(Ĥ)';
$strFontSize = 'եȥ';
+$strForeignKeyError = '˥顼ȯޤ (ǡǧƤ)';
$strFormat = 'եޥå';
-$strFormEmpty = 'եǤͤޤǤ';
-$strFreePages = 'ե꡼ʥڡ';
+$strFormEmpty = 'եϤƤʤͤޤ!';
+$strFreePages = 'ե꡼ڡ';
$strFullText = 'ʸ';
-$strFunction = 'ؿ';
$strFunctions = 'ؿ';
+$strFunction = 'ؿ';
$strGenBy = 'Ķ';
-$strGeneralRelationFeat = '졼ǽ';
+$strGeneralRelationFeat = 'Ūʥ졼ǽ';
$strGenerate = '';
$strGeneratePassword = 'ѥɤ';
-$strGenTime = 'λ';
+$strGenTime = '';
$strGeorgian = '른';
$strGerman = 'ɥĸ';
$strGlobal = 'Х';
@@ -317,18 +333,22 @@ $strGlobalValue = 'Х';
$strGo = '¹Ԥ';
$strGrantOption = '°Ѿ';
$strGreek = 'ꥷ';
-$strGzip = '"gzip "';
+$strGzip = '"gzip "';
-$strHandler = '';
-$strHasBeenAltered = 'ѹޤ';
-$strHasBeenCreated = 'ޤ';
-$strHaveToShow = 'ɽ뤿ˡʤƤҤȤĤΥ򤷤ʤФʤޤ';
+$strHandler = 'ϥɥ';
+$strHasBeenAltered = 'ѹޤ';
+$strHasBeenCreated = 'ޤ';
+$strHaveToShow = 'ҤȤĤɽ륫򤷤Ƥ';
$strHebrew = 'إ֥饤';
-$strHexForBinary = 'Хʥեɤ 16 ʿѤ';
+$strHelp = 'إ';
+$strHexForBinary = 'ХʥեɤǤ 16 ʿѤ';
+$strHide = '';
+$strHideShowAll = '٤Ʊ/ɽ';
+$strHideShowNoRelation = '졼Τʤơ֥򱣤/ɽ';
$strHome = 'ᥤڡ';
-$strHomepageOfficial = 'phpMyAdmin ۡ';
+$strHomepageOfficial = 'phpMyAdmin Υե륵';
+$strHostEmpty = 'ۥ̾Ǥ!';
$strHost = 'ۥ';
-$strHostEmpty = 'ۥȤ϶Ǥ!';
$strHTMLExcel = 'Microsoft Excel 2000';
$strHTMLExcelOptions = 'Microsoft Excel 2000 ݡȥץ';
$strHTMLWord = 'Microsoft Word 2000';
@@ -338,642 +358,670 @@ $strHungarian = 'ϥ󥬥꡼';
$strIcelandic = 'ɸ';
$strId = 'ID';
$strIdxFulltext = 'ʸ';
+$strIEUnsupported = 'Internet Explorer ǤϤεǽѤǤޤ';
+$strIgnoreDuplicates = 'ʣƤԤ̵뤹';
$strIgnore = '̵';
-$strIgnoreDuplicates = 'Ԥʣ̵뤹';
-$strIgnoreInserts = 'INSERT IGNOREѤ';
-$strImport = 'ݡ';
+$strIgnoreInserts = 'INSERT IGNORE Ѥ';
+$strImportExportCoords = 'PDF ޤκɸ򥤥ݡ/ݡȤ';
$strImportFiles = 'ݡȥե';
-$strImportFormat = 'ݡȺѥեν';
-$strImportSuccessfullyFinished = 'ݡȤޤ%d ĤξȲ¹Ԥޤ';
-$strIndex = 'ǥå';
+$strImportFormat = 'ݡȤեη';
+$strImport = 'ݡ';
+$strImportSuccessfullyFinished = 'ݡȤェλޤ%d ĤΥ¹Ԥޤ';
$strIndexes = 'ǥå';
-$strIndexHasBeenDropped = 'ǥå %s ޤ';
-$strIndexName = 'ǥå&nbsp;:';
-$strIndexType = 'ǥåμ&nbsp;:';
-$strIndexWarningMultiple = '1 Ĥۤ INDEX `%s` Ѥ˺ޤ';
-$strIndexWarningPrimary = ' `%s` PRIMARY INDEX ΥξȤꤹΤϤ褷ޤ礦';
-$strIndexWarningTable = 'ơ֥ `%s` Υǥå˴ؤǤ';
-$strIndexWarningUnique = ' `%s` UNIQUE INDEX ΥξȤꤹΤϤ褷ޤ礦';
-$strInnoDBAutoextendIncrementDesc = ' 줬äѤˤʤˡưĥơ֥륹ڡΥĥ뤿ʬ̤Ǥ';
-$strInnoDBAutoextendIncrement = 'ưĥɲ';
-$strInnoDBBufferPoolSize = 'Хåեѥ';
-$strInnoDBBufferPoolSizeDesc = 'InnoDB åǡȤΥơ֥Υǥå˻ȤХåեΥǤ';
+$strIndexHasBeenDropped = 'ǥå %s ޤ';
+$strIndexName = 'ǥå̾:';
+$strIndex = 'ǥå';
+$strIndexType = 'ǥåμ:';
+$strIndexWarningMultiple = '%s Ȥ `%s` ʣޤ';
+$strIndexWarningPrimary = ' `%s` PRIMARY INDEX ξꤹ뤳ȤϤǤޤ';
+$strIndexWarningTable = 'ơ֥ `%s` Υǥå꤬ޤ';
+$strIndexWarningUnique = ' `%s` UNIQUE INDEX ξꤹ뤳ȤϤǤޤ';
+$strInnoDBAutoextendIncrementDesc = 'ڡäѤˤʤäȤ˼ưŪ˥ơ֥ĥɲäơ֥륵';
+$strInnoDBAutoextendIncrement = 'ưĥɲäơ֥륵';
+$strInnoDBBufferPoolSize = 'ХåեסΥ';
+$strInnoDBBufferPoolSizeDesc = 'InnoDB ơ֥Υǡ䥤ǥå򥭥å夹Τ˻ȤХåե';
$strInnoDBDataFilePath = 'ǡե';
-$strInnoDBDataHomeDir = 'ǡۡǥ쥯ȥ';
-$strInnoDBDataHomeDirDesc = '٤Ƥ InnoDB ǡեѤΥǥ쥯ȥѥζʬǤ';
+$strInnoDBDataHomeDir = 'ǡΥۡǥ쥯ȥ';
+$strInnoDBDataHomeDirDesc = '٤Ƥ InnoDB ǡե˶̤ǥ쥯ȥѥ';
$strInnoDBPages = 'ڡ';
+$strInnoDBRelationAdded = 'InnoDB 졼ɲäޤ';
$strInnodbStat = 'InnoDB ơ';
-$strInsecureMySQL = 'ʤΥե졼ե꤬ MySQL ǥեȤøȤˤʤäƤޤ (root 桼ǥѥɤʤ) MySQL Ф⤳ΥǥեưƤΤǡԤФ̵ǤΥƥۡɬĤƤ';
-$strInsertAsNewRow = 'ԤȤɲä';
-$strInsertedRowId = '󥵡Ȥ ID:';
-$strInsertedRows = 'ɲä줿Կ:';
-$strInsert = 'ɲ';
-$strInternalNotNecessary = '* InnoDB ¸ߤ硢졼ɬפǤϤޤ';
+$strInsecureMySQL = 'Ȥե MySQL ΥǥեøȤ (root 桼ǥѥɤʤ) ޤޤƤޤȤ MySQL ФϤΥǥեưƤ뤿ǽʾ֤ˤʤäƤޤΥƥۡϤʤ餺ĤƤ';
+$strInsertAsNewRow = 'ԤȤ';
+$strInsert = '';
+$strInsertedRowId = ' ID:';
+$strInsertedRows = 'Կ:';
+$strInternalNotNecessary = '* InnoDB ˤ졼¸ߤƤפǤ';
+$strInternalRelationAdded = '졼ɲäޤ';
$strInternalRelations = '졼';
$strInUse = '';
-$strInvalidAuthMethod = 'ʤǧˡꤷƤޤ:';
-$strInvalidColumn = 'ʤ (%s) ꤵޤ!';
-$strInvalidColumnCount = ' 0 礭ʤФޤ';
-$strInvalidCSVFieldCount = 'CSV ̵ʹܿޤ(:%d)';
-$strInvalidCSVFormat = 'CSV ̵ʽ񼰤ޤ(:%d)';
-$strInvalidCSVParameter = 'CSV ݡȤΥѥ᡼̵Ǥ: %s';
-$strInvalidDatabase = 'ǡ١Ǥ';
-$strInvalidFieldAddCount = 'ʤȤҤȤĤΥեɤɲäʤФʤޤ';
-$strInvalidFieldCount = 'ơ֥ϾʤȤҤȤĤΥեɤɬפǤ';
-$strInvalidLDIImport = 'Υץ饰ϰ̺ѥݡȤ򥵥ݡȤƤޤ!';
-$strInvalidRowNumber = '%d ʤֹǤ';
-$strInvalidServerHostname = 'С%1$sΥۥȤ̵ǤĴƤ';
-$strInvalidServerIndex = '̵ʥХǥåǤ: "%s"';
-$strInvalidTableName = 'ơ֥뤬Ǥ';
+$strInvalidAuthMethod = 'ե̵ǧˡꤵƤޤ:';
+$strInvalidColumnCount = ' 0 礭ʤФޤ';
+$strInvalidColumn = 'ʥ(%s)ꤵƤޤ!';
+$strInvalidCSVFieldCount = 'CSV ϤΥեɿǤ (: %d)';
+$strInvalidCSVFormat = 'CSV Ϥν񼰤Ǥ (: %d)';
+$strInvalidCSVParameter = 'CSV ݡȤΥѥ᡼Ǥ: %s';
+$strInvalidDatabase = 'ʥǡ١Ǥ';
+$strInvalidFieldAddCount = 'ҤȤĤϥեɤɲäƤ';
+$strInvalidFieldCount = 'ơ֥ˤϺҤȤĤΥեɤɬפǤ';
+$strInvalidLDIImport = 'Υץ饰Ǥϰ̤줿եΥݡȤϤǤޤ!';
+$strInvalidRowNumber = '%d ʹֹǤ';
+$strInvalidServerHostname = ' %1$s Υۥ̾ǤǧƤ';
+$strInvalidServerIndex = 'ФΥǥåǤ: "%s"';
+$strInvalidTableName = 'ơ֥̾Ǥ';
$strJapanese = 'ܸ';
$strJoins = '';
-$strJumpToDB = '&quot;%s&quot; ǡ١إ.';
-$strJustDelete = 'øơ֥뤫桼¨';
-$strJustDeleteDescr = '&quot;&quot; 桼øɤޤǥФ˥ǽǤ';
+$strJumpToDB = '&quot;%s&quot; ǡ١˰ư';
+$strJustDelete = 'øơ֥뤫桼ˤ';
+$strJustDeleteDescr = 'øɤޤǤϡֺפ줿桼դĤ˥Ф˥Ǥޤ';
$strKanjiEncodConvert = 'Ѵ'; // kanji code convert
-$strKeepPass = 'ѥɤѹʤ';
+$strKeepPass = 'ѥɤѹʤ';
$strKeyCache = 'å';
-$strKeyname = '';
+$strKeyname = '̾';
$strKill = '';
+$strKnownExternalBug = '%s εǽˤϴΤΥХޤ%s ';
$strKorean = 'ڹ';
-$strLandscape = 'ɥ';
+$strLandscape = '';
+$strLanguageFileNotFound = 'ե%1$sפĤޤ';
+$strLanguageUnknown = 'ե뤬ϿƤޤ: %1$s';
$strLanguage = '';
-$strLanguageFileNotFound = 'ե%1$sĤޤ';
-$strLanguageUnknown = 'θ: %1$s.';
$strLatchedPages = 'åƤڡ';
-$strLatexCaption = 'ơ֥륭ץ';
+$strLatexCaption = 'ơ֥Υץ';
$strLatexContent = 'ơ֥ __TABLE__ ';
-$strLatexContinued = '(³)';
-$strLatexContinuedCaption = '³Υơ֥륭ץ';
-$strLatexIncludeCaption = 'ơ֥륭ץޤ';
+$strLatexContinued = '(³)';
+$strLatexContinuedCaption = 'ơ֥Υץ(³)';
+$strLatexIncludeCaption = 'ơ֥Υץޤ';
$strLatexLabel = '٥륭';
$strLaTeX = 'LaTeX';
$strLaTeXOptions = 'LaTeX ץ';
$strLatexStructure = 'ơ֥ __TABLE__ ι¤';
$strLatvian = 'ȥӥ';
-$strLDIImportOptions = 'LOAD DATA Ѥ CSV ΥݡȤ򤹤륪ץ';
-$strLDI = 'LOAD DATA Ѥ CSV';
-$strLDILocal = '륭ɤѤ';
-$strLengthSet = 'Ĺ/å*';
-$strLimitNumRows = 'ڡκ쥳ɿ';
+$strLDIImportOptions = 'LOAD DATA CSV ݡȤȤΥץ';
+$strLDI = 'LOAD DATA CSV';
+$strLDILocal = 'LOCAL ɤѤ';
+$strLengthSet = 'Ĺ/';
+$strLimitNumRows = 'ڡιԿ';
$strLinesTerminatedBy = 'Ԥνü';
-$strLinkNotFound = '󥯤Ĥޤ';
-$strLinksTo = '';
+$strLinkNotFound = '褬Ĥޤ';
+$strLinksTo = '';
$strLithuanian = 'ȥ˥';
$strLocalhost = '';
-$strLocationTextfile = 'ƥȥեξ';
-$strLogin = '';
+$strLocationTextfile = 'ƥȥեΰ';
$strLoginInformation = '';
+$strLogin = '';
$strLogout = '';
$strLogPassword = 'ѥ:';
$strLogServer = '';
-$strLogUsername = '桼:';
-$strLongOperation = 'ϻ֤ޤǤʤߤޤ?';
+$strLogUsername = '桼̾:';
+$strLongOperation = 'κȤˤϻ֤뤳Ȥޤ³Ԥޤ?';
-$strMaxConnects = '¹³';
-$strMaximalQueryLength = 'ȲκĹ';
-$strMaximumSize = '祵: %s%s';
-$strMbExtensionMissing = 'mbstring PHP ĥϸĤޤǤޥХʸåȤѤƤ褦˸ޤphpMyAdmin mbstring ĥʤǤʸΤʬ䤹뤳ȤǤޤͽʤ̤֤äƤ뤫⤷ޤ';
-$strMbOverloadWarning = 'PHP mbstring.func_overload ͭǤΥץ phpMyAdmin ȸߴʤĤΥǡ˲⤷ޤ!';
-$strMIME_available_mime = 'ͭ MIME ';
-$strMIME_available_transform = 'Ѵͭ';
+$strMaxConnects = 'Ʊ³';
+$strMaximalQueryLength = '륯κĹ';
+$strMaximumSize = 'Ĺ: %s%s';
+$strMbExtensionMissing = 'PHP mbstring ĥĤޤǤޥХʸåȤѤƤ褦Ǥmbstring ĥʤ phpMyAdmin ʸʬǤʤͽʤ̤ˤʤ뤳Ȥޤ';
+$strMbOverloadWarning = 'PHP mbstring.func_overload ͭˤʤäƤޤphpMyAdmin ϤΥץбƤʤᡢǡ˲뤳Ȥޤ!';
+$strMIME_available_mime = 'ѤǤ MIME ';
+$strMIME_available_transform = 'ѤǤѴǽ';
$strMIME_description = '';
$strMIME_MIMEtype = 'MIME ';
-$strMIME_nodescription = 'Ѵˤͭޤ<br />Ԥ%sΰ̣򤴳ǧ';
-$strMIME_transformation = '֥饦Ѵ';
-$strMIME_transformation_note = 'ѲǽѴץΰӤ MIME Ѵ˴ؤƤϡ%sѴ%s 򥯥åƤ';
+$strMIME_nodescription = 'Ѵǽˤޤ<br />%s ưˤĤƤϺԤˤǧ';
+$strMIME_transformation_note = 'ѲǽѴץ MIME פѴΰˤĤƤ %sѴǽ%s ';
+$strMIME_transformation = '֥饦Ѵǽ';
$strMIME_transformation_options = 'Ѵץ';
-$strMIME_transformation_options_note = 'ν񼰤ѤơѴץͤϤƤ: \'a\', 100, b,\'c\'...<br />Хåå("\")䥷󥰥륯("\'")ͤ˴ޤɬפ(\\\\xyza\\\'bΤ褦)ХååǥפƤ';
-$strMIMETypesForTable = 'MIME TYPES FOR TABLE';
-$strMIME_without = 'åΤǰ줿 MIME פϸ̤ѴؿäƤޤ';
-$strModifications = 'ޤ';
+$strMIME_transformation_options_note = 'Ѵץͤν: \'a\',\'b\',\'c\'...<br />Хåå ("\") 䥷󥰥륯 ("\'") ͤ˴ޤɬפ ( \\\\xyz a\\\'b Τ褦) ХååǥפƤ';
+$strMIMETypesForTable = 'MIME TYPES FOR TABLE'; // XXX
+$strMIME_without = 'åɽƤ MIME פˤϸ̤ѴؿϤޤ';
+$strModifications = '¸ޤ';
+$strModifyIndexTopic = 'ǥå';
$strModify = '';
-$strModifyIndexTopic = 'ǥåѹ';
-$strMoveTable = 'ơ֥(database<b>.</b>table)˰ư:';
-$strMoveTableOK = 'ơ֥%s%s˰ưޤ';
-$strMoveTableSameNames = 'Ʊơ֥˰ưǤޤ!';
-$strMultilingual = '¿';
-$strMyISAMDataPointerSize = 'ǡΥݥ󥿡';
-$strMyISAMDataPointerSizeDesc = 'CREATE TABLE MyISAM ơ֥˻Ѥ MAX_ROWS ץ󤬻ꤵʤΥХȻΥǥեȥݥ󥿡Ǥ';
-$strMyISAMMaxExtraSortFileSize = 'ǥåѰեκ祵';
-$strMyISAMMaxExtraSortFileSizeDesc = 'MyISAMΥǥå®ȤѤƥݥե礭åѤȤꤳ˻ꤷͰʾ礭ʤϡåˡȤޤ';
-$strMyISAMMaxSortFileSize = 'ȥեκ祵';
-$strMyISAMMaxSortFileSizeDesc = 'MyISAM ǥåκƺǻѤ뤳Ȥ줿 MySQL եκ祵Ǥ (REPAIR TABLE 桢ALTER TABLE LOAD DATA INFILE)';
-$strMyISAMRecoverOptionsDesc = 'å夷 MyISAM ơ֥μưѥ⡼ɤǡеưץ --myisam-recover ꤷޤ';
+$strMoveMenu = '˥塼ư';
+$strMoveTable = 'ơ֥ΰư(database<b>.</b>table):';
+$strMoveTableOK = 'ơ֥ %s %s ˰ưޤ';
+$strMoveTableSameNames = 'Ʊơ֥ˤϰưǤޤ!';
+$strMultilingual = 'ʣ';
+$strMyISAMDataPointerSize = 'ǡݥ󥿤Υ';
+$strMyISAMDataPointerSizeDesc = 'MAX_ROWS ץꤻ MyISAM ơ֥Ȥ CREATE TABLE ѤǥեȤΥݥ󥿥 (Хñ)';
+$strMyISAMMaxExtraSortFileSizeDesc = 'MyISAM Υǥå®ȤѤեȥåκǻꤷͰʾ礭ʤϡåˡȤޤ';
+$strMyISAMMaxExtraSortFileSize = 'ǥåѤեκ祵';
+$strMyISAMMaxSortFileSizeDesc = 'MyISAM ǥåƺȤ (REPAIR TABLE ALTER TABLELOAD DATA INFILE κ) ѤǤեκ祵';
+$strMyISAMMaxSortFileSize = 'Ѥΰեκ祵';
+$strMyISAMRecoverOptionsDesc = 'å夷 MyISAM ơ֥ưȤΥ⡼ (еưץ --myisam-recover ꤵ)';
$strMyISAMRecoverOptions = 'ư⡼';
$strMyISAMRepairThreads = 'åɤν';
-$strMyISAMRepairThreadsDesc = '⤷ͤ 1 ʾʤ顢MyISAM ơ֥ΥǥåϥȽνʿԤ(켫Ȥγƥǥå)ޤ';
-$strMyISAMSortBufferSize = 'ȥХåե';
-$strMyISAMSortBufferSizeDesc = 'ΥХåեϡREPAIR TABLE δ֤ MyISAM ǥå򥽡Ȥ硢ޤ CREATE INDEX ALTER TABLE ȥǥåˡդޤ';
+$strMyISAMRepairThreadsDesc = 'ͤ 1 礭 MyISAM ơ֥Υǥå⽤˥ȥץˤä (åɤȤ) Ʊޤ';
+$strMyISAMSortBufferSizeDesc = 'REPAIR TABLE κ MyISAM Υǥå򥽡ȤȤ뤤 CREATE INDEX ALTER TABLE ǥǥåȤ˳ƤХåե';
+$strMyISAMSortBufferSize = 'ȥХåեΥ';
$strMySQLCharset = 'MySQL ʸå';
-$strMysqlClientVersion = 'MySQL 饤ȥС';
-$strMySQLConnectionCollation = 'MySQL ³ȹ';
+$strMysqlClientVersion = 'MySQL 饤ȤΥС';
+$strMySQLConnectionCollation = 'MySQL ³ȹ';
$strMySQLSaid = 'MySQLΥå: ';
$strMySQLShowProcess = 'MySQL ץɽ';
$strMySQLShowStatus = 'MySQL Υ󥿥';
$strMySQLShowVars = 'MySQL Υƥѿ';
-$strName = '';
+$strName = '̾';
$strNext = '';
+$strNoActivity = '%s ðʾ򤷤ޤǤ󤷤ʤƤ';
+$strNoDatabases = 'ǡ١¸ߤޤ';
+$strNoDatabasesSelected = 'ǡ١򤵤Ƥޤ';
+$strNoDataReceived = 'ݡȤǡǤޤǤե̾Ƥʤե륵 PHP ǵĤ줿ͤĶƤޤFAQ 1.16';
+$strNoDescription = 'ޤ';
+$strNoDetailsForEngine = 'Υȥ졼󥸥ˤϥơξܺپϤޤ';
+$strNoDropDatabases = 'DROP DATABASE ʸ̵ˤƤޤ';
+$strNoExplain = 'SQL EXPLAIN Ϥ򥹥å';
+$strNoFilesFoundInZip = 'ZIP ֤˥ե뤬ޤޤƤޤ!';
+$strNoFrames = 'phpMyAdmin <b>ե졼б</b>֥饦ǤѤ򤪴ᤷޤ';
+$strNoIndex = 'ǥåƤޤ!';
+$strNoIndexPartsDefined = 'ǥåʬƤޤ!';
+$strNoModification = 'ѹʤ';
+$strNone = 'ʤ';
+$strNoOptions = 'ν񼰤ˤϥץϤޤ';
+$strNoPassword = 'ѥɤʤ';
+$strNoPermission = 'Υ֥Фˤϥե %s ¸븢¤ޤ';
+$strNoPhp = 'PHP ɤά';
+$strNoPrivileges = 'øʤ';
+$strNoRights = 'ø­ǥǤޤ!';
+$strNoRowsSelected = 'Ԥ򤵤Ƥޤ';
$strNo = '';
-$strNoActivity = '%s ðʾ򤷤ޤǤ٥򤷤Ƥ';
-$strNoDatabases = 'ǡ١';
-$strNoDatabasesSelected = 'ǡ١򤵤Ƥޤ';
-$strNoDataReceived = 'ݡȤǡǤޤǤե뤬Ƥʤե륵PHPǵĤ줿ͤĶƤޤFAQ 1.16';
-$strNoDescription = 'Ҥޤ';
-$strNoDetailsForEngine = 'Υȥ졼󥸥ˤͭʥơξܺپϤޤ';
-$strNoDropDatabases = 'DROP DATABASEơȥȤ϶ػߤ';
-$strNoExplain = 'SQL ʬϤФ';
-$strNoFilesFoundInZip = 'ZIP ˥ե뤬Ĥޤ!';
-$strNoFrames = 'phpMyAdmin <b>ե졼</b>򥵥ݡȤ֥饦ǤѤ򤪴ᤷޤ';
-$strNoIndex = 'ǥåꤵƤޤ';
-$strNoIndexPartsDefined = 'ǥåʬꤵƤޤ';
-$strNoModification = 'ѹ̵';
-$strNone = '̵';
-$strNoOptions = 'ν񼰤ϥץ󤬤ޤ';
-$strNoPassword = 'ѥ̵';
-$strNoPermission = 'ե%s¸ѡߥå򥦥֥ФϻäƤޤ';
-$strNoPhp = 'PHP ̵';
-$strNoPrivileges = 'ø̵';
-$strNoRights = 'øäƤʤΤǤޤ';
-$strNoRowsSelected = 'Ԥ򤵤ޤǤ';
-$strNoSpace = 'ե%s¸ˤ϶̤ʬǤ';
-$strNoTablesFound = 'ߤΥǡ١˥ơ֥Ϥޤ';
-$strNoThemeSupport = 'ơޤ򥵥ݡȤƤޤȥơޥǥ쥯ȥ%sǧƤ';
-$strNotNumber = 'ϿͤǤϤޤ';
-$strNotOK = 'OK ǤϤޤ';
-$strNotSet = 'ơ֥<b>%s</b>Ĥʤ%s ꤵƤޤ';
-$strNoUsersFound = '桼ϸĤޤǤ';
-$strNoValidateSQL = 'SQL ڤ򥹥å';
-$strNull = '(NULL)';
+$strNoSpace = '­ǥե %s ¸Ǥޤ';
+$strNoTablesFound = 'Υǡ١ˤϥơ֥뤬ޤ';
+$strNoThemeSupport = 'ơޤѤǤޤơޥǥ쥯ȥ %s ǧƤ';
+$strNotNumber = 'ͤǤϤޤ!';
+$strNotOK = 'Not OK';
+$strNotSet = 'ơ֥ <b>%s</b> Ĥޤ󡣤뤤 %s ˤꤵƤޤ';
+$strNoUsersFound = '桼¸ߤޤ';
+$strNoValidateSQL = 'SQL θڤ򥹥å';
+$strNull = '̥(NULL)';
$strNumberOfFields = 'եɿ';
-$strNumSearchResultsInTable = 'ơ֥ <i>%2\$s</i> %2\$s פޤ';
-$strNumSearchResultsTotal = '<b>:</b> <i>%s</i> Ĥޤ';
+$strNumberOfTables = 'ơ֥';
+$strNumSearchResultsInTable = '%s ʥơ֥ <i>$s</i>)';
+$strNumSearchResultsTotal = '<b>:</b> <i>%s</i> ';
$strNumTables = 'ơ֥';
$strOK = 'OK';
$strOpenDocumentSpreadsheet = 'ץåɥȤ򳫤';
-$strOpenDocumentSpreadsheetOptions = 'ץåɥȤ򳫤ȤΥץ';
+$strOpenDocumentSpreadsheetOptions = 'ץåɥȥץ';
$strOpenDocumentText = 'ƥȤ򳫤';
-$strOpenDocumentTextOptions = 'ƥȤ򳫤ȤΥץ';
-$strOpenNewWindow = ' phpMyAdmin Υɥ򳫤';
+$strOpenDocumentTextOptions = 'ƥȥץ';
+$strOpenNewWindow = '̥ɥdz';
$strOperations = '';
-$strOperator = '';
+$strOperator = '黻';
$strOptimizeTable = 'ơ֥Ŭ';
$strOr = 'ޤ';
$strOverhead = 'Сإå';
-$strOverwriteExisting = 'ե뤬¸ߤϾ';
+$strOverwriteExisting = '¸ΥեϾ';
$strPageNumber = 'ڡֹ:';
-$strPagesToBeFlushed = 'եå夵줿ڡ';
-$strPaperSize = '極';
-$strPartialImport = 'ʬŪʥݡ';
-$strPartialText = 'ʬŪʸ';
-$strPassword = 'ѥ';
-$strPasswordChanged = '%s Υѥɤѹޤ';
-$strPasswordEmpty = 'ѥɤǤ';
+$strPagesToBeFlushed = 'եåԤڡ';
+$strPaperSize = 'ѻ極';
+$strPartialImport = 'ʬݡ';
+$strPartialText = 'ʬƥ';
+$strPasswordChanged = '%s Υѥɤѹޤ';
+$strPasswordEmpty = 'ѥɤǤ!';
$strPasswordHashing = 'ѥɥϥå';
-$strPasswordNotSame = 'ѥɤƱǤϤޤ';
-$strPdfDbSchema = 'ǡ١%sΥ - ڡ %s';
-$strPdfInvalidTblName = '"%s" ơ֥뤬ޤ!';
+$strPassword = 'ѥ';
+$strPasswordNotSame = 'ѥɤۤʤäƤޤ!';
+$strPdfDbSchema = 'ǡ١ %s Υ - ڡ %s';
+$strPdfInvalidTblName = '"%s" ơ֥¸ߤޤ!';
$strPdfNoTables = 'ơ֥뤬ޤ';
$strPDFOptions = 'PDF ץ';
$strPDF = 'PDF';
-$strPDFReportExplanation = '(ñơ֥ΥǡޤݡȤޤ)';
-$strPDFReportTitle = 'ݡȤ';
-$strPerHour = '';
+$strPDFReportExplanation = '(ҤȤĤΥơ֥ΥǡޤݡȤޤ)';
+$strPDFReportTitle = 'ݡȤΥȥ';
+$strPerHour = '/';
$strPerMinute = '/ʬ';
$strPerSecond = '/';
$strPersian = 'ڥ륷';
$strPhoneBook = 'Ģ';
-$strPHP40203 = 'ޥХʸ(mbstring)ΰ˽ʥХΤ PHP 4.2.3 ȤäƤޤPHP ΥХݡ 19404 ֤ǤphpMyAdmin Ѥʤ顢ΥС PHP Ϥᤷޤ...ȸѥå򤢤Ƥʤưޤ';
+$strPHP40203 = 'Ȥ PHP 4.2.3 ˤϥޥХʸ (mbstring) ΰ˽ʥХޤPHP ΥХݡ 19404 ֤ΥС PHP ϤǤޤ';
$strPhp = 'PHP ɤκ';
-$strPHPVersion = 'PHP С';
+$strPHPVersion = 'PHP ΥС';
+$strPleaseSelectPrimaryOrUniqueKey = '祭ޤϥˡʥ򤷤Ƥ';
$strPmaDocumentation = 'phpMyAdmin Υɥ';
-$strPmaUriError = '<tt>$cfg[\'PmaAbsoluteUri\']</tt> ɬեꤷƤ!';
+$strPmaUriError = '<tt>$cfg[\'PmaAbsoluteUri\']</tt> Ϥʤ餺եꤹɬפޤ!';
+$strPmaWiki = 'phpMyAdmin wiki';
$strPolish = 'ݡɸ';
-$strPortrait = 'ݡȥ쥤';
-$strPos1 = 'ǽ';
-$strPrevious = '';
-$strPrimary = '';
-$strPrimaryKeyHasBeenDropped = '祭ޤ';
-$strPrimaryKeyName = '祭... PRIMARY ǤϤʤФޤ';
-$strPrimaryKeyWarning = '("PRIMARY"Ϥ礦ɼ祭ǤϤʤФޤ';
+$strPortrait = 'ĸ';
+$strPos1 = 'Ƭ';
+$strPrevious = '';
+$strPrimaryKeyHasBeenDropped = '祭ޤ';
+$strPrimaryKeyName = '祭̾ PRIMARY ǤʤФʤޤ!';
+$strPrimaryKeyWarning = '(祭Ϥʤ餺 "PRIMARY" Ȥ̾ǤʤФʤޤ󡣤ޤ祭ʳ"PRIMARY"Ȥ̾ȤäƤϤʤޤ!)';
+$strPrimary = '';
$strPrint = '';
-$strPrintView = 'Ѥɽ';
-$strPrintViewFull = 'ӥ塼 (ƥȤޤ)';
-$strPrivDescAllPrivileges = 'GRANT ٤Ƥøޤߤޤ';
-$strPrivDescAlter = '¸ߤơ֥빽¤ѹĤޤ';
-$strPrivDescAlterRoutine = 'ȥɥ롼ѹ˴Ĥޤ';
-$strPrivDescCreateDb = 'ǡ١ơ֥κĤޤ';
-$strPrivDescCreateRoutine = 'ȥɥ롼κĤޤ';
-$strPrivDescCreateTbl = 'ơ֥κĤޤ';
-$strPrivDescCreateTmpTable = 'ƥݥ꡼ơ֥κĤޤ';
-$strPrivDescCreateUser = '桼Ȥκ˴ѹĤޤ';
-$strPrivDescCreateView = 'ӥ塼κĤޤ';
-$strPrivDescDelete = 'ǡκĤޤ';
-$strPrivDescDropDb = 'ǡ١ȥơ֥κĤޤ';
-$strPrivDescDropTbl = 'ơ֥κĤޤ';
-$strPrivDescExecute5 = 'ȥɥ롼μ¹ԤĤޤ';
-$strPrivDescExecute = 'ȥɥץ㡼¹Ԥ뤳ȤĤޤ MySQL ǤǤϰ̣ޤ';
-$strPrivDescFile = 'ǡΥݡȡǡΥեؤΥݡȤĤޤ';
-$strPrivDescGrant = 'øơ֥Υɤʤ˥桼øɲäĤޤ';
-$strPrivDescIndex = 'ǥåκĤޤ';
-$strPrivDescInsert = 'ǡؤĤޤ';
-$strPrivDescLockTables = 'ߤΥåɤΥå󥰥ơ֥Ĥޤ';
-$strPrivDescMaxConnections = '1 ˿³ǽʿ¤ޤ';
-$strPrivDescMaxQuestions = '1 ˥Ф˾Ȳ¤ޤ';
-$strPrivDescMaxUpdates = '1 ˥ơ֥롢ǡ١ФƤѹȯ륳ޥɤο¤ޤ';
-$strPrivDescMaxUserConnections = '桼Ʊ³¤ޤ';
-$strPrivDescProcess3 = '¾Υ桼ץߤǤ뤳ȤĤޤ';
-$strPrivDescProcess4 = 'ץδʾȲɽĤޤ';
-$strPrivDescReferences = ' MySQL СǤϰ̣ޤ';
-$strPrivDescReload = 'ФΥɡåΥꥢĤޤ';
-$strPrivDescReplClient = '졼֤ޥ׵Ǥ븢桼Ϳޤ';
-$strPrivDescReplSlave = 'ץꥱ󥹥졼֤ɬפǤ';
-$strPrivDescSelect = 'ǡɤ߽Ф';
-$strPrivDescShowDb = 'ǡ١δʰؤΥͿޤ';
-$strPrivDescShowView = 'Ȳ SHOW CREATE VIEW μ¹ԤĤޤ';
-$strPrivDescShutdown = 'ФΥåȥĤޤ';
-$strPrivDescSuper = '³ãƤ³Ĥޤ¿δϥХѿ¾桼ץνλǤ褦꤬ɬפǤ';
-$strPrivDescUpdate = 'ǡνĤޤ';
-$strPrivDescUsage = 'øޤ';
+$strPrintViewFull = 'Ѳ (ƥȤޤ)';
+$strPrintView = 'Ѳ';
+$strPrivDescAllPrivileges = 'GRANT ʳΤ٤ƤøͿ';
+$strPrivDescAlterRoutine = 'ȥɥ롼νȺĤ';
+$strPrivDescAlter = '¸Υơ֥빽¤ѹĤ';
+$strPrivDescCreateDb = 'ǡ١ơ֥κĤ';
+$strPrivDescCreateRoutine = 'ȥɥ롼κĤ';
+$strPrivDescCreateTbl = 'ơ֥κĤ';
+$strPrivDescCreateTmpTable = 'ơ֥κĤ';
+$strPrivDescCreateUser = '桼Ȥκ͡Ĥ';
+$strPrivDescCreateView = 'ӥ塼κĤ';
+$strPrivDescDelete = 'ǡκĤ';
+$strPrivDescDropDb = 'ǡ١ȥơ֥κĤ';
+$strPrivDescDropTbl = 'ơ֥κĤ';
+$strPrivDescExecute = 'ȥɥץμ¹ԤĤ (ΥС MySQL Ǥ̵Ǥ)';
+$strPrivDescExecute5 = 'ȥɥ롼μ¹ԤĤ';
+$strPrivDescFile = 'ǡΥݡȡݡȤĤ';
+$strPrivDescGrant = 'øơ֥ΥɤʤΥ桼øɲäĤ';
+$strPrivDescIndex = 'ǥåκĤ';
+$strPrivDescInsert = 'ǡִĤ';
+$strPrivDescLockTables = 'ߤΥåɤΥơ֥åĤ';
+$strPrivDescMaxConnections = 'ñ̻˲ǽʿ³¤';
+$strPrivDescMaxQuestions = 'ñ̻˥Фǽʥ¤';
+$strPrivDescMaxUpdates = 'ñ̻˼¹Բǽʥơ֥ʤǡ١Խޥɿ¤';
+$strPrivDescMaxUserConnections = '桼Ʊ³¤';
+$strPrivDescProcess3 = '¾Υ桼ΥץߤĤ';
+$strPrivDescProcess4 = 'ץǴʥɽĤ';
+$strPrivDescReferences = 'ΥС MySQL Ǥ̵Ǥ';
+$strPrivDescReload = 'ΥɡХåΥեåĤ';
+$strPrivDescReplClient = '졼/ޥξȲĤ';
+$strPrivDescReplSlave = 'ץꥱ󥹥졼֤Ǥͭˤɬפޤ';
+$strPrivDescSelect = 'ǡɤ߹ߤĤ';
+$strPrivDescShowDb = 'ǡ١ؤΥĤ';
+$strPrivDescShowView = 'SHOW CREATE VIEW μ¹ԤĤ';
+$strPrivDescShutdown = 'ФΥåȥĤ';
+$strPrivDescSuper = '³ãƤȤǤ³Ĥ롣Хѿ¾Υ桼ΥåɤߤȤä򤹤ϤƤ꤬ɬפˤʤޤ';
+$strPrivDescUpdate = 'ǡνĤ';
+$strPrivDescUsage = 'øϤޤ';
$strPrivileges = 'ø';
-$strPrivilegesReloaded = 'øϥɤޤ';
+$strPrivilegesReloaded = 'ø˥ɤޤ';
$strProcedures = 'ץ';
$strProcesses = 'ץ';
$strProcesslist = 'ץ';
$strProtocolVersion = 'ץȥС';
-$strPutColNames = 'ǽ 1 ܤ˥եɤɲä';
+$strPutColNames = '1 ܤ˥ե̾ɲä';
-$strQBE = 'Ȳ';
$strQBEDel = '';
$strQBEIns = '';
-$strQueryCache = 'Ȳ񥭥å';
-$strQueryFrame = 'Ȳ񥦥ɥ';
-$strQueryOnDb = 'ǡ١ SQL <b>%s</b>:';
-$strQueryResultsOperations = 'Ȳ';
+$strQBE = '';
+$strQueryCache = 'ꥭå';
+$strQueryFrame = 'ꥦɥ';
+$strQueryOnDb = 'ǡ١ <b>%s</b> SQL:';
+$strQueryResultsOperations = '';
$strQuerySQLHistory = 'SQL ';
-$strQueryStatistics = '<b>Ȳ</b>: ư %s ĤξȲ񤬥ФƤޤ';
-$strQueryTime = 'Ȳμ¹Ի %01.4f ';
-$strQueryType = 'Ȳ񥿥';
-$strQueryWindowLock = 'ɥγ餳ξȲ񤭴Ǥޤ';
+$strQueryStatistics = '<b></b>: ư %s ĤΥ򥵡Фޤ';
+$strQueryTime = 'μ¹Ի %01.4f ';
+$strQueryType = '';
+$strQueryWindowLock = '¾Υɥ饯񤭤뤳ȤϤǤޤ';
$strReadRequests = 'ɤ߹ߥꥯȿ';
$strReceived = '';
+$strRecommended = '侩';
$strRecords = '쥳ɿ';
-$strReferentialIntegrity = 'ܤΥå:';
+$strReferentialIntegrity = 'γǧ:';
$strRefresh = '';
$strRelationalSchema = '졼ʥ륹';
-$strRelationNotWorking = 'phpMyAdmin ȼǽǤ졼ǽ뤿Υ󥯥ơ֥뤬ͭˤʤäƤޤ󡣤褹ˤ %s%s 򥯥åƸȯƤ';
+$strRelationDeleted = '졼ޤ';
+$strRelationNotWorking = '󥯥ơ֥뤿ɲõǽ̵ˤʤäƤޤͳˤĤƤ%s%s';
$strRelations = '졼';
$strRelationsForTable = 'RELATIONS FOR TABLE';
-$strRelationView = '졼ɽ';
-$strReloadingThePrivileges = 'øɤ߹Ǥ';
-$strReloadPrivileges = 'MySQL Υ';
-$strRemoveSelectedUsers = '򤵤줿桼ޤ';
-$strRenameDatabaseOK = 'ǡ١%sϡ%s˾ѹޤ';
-$strRenameTable = 'ơ֥ѹ';
-$strRenameTableOK = '%s%sѹޤ';
-$strRepairTable = 'ơ֥줹';
-$strReplaceNULLBy = 'NULL ʸ֤';
-$strReplaceTable = 'եǥơ֥֤';
+$strRelationView = '졼ӥ塼';
+$strReload = '';
+$strReloadingThePrivileges = 'øɤƤޤ';
+$strReloadPrivileges = 'øɤ';
+$strRemoveSelectedUsers = '򤷤桼';
+$strRenameDatabaseOK = 'ǡ١ %s %s ˥͡षޤ';
+$strRenameTable = '͡Υơ֥̾';
+$strRenameTableOK = 'ơ֥ %s %s ˥͡षޤ';
+$strRepairTable = 'ơ֥';
+$strReplaceNULLBy = 'NULL ʸ';
+$strReplaceTable = 'ơ֥ǡ򺹤ؤե';
$strReplication = 'ץꥱ';
$strReset = 'ꥻå';
$strResourceLimits = '꥽';
-$strReType = '';
-$strRevoke = 'ѻ';
-$strRevokeAndDelete = '桼ͭø򤹤٤˴ƺ';
-$strRevokeAndDeleteDescr = '桼øɤ߹ߤޤ USAGE øΤޤޤǤ';
-$strRevokeMessage = '%s øäޤ';
+$strReType = '⤦ϤƤ';
+$strRevokeAndDelete = 'ø򤹤٤Ƽäƥ桼';
+$strRevokeAndDeleteDescr = 'USAGE øˤĤƤøɤޤǻĤޤ';
+$strRevokeMessage = '%s øäޤ';
+$strRevoke = 'ä';
$strRomanian = '롼ޥ˥';
$strRowLength = 'ԤĹ';
$strRows = '';
$strRowsFrom = 'Ϲ';
$strRowSize = ' ԤΥ ';
-$strRowsModeFlippedHorizontal = 'ʿ (žإå)';
+$strRowsModeFlippedHorizontal = 'ʿ (إåž)';
$strRowsModeHorizontal = 'ʿ';
-$strRowsModeOptions = ': %s : %s 󤺤ĥإå򷫤֤ɽ';
+$strRowsModeOptions = '⡼: %s (%s 뤴Ȥ˥إåɽ)';
$strRowsModeVertical = 'ľ';
$strRowsStatistic = 'Ԥ';
-$strRunning = '¹Ǥ %s';
-$strRunQuery = 'Ȳμ¹Ԥ';
-$strRunSQLQuery = 'ǡ١%s SQL ¹Ԥ';
-$strRunSQLQueryOnServer = 'С%s SQL ¹Ԥ';
+$strRunning = '¹ԴĶ: %s';
+$strRunQuery = '¹Ԥ';
+$strRunSQLQuery = 'ǡ١ %s ǥ¹Ԥ';
+$strRunSQLQueryOnServer = ' %s ǥ¹Ԥ';
$strRussian = '';
$strSave = '¸';
-$strSaveOnServer = 'оΥǥ쥯ȥ%s¸';
-$strScaleFactorSmall = '1 ڡ˿ɽ֤뤿ˤ礭᤮ޤ';
-$strSearch = '';
-$strSearchFormTitle = 'ǡ١򸡺';
-$strSearchInTables = 'ơ֥λ:';
-$strSearchNeedle = 'ñ졢ޤ (磻ɥɤ: "%"):';
+$strSaveOnServer = 'оΥǥ쥯ȥ %s ¸';
+$strSavePosition = '֤¸';
+$strScaleFactorSmall = 'Ψ뤿᥹ޤ 1 ڡ˼ޤޤ';
+$strSearchFormTitle = 'ǡ١⸡';
+$strSearchInTables = 'ơ֥⸡:';
+$strSearchNeedle = 'ñ (磻ɥ: "%"):';
$strSearchOption1 = '줫ñޤ';
$strSearchOption2 = '٤Ƥñޤ';
-$strSearchOption3 = 'Τʥե졼';
+$strSearchOption3 = '';
$strSearchOption4 = 'ɽ';
-$strSearchResultsFor = ' "<i>%s</i>" %s:';
+$strSearchResultsFor = '"<i>%s</i>" θ %s:';
$strSearchType = ':';
-$strSecretRequired = 'եϺ̩ѥե졼ɬפȤޤ(blowfish_secret)';
-$strSelectADb = 'ǡ١򤷤Ƥ';
+$strSearch = '';
+$strSecretRequired = 'ե뤬̩Υѥե졼 (blowfish_secret) ɬפȤ褦ˤʤޤ';
+$strSelectADb = 'ǡ١򤷤Ƥ';
$strSelectAll = '';
-$strSelectBinaryLog = '򤷤Хʥ';
-$strSelectFields = 'եɤ(1 İʾ):';
-$strSelectNumRows = 'Ȳ';
-$strSelectTables = 'ơ֥';
-$strSend = 'ե¸';
+$strSelectBinaryLog = 'ɽХʥ򤷤Ƥ';
+$strSelectFields = 'եɤ򤷤Ƥ(1):';
+$strSelectForeignKey = '򤷤Ƥ';
+$strSelectNumRows = '/';
+$strSelectReferencedKey = 'ȤƤ륭';
+$strSelectTables = 'ơ֥򤷤Ƥ';
+$strSend = 'ե¸';
$strSent = '';
+$strServerChoice = 'Ф';
+$strServerNotResponding = 'Фޤ';
$strServer = '';
-$strServerChoice = 'Ф򤹤';
-$strServerNotResponding = 'Фȿޤ';
$strServers = '';
-$strServerStatus = '󥿥';
$strServerStatusDelayedInserts = 'ٱ䥤󥵡';
-$strServerStatusUptime = ' MySQL Ф %s ưǡ%s ˵ưƤޤ';
+$strServerStatus = '󥿥';
+$strServerStatusUptime = ' MySQL ФβƯ: %s (ư: %s)';
$strServerTabVariables = 'ѿ';
-$strServerTrafficNotes = '<b>Хȥեå</b>: Υơ֥ MySQL ФưƤΥͥåȥȥեåפɽޤ';
+$strServerTrafficNotes = '<b>Хȥեå</b>: ɽ MySQL еưʸΥͥåȥȥեåפǤ';
$strServerVars = 'ѿ';
$strServerVersion = 'ФΥС';
$strSessionValue = 'å';
-$strSetEnumVal = 'եɥפenumϡsetξͤˤν񼰤ȤäϤƤ: \'a\',\'b\',\'c\'...<br />Хåå"\"ϥȡ"\'"ϤȡƬ˥ХååդƲ(: \\\\xyz⤷ϡa\\\'b)';
+$strSetEnumVal = 'եɼ̤enumפʤsetפξͤν: \'a\',\'b\',\'c\'...<br />Хåå("\")䥷󥰥륯("\'")ޤɬפ ( \\\\xyz a\\\'b Τ褦) ˥ХååդƤ';
$strShowAll = '٤ɽ';
$strShowColor = 'ɽ';
$strShowDatadictAs = 'ǡ';
$strShow = 'ɽ';
-$strShowFullQueries = 'ʾȲɽ';
-$strShowGrid = 'åɤɽ';
-$strShowingBookmark = '֥åޡ';
-$strShowingRecords = '쥳ɤɽ';
+$strShowFullQueries = 'Τɽ';
+$strShowGrid = 'åɤɽ';
+$strShowHideLeftMenu = '¦Υ˥塼ɽ/';
+$strShowingBookmark = 'ɽΥ֥åޡ';
+$strShowingPhp = 'PHP ɤȤɽ';
+$strShowingRecords = 'ɽ';
+$strShowingSQL = 'SQL ɽ';
$strShowOpenTables = 'Ƥơ֥ɽ';
$strShowPHPInfo = 'PHP ';
$strShowSlaveHosts = '졼֥ۥȤɽ';
$strShowSlaveStatus = '졼֤ξ֤ɽ';
-$strShowStatusBinlog_cache_disk_useDescr = 'ƥݥХʥåѤ褦Ȥơbinlog_cache_sizeͤĶᤷᡢȥ󥶥ΥơȥȤƥݥե¸ȥ󥶥ο';
-$strShowStatusBinlog_cache_useDescr = 'ХʥåѤοǤ';
-$strShowStatusCreated_tmp_disk_tablesDescr = 'ʸ¹˥ФˤäƼưŪ˥ǥ˺줿ơ֥οǤCreated_tmp_disk_tables 礭硢ΰơ֥ǥ١Ѥ˥١ˤ褦ˡ tmp_table_size 䤷Ǥ礦';
-$strShowStatusCreated_tmp_filesDescr = 'mysqld ϤɤΰŪեǤ';
-$strShowStatusCreated_tmp_tablesDescr = 'Фǹʸμ¹ԤˤäƼưŪ˺줿ΰơ֥ο';
-$strShowStatusDelayed_errorsDescr = '㴳Υ顼ȯ INSERT DELAYED 񤫤줿ԿǤ (餯νʣ)';
-$strShowStatusDelayed_insert_threadsDescr = ' INSERT DELAYED ϥɥ顼åɤοINSERT DELAYED ŬѤۤʤơ֥οͭΥåɤѰդޤ';
-$strShowStatusDelayed_writesDescr = 'INSERT DELAYED 񤭹ߤ򤷤Ǥ';
-$strShowStatusFlush_commandsDescr = 'FLUSH ʸ¹ԤǤ';
-$strShowStatusHandler_commitDescr = 'COMMIT ʸǤ';
-$strShowStatusHandler_deleteDescr = 'ơ֥뤫Ǥ';
-$strShowStatusHandler_discoverDescr = 'MySQLФNDB饹ȥ졼󥸥ĥơ֥ˤĤƤξäƤ뤫䤤碌뤳ȤǤޤϳȸƤФƤޤHandler_discoverϡ줿ơ֥ο򼨤ޤ';
-$strShowStatusHandler_read_firstDescr = 'ǥåϤΥȥɤ߹Ǥ줬⤤硢ϥФ¿δʥǥåԤäƤȼޤ㤨СSELECT col1 FROM foo col1 ϥǥåȲꤷޤ';
-$strShowStatusHandler_read_keyDescr = '˴ŤƹԤɤ߹׵οǤ줬⤤硢ϤʤξȲȥơ֥뤬Ŭڤ˥ǥåդƤȤ褤ɽǤ';
-$strShowStatusHandler_read_nextDescr = 'ν̤˹ԤɤǤꥯȤοͤϰϤĤƥǥåȲ񤷤Ƥ뤫ǥåԤäƤȤޤ';
-$strShowStatusHandler_read_prevDescr = 'ν̤˹Ԥ̤äɤǤꥯȤοɤ߹ߤϼORDER BY ... DESCŬȤѤޤ';
-$strShowStatusHandler_read_rndDescr = 'ꤵ줿֤ɤǤꥯȤοͤϷ̤򥽡ȤɬפȲ̤˹Ԥȹ⤯ʤޤ餯ơ֥Τ򥹥󤷤ʤФʤʤȲ̤˹ԤäƤ뤫ŬڤѤƤʤjoinԤäƤΤȻפޤ';
-$strShowStatusHandler_read_rnd_nextDescr = 'ǡեμιԤɤ߹׵οǤʤ¿Υơ֥륹򤷤Ƥ硢Ϲ⤤Ǥ̤ˤϡʤΥơ֥뤬Ŭڤ˥ǥåդʤȲ񤬥ǥåѤ褦˽񤫤ƤʤȤ򼨺ޤ';
-$strShowStatusHandler_rollbackDescr = ' ROLLBACK ʸοǤ';
-$strShowStatusHandler_updateDescr = 'ơ֥ιԤι׵ᤷǤ';
-$strShowStatusHandler_writeDescr = 'ơ֥˹Ԥ׵ᤷǤ';
-$strShowStatusInnodb_buffer_pool_pages_dataDescr = 'ǡޤڡοǤ (dirty or clean).';
-$strShowStatusInnodb_buffer_pool_pages_dirtyDescr = 'ߤαڡοǤ';
-$strShowStatusInnodb_buffer_pool_pages_flushedDescr = 'եå夵뤳Ȥ׵ᤷХåեסڡοǤ';
-$strShowStatusInnodb_buffer_pool_pages_freeDescr = 'ڡǤ';
-$strShowStatusInnodb_buffer_pool_pages_latchedDescr = 'InnoDBХåեסǥåƤڡϸɤ߹Ǥ롢뤤Ͻ񤭹Ǥڡ뤤¾β餫ͳǥեå夷ǤʤʤäƤڡοǤ';
-$strShowStatusInnodb_buffer_pool_pages_miscDescr = 'ԥå䥢ץƥ֥ϥå奤ǥåȤäХإåɤΤǥӥˤʤäƤڡͤInnodb_buffer_pool_pages_total - Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_dataȤǤ׻Ǥޤ';
-$strShowStatusInnodb_buffer_pool_pages_totalDescr = 'ڡΥХåեסΥιפǤ';
-$strShowStatusInnodb_buffer_pool_read_ahead_rndDescr = 'InnoDBϤ֥ɤ߹ߤβϾȲ񤬥ơ֥ʬʽ֤ǥ󤹤Ȥȯޤ';
-$strShowStatusInnodb_buffer_pool_read_ahead_seqDescr = 'InnoDBϤ󥷥ɤ߹ߤβInnoDB󥷥ʥեơ֥륹ԤȤȯޤ';
-$strShowStatusInnodb_buffer_pool_read_requestsDescr = 'InnoDB ԤäŪɤ߹׵οǤ';
-$strShowStatusInnodb_buffer_pool_readsDescr = 'InnoDBХåեסƤѤǤ󥰥ڡɤ߹ߤԤʤФʤʤäɤ߹ߤβ';
-$strShowStatusInnodb_buffer_pool_wait_freeDescr = '̾InnoDBХåեסؤν񤭹ߤϥХå饦ɤǹԤޤڡɤ߹ߤʤԤɬפΤ˥꡼ʥڡʤϡޤΥڡեå夵ΤԤɬפޤΥ󥿤ϡΥȤβ򥫥ȤΤǤХåեסͤŬڤꤵƤСͤϾϤǤ';
-$strShowStatusInnodb_buffer_pool_write_requestsDescr = 'InnoDB Хåեסؤν񤭹ߤ򤷤Ǥ';
-$strShowStatusInnodb_data_fsyncsDescr = 'ޤǤ fsync() Ǥ';
-$strShowStatusInnodb_data_pending_fsyncsDescr = 'ߤ fsync() αοǤ';
-$strShowStatusInnodb_data_pending_readsDescr = 'ߤɤ߹αοǤ';
-$strShowStatusInnodb_data_pending_writesDescr = 'ߤν񤭹αοǤ';
-$strShowStatusInnodb_data_readDescr = 'ޤǤΥǡɤ߹̤Ǥ(ñ:Х)';
-$strShowStatusInnodb_data_readsDescr = 'ɤ߹ߥǡοǤ';
-$strShowStatusInnodb_data_writesDescr = '񤭹ߥǡοǤ';
-$strShowStatusInnodb_data_writtenDescr = 'ޤǤΥǡν񤭹̤Ǥ(ñ:Х)';
-$strShowStatusInnodb_dblwr_pages_writtenDescr = 'Ž񤭹ߤ¹Ԥ줿ȡŽ񤭹ߤȯڡ';
-$strShowStatusInnodb_dblwr_writesDescr = 'Ž񤭹ߤ¹Ԥ줿ȡŽ񤭹ߤȯڡ';
-$strShowStatusInnodb_log_waitsDescr = 'Хåե뤻ǺȤ³Ԥ˥եå夷ʤФʤʤʤäȯȤβ';
-$strShowStatusInnodb_log_write_requestsDescr = '׵ᤵ줿񤭹ߤοǤ';
-$strShowStatusInnodb_log_writesDescr = 'եؤʪŪʽߤοǤ';
-$strShowStatusInnodb_os_log_fsyncsDescr = 'ե fsync 񤭹ߤ򤷤Ǥ';
-$strShowStatusInnodb_os_log_pending_fsyncsDescr = 'fsync ԤΥեǤ';
-$strShowStatusInnodb_os_log_pending_writesDescr = 'եν񤭹ߤαǤ';
-$strShowStatusInnodb_os_log_writtenDescr = 'ե˽񤭹ߤХȿǤ';
-$strShowStatusInnodb_pages_createdDescr = '줿ڡοǤ';
-$strShowStatusInnodb_page_sizeDescr = 'ѥΥڡ(ǥե 16KB)Ǥ¿ͤڡǥȤޤ; ڡϡ餬ưפ˥ХȤѴ뤳ȤĤޤ';
-$strShowStatusInnodb_pages_readDescr = 'ɤ߹ߤڡǤ';
-$strShowStatusInnodb_pages_writtenDescr = '񤭹ߤڡǤ';
-$strShowStatusInnodb_row_lock_current_waitsDescr = 'ԤƤåοǤ';
-$strShowStatusInnodb_row_lock_time_avgDescr = 'åʿѻ֤Ǥ(ñ:ߥ)';
-$strShowStatusInnodb_row_lock_timeDescr = 'γ˻Ȥ줿׻Ǥ(ñ:ߥ)';
-$strShowStatusInnodb_row_lock_time_maxDescr = 'å֤Ǥ(ñ:ߥ)';
-$strShowStatusInnodb_row_lock_waitsDescr = 'ԥåԤʤФʤʤäǤ';
-$strShowStatusInnodb_rows_deletedDescr = 'InnoDB ơ֥뤫Ǥ';
-$strShowStatusInnodb_rows_insertedDescr = 'InnoDB ơ֥Ǥ';
-$strShowStatusInnodb_rows_readDescr = 'InnoDB ơ֥뤫ɤ߹Ǥ';
-$strShowStatusInnodb_rows_updatedDescr = 'InnoDB ơ֥ǹ줿Ǥ';
-$strShowStatusKey_blocks_not_flushedDescr = 'ѹ줬ޤǥ˥եå夵ƤʤåΥ֥åοǤϤĤƤ Not_flushed_key_blocks ȤΤޤ';
-$strShowStatusKey_blocks_unusedDescr = 'å̤ѥ֥åοǤɤѤƤ뤫ꤹ뤿ˤͤѤ뤳ȤǤޤ';
-$strShowStatusKey_blocks_usedDescr = 'åΥ֥åλѿǤͤϡޤƱ˻Ѥ줿֥åκؤǹǤ';
-$strShowStatusKey_read_requestsDescr = 'å夫饭֥åɤ߹ꥯȿǤ';
-$strShowStatusKey_readsDescr = 'ǥΥ֥åʪŪɤ߹߿ǤKey_reads 礭硢 key_buffer_size 餯ޤåߥΨ Key_reads/Key_read_requests ȤƷ׻뤳ȤǤޤ';
-$strShowStatusKey_write_requestsDescr = 'åؤΥ֥åν񤭹ꥯȿǤ';
-$strShowStatusKey_writesDescr = 'ǥؤΥ֥åʪŪʽ񤭹߿Ǥ';
-$strShowStatusLast_query_costDescr = 'Ȳ񥪥ץƥޥˤäƷ׻줿Ǹ˥ѥ뤵줿ȲȤǤƱȲΰۤʤȲץΥȤӤΤΩޤǥե 0 ϡȲ񤬤ޤѥ뤵ƤʤȤ̣ޤ';
-$strShowStatusNot_flushed_delayed_rowsDescr = 'Ȳ INSERT DELAY ν񤭹ԤιԿǤ';
-$strShowStatusOpened_tablesDescr = 'Ƥơ֥οǤƤơ֥뤬¿硢餯ơ֥륭åͤޤ';
-$strShowStatusOpen_filesDescr = 'ƤեοǤ';
-$strShowStatusOpen_streamsDescr = 'Ƥ륹ȥ꡼οǤ (ȤƥεϿ˻Ѥޤ)';
-$strShowStatusOpen_tablesDescr = 'Ƥơ֥οǤ';
-$strShowStatusQcache_free_blocksDescr = 'Ȳ񥭥åζ֥åοǤ';
-$strShowStatusQcache_free_memoryDescr = 'Ȳ񥭥åζ̤Ǥ';
-$strShowStatusQcache_hitsDescr = 'åΥҥåȿǤ';
-$strShowStatusQcache_insertsDescr = 'åɲä줿ȲǤ';
-$strShowStatusQcache_lowmem_prunesDescr = 'Ȳ򥭥å夹뤿˥٤å夫줿ȲοξϾȲ񥭥åΥĴȤǤȲ񥭥å夬å夫ȲꤹݤˤϡǸ˻Ȥ줿郎ǤŤΤάȤޤ';
-$strShowStatusQcache_not_cachedDescr = 'å夵ʤȲοǤ (åǤʤ query_cache_type ˤ륭å夷ʤ)';
-$strShowStatusQcache_queries_in_cacheDescr = 'åϿ줿ȲοǤ';
-$strShowStatusQcache_total_blocksDescr = 'Ȳ񥭥å֥åǤ';
+$strShowStatusBinlog_cache_disk_useDescr = 'ХʥåѤΤ binlog_cache_size ͤĶᤷե˥ơȥȤ¸ȥ󥶥';
+$strShowStatusBinlog_cache_useDescr = 'ХʥåѤȥ󥶥';
+$strShowStatusCreated_tmp_disk_tablesDescr = 'ơȥȼ¹˥Фǥ˼ươ֥Created_tmp_disk_tables ͤ礭 tmp_table_size ͤ䤷ƥǥǤϤʤ˰ơ֥ۤ褤⤷ޤ';
+$strShowStatusCreated_tmp_filesDescr = 'mysqld ե';
+$strShowStatusCreated_tmp_tablesDescr = 'ơȥȼ¹˥Фưΰơ֥';
+$strShowStatusDelayed_errorsDescr = '餫Υ顼 (֤󥭡νʣ) ȯ INSERT DELAYED 줿Կ';
+$strShowStatusDelayed_insert_threadsDescr = ' INSERT DELAYED ϥɥΥåɿINSERT DELAYED ŬѤơ֥οͭΥåɤѰդޤ';
+$strShowStatusDelayed_writesDescr = 'INSERT DELAYED ǽ񤭹ޤ줿Կ';
+$strShowStatusFlush_commandsDescr = 'FLUSH ʸμ¹Բ';
+$strShowStatusHandler_commitDescr = ' COMMIT ʸ¹Ԥ';
+$strShowStatusHandler_deleteDescr = 'ơ֥뤫Ԥ';
+$strShowStatusHandler_discoverDescr = 'MySQL Ф NDB 饹ȥ졼󥸥̾ĥơ֥ˤĤƤξäƤ뤫䤤碌뤳ȤǤޤ򳫼ȸޤHandler_discover Ϥγ줿ơ֥οǤ';
+$strShowStatusHandler_read_firstDescr = 'ǥåκǽΥȥɤ߹ͤ⤤ϥФ٤⥤ǥåΥե륹¹ԤƤΤȻפޤ㤨 SELECT col1 FROM foo ¹Ԥ (col1 ϥǥå˴ޤޤƤΤȤޤ)';
+$strShowStatusHandler_read_keyDescr = '˴ŤƹԤɤ߹ꥯȤοͤ⤤ϥȥơ֥뤬Ŭڤ˥ǥåƤΤȹͤޤ';
+$strShowStatusHandler_read_nextDescr = 'ν̤˼ιԤɤ߹ꥯȤοͤϥǥåΥϰϻ򤷤Ƥ뤫ǥåԤäƤȤäޤ';
+$strShowStatusHandler_read_prevDescr = 'ν̤ιԤɤ߹ꥯȤοɤ߹ߤϼ ORDER BY ... DESC κŬѤޤ';
+$strShowStatusHandler_read_rndDescr = 'ޤä֤˹Ԥɤ߹ꥯȤοͤ⤤ΤϷ̤򥽡Ȥɬפ륯̤˼¹ԤƤǤ餯ơ֥Τ򥹥󤷤ʤФʤʤ̤˹ԤäƤ뤫κݤΥλȤŬڤʤȤޤ';
+$strShowStatusHandler_read_rnd_nextDescr = 'ǡեμιԤɤ߹ꥯȤοͤ⤤Τϥơ֥륹̤˼¹ԤƤ뤿Ǥ̤ˤϥơ֥ΥǥåŬڤ꤬ǥåѤ褦˽񤫤ƤʤȤ̣ޤ';
+$strShowStatusHandler_rollbackDescr = ' ROLLBACK ʸ¹Ԥ';
+$strShowStatusHandler_updateDescr = 'ơ֥ιԤ򹹿ꥯȤο';
+$strShowStatusHandler_writeDescr = 'ơ֥˹ԤꥯȤο';
+$strShowStatusInnodb_buffer_pool_pages_dataDescr = 'ǡޤޤڡο (ƥڡ꡼ڡ̤鷺)';
+$strShowStatusInnodb_buffer_pool_pages_dirtyDescr = 'ߤΥƥڡο';
+$strShowStatusInnodb_buffer_pool_pages_flushedDescr = 'եåꥯȤХåեסΥڡ';
+$strShowStatusInnodb_buffer_pool_pages_freeDescr = 'ڡ';
+$strShowStatusInnodb_buffer_pool_pages_latchedDescr = 'InnoDBХåեסǥåƤڡϸɤ߹Ǥ롢뤤Ͻ񤭹Ǥڡ뤤¾β餫ͳǥեå夷ǤʤʤäƤڡοǤ';
+$strShowStatusInnodb_buffer_pool_pages_miscDescr = 'ԥå䥢ץƥ֥ϥå奤ǥåȤäХإåɤΤǥӥˤʤäƤڡͤInnodb_buffer_pool_pages_total - Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_dataȤǤ׻Ǥޤ';
+$strShowStatusInnodb_buffer_pool_pages_totalDescr = 'ڡΥХåեס륵ι';
+$strShowStatusInnodb_buffer_pool_read_ahead_rndDescr = 'InnoDBϤɤ߹ߤβϥ꤬ơ֥ʬʽ֤ǥ󤹤Ȥȯޤ';
+$strShowStatusInnodb_buffer_pool_read_ahead_seqDescr = 'InnoDBϤ󥷥ɤ߹ߤβInnoDB󥷥ʥեơ֥륹ԤȤȯޤ';
+$strShowStatusInnodb_buffer_pool_read_requestsDescr = 'InnoDB ¹Ԥɤ߹ߥꥯȤο';
+$strShowStatusInnodb_buffer_pool_readsDescr = 'InnoDB ХåեסƤѤǤ󥰥ڡɤ߹ߤԤʤФʤʤäɤ߹ߤβ';
+$strShowStatusInnodb_buffer_pool_wait_freeDescr = '̾ InnoDB Хåեסؤν񤭹ߤϥХå饦ɤǹԤޤڡɤ߹ߤʤԤɬפΤ˥꡼ʥڡʤϡޤΥڡեå夵ΤԤɬפޤΥ󥿤ϡΥȤβ򥫥ȤΤǤХåեסͤŬڤꤵƤСͤϾϤǤ';
+$strShowStatusInnodb_buffer_pool_write_requestsDescr = 'InnoDB Хåեסؤν񤭹߲';
+$strShowStatusInnodb_data_fsyncsDescr = 'ޤǤ fsync() ¹Ԥ';
+$strShowStatusInnodb_data_pending_fsyncsDescr = 'αƤ fsync() β';
+$strShowStatusInnodb_data_pending_readsDescr = 'αƤɤ߹ߤο';
+$strShowStatusInnodb_data_pending_writesDescr = 'αƤ񤭹ߤο';
+$strShowStatusInnodb_data_readDescr = 'ޤǤΥǡɤ߹ (ñ:Х)';
+$strShowStatusInnodb_data_readsDescr = 'ǡɤ߹߲ι';
+$strShowStatusInnodb_data_writesDescr = 'ǡ񤭹߲ι';
+$strShowStatusInnodb_data_writtenDescr = 'ޤǤΥǡν񤭹 (ñ:Х)';
+$strShowStatusInnodb_dblwr_pages_writtenDescr = 'Ž񤭹ߤμ¹ԲŽ񤭹ߤȯڡ';
+$strShowStatusInnodb_dblwr_writesDescr = 'Ž񤭹ߤμ¹ԲŽ񤭹ߤȯڡ';
+$strShowStatusInnodb_log_waitsDescr = 'Хåեƥեå夷ʤȺȤ³ԤǤʤʤäȯȤβ';
+$strShowStatusInnodb_log_write_requestsDescr = '񤭹ߥꥯȤο';
+$strShowStatusInnodb_log_writesDescr = 'եؤʪ񤭹ߤβ';
+$strShowStatusInnodb_os_log_fsyncsDescr = 'եؤ fsync 񤭹ߤβ';
+$strShowStatusInnodb_os_log_pending_fsyncsDescr = 'αΥեؤ fsync ';
+$strShowStatusInnodb_os_log_pending_writesDescr = 'αΥեؤν񤭹߲';
+$strShowStatusInnodb_os_log_writtenDescr = 'ե˽񤭹Хȿ';
+$strShowStatusInnodb_pages_createdDescr = '줿ڡ';
+$strShowStatusInnodb_page_sizeDescr = 'ѥ InnoDB Υڡ (ǥե:16KB)¿ͤڡñ̤Ƿ׻ޤͤȤдñ˥Хñ̤ѴǤޤ';
+$strShowStatusInnodb_pages_readDescr = 'ɤ߹ڡ';
+$strShowStatusInnodb_pages_writtenDescr = '񤭹ڡ';
+$strShowStatusInnodb_row_lock_current_waitsDescr = 'Եιԥåο';
+$strShowStatusInnodb_row_lock_time_avgDescr = 'ԥåפʿѻ (ñ:ߥ)';
+$strShowStatusInnodb_row_lock_timeDescr = 'ԥåפ֤ι (ñ:ߥ)';
+$strShowStatusInnodb_row_lock_time_maxDescr = 'ԥåפ֤κ (ñ:ߥ)';
+$strShowStatusInnodb_row_lock_waitsDescr = 'ԥåԵ';
+$strShowStatusInnodb_rows_deletedDescr = 'InnoDB ơ֥뤫Կ';
+$strShowStatusInnodb_rows_insertedDescr = 'InnoDB ơ֥Կ';
+$strShowStatusInnodb_rows_readDescr = 'InnoDB ơ֥뤫ɤ߹Կ';
+$strShowStatusInnodb_rows_updatedDescr = 'InnoDB ơ֥ǹ줿Կ';
+$strShowStatusKey_blocks_not_flushedDescr = 'ѹƤǥ˥եå夵ƤʤåΥ֥åο Not_flushed_key_blocks Ǥ';
+$strShowStatusKey_blocks_unusedDescr = 'å̤ѥ֥åοåλΨĴ٤Ȥ˻Ȥޤ';
+$strShowStatusKey_blocks_usedDescr = 'åλѺѤߥ֥åοͤϤޤǰ٤˻Ѥ줿֥åκǤ';
+$strShowStatusKey_read_requestsDescr = 'å夫饭֥åɤ߹ꥯȤο';
+$strShowStatusKey_readsDescr = 'ǥ饭֥åʪɤ߹ߤKey_reads 礭ΤϤ餯 key_buffer_size 뤿Ǥåߥγ Key_reads/Key_read_requests Ƿ׻Ǥޤ';
+$strShowStatusKey_write_requestsDescr = 'å˥֥å񤭹ꥯȤο';
+$strShowStatusKey_writesDescr = 'ǥ˥֥åʪ񤭹ߤ';
+$strShowStatusLast_query_costDescr = 'ꥪץƥޥη׻ˤ롢Ǹ˥ѥ뤵줿ȡΥץѤȤ˥ȤɤѤ뤫ӤȤǤǥեͤ 0 Ϥޤ٤⥯򥳥ѥ뤷ƤʤȤ̣Ǥ';
+$strShowStatusNot_flushed_delayed_rowsDescr = 'INSERT DELAY 塼ǽ񤭹ޤΤԤäƤԿ';
+$strShowStatusOpened_tablesDescr = 'Ƥơ֥οƤơ֥뤬¿Ϥ餯ơ֥륭åͤޤ';
+$strShowStatusOpen_filesDescr = 'Ƥեο';
+$strShowStatusOpen_streamsDescr = 'Ƥ륹ȥ꡼ο (˥εϿѤǤ)';
+$strShowStatusOpen_tablesDescr = 'Ƥơ֥ο';
+$strShowStatusQcache_free_blocksDescr = 'ꥭåζ֥åο';
+$strShowStatusQcache_free_memoryDescr = 'ꥭåζ';
+$strShowStatusQcache_hitsDescr = 'åΥҥåȿ';
+$strShowStatusQcache_insertsDescr = 'åɲä줿ο';
+$strShowStatusQcache_lowmem_prunesDescr = '򥭥å夹뤿˥٤å夫줿οξϥꥭåΥĴȤǤꥭåϺǸ˻Ȥ줿郎ǤŤΤ(LRU)ά˽äƺ륯ޤ';
+$strShowStatusQcache_not_cachedDescr = 'å夵ʤä (åǤʤ query_cache_type ǥå夷ʤȤˤʤäƤ) ο';
+$strShowStatusQcache_queries_in_cacheDescr = 'åϿƤ륯ο';
+$strShowStatusQcache_total_blocksDescr = 'ꥭå֥å';
$strShowStatusReset = 'ꥻå';
-$strShowStatusRpl_statusDescr = 'ե륻եץꥱξ֤Ǥ (Ƥޤ)';
-$strShowStatusSelect_full_joinDescr = 'ǥåѤʤοǤͤ 0 Ǥʤ硢ơ֥Υǥå褯ǧƤ';
-$strShowStatusSelect_full_range_joinDescr = 'Ϣơ֥ϰϸѤοǤ';
-$strShowStatusSelect_range_checkDescr = 'ʤjoinϳƹԤˤĤƥλ٤åΤǤʤ줬0ʳξϥơ֥Υǥå褯åƤˡ';
-$strShowStatusSelect_rangeDescr = 'ǽΥơ֥ϰϤѤοǤ (줬礭Ƥ̾ϴǤϤޤ)';
-$strShowStatusSelect_scanDescr = 'ǽΥơ֥δʥԤäοǤ';
-$strShowStatusSlave_open_temp_tablesDescr = '졼 SQL åɤˤäƸ߳ƤŪơ֥οǤ';
-$strShowStatusSlave_retried_transactionsDescr = 'ץꥱΥ졼 SQL åɤȥ󥶥ƻԤ(ư)׿';
-$strShowStatusSlave_runningDescr = 'ΥФޥ³륹졼֤Ǥ硢 ON Ǥ';
-$strShowStatusSlow_launch_threadsDescr = 'slow_launch_time ÿ֤äƺ줿åɤοǤ';
-$strShowStatusSlow_queriesDescr = 'long_query_time ÿۤȲοǤ';
-$strShowStatusSort_merge_passesDescr = 'ȥ르ꥺब¹ԤʤФʤʤäޡβͤ⤤ϡsort_buffer_sizeƥѿͤ䤹ȤƤƤ';
-$strShowStatusSort_rangeDescr = 'ϰǥȤԤ줿';
-$strShowStatusSort_rowsDescr = 'ȺѤιԿǤ';
-$strShowStatusSort_scanDescr = 'ơ֥ˤԤ줿ȿǤ';
-$strShowStatusTable_locks_immediateDescr = 'ơ֥å˼줿Ǥ';
-$strShowStatusTable_locks_waitedDescr = 'ơ֥å˼Ǥʤä˥Ȥȯͤ⤯ѥեޥ󥹤꤬ƤϡޤȲŬƤǤʤ顢ơ֥ʬ䤹뤫ץꥱѤƤ';
-$strShowStatusThreads_cachedDescr = 'åɥåΥåɿǤåҥåΨ Threads_created/Connections ȤƷ׻뤳ȤǤޤֻͤˤʤäƤȤ thread_cache_size 夲Ƥ';
-$strShowStatusThreads_connectedDescr = '³οǤ';
-$strShowStatusThreads_createdDescr = '³򰷤˺줿åɤοǤThreads_created 礭硢 thread_cache_size äȻפ⤷ޤ(̾褤åɼ򤷤Ƥ硢ϸʥѥեޥ󥹸Ϳޤ)';
-$strShowStatusThreads_runningDescr = '꡼פƤʤåɤοǤ';
+$strShowStatusRpl_statusDescr = 'ե륻եץꥱξ (̤)';
+$strShowStatusSelect_full_joinDescr = 'ǥåѤʤäοͤ 0 Ǥʤϥơ֥Υǥå褯ǧƤ';
+$strShowStatusSelect_full_range_joinDescr = 'ȥơ֥ϰϸ򤷤ο';
+$strShowStatusSelect_range_checkDescr = 'ꤵƤʤäԤĥȤƤ뤫ǧο0 Ǥʤϥơ֥Υǥå褯ǧƤ';
+$strShowStatusSelect_rangeDescr = 'ǽΥơ֥ϰϻꤵ줿ο (ͤ礭ƤդĤꤢޤ)';
+$strShowStatusSelect_scanDescr = 'ǽΥơ֥ե륹󤷤ο';
+$strShowStatusSlave_open_temp_tablesDescr = '졼֤ SQL åɤ߳Ƥơ֥ο';
+$strShowStatusSlave_retried_transactionsDescr = 'ץꥱ󥹥졼֤ SQL åɤȥ󥶥ƻԤ(ưι)';
+$strShowStatusSlave_runningDescr = 'ΥФޥ³륹졼֤Ǥ ON ˤʤޤ';
+$strShowStatusSlow_launch_threadsDescr = 'slow_launch_time ǻꤵ줿ÿʾ˺֤äåɤο';
+$strShowStatusSlow_queriesDescr = 'long_query_time ǻꤵ줿ÿʾ˻֤Τäο';
+$strShowStatusSort_merge_passesDescr = 'ȥ르ꥺब¹ԤʤФʤʤäޡβͤ⤤ sort_buffer_size ƥѿͤ䤷褤Ǥ礦';
+$strShowStatusSort_rangeDescr = 'ϰϻդǥȤԤ줿';
+$strShowStatusSort_rowsDescr = 'ȺѤιԿ';
+$strShowStatusSort_scanDescr = 'ơ֥򥹥󤷤Ȥ˼¹Ԥ줿Ȥβ';
+$strShowStatusTable_locks_immediateDescr = 'ơ֥å򤹤˼Ǥ';
+$strShowStatusTable_locks_waitedDescr = 'ơ֥å򤹤˼ǤȤȯͤ⤯ѥեޥ󥹤꤬ƤϡޤŬƤǤʤơ֥ʬ䤹뤫ץꥱѤƤ';
+$strShowStatusThreads_cachedDescr = 'åɥåΥåɿåΥҥåΨ Threads_created/Connections Ƿ׻Ǥޤ֤ͤʤäƤ thread_cache_size 礭Ƥ';
+$strShowStatusThreads_connectedDescr = '߳Ƥ³ο';
+$strShowStatusThreads_createdDescr = '³Τ˺줿åɤοThreads_created 礭 thread_cache_size ͤ䤷褤⤷ޤ (åɤμ꤬ʤϤդĤޤѥեޥ󥹤ϸ夷ޤ)';
+$strShowStatusThreads_runningDescr = '꡼פƤʤåɤο';
$strShowTableDimension = 'ơ֥礭ɽ';
-$strShowTables = 'ơ֥ɽ';
-$strShowThisQuery = ' ¹ԤȲ򤳤ɽ';
+$strShowTables = 'ơ֥ɽ';
+$strShowThisQuery = ' ¹Ԥ򤳤ɽ';
$strSimplifiedChinese = 'λ';
$strSingly = '(1 )';
$strSize = '';
-$strSkipQueries = 'Ϥ饹åפ쥳(Ȳ)ο';
+$strSkipQueries = 'Ƭåפ쥳()ο';
$strSlovak = 'Х';
$strSlovenian = '٥˥';
-$strSocketProblem = '(ޤϡ MySQL ФΥåȤΤꤵޤ)';
-$strSort = '';
+$strSmallBigAll = '٤Ƥ礭/';
+$strSnapToGrid = 'åɤˤ碌';
+$strSocketProblem = '(뤤ϥ MySQL ФΥåȤꤵƤޤ)';
$strSortByKey = 'ǥ';
-$strSorting = '';
+$strSorting = '';
+$strSort = '';
$strSpaceUsage = 'ǥ';
$strSpanish = 'ڥ';
-$strSplitWordsWithSpace = 'ñϥڡʸ(" ")ǶڤäƲ';
+$strSplitWordsWithSpace = 'ñ϶ʸ(" ")ǶڤäƤ';
$strSQLCompatibility = 'SQLߴ⡼';
$strSQLExportType = 'ݡȷ';
$strSQLImportOptions = 'SQL ץ';
$strSQLOptions = 'SQL ץ';
-$strSQLParserBugMessage = 'ʤ SQL ѡΥХ򸫤뤫⤷ޤ󡣤ʤ䤤碌ǰ˳Τơ䤬ߥޥåʤåޤ礦¾μԤˤϥƥȥꥢǰѤ¦˥Хʥ꡼ɤդƥե뤬åץɤƤޤä褦ʸͤޤޤʤ䤤碌 MySQL Υޥɥ饤ȤäƻȤǤޤMySQL ФϰʲΤ褦˥顼Фޤˤ褹Ǥ礦ޥɥ饤ǤƤ⡢ޤ꤬硢ѡԤˤϡΤ SQL 䤤碌ҤȤĤʸ˸餷ƤߤƲưʲΥǥǡڤäƥХäƲ:';
-$strSQLParserUserError = 'SQL ˥顼ޤMySQL ФϰʲΤ褦˥顼Ϥޤˤ褹Ǥ礦';
+$strSQLParserBugMessage = 'SQL ѡ˥ХĤ뤳Ȥ⤢ꤨޤޤϥ褯ưο˴ְ㤤ʤǧƤȤƤʤƥΰ˥Хʥե򥢥åץɤ饯꤬ԤȤȤ⤢ꤨޤMySQL Υޥɥ饤󥤥󥿥եѤƥ¹ԤƤߤƤ褤Ǥ礦 MySQL ФΥ顼ϤФƤ褦ʤβϤΩĤ⤷ޤ󡣤Ǥ褷ʤޥɥ饤ǤΤ˥ѡǤϼԤϡSQL ϥǡºݤ򵯤Ƥ륯ҤȤĤ˹ʤǤ顢ʲΡCUTץ˥ǡźƥХäƤ:';
+$strSQLParserUserError = 'SQL ˥顼褦Ǥ MySQL ФΥ顼ϤФƤ褦ʤβϤΩĤ⤷ޤ';
$strSQLQuery = '¹Ԥ SQL';
$strSQLResult = 'SQL η';
$strSQL = 'SQL';
-$strSQPBugInvalidIdentifer = 'ǧڤ̵Ǥ';
-$strSQPBugUnclosedQuote = '䤬ĤƤޤ';
-$strSQPBugUnknownPunctuation = '̵ʶʸǤ';
+$strSQPBugInvalidIdentifer = 'ʼ̻ҤǤ';
+$strSQPBugUnclosedQuote = '䤬ĤƤޤ';
+$strSQPBugUnknownPunctuation = '̵ʶʸǤ';
+$strStandInStructureForView = 'ӥ塼Ѥع¤';
$strStatCheckTime = 'ǽ';
$strStatCreateTime = '';
$strStatement = 'ơȥ';
-$strStatisticsOverrun = 'ӥʥФǤϡХȥ󥿤Ķ᤹뤫⤷ޤ󡣽äơMySQL Ф𤹤뤽פʤ⤷ޤ';
+$strStatisticsOverrun = '椹륵ФǤϥХȥ󥿤Ķ᤹뤳Ȥ뤿ᡢMySQL Ф𤷤ƤפΤʤȤޤ';
$strStatUpdateTime = 'ǽ';
$strStatus = '';
$strStorageEngine = 'ȥ졼󥸥';
$strStorageEngines = 'ȥ졼󥸥';
$strStrucCSV = 'CSV ǡ';
$strStrucData = '¤ȥǡ';
-$strStrucExcelCSV = 'MS Excel CSV ǡ';
-$strStrucNativeExcel = ' MS Excel ǡ';
-$strStrucNativeExcelOptions = 'ExcelΥͥƥ֥ݡȤΥץ';
+$strStrucExcelCSV = 'MS Excel Ѥ CSV';
+$strStrucNativeExcel = 'MS Excel Υͥƥַ';
+$strStrucNativeExcelOptions = 'Excel Υͥƥ֥ݡȥץ';
$strStrucOnly = '¤Τ';
$strStructPropose = 'ơ֥빽¤ǧ';
$strStructure = '¤';
+$strStructureForView = 'ӥ塼Ѥι¤';
$strSubmit = '¹Ԥ';
-$strSuccess = 'SQL ˼¹Ԥޤ';
+$strSuccess = 'SQL ˼¹Ԥޤ';
$strSum = '';
$strSwedish = 'ǥ';
$strSwitchToDatabase = 'ԡǡ١ڤؤ';
$strSwitchToTable = 'ԡơ֥ڤؤ';
-$strTable = 'ơ֥ ';
+$strTable = 'ơ֥';
$strTableAlreadyExists = 'ơ֥ %s ϴ¸ߤޤ!';
-$strTableComments = 'ơ֥';
-$strTableEmpty = 'ơ֥϶Ǥ';
-$strTableHasBeenDropped = 'ơ֥ %s ޤ';
-$strTableHasBeenEmptied = 'ơ֥ %s ˤޤ';
-$strTableHasBeenFlushed = 'ơ֥ %s Υåˤޤ';
+$strTableComments = 'ơ֥Υ';
+$strTableEmpty = 'ơ֥̾Ǥ!';
+$strTableHasBeenDropped = 'ơ֥ %s ޤ';
+$strTableHasBeenEmptied = 'ơ֥ %s ˤޤ';
+$strTableHasBeenFlushed = 'ơ֥ %s եå夷ޤ';
+$strTableIsEmpty = 'ơ֥뤬Τ褦Ǥ!';
$strTableMaintenance = 'ơ֥';
+$strTableName = 'ơ֥̾';
$strTableOfContents = 'ơ֥';
$strTableOptions = 'ơ֥륪ץ';
-$strTables = '%sơ֥';
+$strTables = '%s ơ֥';
$strTableStructure = 'ơ֥ι¤';
-$strTakeIt = 'ˤޤ';
-$strTblPrivileges = 'ơ֥ ø';
+$strTakeIt = 'ˤ';
+$strTblPrivileges = 'ơ֥ͭø';
$strTempData = 'ǡ';
-$strTextAreaLength = ' Ĺν٤ǤΥեɤ<br /> Ǥʤǽޤ';
+$strTextAreaLength = ' ĹˤäƤϤΥեɤ<br /> Ǥʤʤ⤢ޤ';
$strThai = '';
$strTheme = 'ơ / ';
-$strThemeDefaultNotFound = 'ǥեȥơޡ%sĤޤ!';
-$strThemeNoPreviewAvailable = 'ץӥ塼ѤǤޤ';
-$strThemeNotFound = 'ơޡ%sĤޤ!';
-$strThemeNoValidImgPath = 'ơޡ%sѥĤޤ!';
-$strThemePathNotFound = 'ơޡ%sΥơޥѥĤޤ!';
+$strThemeDefaultNotFound = 'ǥեȥơ %s Ĥޤ!';
+$strThemeNoPreviewAvailable = 'ץӥ塼ѤǤޤ';
+$strThemeNotFound = 'ơ %s Ĥޤ!';
+$strThemeNoValidImgPath = 'ơ %s βѥ̵Ǥ!';
+$strThemePathNotFound = 'ơ %s ΥơޥѥĤޤ!';
$strThisHost = 'Υۥ';
$strThreads = 'å';
-$strThreadSuccessfullyKilled = 'å %s Ͻλޤ';
+$strThreadSuccessfullyKilled = 'å %s ェλޤ';
+$strTimeoutInfo = 'ľΥݡȤϥॢȤޤȰ %d Ƴޤ';
+$strTimeoutNothingParsed = 'Ǹ˼¹ԤȤϤޤäǡϤǤޤǤդĤ PHP λ¤򿭤Фʤ¤ꤳΥǡΥݡȤϤǤޤ';
+$strTimeoutPassed = 'ץȤॢȤޤݡȤλΤǤƱեХݡȤƳޤ';
$strTime = '';
-$strTimeoutInfo = '˥ݡȤǥॢȤƤޤ塢 %d ³Ǥ礦';
-$strTimeoutNothingParsed = 'Ǹμ¹ԤǤΥǡϲϤƤޤ󡣤ϡ̾ php λ¤䤵ʤ phpMyAdmin ΥݡȤλ뤳ȤǤʤȤȤ̣ޤ';
-$strTimeoutPassed = 'ץȤॢȤ᤮ޤݡȤ򽪤餻硢ƱեݡȤƳƤ';
-$strToggleScratchboard = 'ȥ륹åܡ';
+$strToFromPage = '/λڡ';
+$strToggleScratchboard = 'åܡɤڤؤ';
+$strToggleSmallBig = '羮ڤؤ';
+$strToSelectRelation = '졼򤷤ޤ:';
$strTotal = '';
$strTotalUC = '';
-$strTraditionalChinese = 'Ū';
-$strTraditionalSpanish = 'Ūʥڥ';
+$strTraditionalChinese = 'λ';
+$strTraditionalSpanish = 'ڥ (ɽ)';
$strTraffic = 'ȥեå';
$strTransactionCoordinator = 'ȥ󥶥󥳡ǥ͡';
-$strTransformation_application_octetstream__download = 'եɤΥХʥǡɤ󥯤ɽޤ1 ܤΥץϥХʥեΥեǤ2 ܥץϥեޤơ֥ԤեɤǤ2 ܤΥץ󶡤硢1 ܤΥץ϶ʸꤹɬפޤ';
-$strTransformation_application_octetstream__hex = 'ǡ 16 ʿɽǤ';
-$strTransformation_image_jpeg__inline = 'åǽʥͥɽޤ; ץ: widthheight ԥǻ (Ψݤޤ)';
-$strTransformation_image_jpeg__link = 'βؤΥ󥯤ɽ (㤨 blob ľܥ).';
-$strTransformation_image_png__inline = 'image/jpeg: inline򻲾ȤƤ';
-$strTransformation_text_plain__external = 'LINUX Τ: ץꥱưɸϤեɥǡϤޤץꥱɸϤ֤ޤǥեȤ Tidy ǡ HTML ɤϤޤƥͳǡưǥեlibraries/text_plain__external.inc.phpԽ¹ԤĤġʤФʤޤ󡣺ǽΥץϡѤץοǡ2 ܤΥץϥץΥѥ᡼Ǥ3 ܤΥץ 1 ꤵƤ硢htmlspecialchars() ѤƽϤѴǤ礦(ǥե: 1)4 ץ 1 ꤵƤ硢§ɤϤ٤ 1 Ԥ˸뤳ȤݾڤǤ礦(ǥե: 1).';
-$strTransformation_text_plain__formatted = 'եɤθν񼰤¸ޤפ˽λޤ';
-$strTransformation_text_plain__imagelink = 'ȥ󥯡եޤեɤɽޤ; 1 ܤΥץ "http://domain.com/" Τ褦Ƭǡ2 ܤΥץϥԥ3 ܤϹ⤵Ǥ';
-$strTransformation_text_plain__link = 'եޤեɡ󥯤ɽ; 1 ܤΥץ "http://domain.com/" Τ褦Ƭ졢2 ܤΥץϥ󥯤ΥȥǤ';
-$strTransformation_text_plain__sql = 'SQL Ҳ ȤƥƥȤηʸˡϥ饤Ȥޤ';
-$strTransformation_text_plain__substr = 'ʸΰΤɽޤ1 ܤΥץϥƥȤνϤɤdzϤ뤫եåȤޤ (ǥեȤϡ0Ǥ)2 ܤΥץϤɤΥƥȤ֤ΥեåȤǤξ硢ĤΥƥȤ򤹤٤֤ޤ3 ܤΥץϡʸΰ֤ɤʸϤɲä뤫ޤ (ǥեȤϡ...Ǥ)';
-$strTruncateQueries = 'Ȳɽڤͤ';
+$strTransformation_application_octetstream__download = 'եɤΥХʥǡɤ󥯤ɽޤ1 ܤΥץ˥ХʥեΥե̾ꤹ뤳ȤǤޤ2 ܤΥץ˥ե̾ݻƤեɤ̾ϤȤǤޤ2 ܤΥץȤ 1 ܤΥץ϶ʸˤɬפޤ';
+$strTransformation_application_octetstream__hex = 'ǡ 16 ʿɽޤץȤƺǽΥѥ᡼˥ڡɲä٤ꤹ뤳ȤǤޤ (ǥեȤ 2 ˥֥뤴ȤǤ)';
+$strTransformation_image_jpeg__inline = 'åǽʥͥɽޤ; ץȤȹ⤵κͤԥñ̤ǻǤޤڥϤΤޤްݻޤ';
+$strTransformation_image_jpeg__link = 'βɤ뤿Υ󥯤ɽޤ';
+$strTransformation_image_png__inline = 'image/jpeg: inline';
+$strTransformation_text_plain__dateformat = 'TIMETIMESTAMPDATETIME뤤UnixॹפͤäƤեɤ񼰤ˤ碌ɽޤ1 ܤΥץϥॹפ˲ûǤ(ǥե: 0)2 ܤΥץˤνʸꤷޤ3 ܤΥץϥȤߤʤ UTC ȤߤʤǤ ("local"ʤ"utc"ȤʸꤷƤ)ͤˤäɽѤޤ"local" ξ PHP strftime() ؿ"utc" ξ gmdate() Ѥޤ'; // XXX replaced
+$strTransformation_text_plain__external = 'LINUX Τ: ץꥱưɸϷͳǥեɥǡϤޤץꥱɸϤ֤ޤǥեȤ Tidy Ǥ ( HTML ɤˤ뤿ΤΤǤ)ƥͳ libraries/transformations/text_plain__external.inc.php ʬԽѤġƤɬפޤǽΥץѤץοǡ2 ܤΥץϥץΥѥ᡼Ǥ3 ܤΥץ 1 ꤵƤ htmlspecialchars() ѤƽϤѴޤ(ǥեȤ 1 Ǥ)4 ܤΥץ 1 ꤵƤ϶§򤻤Τ 1 Ԥ˼ޤ褦ˤޤ (ǥեȤ 1 Ǥ)';
+$strTransformation_text_plain__formatted = 'եɤƤ򤽤Τޤޡhtmlspecialchars()̤ɽޤξ硢եɤˤ HTML ޤޤƤΤȲꤷޤ';
+$strTransformation_text_plain__imagelink = 'ȥ󥯤ɽޤեɤˤϥե̾Ƥ1 ܤΥץ "http://domain.com/" Τ褦URLƬʬǤ2 ܤ3 ܤΥץˤȹ⤵ԥñ̤ǻꤷޤ';
+$strTransformation_text_plain__link = '󥯤ɽޤեɤˤϥե̾Ƥ1 ܤΥץ "http://domain.com/" Τ褦 URL Ƭʬ2 ܤΥץϥ󥯤ΥȥǤ';
+$strTransformation_text_plain__sql = 'ƥȤƤ SQL Ȥߤʤʸϥ饤ɽޤ';
+$strTransformation_text_plain__substr = 'ʸΰΤߤɽޤ1 ܤΥץʸƬ鲿ʸåפ뤫 (ǥեȤ 0 Ǥ)2 ܤΥץɽƥȤʸǤ (ǥեȤʸޤǤǤ)3 ܤΥץʸڤͤȤ䤦άǤ (ǥեȤ ... Ǥ)';
+$strTruncateQueries = 'ɽڤͤ';
$strTurkish = 'ȥ륳';
-$strType = 'եɥ';
+$strType = '';
$strUkrainian = '饤ʸ';
-$strUncheckAll = 'å򤹤٤ƺ';
+$strUncheckAll = '٤ƤΥå򳰤';
$strUnicode = 'UNICODE';
-$strUnique = '';
-$strUnknown = '';
+$strUnique = 'ˡ';
+$strUnknown = '';
$strUnselectAll = '';
-$strUnsupportedCompressionDetected = 'ݡȤƤʤ̷(%s)Υեɤ߹ߤߤޤμݡȤƤʤ̵ˤʤäƤ뤫Τ줫Ǥ';
-$strUpdatePrivMessage = '%s ø򹹿ޤ';
-$strUpdateProfileMessage = 'ץե򹹿ޤ';
-$strUpdateQuery = 'Ȳ򹹿';
-$strUpdComTab = 'Column_comments ơ֥Υåץ졼ˡΥɥȤ򻲾ȤƤ';
-$strUpgrade = '%s %s ʹߤ˥åץ졼ɤƤ';
-$strUploadLimit = '餯ޤˤ礭ʥե򥢥åץɤ褦Ȥޤ¤βʤȤ %sɥ%s 򻲾ȤƤ';
-$strUploadsNotAllowed = 'ΥФǤϥեΥåץɤؤƤޤ';
+$strUnsupportedCompressionDetected = 'ݡȤƤʤ̷(%s)Υեɤ褦ȤޤηϥݡȤƤʤ̵ˤƤޤ';
+$strUpdatePrivMessage = '%s ø򹹿ޤ';
+$strUpdateProfileMessage = 'ץե򹹿ޤ';
+$strUpdateQuery = '򹹿';
+$strUpdComTab = 'column_comments ơ֥ιˡˤĤƤϥɥȤ';
+$strUpgrade = '%s %s ʹߤ˥åץ졼ɤƤ';
+$strUploadLimit = 'åץɤ褦Ȥե뤬礭褦ǤкˤĤƤ %sɥ%s ';
+$strUploadsNotAllowed = 'ΥФǤϥեΥåץɤϤǤޤ';
$strUsage = '';
-$strUseBackquotes = 'եȤǥơ֥եɤϤ';
+$strUseBackquotes = 'ơ֥̾ե̾եȤǰϤ';
$strUsedPhpExtensions = ' PHP ĥ';
$strUseHostTable = 'ۥȥơ֥Ȥ';
-$strUserAlreadyExists = '桼%sϴ¸ߤޤ!';
$strUser = '桼';
-$strUserEmpty = '桼϶Ǥ';
-$strUserName = '桼';
-$strUserNotFound = '򤵤줿桼øơ֥˸ĤޤǤ';
+$strUserAlreadyExists = '桼 %s ϴ¸ߤޤ!';
+$strUserEmpty = '桼̾Ǥ!';
+$strUserName = '桼̾';
+$strUserNotFound = 'øơ֥ˤ򤷤桼ޤ';
$strUserOverview = '桼ά';
-$strUsersDeleted = '򤵤줿桼Ϻޤ';
-$strUsersHavingAccessToDb = '桼 &quot;%s&quot; ؤΥ¤Ƥޤ';
-$strUseTabKey = 'ͤͤޤǰܤˤ TAB 򡢤⤷ϤʾǤưˤ CTRL + Ѥޤ';
-$strUseTables = 'Ȥơ֥';
-$strUseTextField = 'ƥȥեɤ';
-$strUseThisValue = 'ͤ';
+$strUsersDeleted = '򤷤桼ޤ';
+$strUsersHavingAccessToDb = '&quot;%s&quot; ˥Ǥ桼';
+$strUseTabKey = 'ͤ˰ưȤ TAB ȤäƤCTRLܥ륭Ȥȼͳ˰ưǤޤ';
+$strUseTables = 'Ѥơ֥';
+$strUseTextField = 'ƥȥեɤͤѤ';
+$strUseThisValue = 'ͤѤ';
$strValidateSQL = 'SQL θ';
-$strValidatorError = 'SQL θڵǽǤޤ%sɥ%s ˵ҤƤ褦 PHP ĥ饤֥꤬󥹥ȡ뤵Ƥ뤫åƤ';
+$strValidatorError = 'SQL θڵǽǤޤ%sɥ%s ε̤ɬפ PHP ĥ󥹥ȡ뤵Ƥ뤫ǧƤ';
$strValue = '';
$strVar = 'ѿ';
$strVersionInformation = 'С';
-$strView = 'ӥ塼';
$strViewDump = 'ơ֥Υ()ɽ';
-$strViewDumpDatabases = 'ǡ١Υץӥ塼 ()';
+$strViewDumpDatabases = 'ǡ١Υ()ɽ';
$strViewDumpDB = 'DB Υ()ɽ';
-$strViewHasBeenDropped = 'ӥ塼 %s ˴ޤ';
-$strViewMaxExactCount = 'Υӥ塼 %s ʾ夢ޤ%sɥ%s 򻲾ȤƤ';
+$strViewHasBeenDropped = 'ӥ塼 %s ˴ޤ';
+$strViewMaxExactCount = 'ӥ塼ιԿ %s ۤޤ%sɥ%s ';
+$strView = 'ӥ塼';
-$strWebServerUploadDirectory = '֥оǥåץɤ';
-$strWebServerUploadDirectoryError = 'åץɤԤǥ쥯ȥ꤬ޤ';
+$strWebServerUploadDirectoryError = 'ꤷåץɥǥ쥯ȥ꤬ѤǤޤ';
+$strWebServerUploadDirectory = '֥оΥåץɥǥ쥯ȥ';
$strWelcome = '%s ؤ褦';
$strWestEuropean = '衼åѸ';
$strWildcard = '磻ɥ';
-$strWindowNotFound = 'åȥ֥饦ɥ򹹿뤳ȤǤޤ󡣶餯ƥɥĤ뤤ϥ֥饦Υƥǡɥι֥åƤޤ';
+$strWindowNotFound = 'åȤȤʤ֥饦ɥ򹹿ǤޤǤƥɥĤ֥饦Υƥǥɥι֥åƤΤȻפޤ';
$strWithChecked = 'åΤ:';
$strWriteRequests = '񤭹ߥꥯȿ';
-$strWrongUser = '桼ޤϥѥɤޤ<br />ϵݤޤ';
+$strWrongUser = '桼̾ʤѥɤְäƤޤ<br />ϵݤޤ';
$strXkana = 'ѥʤѴ'; // convert to X208-kana
$strXMLOptions = 'XMLץ';
@@ -981,55 +1029,17 @@ $strXML = 'XML';
$strYes = 'Ϥ';
-$strZeroRemovesTheLimit = ': ץ 0 ()ꤹ¤ʤʤޤ';
-$strZip = '"zip "';
+$strZeroRemovesTheLimit = ': ץ 0 ()ꤹ¤ޤ';
+$strZip = '"zip "';
-$strPmaWiki = 'phpMyAdmin wiki'; //to translate
-$strTransformation_text_plain__dateformat = '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.'; //to translate
-$strDocSQL = 'DocSQL'; //to translate
-$strDocSQLOptions = 'DocSQL options'; //to translate
-$strTableName = 'Table name'; //to translate
-$strTableIsEmpty = 'Table seems to be empty!'; //to translate
-$strDbIsEmpty = 'Database seems to be empty!'; //to translate
-$strShowingPhp = 'Showing as PHP code'; //to translate
-$strShowingSQL = 'Showing SQL query'; //to translate
-$strDesigner = 'Designer'; //to translate
-$strNumberOfTables = 'Number of tables'; //to translate
-$strCreateTable = 'Create table'; //to translate
-$strCreateRelation = 'Create relation'; //to translate
-$strSavePosition = 'Save position'; //to translate
-$strSelectForeignKey = 'Select Foreign Key'; //to translate
-$strHide = 'Hide'; //to translate
-$strShowHideLeftMenu = 'Show/Hide left menu'; //to translate
-$strReload = 'Reload'; //to translate
-$strSmallBigAll = 'Small/Big All'; //to translate
-$strImportExportCoords = 'Import/Export coordinates for PDF schema'; //to translate
-$strMoveMenu = 'Move Menu'; //to translate
-$strAngularLinks = 'Angular links'; //to translate
-$strDirectLinks = 'Direct links'; //to translate
-$strHideShowAll = 'Hide/Show all'; //to translate
-$strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate
-$strInternalRelationAdded = 'Internal relation added'; //to translate
-$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate
-$strRelationDeleted = 'Relation deleted'; //to translate
-$strToSelectRelation = 'To select relation, click :'; //to translate
-$strExportImportToScale = 'Export/Import to scale'; //to translate
-$strRecommended = 'recommended'; //to translate
-$strToFromPage = 'to/from page'; //to translate
-$strSelectReferencedKey = 'Select referenced key'; //to translate
-$strPleaseSelectPrimaryOrUniqueKey = 'Please select the primary key or a unique key'; //to translate
-$strForeignKeyError = 'Error creating foreign key (check data types)'; //to translate
-$strHelp = 'Help'; //to translate
-$strCancel = 'Cancel'; //to translate
-$strDeleteRelation = 'Delete relation'; //to translate
-$strKnownExternalBug = 'The %s functionality is affected by a known bug, see %s'; //to translate
-$strStructureForView = 'Structure for view'; //to translate
-$strStandInStructureForView = 'Stand-in structure for view'; //to translate
-$strToggleSmallBig = 'Toggle small/big'; //to translate
-$strIEUnsupported = 'Internet Explorer does not support this function.'; //to translate
-$strErrorRelationAdded = 'Error: Relation not added.'; //to translate
-$strErrorRelationExists = 'Error: relation already exists.'; //to translate
-$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
-$strSnapToGrid = 'Snap to grid'; //to translate
-$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/japanese-sjis.inc.php b/lang/japanese-sjis.inc.php
index e7f9f74bd5..8850aaa69f 100644
--- a/lang/japanese-sjis.inc.php
+++ b/lang/japanese-sjis.inc.php
@@ -23,161 +23,165 @@ $month = array('1 ','2 ','3 ','4 ','5 ','6 ','7 ','8 ','9 ','1
$datefmt = '%Y N %B %d %H:%M';
$timespanfmt = '%s %s %s %s b';
-$strAbortedClients = 'f܂B';
-$strAccessDenied = 'ANZX͋ۂ܂B';
-$strAccessDeniedCreateConfig = '炭̖̗ŔAݒt@C쐬ĂȂ߂łB%1$sZbgAbvXNvg%2$s gpĂЂƂ쐬邱Ƃł܂B';
-$strAccessDeniedExplanation = 'MySQL T[oɐڑ悤Ƃ܂Aڑ₳܂Bconfig.inc.php ̒̃zXgA[UуpX[hMySQL T[o̊Ǘ҂^ꂽƈv邩mFĂB';
+$strAbortedClients = 'f';
+$strAccessDenied = 'ANZX͋ۂ܂';
+$strAccessDeniedCreateConfig = 'ݒt@C쐬ĂȂ̂Ǝv܂B%1$sZbgAbvXNvg%2$s 𗘗pĐݒt@C쐬Ă';
+$strAccessDeniedExplanation = 'MySQL T[oɐڑ悤Ƃ܂ۂ܂Bconfig.inc.php ̃zXgA[UApX[h MySQL T[o̊Ǘ҂^ꂽƈv邩mFĂ';
$strAction = '';
-$strAddAutoIncrement = 'uAUTO_INCREMENTllj';
+$strAddAutoIncrement = 'AUTO_INCREMENT llj';
$strAddClause = '%slj';
-$strAddConstraints = 'lj';
+$strAddConstraints = 'lj';
$strAddDeleteColumn = 'tB[hljE폜';
$strAddDeleteRow = 'sljE폜';
$strAddFields = '%s ‚̃tB[hlj';
-$strAddHeaderComment = 'wb_[փJX^Rglj (\\n ʼns)';
+$strAddHeaderComment = 'wb_ɃJX^Rglj (\\n ʼns)';
$strAddIntoComments = 'ljRg';
-$strAddNewField = 'tB[hlj';
-$strAddPrivilegesOnDb = 'f[^x[X֓̒lj';
-$strAddPrivilegesOnTbl = 'e[u֓̒lj';
-$strAddSearchConditions = 'ljĂB("where"̐ߕ):';
-$strAddToIndex = ' &nbsp;%s&nbsp; ̗CfbNXɒlj܂B';
-$strAddUser = '[Ulj';
-$strAddUserMessage = '[Ulj܂B';
+$strAddNewField = 'VKtB[hlj';
+$strAddPrivilegesOnDb = 'f[^x[Xɓlj';
+$strAddPrivilegesOnTbl = 'e[uɓlj';
+$strAddSearchConditions = '("where"߂̓e)ljĂ:';
+$strAddToIndex = 'CfbNX&nbsp;%s&nbsp; ̗lj܂';
+$strAddUserMessage = 'V[Ulj܂';
+$strAddUser = 'V[Ulj';
$strAdministration = 'Ǘ';
-$strAffectedRows = 'eꂽs:';
-$strAfter = 'wJ̌ %s';
-$strAfterInsertBack = '߂';
-$strAfterInsertNewInsert = 'VR[hlj';
+$strAffectedRows = 'ύXꂽs:';
+$strAfterInsertBack = 'Õy[Wɖ߂';
+$strAfterInsertNewInsert = 'VR[hlj';
$strAfterInsertNext = '̍sҏW';
$strAfterInsertSame = '̃y[Wɖ߂';
+$strAfter = 'wJ̌ %s';
+$strAllowInterrupt = 'Ԃ߂ȂƂɃXNvgŃC|[g𒆒fł悤ɂ܂B傫ȃt@CC|[gꍇɂ͕֗łAgUNV邱Ƃ܂';
$strAll = 'S';
-$strAllowInterrupt = '̐Ԃ߂ÂĂ邱ƂXNvgmꍇAC|[gւ݂̊‚܂B͑傫ȃt@CC|[gꍇ̂悢i܂񂪁A̓gUNV󂷂ƂɂȂ܂B';
-$strAllTableSameWidth = 'ׂẴe[u𓯂ŕ\܂?';
-$strAlterOrderBy = 'e[uԂ̏';
+$strAllTableSameWidth = 'ׂẴe[u𓯂ŕ\\܂?';
+$strAlterOrderBy = 'e[u̕я';
$strAnalyzeTable = 'e[u𕪐͂';
$strAnd = 'AND';
-$strAndThen = 'Ă̌';
-$strAnIndex = 'CfbNXu%sɒljĂ܂B';
+$strAndThen = '';
+$strAngularLinks = 'pN';
+$strAnIndex = '%s ɃCfbNXlj܂';
$strAny = 'ׂ';
$strAnyHost = 'ׂẴzXg';
$strAnyUser = 'ׂẴ[U';
-$strApproximateCount = '߂܂BFAQ 3.11 QƂĂB';
-$strAPrimaryKey = 'L[ %s ɒlj܂B';
+$strApproximateCount = 'mȐƂ͌܂BFAQ 3.11 ';
+$strAPrimaryKey = '%s ɎL[lj܂';
$strArabic = 'ArA';
$strArmenian = 'AjA';
$strAscending = '';
$strAtBeginningOfTable = 'e[u̐擪';
$strAtEndOfTable = 'e[u̖';
-$strAttr = '\';
+$strAttr = '';
$strAutodetect = 'm';
$strAutomaticLayout = 'CAEg';
$strBack = '߂';
$strBaltic = 'og';
-$strBeginCut = '؂Jn';
-$strBeginRaw = 'RAW Jn';
-$strBinary = ' oCi ';
-$strBinaryDoNotEdit = ' oCi - Cł܂';
+$strBeginCut = 'BEGIN CUT';
+$strBeginRaw = 'BEGIN RAW';
+$strBinaryDoNotEdit = ' oCi - ҏWs';
$strBinaryLog = 'oCiO';
-$strBinLogEventType = 'Cxg^Cv';
+$strBinary = ' oCi';
+$strBinLogEventType = 'Cxg';
$strBinLogInfo = '';
-$strBinLogName = 'O';
+$strBinLogName = 'O';
$strBinLogOriginalPosition = '̈ʒu';
$strBinLogPosition = 'ʒu';
$strBinLogServerId = 'T[o ID';
-$strBookmarkAllUsers = 'ׂẴ[ŨubN}[NANZXł';
+$strBookmarkAllUsers = 'ׂẴ[ŨubN}[N𗘗pł悤ɂ';
$strBookmarkCreated = 'ubN}[N %s 쐬܂';
-$strBookmarkDeleted = 'ubN}[N𐳏ɍ폜܂B';
+$strBookmarkDeleted = 'ubN}[N폜܂';
$strBookmarkLabel = 'x';
$strBookmarkQuery = 'ubN}[NĂ SQL';
-$strBookmarkReplace = 'ɑ݂铯ÕubN}[Nu';
-$strBookmarkThis = 'SQL ubN}[N';
-$strBookmarkView = '\̂';
-$strBrowseDistinctValues = '•ʂɒl\';
-$strBrowse = '\';
-$strBrowseForeignValues = 'OL[\';
+$strBookmarkReplace = '̃ubN}[N͍ւ';
+$strBookmarkThis = ' SQL ubN}[N';
+$strBookmarkView = '\\̂'; // XXX r[pH
+$strBrowseDistinctValues = 'dĂl\\Ȃ'; // XXX
+$strBrowseForeignValues = 'QƂĂl\\';
+$strBrowse = '\\';
+$strBufferPoolActivity = 'obt@v[̗p';
$strBufferPool = 'obt@v[';
-$strBufferPoolActivity = 'obt@[v[̊x';
$strBufferPoolUsage = 'obt@v[̎gp';
-$strBufferReadMisses = 'ǂݍ݃~X';
-$strBufferReadMissesInPercent = '% ̓ǂݍ݃~X';
-$strBufferWriteWaits = 'ݑ҂';
-$strBufferWriteWaitsInPercent = '% ̏ݑ҂';
+$strBufferReadMisses = 'ǂݍ݃~X';
+$strBufferReadMissesInPercent = 'ǂݍ݃~X()';
+$strBufferWriteWaitsInPercent = 'ݑ҂()';
+$strBufferWriteWaits = 'ݑ҂';
$strBulgarian = 'uKA';
-$strBusyPages = 'rW[ȃy[W';
-$strBzError = ' php o[W Bz2 gĂ̂ phpMyAdmin k_vł܂BphpMyAdmin ̃RtBO[Vt@C <code>$cfg[\'BZipDump\']</code> <code>FALSE</code>ɐݒ肵ĂBBz2 k@\gꍇɂ php ̃o[WグĉBphp oO %s ڍׁB';
-$strBzip = '"bzip "';
+$strBusyPages = 'rW[ȃy[W'; // XXX
+$strBzError = '̃o[W PHP Bz2 gĂ̂Ń_vkł܂BphpMyAdmin ̐ݒt@C <code>$cfg[\'BZipDump\']</code> <code>FALSE</code>ɐݒ肷邱Ƃ܂BBz2 k@\gꍇ PHP ̃o[WグĉBPHP ̃oO|[g %s ';
+$strBzip = '"bzip `"';
$strCalendar = 'J_[';
+$strCancel = 'LZ';
$strCanNotLoadExportPlugins = 'GNX|[gvOC[hł܂BCXg[Ă邩mFĂ!';
-$strCanNotLoadImportPlugins = 'C|[gvOCǂݍ߂܂BCXg[mFĂ!';
+$strCanNotLoadImportPlugins = 'C|[gvOC[hł܂BCXg[Ă邩mFĂ!';
$strCannotLogin = 'MySQL T[oɃOCł܂';
-$strCantLoad = 'Ȃgq̃t@Cł,<br />PHP ̐ݒ`FbNĂB';
-$strCantLoadRecodeIconv = 'Zbgϊs߂ɂ͑gݍ܂ĂȂ iconv ܂ GNU recode ̊gKvłBphp ɁÅgݒsĂAphpMyAdmin ł͕ZbgϊȂݒɂĂB';
-$strCantRenameIdxToPrimary = 'CfbNX̑O PRIMARY ɕύXł܂B';
-$strCantUseRecodeIconv = 'iconvAlibiconvArecode_string ̂̊֐gpł܂Bphp ̐ݒ`FbNĂB';
+$strCantLoad = '[a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] g[hł܂BPHP ̐ݒmFĂ';
+$strCantLoadRecodeIconv = 'Zbg̕ϊɕKv iconv Ȃ GNU recode g[hł܂BPHP ł̊gLɂ邩AphpMyAdmin ŕZbg̕ϊ𖳌ɂĂ';
+$strCantRenameIdxToPrimary = 'CfbNX PRIMARY ɕύX邱Ƃ͂ł܂!';
+$strCantUseRecodeIconv = 'KvȊg̓[hĂ悤łAiconv libiconvArecode_string ̊֐𗘗pł܂BPHP ̐ݒmFĂ';
$strCardinality = 'ӂȒl̐';
-$strCaseInsensitive = 'p̑召ʂȂ';
-$strCaseSensitive = 'p̑召ʂ';
+$strCaseInsensitive = '啶ʂȂ';
+$strCaseSensitive = '啶ʂ';
$strCentralEuropean = '[bp';
+$strChangeCopyMode = 'V[U';
+$strChangeCopyModeCopy = '̃[Uc';
+$strChangeCopyModeDeleteAndReload = '[Ue[u猳̃[U폜A[h';
+$strChangeCopyModeJustDelete = '[Ue[u猳̃[U폜';
+$strChangeCopyModeRevoke = '̃[Uׂ̓ĖɂĂ폜';
+$strChangeCopyUser = 'OC̕ύX / [U̕';
+$strChangeDisplay = '\\tB[hIĂ';
$strChange = 'ύX';
-$strChangeCopyMode = 'VK̃[U...';
-$strChangeCopyModeCopy = '... Â̂ێ';
-$strChangeCopyModeDeleteAndReload = ' ... [Ue[uÂ̂폜AœɍĂу[h';
-$strChangeCopyModeJustDelete = ' ... [Ue[uÂ̂폜';
-$strChangeCopyModeRevoke = ' ... Â̂LȓׂĖɂAō폜';
-$strChangeCopyUser = 'OC̕ύX / [URs[';
-$strChangeDisplay = '\tB[hIʼn';
$strChangePassword = 'pX[hύX';
-$strCharset = 'Zbg';
$strCharsetOfFile = 't@C̕Zbg:';
-$strCharsets = 'R[h';
$strCharsetsAndCollations = 'ZbgƏƍ';
+$strCharsets = 'Zbg';
+$strCharset = 'Zbg';
$strCheckAll = 'ׂă`FbN';
-$strCheckOverhead = 'I[o[wbȟ';
-$strCheckPrivs = '̃`FbN';
-$strCheckPrivsLong = 'f[^x[X &quot;%s&quot; ̓`FbNB';
+$strCheckOverhead = 'I[o[wbĥe[umFĂ'; // XXX
+$strCheckPrivs = '`FbN';
+$strCheckPrivsLong = 'f[^x[X &quot;%s&quot; ̓mFĂ'; // XXX
$strCheckTable = 'e[u`FbN';
-$strChoosePage = 'ҏWy[WIĂB';
-$strColComFeat = 'Rg\@\\';
+$strChoosePage = 'ҏWy[WIĂ';
+$strColComFeat = 'Rg\\@\\'; // XXX
$strCollation = 'ƍ';
-$strColumnNames = '(J)';
-$strColumnPrivileges = 'Jw̓';
+$strColumnNames = 'J';
+$strColumnPrivileges = '̃JɌŗL̓';
$strCommand = 'R}h';
+$strCommentsForTable = 'COMMENTS FOR TABLE'; // XXX
$strComments = 'Rg';
-$strCommentsForTable = 'COMMENTS FOR TABLE';
$strCompatibleHashing = 'MySQL&nbsp;4.0 ݊';
$strCompleteInserts = 'S INSERT 쐬';
$strCompression = 'k';
-$strCompressionWillBeDetected = 'C|[gꂽt@CḱAIɌmł傤: %s';
-$strConfigDefaultFileError = 'ftHgݒǂݍ߂܂ł: "%1$s"';
-$strConfigFileError = 'phpMyAdmin ݒt@CǂݍނƂł܂! <br />@G[At@C‚܂B<br />̃Nݒt@C𒼐ړǂݍŁAPHP ̃G[bZ[WmFĂB̏ꍇA؂蕶Z~RYĂ܂B<br />󔒂̃y[Wꂽ炷ׂĂ܂sĂ܂B';
-$strConfigureTableCoord = 'e[uu%se[u̐ݒ𒲐ĂB';
-$strConnectionError = 'ڑł܂: ȐݒłB';
+$strCompressionWillBeDetected = 'C|[gt@C̈k@͎̒玩o܂: %s';
+$strConfigDefaultFileError = 'ftHg̐ݒǂݍ߂܂ł: "%1$s"';
+$strConfigFileError = 'phpMyAdmin ̐ݒt@Cǂݍ߂܂ł! <br />@G[At@C‚܂B<br />̃N璼ڐݒt@Cǂݍ PHP ̃G[bZ[WmFĂBĂ̏ꍇ͂ǂɈpZ~R̔܂B<br />󔒂̃y[W\\ΖȂł';
+$strConfigureTableCoord = 'e[u %s ̍Wݒ肵Ă';
+$strConnectionError = 'ڑł܂: ݒ肪ł';
$strConnections = 'ڑ';
-$strConstraintsForDumped = '_vσe[u̐';
-$strConstraintsForTable = 'e[u̐';
-$strCookiesRequired = '̓NbL[‚ĂKv܂B';
-$strCopy = 'Rs[';
-$strCopyDatabaseOK = 'f[^x[Xu%śu%sɃRs[܂B';
+$strConstraintsForDumped = '_ve[u̐';
+$strConstraintsForTable = 'e[u̐';
+$strCookiesRequired = 'NbL[LɂĂ';
+$strCopyDatabaseOK = 'f[^x[X %s %s ɃRs[܂';
+$strCopy = 'Rs[';
$strCopyTable = 'e[u(database<b>.</b>table)ɃRs[:';
-$strCopyTableOK = 'e[uu%su%sɃRs[܂B';
-$strCopyTableSameNames = 'e[uɃRs[ł܂!';
-$strCouldNotKill = 'phpMyAdmin Xbh %s I邱Ƃł܂łB炭AɏIĂ܂B';
+$strCopyTableOK = 'e[u %s %s ɃRs[܂';
+$strCopyTableSameNames = 'e[uɂ̓Rs[ł܂!';
+$strCouldNotKill = 'Xbh %s ̏IɎs܂Błɕ‚Ă悤ł';
+$strCreateDatabaseBeforeCopying = 'Rs[̑O CREATE DATABASE ';
$strCreate = '쐬';
-$strCreateDatabaseBeforeCopying = 'Rs[̑OɁuCREATE DATABASE';
-$strCreateIndex = '&nbsp;%s&nbsp; ̗̃CfbNX쐬';
-$strCreateIndexTopic = 'VKCfbNX쐬';
+$strCreateIndex = '&nbsp;%s&nbsp; ̃JɃCfbNX쐬';
+$strCreateIndexTopic = 'VCfbNX쐬';
$strCreateNewDatabase = 'VKf[^x[X쐬';
-$strCreateNewTable = 'f[^x[Xu%sɃe[uVK쐬';
-$strCreatePage = 'VKy[W쐬';
-$strCreatePdfFeat = 'PDF 쐬@\\';
-$strCreateUserDatabase = '[Upf[^x[X';
-$strCreateUserDatabaseName = '̃f[^x[X쐬ĂׂĂ̓^܂';
+$strCreateNewTable = 'f[^x[X %s ɐVe[u쐬';
+$strCreatePage = 'Vy[W쐬';
+$strCreatePdfFeat = 'PDF ̍쐬';
+$strCreateRelation = '[V쐬';
+$strCreateTable = 'e[u쐬';
+$strCreateUserDatabaseName = '̃f[^x[X쐬ĂׂĂ̓^';
$strCreateUserDatabaseNone = 'Ȃ';
-$strCreateUserDatabaseWildcard = 'ChJ[hŎw肳ꂽf[^x[XɂׂĂ̓^܂([U_%)';
-$strCreationDates = '쐬/XV/̓tlj';
-$strCriteria = 'i݊';
+$strCreateUserDatabase = '[Upf[^x[X';
+$strCreateUserDatabaseWildcard = 'ChJ[h([U_%)ɊYf[^x[XɂׂĂ̓^';
+$strCreationDates = '쐬/XV/';
+$strCriteria = '';
$strCroatian = 'NA`A';
$strCSV = 'CSV';
$strCSVImportOptions = 'CSV IvV';
@@ -187,128 +191,140 @@ $strCzech = '`FR';
$strCzechSlovak = '`FR̃XoLA';
$strDanish = 'f}[N';
-$strData = 'f[^';
-$strDatabase = 'f[^x[X';
-$strDatabaseEmpty = 'f[^x[Xł!';
+$strDatabaseEmpty = 'f[^x[Xł!';
$strDatabaseExportOptions = 'f[^x[XGNX|[gIvV';
-$strDatabaseHasBeenDropped = 'f[^x[Xu%s𐳏ɍ폜܂B';
-$strDatabaseNoTable = '̃f[^x[X̓e[u܂ł܂!';
+$strDatabase = 'f[^x[X';
+$strDatabaseHasBeenDropped = 'f[^x[X %s 폜܂';
+$strDatabaseNoTable = '̃f[^x[Xɂ̓e[u܂!';
+$strDatabasesDropped = 'f[^x[X %s 𐳏ɍ폜܂';
$strDatabases = 'f[^x[X';
-$strDatabasesDropped = 'f[^x[Xu%s͍폜܂B';
-$strDatabasesStats = 'f[^x[X̓v';
$strDatabasesStatsDisable = 'v𖳌ɂ';
-$strDatabasesStatsEnable = 'v‚';
-$strDatabasesStatsHeavyTraffic = ': f[^x[Xv‚ MySQL WEBT[o̊ԂŏdgtBbN邩܂B';
+$strDatabasesStatsEnable = 'vLɂ';
+$strDatabasesStats = 'f[^x[X̓v';
+$strDatabasesStatsHeavyTraffic = ': f[^x[X̓vLɂƃEFuT[o MySQL T[o̊Ԃ̒ʐMʂ邱Ƃ܂';
$strDataDict = 'f[^';
+$strData = 'f[^';
$strDataOnly = 'f[^̂';
-$strDataPages = 'f[^܂ރy[W';
-$strDBComment = 'f[^x[X̃Rg: ';
-$strDBCopy = '̑OŃf[^x[XRs[';
-$strDbPrivileges = 'f[^x[X ';
-$strDBRename = '̑OɃf[^x[XύX';
-$strDbSpecific = 'f[^x[Xdl';
-$strDefault = '{l';
-$strDefaultEngine = '%s ́A MySQL T[õftHgXg[WGWłB';
-$strDefaultValueHelp = 'ftHgl̂߂ɁAobNXbVGXP[vpȂ 1 ‚̒lĉ, ̃tH[}bg: a';
+$strDataPages = 'f[^܂܂Ăy[W';
+$strDBComment = 'f[^x[X̃Rg:';
+$strDBCopy = 'f[^x[X̃Rs[';
+$strDbIsEmpty = 'f[^x[X̂悤ł!';
+$strDbPrivileges = 'f[^x[XɌŗL̓';
+$strDBRename = 'Vf[^x[X';
+$strDbSpecific = 'f[^x[XŗL';
+$strDefaultEngine = '%s ͂ MySQL T[õftHgXg[WGWł';
+$strDefault = 'ftHgl';
+$strDefaultValueHelp = 'ftHglɂ͂ЂƂ‚̒l̂ݓ͂ĂBobNXbVɂGXP[vp܂߂邱Ƃ͂ł܂B: a';
$strDefragment = 'e[ũftO';
$strDelayedInserts = 'xCT[ggp';
-$strDelete = '폜';
+$strDeleteAndFlushDescr = '͂ƂN[ȕ@łÃ[hɎԂ邱Ƃ܂';
$strDeleteAndFlush = '[U폜ē[h';
-$strDeleteAndFlushDescr = '̓NA[łB[ĥŏXԂ܂B';
-$strDeleted = 'I폜܂B';
-$strDeletedRows = '폜ꂽs:';
-$strDeleteNoUsersSelected = '폜郆[UIĂ܂!';
+$strDeletedRows = '폜s:';
+$strDeleted = 's폜܂';
+$strDelete = '폜';
+$strDeleteNoUsersSelected = '폜郆[UIĂ܂!';
+$strDeleteRelation = '[V폜';
$strDeleting = '%s 폜ł';
$strDelimiter = 'f~^';
-$strDelOld = '݂̃y[ẂA͂⑶݂Ȃe[uɎQƂ܂B̎QƂ폜ł?';
+$strDelOld = '̃y[Wɂ݂͑Ȃe[uւ̎QƂ܂B̎QƂ폜܂?';
$strDescending = '~';
$strDescription = '';
+$strDesigner = 'fUCi';
+$strDesignerHelpDisplayField = '\\tB[h̓sNFŕ\\܂B\\\\؂ւꍇ́u\\tB[hIvƂACRNbNĂK؂ȃtB[hNbN';
$strDictionary = '';
-$strDirtyPages = 'ȃy[W';
+$strDirectLinks = 'N';
+$strDirtyPages = '_[eBy[W';
$strDisabled = '';
-$strDisableForeignChecks = 'OL[̌𖳌ɂ';
-$strDisplayFeat = 'e[u\@\\';
-$strDisplayOrder = '\:';
-$strDisplayPDF = 'PDF XL[}̕\';
-$strDoAQuery = '"QUERY"s (ChJ[h: "%")';
+$strDisableForeignChecks = 'OL[̃`FbN𖳌ɂ';
+$strDisplayFeat = '\\@\\';
+$strDisplayOrder = '\\:';
+$strDisplayPDF = 'PDF XL[}\\';
+$strDoAQuery = '"query by example"s (ChJ[h: "%")';
+$strDocSQL = 'DocSQL';
+$strDocSQLOptions = 'DocSQL IvV';
$strDocu = 'hLg';
-$strDoYouReally = '{ɎsĂǂł?:';
+$strDoYouReally = '{Ɏs܂?';
+$strDropDatabaseStrongWarning = 'f[^x[XSɍ폜悤ƂĂ܂!';
$strDrop = '폜';
-$strDropDatabaseStrongWarning = 'SɃf[^x[Xj󂷂ł傤!';
-$strDropUsersDb = '[UƓOƒf[^x[X폜';
-$strDumpingData = 'e[ũ_vf[^';
-$strDumpSaved = '_vt@C %s ɕۑ܂B';
-$strDumpXRows = '%s _v܂BJn %s łB';
-$strDynamic = '_Ci~bN';
+$strDropUsersDb = '[UƓ̃f[^x[X폜';
+$strDumpingData = 'e[ũf[^_vĂ܂';
+$strDumpSaved = '_vt@C %s ɕۑ܂';
+$strDumpXRows = '%s s_v܂(Jns: %s)';
+$strDynamic = 'I';
-$strEdit = 'C';
+$strEdit = 'ҏW';
$strEditPDFPages = 'PDF y[WҏW';
-$strEditPrivileges = 'C';
-$strEffective = '';
+$strEditPrivileges = 'ҏW';
+$strEffective = ''; // XXX
$strEmpty = 'ɂ';
-$strEmptyResultSet = 'MySQL ̒lԂ܂ (Ⴆ΍s󂾂)';
+$strEmptyResultSet = 'Ԃlł(s0)';
$strEnabled = 'L';
-$strEncloseInTransaction = 'gUNVŃGNX|[g͂';
+$strEncloseInTransaction = 'GNX|[ggUNVň͂';
$strEncto = 'GR[fBO֕ϊ'; // encoding convert
$strEnd = 'Ō';
-$strEndCut = '؂I';
-$strEndRaw = 'RAW I';
-$strEngineAvailable = '%s ́A MySQL T[oŗp”\łB';
-$strEngineDisabled = '%s ́A MySQL T[oł͖ɂĂ܂B';
+$strEndCut = 'END CUT';
+$strEndRaw = 'END RAW';
+$strEngineAvailable = '%s ͗LɂȂĂ܂';
+$strEngineDisabled = '%s ͖ɂȂĂ܂';
$strEngines = 'GW';
-$strEngineUnsupported = ' MySQL T[o %s Xg[WGWT|[gĂ܂B';
+$strEngineUnsupported = ' MySQL T[o %s Xg[WGWT|[gĂ܂';
$strEnglish = 'p';
-$strEnglishPrivileges = ' : MySQL̓̑O͉pŕ\Ă܂B';
+$strEnglishPrivileges = ': MySQL ͉̓pŕ\\܂';
$strError = 'G[';
$strErrorInZipFile = 'ZIP A[JCuɃG[܂:';
-$strErrorRenamingTable = 'e[u%1$s%2$sɃl[ƂɃG[܂';
-$strEscapeWildcards = 'ChJ[hu_сu%𕶎ʂɎgpƂ́u\ŃGXP[vĂB';
-$strEsperanto = 'ی';
+$strErrorRelationAdded = 'G[: [Vljł܂ł';
+$strErrorRelationExists = 'G[: [V͂łɑ݂Ă܂';
+$strErrorRenamingTable = 'e[u %1$s %2$s Ƀl[ƂɃG[܂';
+$strErrorSaveTable = 'fUCi̍WۑƂɃG[܂';
+$strEscapeWildcards = '_ % ƂChJ[h𕶎ƂĎgpƂ \ ŃGXP[vĂ';
+$strEsperanto = 'GXyg';
$strEstonian = 'GXgjA';
-$strExcelEdition = 'Excel ̎';
-$strExcelOptions = 'Excel IvV';
-$strExecuteBookmarked = 'ubN}[NꂽƉs';
-$strExplain = 'SQL 𕪐͂';
+$strExcelEdition = 'Excel ̃GfBV';
+$strExcelOptions = 'Excel ̃IvV';
+$strExecuteBookmarked = 'ubN}[NꂽNGs';
+$strExplain = 'EXPLAIN ŊmF';
$strExport = 'GNX|[g';
-$strExportMustBeFile = '̃GNX|[g`̓t@CɕۑKv܂!';
-$strExtendedInserts = 'g INSERT 쐬';
+$strExportImportToScale = '{ɂ킹GNX|[g/C|[g';
+$strExportMustBeFile = '̌`̃GNX|[g̓t@CɕۑKv܂!';
+$strExtendedInserts = ' INSERT 쐬';
$strExtra = '̑';
-$strFailedAttempts = '݂͎s܂';
-$strField = 'tB[h';
-$strFieldHasBeenDropped = 'tB[h %s ɍ폜܂';
-$strFields = 'tB[h';
+$strFailedAttempts = 's';
+$strFieldHasBeenDropped = 'tB[h %s 폜܂';
$strFieldsEmpty = ' tB[hłB ';
$strFieldsEnclosedBy = 'tB[h͂݋L';
$strFieldsEscapedBy = 'tB[h̃GXP[vL';
+$strFields = 'tB[h';
$strFieldsTerminatedBy = 'tB[h؂L';
-$strFileAlreadyExists = 't@Cu%s͊ɃT[oɑ݂܂Bt@CύX邩A㏑IvVmFĂB';
-$strFileCouldNotBeRead = 't@Cǂ߂܂B';
-$strFileNameTemplate = 't@C̃ev[g';
-$strFileNameTemplateDescription = '̒l %1$sstrftime%2$s pāAf܂B]āAԏ̕gp邱Ƃł܂BɎ̕uNł傤: %3$sB̂܂܂ɑ̃eLXg͈ێł傤B';
-$strFileNameTemplateDescriptionDatabase = 'f[^x[X';
-$strFileNameTemplateDescriptionServer = 'T[o';
-$strFileNameTemplateDescriptionTable = 'e[u';
-$strFileNameTemplateRemember = 'ev[go';
-$strFileToImport = 't@CC|[g';
+$strField = 'tB[h';
+$strFileAlreadyExists = 'T[oɊ̃t@C %s ܂Bt@CύX邩A㏑IvVLɂĂ';
+$strFileCouldNotBeRead = 't@Cǂݍ߂܂ł';
+$strFileNameTemplateDescriptionDatabase = 'f[^x[X';
+$strFileNameTemplateDescription = '̃ev[g %1$sstrftime%2$s gĉ߂܂B̂߁AԂ̏𗘗pł܂B܂A̕ϊs܂B%3$s ȊÕeLXg͏C܂';
+$strFileNameTemplateDescriptionServer = 'T[o';
+$strFileNameTemplateDescriptionTable = 'e[u';
+$strFileNameTemplateRemember = 'ev[gL';
+$strFileNameTemplate = 't@C̃ev[g';
+$strFileToImport = 'C|[gt@C';
$strFixed = 'Œ';
-$strFlushPrivilegesNote = ': phpMyAdmin MySQL ̓e[u璼ڂɃ[U𓾂܂B}jAœύXĂƁÃe[u̓eƂ͈قȂ邩܂B̏ꍇA܂ %s [h %s Kv܂B';
-$strFlushQueryCache = 'ƉLbVtbV';
-$strFlushTable = 'e[ũLbVɂ("FLUSH")';
+$strFlushPrivilegesNote = ': phpMyAdmin MySQL ̓e[u璼ڃ[U擾܂AƂœXVꍇ phpMyAdmin pĂe[u̓eƃT[o̓̓evȂȂ邱Ƃ܂̂ŁAƂ𑱂O %s[h%s Ă';
+$strFlushQueryCache = 'NGLbVtbV';
+$strFlushTable = 'e[utbV("FLUSH")';
$strFlushTables = 'ׂẴe[utbV(‚)';
$strFontSize = 'tHgTCY';
+$strForeignKeyError = 'OL[쐬ɃG[܂ (f[^^mFĂ)';
$strFormat = 'tH[}bg';
-$strFormEmpty = 'tH[ł͒l܂łB';
-$strFreePages = 't[ȃy[W';
+$strFormEmpty = 'tH[ɓ͂ĂȂl܂!';
+$strFreePages = 't[y[W';
$strFullText = 'S';
$strFunction = '֐';
$strFunctions = '֐';
$strGenBy = '‹';
-$strGeneralRelationFeat = '[V@\\';
+$strGeneralRelationFeat = 'ʓIȃ[V@\\';
$strGenerate = '';
$strGeneratePassword = 'pX[h𐶐';
-$strGenTime = '쐬̎';
+$strGenTime = '';
$strGeorgian = 'OWA';
$strGerman = 'hCc';
$strGlobal = 'O[o';
@@ -317,18 +333,22 @@ $strGlobalValue = 'O[ol';
$strGo = 's';
$strGrantOption = 'Ϗ';
$strGreek = 'MVA';
-$strGzip = '"gzip "';
+$strGzip = '"gzip `"';
-$strHandler = '';
-$strHasBeenAltered = 'ύX܂B';
-$strHasBeenCreated = '쐬܂B';
-$strHaveToShow = '\邽߂ɁAȂĂЂƂ‚̃JIȂ΂Ȃ܂B';
+$strHandler = 'nh';
+$strHasBeenAltered = 'ύX܂';
+$strHasBeenCreated = '쐬܂';
+$strHaveToShow = 'ŒЂƂ‚͕\\JIĂ';
$strHebrew = 'wuC';
-$strHexForBinary = 'oCitB[h 16 igp';
+$strHelp = 'wv';
+$strHexForBinary = 'oCitB[hł 16 igp';
+$strHide = 'B';
+$strHideShowAll = 'ׂĉB/\\';
+$strHideShowNoRelation = '[V̂Ȃe[uB/\\';
$strHome = 'Cy[W';
-$strHomepageOfficial = 'phpMyAdmin z[';
+$strHomepageOfficial = 'phpMyAdmin ̃ItBVTCg';
+$strHostEmpty = 'zXgł!';
$strHost = 'zXg';
-$strHostEmpty = 'zXg͋ł!';
$strHTMLExcel = 'Microsoft Excel 2000';
$strHTMLExcelOptions = 'Microsoft Excel 2000 GNX|[gIvV';
$strHTMLWord = 'Microsoft Word 2000';
@@ -338,642 +358,670 @@ $strHungarian = 'nK[';
$strIcelandic = 'ACXh';
$strId = 'ID';
$strIdxFulltext = 'S';
+$strIEUnsupported = 'Internet Explorer ł͂̋@\͗pł܂';
$strIgnore = '';
-$strIgnoreDuplicates = 's̕𖳎';
-$strIgnoreInserts = 'uINSERT IGNOREgp';
+$strIgnoreDuplicates = 'dĂs𖳎';
+$strIgnoreInserts = 'INSERT IGNORE gp';
$strImport = 'C|[g';
+$strImportExportCoords = 'PDF XL[}̍WC|[g/GNX|[g';
$strImportFiles = 'C|[gt@C';
-$strImportFormat = 'C|[gσt@C̏';
-$strImportSuccessfullyFinished = 'C|[gɐ܂B%d ‚̏Ɖs܂B';
+$strImportFormat = 'C|[gt@Č`';
+$strImportSuccessfullyFinished = 'C|[g͐I܂B%d ‚̃NGs܂';
$strIndex = 'CfbNX';
$strIndexes = 'CfbNXTCY';
-$strIndexHasBeenDropped = 'CfbNX %s 폜܂';
-$strIndexName = 'CfbNX&nbsp;:';
-$strIndexType = 'CfbNX̎&nbsp;:';
-$strIndexWarningMultiple = '1 ‚z INDEX L[J `%s` pɍ쐬܂B';
-$strIndexWarningPrimary = 'J `%s` PRIMARY INDEX ̃L[𗼕Ƃݒ肷̂͂悵܂傤B';
-$strIndexWarningTable = 'e[u `%s` ̃CfbNXɊւłB';
-$strIndexWarningUnique = 'J `%s` UNIQUE INDEX ̃L[𗼕Ƃݒ肷̂͂悵܂傤B';
-$strInnoDBAutoextendIncrementDesc = ' ꂪςɂȂꍇɁAge[uXy[X̃TCYg邽߂̑ʂłB';
-$strInnoDBAutoextendIncrement = 'g̒lj';
-$strInnoDBBufferPoolSize = 'obt@[~σTCY';
-$strInnoDBBufferPoolSizeDesc = 'InnoDB LbVf[^Ƃ̃e[ũCfbNXɎgobt@̃TCYłB';
+$strIndexHasBeenDropped = 'CfbNX %s 폜܂';
+$strIndexName = 'CfbNX:';
+$strIndexType = 'CfbNX̎:';
+$strIndexWarningMultiple = '%s ƂL[J `%s` ɕ쐬܂';
+$strIndexWarningPrimary = 'J `%s` PRIMARY L[ INDEX L[𗼕w肷邱Ƃ͂ł܂';
+$strIndexWarningTable = 'e[u `%s` ̃CfbNXɖ肪܂';
+$strIndexWarningUnique = 'J `%s` UNIQUE L[ INDEX L[𗼕w肷邱Ƃ͂ł܂';
+$strInnoDBAutoextendIncrementDesc = 'Xy[XςɂȂƂɎIɃe[ugꍇɒlje[uTCY';
+$strInnoDBAutoextendIncrement = 'gɒlje[uTCY';
+$strInnoDBBufferPoolSizeDesc = 'InnoDB e[ũf[^CfbNXLbV̂Ɏgobt@';
+$strInnoDBBufferPoolSize = 'obt@v[̃TCY';
$strInnoDBDataFilePath = 'f[^t@C';
-$strInnoDBDataHomeDir = 'f[^z[fBNg';
-$strInnoDBDataHomeDirDesc = 'ׂĂ InnoDB f[^t@Cp̃fBNgpX̋ʕłB';
+$strInnoDBDataHomeDirDesc = 'ׂĂ InnoDB f[^t@CɋʂfBNgpX';
+$strInnoDBDataHomeDir = 'f[^̃z[fBNg';
$strInnoDBPages = 'y[W';
+$strInnoDBRelationAdded = 'InnoDB [Vlj܂';
$strInnodbStat = 'InnoDB Xe[^X';
-$strInsecureMySQL = 'Ȃ̃RtBO[Vt@C̐ݒ肪 MySQL ftHg̓AJEgɂȂĂ܂ (root [UŃpX[hȂ) B MySQL T[õftHgݒœ삵Ă̂ŁAN҂ɑ΂ĖhłB̃ZLeB[z[͕K‚ĂB';
-$strInsertAsNewRow = 'VsƂĒlj';
-$strInsertedRowId = 'CT[gs ID:';
-$strInsertedRows = 'ljꂽs:';
-$strInsert = 'lj';
-$strInternalNotNecessary = '* InnoDB ݂ꍇA[V͕Kvł͂܂B';
+$strInsecureMySQL = 'g̐ݒt@C MySQL ̃ftHgAJEgɑݒ (root [UŃpX[hȂ) ܂܂Ă܂Bg MySQL T[o͂̃ftHgݒœ삵Ă邽ߕsANZX”\ȏԂɂȂĂ܂B̃ZLeB[z[͂Ȃ炸‚Ă';
+$strInsertAsNewRow = 'VsƂđ}';
+$strInsertedRowId = '}s ID:';
+$strInsertedRows = '}s:';
+$strInsert = '}';
+$strInternalNotNecessary = '* InnoDB ɂ[V݂Ăꍇ͕svł';
+$strInternalRelationAdded = '[Vlj܂';
$strInternalRelations = '[V';
$strInUse = 'gp';
-$strInvalidAuthMethod = 'ݒŐȂFؕ@ݒ肵Ă܂:';
-$strInvalidColumn = 'Ȃ (%s) w肳܂!';
-$strInvalidColumnCount = 'J 0 傫Ȃ΂܂B';
-$strInvalidCSVFieldCount = 'CSV ͒ ɖȍڐ܂(s:%d)';
-$strInvalidCSVFormat = 'CSV ͒ ɖȏ܂(s:%d)';
-$strInvalidCSVParameter = 'CSV C|[g̃p[^[ł: %s';
-$strInvalidDatabase = 'f[^x[Xł';
-$strInvalidFieldAddCount = 'ȂƂЂƂ‚̃tB[hljȂ΂Ȃ܂B';
-$strInvalidFieldCount = 'e[u͏ȂƂЂƂ‚̃tB[hKvłB';
-$strInvalidLDIImport = '̃vOC͈kσC|[gT|[gĂ܂!';
-$strInvalidRowNumber = '%d ͐ȂsԍłB';
-$strInvalidServerHostname = 'T[ou%1$s̃zXgłBݒ𒲍ĂB';
-$strInvalidServerIndex = 'ȃT[oCfbNXł: "%s"';
-$strInvalidTableName = 'e[uł';
+$strInvalidAuthMethod = 'ݒt@CɖȔFؕ@w肳Ă܂:';
+$strInvalidColumnCount = 'J 0 傫Ȃ΂܂';
+$strInvalidColumn = 'sȃJ(%s)w肳Ă܂!';
+$strInvalidCSVFieldCount = 'CSV ͂̃tB[hsł (s: %d)';
+$strInvalidCSVFormat = 'CSV ͂̏sł (s: %d)';
+$strInvalidCSVParameter = 'CSV C|[g̃p[^sł: %s';
+$strInvalidDatabase = 'sȃf[^x[Xł';
+$strInvalidFieldAddCount = 'ŒЂƂ‚̓tB[hljĂ';
+$strInvalidFieldCount = 'e[uɂ͍ŒЂƂ‚̃tB[hKvł';
+$strInvalidLDIImport = '̃vOCł͈kꂽt@C̃C|[g͂ł܂!';
+$strInvalidRowNumber = '%d ͕sȍsԍł';
+$strInvalidServerHostname = 'T[o %1$s ̃zXgsłBݒmFĂ';
+$strInvalidServerIndex = 'T[õCfbNXsł: "%s"';
+$strInvalidTableName = 'e[usł';
$strJapanese = '{';
$strJoins = '';
-$strJumpToDB = '&quot;%s&quot; f[^x[XփWv.';
-$strJustDelete = 'e[u烆[U𑦍폜';
-$strJustDeleteDescr = '&quot;폜&quot; [U͓[h܂ŃT[oɃANZX”\łB';
+$strJumpToDB = '&quot;%s&quot; f[^x[XɈړ';
+$strJustDelete = 'e[u烆[U폜邾ɂ';
+$strJustDeleteDescr = '[h܂ł́u폜vꂽ[Uӂ‚ɃT[oɃANZXł܂';
$strKanjiEncodConvert = 'R[hϊ'; // kanji code convert
-$strKeepPass = 'pX[hύXȂ';
+$strKeepPass = 'pX[h͕ύXȂ';
$strKeyCache = 'L[LbV';
-$strKeyname = 'L[';
+$strKeyname = 'L[';
$strKill = '~';
+$strKnownExternalBug = '%s ̋@\ɂ͊m̃oO܂B%s ';
$strKorean = '؍';
-$strLandscape = 'hXP[v';
+$strLandscape = '';
+$strLanguageFileNotFound = 't@Cu%1$sv‚܂';
+$strLanguageUnknown = 't@Co^Ă܂: %1$s';
$strLanguage = '';
-$strLanguageFileNotFound = 't@Cu%1$s‚܂B';
-$strLanguageUnknown = '̌: %1$s.';
$strLatchedPages = 'b`Ăy[W';
-$strLatexCaption = 'e[uLvV';
+$strLatexCaption = 'e[ũLvV';
$strLatexContent = 'e[u __TABLE__ ̓e';
-$strLatexContinued = '()';
-$strLatexContinuedCaption = 'p̃e[uLvV';
-$strLatexIncludeCaption = 'e[uLvV܂';
+$strLatexContinued = '()';
+$strLatexContinuedCaption = 'e[ũLvV()';
+$strLatexIncludeCaption = 'e[ũLvV܂߂';
$strLatexLabel = 'xL[';
$strLaTeX = 'LaTeX';
$strLaTeXOptions = 'LaTeX IvV';
$strLatexStructure = 'e[u __TABLE__ ̍\';
$strLatvian = 'grA';
-$strLDIImportOptions = 'LOAD DATA p CSV ̃C|[gIvV';
-$strLDI = 'LOAD DATA p CSV';
-$strLDILocal = '[JL[[hgp';
-$strLengthSet = '/Zbg*';
-$strLimitNumRows = 'y[W̍ő僌R[h';
+$strLDIImportOptions = 'LOAD DATA CSV C|[gƂ̃IvV';
+$strLDI = 'LOAD DATA CSV';
+$strLDILocal = 'LOCAL L[[hgp';
+$strLengthSet = '/l';
+$strLimitNumRows = 'y[W̍s';
$strLinesTerminatedBy = 's̏I[L';
-$strLinkNotFound = 'N‚܂';
-$strLinksTo = 'N';
+$strLinkNotFound = 'N悪‚܂';
+$strLinksTo = 'N';
$strLithuanian = 'gAjA';
$strLocalhost = '[J';
-$strLocationTextfile = 'eLXgt@C̏ꏊ';
-$strLogin = 'OC';
+$strLocationTextfile = 'eLXgt@C̈ʒu';
$strLoginInformation = 'OC';
+$strLogin = 'OC';
$strLogout = 'OAEg';
$strLogPassword = 'pX[h:';
$strLogServer = 'T[o';
-$strLogUsername = '[U:';
-$strLongOperation = '͎̑Ԃ܂Błi݂܂?';
+$strLogUsername = '[U:';
+$strLongOperation = '̍Ƃɂ͎Ԃ邱Ƃ܂Bs܂?';
-$strMaxConnects = 'ősڑ';
-$strMaximalQueryLength = '쐬Ɖ̍ő咷';
-$strMaximumSize = 'őTCY: %s%s';
-$strMbExtensionMissing = 'mbstring PHP g͌‚܂łAA}`oCgZbggpĂ悤Ɍ܂BphpMyAdmin mbstring gȂł͕𐳊mɕ邱ƂłA܂A\ȂʂԂĂ邩܂B';
-$strMbOverloadWarning = 'PHP ̐ݒ mbstring.func_overload LłB̃IvV phpMyAdmin ƌ݊ȂA‚̃f[^̔jN܂!';
-$strMIME_available_mime = 'L MIME ^Cv';
-$strMIME_available_transform = 'ϊL';
+$strMaxConnects = 'ő哯ڑ';
+$strMaximalQueryLength = '쐬NG̍ő咷';
+$strMaximumSize = 'Œ: %s%s';
+$strMbExtensionMissing = 'PHP mbstring g‚܂łB}`oCgZbggpĂ悤łAmbstring gȂ phpMyAdmin ͕𐳂łȂߗ\ȂʂɂȂ邱Ƃ܂';
+$strMbOverloadWarning = 'PHP ̐ݒ mbstring.func_overload LɂȂĂ܂BphpMyAdmin ͂̃IvVɑΉĂȂ߁Af[^j󂳂邱Ƃ܂!';
+$strMIME_available_mime = 'pł MIME ^Cv';
+$strMIME_available_transform = 'płϊ@\\';
$strMIME_description = '';
$strMIME_MIMEtype = 'MIME ^Cv';
-$strMIME_nodescription = '̕ϊɂ͗LȐ܂B<br />҂%s̈ӖmFB';
-$strMIME_transformation = 'uEU[ϊ';
-$strMIME_transformation_note = 'p”\ȕϊIvV̈ꗗAт MIME `ϊɊւẮA%sϊ̐%s NbNĂB';
+$strMIME_nodescription = '̕ϊ@\ɂ͐܂B<br />%s ̓ɂ‚Ă͍҂ɂmF';
+$strMIME_transformation_note = 'p”\ȕϊIvV MIME ^Cv̕ϊ̈ꗗɂ‚Ă %sϊ@\̐%s ';
$strMIME_transformation_options = 'ϊIvV';
-$strMIME_transformation_options_note = '̏gpāAϊIvV̒l͂Ă: \'a\', 100, b,\'c\'...<br />obNXbV("\")VONH[g("\'")lɊ܂߂Kvꍇ(u\\\\xyzua\\\'b̂悤)obNXbVŃGXP[vĂ';
-$strMIMETypesForTable = 'MIME TYPES FOR TABLE';
-$strMIME_without = 'C^bN̂ňꂽ MIME ^Cv͌•ʂ̕ϊ֐Ă܂B';
-$strModifications = '𐳂C܂B';
+$strMIME_transformation_options_note = 'ϊIvV̒l̏: \'a\',\'b\',\'c\'...<br />obNXbV ("\") VONH[g ("\'") lɊ܂߂Kvꍇ ( \\\\xyz a\\\'b ̂悤) obNXbVŃGXP[vĂ';
+$strMIME_transformation = 'uEUϊ@\\';
+$strMIMETypesForTable = 'MIME TYPES FOR TABLE'; // XXX
+$strMIME_without = 'C^bN\\Ă MIME ^Cvɂ͌•ʂ̕ϊ֐͂܂';
+$strModifications = 'Cۑ܂';
$strModify = 'C';
-$strModifyIndexTopic = 'CfbNXύX';
-$strMoveTable = 'e[u(database<b>.</b>table)Ɉړ:';
-$strMoveTableOK = 'e[uu%su%sɈړ܂B';
-$strMoveTableSameNames = 'e[uɈړł܂!';
-$strMultilingual = '';
-$strMyISAMDataPointerSize = 'f[^̃|C^[TCY';
-$strMyISAMDataPointerSizeDesc = 'CREATE TABLE MyISAM e[uɎgp MAX_ROWS IvVw肳Ȃꍇ̃oCgw̃ftHg|C^[TCYłB';
-$strMyISAMMaxExtraSortFileSize = 'CfbNX쐬pꎞt@C̍őTCY';
-$strMyISAMMaxExtraSortFileSizeDesc = 'MyISAM̃CfbNX쐬Ƃɗpe|t@C̑傫AL[LbV𗘗pƂ肱Ɏw肵lȏ傫Ȃꍇ́AL[LbV@g܂B';
-$strMyISAMMaxSortFileSize = 'ꎞ\[gt@C̍őTCY';
-$strMyISAMMaxSortFileSizeDesc = 'MyISAM CfbNX̍č쐬Ŏgp邱Ƃꂽ MySQL ꎞt@C̍őTCYł (REPAIR TABLE AALTER TABLE LOAD DATA INFILE)';
-$strMyISAMRecoverOptionsDesc = 'NbV MyISAM e[u̎񕜗p[hŁAT[oNIvV --myisam-recover Őݒ肵܂B';
+$strModifyIndexTopic = 'CfbNXC';
+$strMoveMenu = 'j[ړ';
+$strMoveTable = 'e[üړ(database<b>.</b>table):';
+$strMoveTableOK = 'e[u %s %s Ɉړ܂';
+$strMoveTableSameNames = 'e[uɂ͈ړł܂!';
+$strMultilingual = '';
+$strMyISAMDataPointerSizeDesc = 'MAX_ROWS IvVw肹 MyISAM e[u쐬Ƃ CREATE TABLE gpftHg̃|C^TCY (oCgP)';
+$strMyISAMDataPointerSize = 'f[^|C^̃TCY';
+$strMyISAMMaxExtraSortFileSize = 'CfbNX쐬ɗpꎞt@C̍őTCY';
+$strMyISAMMaxExtraSortFileSizeDesc = 'MyISAM ̃CfbNXƂɗpꎞt@CƃL[LbV̍Ŏw肵lȏɑ傫Ȃꍇ́AL[LbV@g܂';
+$strMyISAMMaxSortFileSizeDesc = 'MyISAM CfbNXč쐬Ƃ (REPAIR TABLE ALTER TABLEALOAD DATA INFILE ̍Œ) ɗpłꎞt@C̍őTCY';
+$strMyISAMMaxSortFileSize = '\[gp̈ꎞt@C̍őTCY';
$strMyISAMRecoverOptions = 'C[h';
+$strMyISAMRecoverOptionsDesc = 'NbV MyISAM e[uCƂ̃[h (T[oNIvV --myisam-recover Őݒ肳)';
+$strMyISAMRepairThreadsDesc = '̒l 1 傫ꍇ MyISAM e[ũCfbNXCɃ\[gvZXɂ (XbhƂ) 쐬܂';
$strMyISAMRepairThreads = 'Xbh̏C';
-$strMyISAMRepairThreadsDesc = '̒l 1 ȏȂAMyISAM e[ũCfbNX̓\[g̏Cɕs(ꎩg̊eCfbNX)쐬܂B';
-$strMyISAMSortBufferSize = '\[gobt@[TCY';
-$strMyISAMSortBufferSizeDesc = '̃obt@[́AREPAIR TABLE ̊Ԃ MyISAM CfbNX\[gꍇA܂ CREATE INDEX ALTER TABLE ƃCfbNX쐬ꍇɁAt܂B';
+$strMyISAMSortBufferSizeDesc = 'REPAIR TABLE ̍Œ MyISAM ̃CfbNX\[gƂA邢 CREATE INDEX ALTER TABLE ŃCfbNX쐬ƂɊ蓖Ăobt@';
+$strMyISAMSortBufferSize = '\[gobt@̃TCY';
$strMySQLCharset = 'MySQL ̕Zbg';
-$strMysqlClientVersion = 'MySQL NCAgo[W';
-$strMySQLConnectionCollation = 'MySQL ڑƍ';
+$strMysqlClientVersion = 'MySQL NCAg̃o[W';
+$strMySQLConnectionCollation = 'MySQL ̐ڑƍ';
$strMySQLSaid = 'MySQL̃bZ[W: ';
-$strMySQLShowProcess = 'MySQL vZX̕\';
+$strMySQLShowProcess = 'MySQL vZX̕\\';
$strMySQLShowStatus = 'MySQL ̃^C';
$strMySQLShowVars = 'MySQL ̃VXeϐ';
-$strName = 'O';
+$strName = 'O';
$strNext = '';
+$strNoActivity = '%s bȏ㑀܂łBOCȂĂ';
+$strNoDatabases = 'f[^x[X݂܂';
+$strNoDatabasesSelected = 'f[^x[XIĂ܂';
+$strNoDataReceived = 'C|[gf[^Mł܂łBt@CMĂȂAt@CTCY PHP ̐ݒŋ‚ꂽől𒴂Ă܂BFAQ 1.16';
+$strNoDescription = '܂';
+$strNoDetailsForEngine = '̃Xg[WGWɂ̓Xe[^X̏ڍ׏͂܂';
+$strNoDropDatabases = 'DROP DATABASE ͖ɂĂ܂';
+$strNoExplain = 'SQL EXPLAIN ͂XLbv';
+$strNoFilesFoundInZip = 'ZIP A[JCuɃt@C܂܂Ă܂!';
+$strNoFrames = 'phpMyAdmin <b>t[Ή</b>uEUł̗p߂܂';
+$strNoIndex = 'CfbNX`Ă܂!';
+$strNoIndexPartsDefined = 'CfbNX`Ă܂!';
+$strNoModification = 'ύXȂ';
+$strNone = 'Ȃ';
+$strNoOptions = '̏ɂ̓IvV͂܂';
+$strNoPassword = 'pX[hȂ';
+$strNoPermission = '̃EFuT[oɂ̓t@C %s ۑ錠܂';
+$strNoPhp = 'PHP R[hȗ';
+$strNoPrivileges = 'Ȃ';
+$strNoRights = 'sŃANZXł܂!';
+$strNoRowsSelected = 'sIĂ܂';
$strNo = '';
-$strNoActivity = '%s bȏ㑀܂łBēxOCĂB';
-$strNoDatabases = 'f[^x[X';
-$strNoDatabasesSelected = 'f[^x[XIĂ܂B';
-$strNoDataReceived = 'C|[gf[^Mł܂łBt@CMĂȂAt@CTCYPHP̐ݒŋ‚ꂽől𒴂Ă܂BFAQ 1.16';
-$strNoDescription = 'Lq܂';
-$strNoDetailsForEngine = '̃Xg[WGWɂ͗LȃXe[^X̏ڍ׏͂܂B';
-$strNoDropDatabases = 'uDROP DATABASEXe[gg͋֎~';
-$strNoExplain = 'SQL ͂̕΂';
-$strNoFilesFoundInZip = 'ZIP A[JCuɃt@C‚܂!';
-$strNoFrames = 'phpMyAdmin <b>t[</b>T|[guEUł̗p߂܂B';
-$strNoIndex = 'CfbNX͐ݒ肳Ă܂B';
-$strNoIndexPartsDefined = 'CfbNX͐̕ݒ肳Ă܂B';
-$strNoModification = 'ύX';
-$strNone = '';
-$strNoOptions = '̏̓IvV܂B';
-$strNoPassword = 'pX[h';
-$strNoPermission = 't@Cu%sۑp[~bVEFuT[o͎Ă܂B';
-$strNoPhp = 'PHP R[h';
-$strNoPrivileges = '';
-$strNoRights = 'ݓĂȂ̂łɓ܂B';
-$strNoRowsSelected = 's͑I܂łB';
-$strNoSpace = 't@Cu%sۑɂ͋󂫗eʂ\łB';
-$strNoTablesFound = '݂̃f[^x[XɃe[u͂܂B';
-$strNoThemeSupport = 'e[}T|[gĂ܂Bݒƃe[}fBNgu%smFĂB';
-$strNotNumber = '͐lł͂܂B';
-$strNotOK = 'OK ł͂܂B';
-$strNotSet = 'e[uu<b>%s</b>‚ȂA%s ݒ肳Ă܂B';
-$strNoUsersFound = 'Y[U͌‚܂łB';
-$strNoValidateSQL = 'SQL ؂XLbv';
-$strNull = '̒l(NULL)';
+$strNoSpace = '󂫗eʕsŃt@C %s ۑł܂';
+$strNoTablesFound = '̃f[^x[Xɂ̓e[u܂';
+$strNoThemeSupport = 'e[}͗pł܂Bݒe[}fBNg %s mFĂ';
+$strNotNumber = 'lł͂܂!';
+$strNotOK = 'Not OK';
+$strNotSet = 'e[u <b>%s</b> ‚܂B邢 %s ɂ͐ݒ肳Ă܂';
+$strNoUsersFound = '[U݂܂';
+$strNoValidateSQL = 'SQL ̌؂XLbv';
+$strNull = 'k(NULL)';
$strNumberOfFields = 'tB[h';
-$strNumSearchResultsInTable = 'e[u <i>%2\$s</i> %2\$s v܂B';
-$strNumSearchResultsTotal = '<b>:</b> <i>%s</i> ‚܂B';
+$strNumberOfTables = 'e[u';
+$strNumSearchResultsInTable = '%s ie[u <i>$s</i>)';
+$strNumSearchResultsTotal = '<b>v:</b> <i>%s</i> ';
$strNumTables = 'e[u';
$strOK = 'OK';
+$strOpenDocumentSpreadsheetOptions = 'XvbhV[gIvV';
$strOpenDocumentSpreadsheet = 'XvbhV[gJ';
-$strOpenDocumentSpreadsheetOptions = 'XvbhV[gJƂ̃IvV';
$strOpenDocumentText = 'eLXgJ';
-$strOpenDocumentTextOptions = 'eLXgJƂ̃IvV';
-$strOpenNewWindow = 'V phpMyAdmin ̃EBhEJ';
+$strOpenDocumentTextOptions = 'eLXgIvV';
+$strOpenNewWindow = 'ʃEBhEŊJ';
$strOperations = '';
-$strOperator = '';
+$strOperator = 'Zq';
$strOptimizeTable = 'e[uœK';
$strOr = '܂';
$strOverhead = 'I[o[wbh';
-$strOverwriteExisting = 't@C݂ꍇ͏㏑';
+$strOverwriteExisting = '̃t@C͏㏑';
$strPageNumber = 'y[Wԍ:';
-$strPagesToBeFlushed = 'tbVꂽy[W';
-$strPaperSize = 'TCY';
-$strPartialImport = 'IȃC|[g';
-$strPartialText = 'Iȕ';
-$strPassword = 'pX[h';
-$strPasswordChanged = '%s ̃pX[h͕ύX܂B';
-$strPasswordEmpty = 'pX[hłB';
+$strPagesToBeFlushed = 'tbV҂y[W';
+$strPaperSize = 'pTCY';
+$strPartialImport = 'C|[g';
+$strPartialText = 'eLXg';
+$strPasswordChanged = '%s ̃pX[h͐ύX܂';
+$strPasswordEmpty = 'pX[hł!';
$strPasswordHashing = 'pX[hnbV';
-$strPasswordNotSame = 'pX[hł͂܂B';
-$strPdfDbSchema = 'f[^x[Xu%s̃XL[} - y[W %s';
-$strPdfInvalidTblName = '"%s" e[u܂!';
+$strPasswordNotSame = 'pX[hقȂĂ܂!';
+$strPassword = 'pX[h';
+$strPdfDbSchema = 'f[^x[X %s ̃XL[} - y[W %s';
+$strPdfInvalidTblName = '"%s" e[u݂͑܂!';
$strPdfNoTables = 'e[u܂';
$strPDFOptions = 'PDF IvV';
$strPDF = 'PDF';
-$strPDFReportExplanation = '(Pe[ũf[^܂ރ|[g𐶐܂)';
-$strPDFReportTitle = '|[g̑';
-$strPerHour = '';
+$strPDFReportExplanation = '(ЂƂ‚̃e[ũf[^܂ރ|[g𐶐܂)';
+$strPDFReportTitle = '|[g̃^Cg';
+$strPerHour = '/';
$strPerMinute = '/';
$strPerSecond = '/b';
$strPersian = 'yVA';
$strPhoneBook = 'db';
-$strPHP40203 = '}`oCg(mbstring)̈ɏdȃoÔ PHP 4.2.3 gĂ܂BPHP ̃oO|[g 19404 ԂłBphpMyAdmin gpȂÃo[W PHP ͂߂܂...ƌpb`ĂȂΓ삵܂B';
+$strPHP40203 = 'g PHP 4.2.3 ɂ̓}`oCg (mbstring) ̈ɏdȃoO܂BPHP ̃oO|[g 19404 ԂB̃o[W PHP ͂߂ł܂';
$strPhp = 'PHP R[h̍쐬';
-$strPHPVersion = 'PHP o[W';
+$strPHPVersion = 'PHP ̃o[W';
+$strPleaseSelectPrimaryOrUniqueKey = 'L[܂̓j[NȃL[IĂ';
$strPmaDocumentation = 'phpMyAdmin ̃hLg';
-$strPmaUriError = '<tt>$cfg[\'PmaAbsoluteUri\']</tt> Kݒt@CŐݒ肵Ă!';
+$strPmaUriError = '<tt>$cfg[\'PmaAbsoluteUri\']</tt> ͂Ȃ炸ݒt@CŐݒ肷Kv܂!';
+$strPmaWiki = 'phpMyAdmin wiki';
$strPolish = '|[h';
-$strPortrait = '|[gCg';
-$strPos1 = 'ŏ';
-$strPrevious = 'ȑO';
-$strPrimary = 'v';
-$strPrimaryKeyHasBeenDropped = 'L[폜܂B';
-$strPrimaryKeyName = 'L[̑O... PRIMARY ł͂Ȃ΂܂B';
-$strPrimaryKeyWarning = '("PRIMARY"͂傤ǎL[̑Oł͂Ȃ΂܂B';
+$strPortrait = 'c';
+$strPos1 = '擪';
+$strPrevious = 'O';
+$strPrimary = '';
+$strPrimaryKeyHasBeenDropped = 'L[폜܂';
+$strPrimaryKeyName = 'L[̖O PRIMARY łȂ΂Ȃ܂!';
+$strPrimaryKeyWarning = '(L[͂Ȃ炸 "PRIMARY" ƂOłȂ΂Ȃ܂B܂L[ȊO"PRIMARY"ƂOgĂ͂Ȃ܂!)';
$strPrint = '';
-$strPrintView = 'p̕\';
-$strPrintViewFull = 'r[ (SeLXg܂)';
-$strPrivDescAllPrivileges = 'GRANT ׂĂ̓܂݂܂B';
-$strPrivDescAlter = '݂e[u\̕ύX‚܂B';
-$strPrivDescAlterRoutine = 'XgAh[`̕ύXƔj‚܂B';
-$strPrivDescCreateDb = 'Vf[^x[XAe[u̍쐬‚܂B';
-$strPrivDescCreateRoutine = 'XgAh[`̍쐬‚܂B';
-$strPrivDescCreateTbl = 'Ve[u̍쐬‚܂B';
-$strPrivDescCreateTmpTable = 'e|[e[u̍쐬‚܂B';
-$strPrivDescCreateUser = '[UAJEg̍쐬EjE̕ύX‚܂B';
-$strPrivDescCreateView = 'Vr[̍쐬‚܂B';
-$strPrivDescDelete = 'f[^̍폜‚܂B';
-$strPrivDescDropDb = 'f[^x[Xƃe[u̍폜‚܂B';
-$strPrivDescDropTbl = 'e[u̍폜‚܂B';
-$strPrivDescExecute5 = 'XgAh[`̎s‚܂B';
-$strPrivDescExecute = 'XgA[hvVW[s邱Ƃ‚܂B MySQL łł͈Ӗ܂B';
-$strPrivDescFile = 'f[^̃C|[gAf[^̃t@Cւ̃GNX|[g‚܂B';
-$strPrivDescGrant = 'e[ũ[hȂɃ[UA̒lj‚܂B';
-$strPrivDescIndex = 'CfbNX̍쐬A폜‚܂B';
-$strPrivDescInsert = 'f[^̑}Aւ‚܂B';
-$strPrivDescLockTables = '݂̃Xbh̃bLOe[u‚܂B';
-$strPrivDescMaxConnections = '1 ԓɐVڑ”\Ȑ𐧌܂B';
-$strPrivDescMaxQuestions = '1 ԓɃT[oɏƉ𑗂鐔𐧌܂B';
-$strPrivDescMaxUpdates = '1 ԓɃe[uAf[^x[Xɑ΂Ă̕ύXR}h̐𐧌܂B';
-$strPrivDescMaxUserConnections = '[U̓̐ڑ𐧌܂B';
-$strPrivDescProcess3 = '̃[UvZX~ł邱Ƃ‚܂B';
-$strPrivDescProcess4 = 'vZXꗗ̊SȏƉ̕\‚܂B';
-$strPrivDescReferences = ' MySQL o[Wł͈Ӗ܂B';
-$strPrivDescReload = 'T[õ[hALbṼNA‚܂B';
-$strPrivDescReplClient = 'X[u}X^[vł錠[Uɗ^܂B';
-$strPrivDescReplSlave = 'vP[VX[uKvłB';
-$strPrivDescSelect = 'f[^̓ǂݏo';
-$strPrivDescShowDb = 'f[^x[X̊SȈꗗւ̃ANZX^܂B';
-$strPrivDescShowView = 'Ɖ SHOW CREATE VIEW ̎s‚܂B';
-$strPrivDescShutdown = 'T[õVbg_E‚܂B';
-$strPrivDescSuper = 'ő̐ڑɒBĂڑ‚܂B̊Ǘ̓O[oϐ⑼[UvZX̏Ił悤Ȑݒ肪KvłB';
-$strPrivDescUpdate = 'f[^̏C‚܂B';
-$strPrivDescUsage = '܂B';
+$strPrintViewFull = 'p (SeLXg܂)';
+$strPrintView = 'p';
+$strPrivDescAllPrivileges = 'GRANT ȊÔׂĂ̓t^';
+$strPrivDescAlterRoutine = 'XgAh[`̏Cƍ폜‚';
+$strPrivDescAlter = '̃e[u\̕ύX‚';
+$strPrivDescCreateDb = 'Vf[^x[Xe[u̍쐬‚';
+$strPrivDescCreateRoutine = 'XgAh[`̍쐬‚';
+$strPrivDescCreateTbl = 'Ve[u̍쐬‚';
+$strPrivDescCreateTmpTable = 'ꎞe[u̍쐬‚';
+$strPrivDescCreateUser = '[UAJEg̍쐬E폜El[‚';
+$strPrivDescCreateView = 'Vr[̍쐬‚';
+$strPrivDescDelete = 'f[^̍폜‚';
+$strPrivDescDropDb = 'f[^x[Xƃe[u̍폜‚';
+$strPrivDescDropTbl = 'e[u̍폜‚';
+$strPrivDescExecute5 = 'XgAh[`̎s‚';
+$strPrivDescExecute = 'XgA[hvVW̎s‚ (̃o[W MySQL ł͖ł)';
+$strPrivDescFile = 'f[^̃C|[gAGNX|[g‚';
+$strPrivDescGrant = 'e[ũ[hȂ̃[UE̒lj‚';
+$strPrivDescIndex = 'CfbNX̍쐬A폜‚';
+$strPrivDescInsert = 'f[^̑}Au‚';
+$strPrivDescLockTables = '݂̃Xbh̃e[ubN‚';
+$strPrivDescMaxConnections = 'Pʎԓɉ”\ȐVKڑ񐔂𐧌';
+$strPrivDescMaxQuestions = 'PʎԓɃT[oɑM”\ȃNG𐧌';
+$strPrivDescMaxUpdates = 'PʎԓɎs”\ȃe[uȂf[^x[X̕ҏWR}h𐧌';
+$strPrivDescMaxUserConnections = '[U̓ڑ𐧌';
+$strPrivDescProcess3 = '̃[ŨvZX̒~‚';
+$strPrivDescProcess4 = 'vZXꗗŊSȃNG̕\\‚';
+$strPrivDescReferences = '̃o[W MySQL ł͖ł';
+$strPrivDescReload = 'T[oݒ̃[hAT[oLbṼtbV‚';
+$strPrivDescReplClient = 'X[u/}X^[̏Ɖ‚';
+$strPrivDescReplSlave = 'vP[VX[uł͗LɂKv܂';
+$strPrivDescSelect = 'f[^̓ǂݍ݂‚';
+$strPrivDescShowDb = 'f[^x[Xꗗւ̃ANZX‚';
+$strPrivDescShowView = 'SHOW CREATE VIEW NG̎s‚';
+$strPrivDescShutdown = 'T[õVbg_E‚';
+$strPrivDescSuper = 'őڑɒBĂƂłڑ‚BO[oϐ̐ݒ⑼̃[ŨXbh~ƂǗꍇ͂Ă̐ݒ肪KvɂȂ܂';
+$strPrivDescUpdate = 'f[^̏C‚';
+$strPrivDescUsage = '͂܂';
$strPrivileges = '';
-$strPrivilegesReloaded = '̓[h܂B';
+$strPrivilegesReloaded = '𐳏Ƀ[h܂';
$strProcedures = 'vVW';
$strProcesses = 'vZX';
$strProcesslist = 'vZXꗗ';
$strProtocolVersion = 'vgRo[W';
-$strPutColNames = 'ŏ 1 sڂɃtB[hlj';
+$strPutColNames = '1 sڂɃtB[hlj';
-$strQBE = 'Ɖ';
$strQBEDel = '폜';
$strQBEIns = '}';
-$strQueryCache = 'ƉLbV';
-$strQueryFrame = 'ƉEBhE';
-$strQueryOnDb = 'f[^x[X SQL <b>%s</b>:';
-$strQueryResultsOperations = 'Ɖʑ';
+$strQBE = 'NG';
+$strQueryCache = 'NGLbV';
+$strQueryFrame = 'NGEBhE';
+$strQueryOnDb = 'f[^x[X <b>%s</b> SQL:';
+$strQueryResultsOperations = 'NGʑ';
$strQuerySQLHistory = 'SQL ';
-$strQueryStatistics = '<b>Ɖv</b>: N %s ‚̏ƉT[oɑMĂ܂B';
-$strQueryTime = 'Ɖ̎s %01.4f b';
-$strQueryType = 'Ɖ^Cv';
-$strQueryWindowLock = 'EBhE̊O炱̏Ɖł܂B';
+$strQueryStatistics = '<b>NGv</b>: N琔 %s ‚̃NGT[oɑM܂';
+$strQueryTime = 'NG̎s %01.4f b';
+$strQueryType = 'NG';
+$strQueryWindowLock = '̃EBhENG㏑邱Ƃ͂ł܂';
$strReadRequests = 'ǂݍ݃NGXg';
$strReceived = 'M';
+$strRecommended = '';
$strRecords = 'R[h';
-$strReferentialIntegrity = 'ڂ̃`FbN:';
+$strReferentialIntegrity = 'QƐ̊mF:';
$strRefresh = 'ĕ`';
$strRelationalSchema = '[ViXL[}';
-$strRelationNotWorking = 'phpMyAdmin ̓Ǝ@\ł郊[V@\邽߂̃Ne[uLɂȂĂ܂Bɂ %s%s NbNČ𔭌ĂB';
-$strRelations = '[V';
+$strRelationDeleted = '[V폜܂';
+$strRelationNotWorking = 'Ne[u邽߂̒lj@\ɂȂĂ܂BRɂ‚Ă%s%s';
$strRelationsForTable = 'RELATIONS FOR TABLE';
-$strRelationView = '[V\';
-$strReloadingThePrivileges = 'ēǂݍݒłB';
-$strReloadPrivileges = 'MySQL ̃[h';
-$strRemoveSelectedUsers = 'Iꂽ[U폜܂';
-$strRenameDatabaseOK = 'f[^x[Xu%śu%sɏ̕ύX܂B';
-$strRenameTable = 'e[u̕ύX';
-$strRenameTableOK = 'u%su%sɑOύX܂B';
-$strRepairTable = 'e[u𕜋';
-$strReplaceNULLBy = 'NULL w̕Œu';
-$strReplaceTable = 't@CŃe[uu';
+$strRelations = '[V';
+$strRelationView = '[Vr[';
+$strReload = '[h';
+$strReloadingThePrivileges = '[hĂ܂';
+$strReloadPrivileges = '[h';
+$strRemoveSelectedUsers = 'I[U폜';
+$strRenameDatabaseOK = 'f[^x[X %s %s Ƀl[܂';
+$strRenameTable = 'l[̃e[u';
+$strRenameTableOK = 'e[u %s %s Ƀl[܂';
+$strRepairTable = 'e[uC';
+$strReplaceNULLBy = 'NULL ̑֕';
+$strReplaceTable = 'e[uf[^ւt@C';
$strReplication = 'vP[V';
$strReset = 'Zbg';
$strResourceLimits = '\[X̐';
-$strReType = 'ē';
-$strRevoke = 'p~';
-$strRevokeAndDelete = '[ULȓׂĔjč폜';
-$strRevokeAndDeleteDescr = '[U͓ēǂݍ݂܂ USAGE ̂܂܂łB';
-$strRevokeMessage = '%s ̓܂B';
+$strReType = 'x͂Ă';
+$strRevoke = '';
+$strRevokeAndDelete = 'ׂĎă[U폜';
+$strRevokeAndDeleteDescr = 'USAGE ɂ‚Ă͓[h܂Ŏc܂';
+$strRevokeMessage = '%s ̓܂';
$strRomanian = '[}jA';
$strRowLength = 's̒';
-$strRows = 's';
$strRowsFrom = 'Jns';
$strRowSize = ' s̃TCY ';
-$strRowsModeFlippedHorizontal = ' (]wb_[)';
+$strRowsModeFlippedHorizontal = ' (wb_])';
$strRowsModeHorizontal = '';
-$strRowsModeOptions = ': %s : %s 񂸂ƒwb_[JԂ\';
+$strRowsModeOptions = '[h: %s (%s ZƂɃwb_\\)';
$strRowsModeVertical = '';
+$strRows = 's';
$strRowsStatistic = 's̓v';
-$strRunning = 'słB %s';
-$strRunQuery = 'Ɖ̎s';
-$strRunSQLQuery = 'f[^x[Xu%s SQL s';
-$strRunSQLQueryOnServer = 'T[ou%s SQL s';
+$strRunning = 's‹: %s';
+$strRunQuery = 'NGs';
+$strRunSQLQuery = 'f[^x[X %s ŃNGs';
+$strRunSQLQueryOnServer = 'T[o %s ŃNGs';
$strRussian = 'VA';
+$strSaveOnServer = 'T[õfBNg %s ɕۑ';
+$strSavePosition = 'ʒuۑ';
$strSave = 'ۑ';
-$strSaveOnServer = 'T[õfBNgu%sɕۑ';
-$strScaleFactorSmall = '1 y[Wɐ}\zu邽߂ɂ͑傫߂܂';
+$strScaleFactorSmall = '{邽߃XL[} 1 y[WɎ܂܂';
+$strSearchFormTitle = 'f[^x[X';
+$strSearchInTables = 'e[u:';
+$strSearchNeedle = 'Pl (ChJ[h: "%"):';
$strSearch = '';
-$strSearchFormTitle = 'f[^x[X';
-$strSearchInTables = 'e[u̎w:';
-$strSearchNeedle = 'PA܂͒l (ChJ[h: "%"):';
$strSearchOption1 = 'ꂩ̒P܂';
$strSearchOption2 = 'ׂĂ̒P܂';
-$strSearchOption3 = 'mȃt[Y';
-$strSearchOption4 = 'K\';
-$strSearchResultsFor = ' "<i>%s</i>" %s:';
+$strSearchOption3 = 'Sv';
+$strSearchOption4 = 'K\\';
+$strSearchResultsFor = '"<i>%s</i>" ̌ %s:';
$strSearchType = ':';
-$strSecretRequired = 'ݒt@C͍͔閧pXt[YKvƂ܂(blowfish_secret)B';
-$strSelectADb = 'f[^x[XIĂB';
+$strSecretRequired = 'ݒt@C閧̃pXt[Y (blowfish_secret) KvƂ悤ɂȂ܂';
+$strSelectADb = 'f[^x[XIĂ';
$strSelectAll = 'SI';
-$strSelectBinaryLog = 'IoCiO{';
-$strSelectFields = 'tB[h̑I(1 ˆȏ):';
-$strSelectNumRows = 'Ɖ';
-$strSelectTables = 'e[ȗI';
-$strSend = 't@Cŕۑ';
+$strSelectBinaryLog = '\\oCiOIĂ';
+$strSelectFields = 'tB[hIĂ(Œ1):';
+$strSelectForeignKey = 'OL[IĂ';
+$strSelectNumRows = 's/NG';
+$strSelectReferencedKey = 'QƂĂL[I';
+$strSelectTables = 'e[uIĂ';
+$strSend = 't@Cɕۑ';
$strSent = 'M';
-$strServer = 'T[o';
-$strServerChoice = 'T[ȏI';
-$strServerNotResponding = 'T[o܂B';
-$strServers = 'T[o';
+$strServerChoice = 'T[ȏI';
+$strServerNotResponding = 'T[o܂';
$strServerStatus = '^C';
$strServerStatusDelayedInserts = 'xCT[g';
-$strServerStatusUptime = ' MySQL T[o %s ԓ쒆ŁA%s ɋNĂ܂B';
+$strServerStatusUptime = ' MySQL T[ỏғ: %s (N: %s)';
+$strServers = 'T[o';
$strServerTabVariables = 'ϐ';
-$strServerTrafficNotes = '<b>T[ogtBbN</b>: ̃e[u MySQL T[oNẴlbg[NgtBbN̓v\܂B';
+$strServer = 'T[o';
+$strServerTrafficNotes = '<b>T[ogtBbN</b>: ̕\\ MySQL T[oNȌ̃lbg[NgtBbN̓vł';
$strServerVars = 'T[oϐƐݒl';
$strServerVersion = 'T[õo[W';
$strSessionValue = 'ZbVl';
-$strSetEnumVal = 'tB[h^Cvuenuḿuset̏ꍇ͒lɂ̏gē͂Ă: \'a\',\'b\',\'c\'...<br />obNXbVu"\"̓NI[gu"\'"͂ƁAɃobNXbVtĉ(: u\\\\xyźua\\\'b)';
-$strShowAll = 'ׂĕ\';
-$strShowColor = 'F\';
+$strSetEnumVal = 'tB[hʂuenumvȂusetv̏ꍇ̒l̏: \'a\',\'b\',\'c\'...<br />obNXbV("\")VONH[g("\'")܂߂Kvꍇ ( \\\\xyz a\\\'b ̂悤) ̑OɃobNXbVtĂ';
+$strShowAll = 'ׂĕ\\';
+$strShowColor = 'F\\';
$strShowDatadictAs = 'f[^`';
-$strShow = '\';
-$strShowFullQueries = 'SȏƉ\';
-$strShowGrid = 'Obh̕\';
-$strShowingBookmark = 'ubN}[N{';
-$strShowingRecords = 'R[h\';
-$strShowOpenTables = 'JĂe[u\';
+$strShowFullQueries = 'NGŜ\\';
+$strShowGrid = 'Obh\\';
+$strShowHideLeftMenu = '̃j[\\/B';
+$strShowingBookmark = '\\̃ubN}[N';
+$strShowingPhp = 'PHP R[hƂĕ\\';
+$strShowingRecords = '\\̗';
+$strShowingSQL = 'SQL NG\\';
+$strShowOpenTables = 'JĂe[u\\';
$strShowPHPInfo = 'PHP ';
-$strShowSlaveHosts = 'X[uzXg\';
-$strShowSlaveStatus = 'X[ȕԂ\';
-$strShowStatusBinlog_cache_disk_useDescr = 'e|oCiOLbV𗘗p悤ƂāAbinlog_cache_size̒l𒴉߂߁AgUNṼXe[gge|t@CɕۑgUNV̐B';
-$strShowStatusBinlog_cache_useDescr = 'ꎞoCiOLbVgp̐łB';
-$strShowStatusCreated_tmp_disk_tablesDescr = '\sɃT[oɂĎIɃfBXNɍ쐬ꂽꎞe[u̐łBCreated_tmp_disk_tables 傫ꍇÄꎞe[ufBXNx[X̕ςɃx[Xɂ悤ɁAl tmp_table_size 𑝂₵ł傤B';
-$strShowStatusCreated_tmp_filesDescr = 'mysqld ͂ǂꂾ̈ꎞIt@C쐬łB';
-$strShowStatusCreated_tmp_tablesDescr = 'T[oō\̎sɂĎIɍ쐬ꂽ̈ꎞe[u̐B';
-$strShowStatusDelayed_errorsDescr = '኱̃G[ INSERT DELAYED ꂽsł (炭L[̏d)';
-$strShowStatusDelayed_insert_threadsDescr = 'gp INSERT DELAYED nh[Xbh̐BINSERT DELAYED Kp鑊قȂe[u̐ŗL̃Xbhpӂ܂B';
-$strShowStatusDelayed_writesDescr = 'INSERT DELAYED ŗ񏑂݂łB';
-$strShowStatusFlush_commandsDescr = 'FLUSH słB';
-$strShowStatusHandler_commitDescr = 'COMMIT ̓łB';
-$strShowStatusHandler_deleteDescr = 'e[u폜񐔂łB';
-$strShowStatusHandler_discoverDescr = 'MySQLT[oNDBNX^Xg[WGWɓ̑Oƒe[uɂ‚Ă̏Ă邩₢킹邱Ƃł܂B͊JƌĂ΂Ă܂BHandler_discoveŕAJꂽ^Ce[u̐܂B';
-$strShowStatusHandler_read_firstDescr = 'CfbNX͂߂̃Ggǂݍ񂾉񐔂łBꂪꍇA̓T[o̊SȃCfbNXsĂƎ܂BႦ΁uSELECT col1 FROM foo col1 ̓CfbNXƉ肵܂B';
-$strShowStatusHandler_read_keyDescr = 'L[ɊÂčsǂݍ񂾗v̐łBꂪꍇA͂Ȃ̏Ɖƃe[uK؂ɃCfbNXtĂƂ悢\łB';
-$strShowStatusHandler_read_nextDescr = 'L[̏Ԓʂɍsǂł郊NGXg̐B̒l͔͈͂̐‚ăCfbNXƉĂ邩ACfbNXXLsĂƂɑ܂B';
-$strShowStatusHandler_read_prevDescr = 'L[̏Ԓʂɍskēǂł郊NGXg̐B̓ǂݍ݂͎ORDER BY ... DESCœKƂɗp܂B';
-$strShowStatusHandler_read_rndDescr = 'Œ肳ꂽʒuɗǂł郊NGXg̐B̒l͌ʂ\[gKvƉʂɍsƍȂ܂B炭e[uŜXLȂ΂ȂȂƉʂɍsĂ邩AL[K؂ɗpĂȂjoinsĂ̂Ǝv܂B';
-$strShowStatusHandler_read_rnd_nextDescr = 'f[^t@C̎̍sǂݍޗv̐łBȂ̃e[uXLĂꍇA͍łBʂɂ́AȂ̃e[uK؂ɃCfbNXtȂAƉCfbNX𗘗p悤ɏĂȂƂ܂B';
-$strShowStatusHandler_rollbackDescr = ' ROLLBACK ̐łB';
-$strShowStatusHandler_updateDescr = 'e[u̍s̍XVvłB';
-$strShowStatusHandler_writeDescr = 'e[uɍs̑}vłB';
-$strShowStatusInnodb_buffer_pool_pages_dataDescr = 'f[^܂ރy[W̐ł (dirty or clean).';
-$strShowStatusInnodb_buffer_pool_pages_dirtyDescr = '݂̉y[W̐łB';
-$strShowStatusInnodb_buffer_pool_pages_flushedDescr = 'tbV邱Ƃvobt@v[y[W̐łB';
-$strShowStatusInnodb_buffer_pool_pages_freeDescr = '󂫃y[WłB';
-$strShowStatusInnodb_buffer_pool_pages_latchedDescr = 'InnoDBobt@v[Ńb`Ăy[WB͌ݓǂݍłA邢͏ły[WA邢͑̉炩̗RŃtbV폜łȂȂĂy[W̐łB';
-$strShowStatusInnodb_buffer_pool_pages_miscDescr = 'sbNA_veBunbVCfbNXƂǗI[owbĥŃrW[ɂȂĂy[WB̒lInnodb_buffer_pool_pages_total - Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_dataƂłvZł܂B';
-$strShowStatusInnodb_buffer_pool_pages_totalDescr = 'y[W̃obt@v[̃TCY̍vłB';
-$strShowStatusInnodb_buffer_pool_read_ahead_rndDescr = 'InnoDBJnu_ǂݍ݂̉񐔁B͏Ɖe[ȗ啔_ȏԂŃXLƂɔ܂B';
-$strShowStatusInnodb_buffer_pool_read_ahead_seqDescr = 'InnoDBJnV[PVǂݍ݂̉񐔁BInnoDBV[PVȃte[uXLsƂɔ܂B';
-$strShowStatusInnodb_buffer_pool_read_requestsDescr = 'InnoDB s_Iȓǂݍݗv̐łB';
-$strShowStatusInnodb_buffer_pool_readsDescr = 'InnoDBobt@v[̓e𗘗płAVOy[Wǂݍ݂sȂ΂ȂȂ_ǂݍ݂̉񐔁B';
-$strShowStatusInnodb_buffer_pool_wait_freeDescr = 'ʏInnoDBobt@v[ւ݂̏̓obNOEhōs܂Ay[W̓ǂݍ݂Ȃ쐬sKv̂ɃN[ȃy[WȂꍇ́A܂̃y[WtbV̂҂•Kv܂B̃JE^́ÃEFCg̉񐔂JEĝłBobt@v[̒lK؂ɐݒ肳Ă΁A̒l͏͂łB';
-$strShowStatusInnodb_buffer_pool_write_requestsDescr = 'InnoDB obt@[v[ւ݂̏łB';
-$strShowStatusInnodb_data_fsyncsDescr = '܂ł fsync() 쐔łB';
-$strShowStatusInnodb_data_pending_fsyncsDescr = '݂ fsync() ۗ̐łB';
-$strShowStatusInnodb_data_pending_readsDescr = '݂̓ǂݍݕۗ̐łB';
-$strShowStatusInnodb_data_pending_writesDescr = '݂̏ݕۗ̐łB';
-$strShowStatusInnodb_data_readDescr = '܂ł̃f[^̓ǂݍݗʂł(P:oCg)';
-$strShowStatusInnodb_data_readsDescr = 'ǂݍ݃f[^̐łB';
-$strShowStatusInnodb_data_writesDescr = '݃f[^̐łB';
-$strShowStatusInnodb_data_writtenDescr = '܂ł̃f[^̏ݗʂł(P:oCg)';
-$strShowStatusInnodb_dblwr_pages_writtenDescr = 'd݂sꂽ񐔂ƁAd݂y[WB';
-$strShowStatusInnodb_dblwr_writesDescr = 'd݂sꂽ񐔂ƁAd݂y[WB';
-$strShowStatusInnodb_log_waitsDescr = 'Oobt@邹ōƂ𑱍sOɃtbVȂ΂ȂȂȂ߂ɔEFCg̉񐔁B';
-$strShowStatusInnodb_log_write_requestsDescr = 'vꂽO݂̐łB';
-$strShowStatusInnodb_log_writesDescr = 'Ot@Cւ̕Iȏ݂̐łB';
-$strShowStatusInnodb_os_log_fsyncsDescr = 'Ot@C fsync ݂łB';
-$strShowStatusInnodb_os_log_pending_fsyncsDescr = 'fsync ҂̃Ot@CłB';
-$strShowStatusInnodb_os_log_pending_writesDescr = 'Ot@C݂̏ۗ̕łB';
-$strShowStatusInnodb_os_log_writtenDescr = 'Ot@Cɏ݂oCgłB';
-$strShowStatusInnodb_pages_createdDescr = '쐬ꂽy[W̐łB';
-$strShowStatusInnodb_page_sizeDescr = 'RpC̃y[WTCY(ftHg 16KB)łB̒ly[WŃJEg܂; y[WTCÝA炪eՂɃoCgɕϊ邱Ƃ‚܂B';
-$strShowStatusInnodb_pages_readDescr = 'ǂݍ݂y[WłB';
-$strShowStatusInnodb_pages_writtenDescr = '݂y[WłB';
-$strShowStatusInnodb_row_lock_current_waitsDescr = 'ݑ҂Ă񃍃bN̐łB';
-$strShowStatusInnodb_row_lock_time_avgDescr = '񃍃bNl镽ώԂł(P:~b)';
-$strShowStatusInnodb_row_lock_timeDescr = '̊lɎgꂽvł(P:~b)';
-$strShowStatusInnodb_row_lock_time_maxDescr = '񃍃bNlő厞Ԃł(P:~b)';
-$strShowStatusInnodb_row_lock_waitsDescr = 'sbNő҂Ȃ΂ȂȂ񐔂łB';
-$strShowStatusInnodb_rows_deletedDescr = 'InnoDB e[u폜񐔂łB';
-$strShowStatusInnodb_rows_insertedDescr = 'InnoDB e[uɑ}񐔂łB';
-$strShowStatusInnodb_rows_readDescr = 'InnoDB e[uǂݍ񂾗񐔂łB';
-$strShowStatusInnodb_rows_updatedDescr = 'InnoDB e[uōXVꂽ񐔂łB';
-$strShowStatusKey_blocks_not_flushedDescr = 'ύXꂪA܂fBXNɃtbVĂȂAL[LbṼL[ubN̐łB͂‚Ă Not_flushed_key_blocks ƂĒm܂B';
-$strShowStatusKey_blocks_unusedDescr = 'L[LbV̖gpubN̐łBǂꂾgpĂ邩肷邽߂ɂ̒lgp邱Ƃł܂B';
-$strShowStatusKey_blocks_usedDescr = 'L[LbṼubN̎gpłB̒ĺA܂œɎgpꂽubN̍ő吔wōłB';
-$strShowStatusKey_read_requestsDescr = 'LbVL[ubNǂݍ񂾃NGXgłB';
-$strShowStatusKey_readsDescr = 'fBXÑL[ubN̕IǂݍݐłBKey_reads 傫ꍇAl key_buffer_size 炭܂BLbV~X Key_reads/Key_read_requests ƂČvZ邱Ƃł܂B';
-$strShowStatusKey_write_requestsDescr = 'LbVւ̃L[ubN̏񂾃NGXgłB';
-$strShowStatusKey_writesDescr = 'fBXNւ̃L[ubN̕IȏݐłB';
-$strShowStatusLast_query_costDescr = 'ƉIveB}CU[ɂČvZꂽAŌɃRpCꂽƉ̑SRXgłBƉ̈قȂƉṽRXgr̂ɖ𗧂܂BftHgl 0 ́AƉ܂RpCĂȂƂӖ܂B';
-$strShowStatusNot_flushed_delayed_rowsDescr = 'Ɖ INSERT DELAY ̏ݑ҂̍słB';
-$strShowStatusOpened_tablesDescr = 'JĂe[u̐łBJĂe[uꍇA炭e[uLbV̒l܂B';
-$strShowStatusOpen_filesDescr = 'JĂt@C̐łB';
-$strShowStatusOpen_streamsDescr = 'JĂXg[̐ł (ƂăŐL^Ɏgp܂)';
-$strShowStatusOpen_tablesDescr = 'JĂe[u̐łB';
-$strShowStatusQcache_free_blocksDescr = 'ƉLbV̋󂫃ubN̐łB';
-$strShowStatusQcache_free_memoryDescr = 'ƉLbV̋󂫃ʂłB';
-$strShowStatusQcache_hitsDescr = 'LbṼqbgłB';
-$strShowStatusQcache_insertsDescr = 'LbVɒljꂽƉłB';
-$strShowStatusQcache_lowmem_prunesDescr = 'VƉLbV邽߂ɃׂALbV폜ꂽƉ̐B̏͏ƉLbṼTCY𒲐Ƃɕ֗łBƉLbVLbV폜Ɖ肷ۂɂ́AŌɎgꂽłÂ̂폜헪Ƃ܂B';
-$strShowStatusQcache_not_cachedDescr = 'LbVȂƉ̐ł (LbVłȂ query_cache_type ɂLbVȂݒ)';
-$strShowStatusQcache_queries_in_cacheDescr = 'LbV̒œo^ꂽƉ̐łB';
-$strShowStatusQcache_total_blocksDescr = 'ƉLbV̑ubNłB';
+$strShow = '\\';
+$strShowSlaveHosts = 'X[uzXg\\';
+$strShowSlaveStatus = 'X[ȕԂ\\';
+$strShowStatusBinlog_cache_disk_useDescr = 'ꎞoCiOLbV𗘗p̂ binlog_cache_size ̒l𒴉߂߈ꎞt@CɃXe[ggۑgUNV';
+$strShowStatusBinlog_cache_useDescr = 'ꎞoCiOLbVgpgUNV';
+$strShowStatusCreated_tmp_disk_tablesDescr = 'Xe[ggsɃT[ofBXNɎꎞe[uBCreated_tmp_disk_tables ̒l傫ꍇ tmp_table_size ̒l𑝂₵ăfBXNł͂ȂɈꎞe[u\z悢܂';
+$strShowStatusCreated_tmp_filesDescr = 'mysqld ꎞt@C';
+$strShowStatusCreated_tmp_tablesDescr = 'Xe[ggsɃT[öꎞe[u';
+$strShowStatusDelayed_errorsDescr = '炩̃G[ (ԂL[̏d) INSERT DELAYED ꂽs';
+$strShowStatusDelayed_insert_threadsDescr = 'gp INSERT DELAYED nh̃XbhBINSERT DELAYED Kpe[u̐ŗL̃Xbhpӂ܂';
+$strShowStatusDelayed_writesDescr = 'INSERT DELAYED ŏ܂ꂽs';
+$strShowStatusFlush_commandsDescr = 'FLUSH ̎s';
+$strShowStatusHandler_commitDescr = ' COMMIT s';
+$strShowStatusHandler_deleteDescr = 'e[us폜';
+$strShowStatusHandler_discoverDescr = 'MySQL T[o NDB NX^Xg[WGWɓ̖Oƒe[uɂ‚Ă̏Ă邩₢킹邱Ƃł܂BJƌ܂AHandler_discover ͂̊Jꂽ^Ce[u̐ł';
+$strShowStatusHandler_read_firstDescr = 'CfbNX̍ŏ̃Ggǂݍ񂾉񐔁B̒lꍇ̓T[oxCfbNX̃tXLsĂ̂Ǝv܂BႦ SELECT col1 FROM foo sꍇ (col1 ̓CfbNXɊ܂܂Ă̂Ƃ܂)';
+$strShowStatusHandler_read_keyDescr = 'L[ɊÂčsǂݍ񂾃NGXg̐B̒lꍇ̓NGƃe[uK؂ɃCfbNXĂ̂ƍl܂';
+$strShowStatusHandler_read_nextDescr = 'L[̏ʂɎ̍sǂݍ񂾃NGXg̐B̒l̓CfbNX̃NGɔ͈͎wĂ邩ACfbNXXLsĂƂɑ܂';
+$strShowStatusHandler_read_prevDescr = 'L[̏ʂɑO̍sǂݍ񂾃NGXg̐B̓ǂݍ݂͎ ORDER BY ... DESC ̍œKɗp܂';
+$strShowStatusHandler_read_rndDescr = '܂ʒuɍsǂݍ񂾃NGXg̐B̒l̂͌ʂ\[gKvNGʂɎsĂꍇłB炭e[uŜXLȂ΂ȂȂNGʂɍsĂ邩A̍ۂ̃L[̎gɕsK؂ȂƂ낪܂';
+$strShowStatusHandler_read_rnd_nextDescr = 'f[^t@C̎̍sǂݍ񂾃NGXg̐B̒l̂̓e[uXLʂɎsĂ邽߂łBʂɂ̓e[ũCfbNXsK؂ANGCfbNX𗘗p悤ɏĂȂƂӖ܂';
+$strShowStatusHandler_rollbackDescr = ' ROLLBACK s';
+$strShowStatusHandler_updateDescr = 'e[u̍sXVNGXg̐';
+$strShowStatusHandler_writeDescr = 'e[uɍs}NGXg̐';
+$strShowStatusInnodb_buffer_pool_pages_dataDescr = 'f[^܂܂y[W̐ (_[eBy[WAN[y[W̕ʂ킸)';
+$strShowStatusInnodb_buffer_pool_pages_dirtyDescr = '݂̃_[eBy[W̐';
+$strShowStatusInnodb_buffer_pool_pages_flushedDescr = 'tbVNGXg󂯂obt@v[̃y[W';
+$strShowStatusInnodb_buffer_pool_pages_freeDescr = '󂫃y[W';
+$strShowStatusInnodb_buffer_pool_pages_latchedDescr = 'InnoDBobt@v[Ńb`Ăy[WB͌ݓǂݍłA邢͏ły[WA邢͑̉炩̗RŃtbV폜łȂȂĂy[W̐ł';
+$strShowStatusInnodb_buffer_pool_pages_miscDescr = 'sbNA_veBunbVCfbNXƂǗI[owbĥŃrW[ɂȂĂy[WB̒lInnodb_buffer_pool_pages_total - Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_dataƂłvZł܂';
+$strShowStatusInnodb_buffer_pool_pages_totalDescr = 'y[W̃obt@v[TCY̍v';
+$strShowStatusInnodb_buffer_pool_read_ahead_rndDescr = 'InnoDBJn_ǂݍ݂̉񐔁B̓NGe[ȗ啔_ȏԂŃXLƂɔ܂';
+$strShowStatusInnodb_buffer_pool_read_ahead_seqDescr = 'InnoDBJnV[PVǂݍ݂̉񐔁BInnoDBV[PVȃte[uXLsƂɔ܂';
+$strShowStatusInnodb_buffer_pool_read_requestsDescr = 'InnoDB s_ǂݍ݃NGXg̐';
+$strShowStatusInnodb_buffer_pool_readsDescr = 'InnoDB obt@v[̓e𗘗płAVOy[Wǂݍ݂sȂ΂ȂȂ_ǂݍ݂̉';
+$strShowStatusInnodb_buffer_pool_wait_freeDescr = 'ʏ InnoDB obt@v[ւ݂̏̓obNOEhōs܂Ay[W̓ǂݍ݂Ȃ쐬sKv̂ɃN[ȃy[WȂꍇ́A܂̃y[WtbV̂҂•Kv܂B̃JE^́ÃEFCg̉񐔂JEĝłBobt@v[̒lK؂ɐݒ肳Ă΁A̒l͏͂ł';
+$strShowStatusInnodb_buffer_pool_write_requestsDescr = 'InnoDB obt@v[ւ̏݉';
+$strShowStatusInnodb_data_fsyncsDescr = '܂ł fsync() s';
+$strShowStatusInnodb_data_pending_fsyncsDescr = 'ݕۗĂ fsync() ̉';
+$strShowStatusInnodb_data_pending_readsDescr = 'ݕۗĂǂݍ݂̐';
+$strShowStatusInnodb_data_pending_writesDescr = 'ݕۗĂ鏑݂̐';
+$strShowStatusInnodb_data_readDescr = '܂ł̃f[^ǂݍݗ (P:oCg)';
+$strShowStatusInnodb_data_readsDescr = 'f[^ǂݍ݉񐔂̍v';
+$strShowStatusInnodb_data_writesDescr = 'f[^݉񐔂̍v';
+$strShowStatusInnodb_data_writtenDescr = '܂ł̃f[^̏ݗ (P:oCg)';
+$strShowStatusInnodb_dblwr_pages_writtenDescr = 'd݂̎s񐔂Ɠd݂y[W';
+$strShowStatusInnodb_dblwr_writesDescr = 'd݂̎s񐔂Ɠd݂y[W';
+$strShowStatusInnodb_log_waitsDescr = 'Oobt@ătbVȂƍƂ𑱍słȂȂ߂ɔEFCg̉';
+$strShowStatusInnodb_log_write_requestsDescr = 'O݃NGXg̐';
+$strShowStatusInnodb_log_writesDescr = 'Ot@Cւ݂̉̕';
+$strShowStatusInnodb_os_log_fsyncsDescr = 'Ot@Cւ fsync ݂̉';
+$strShowStatusInnodb_os_log_pending_fsyncsDescr = 'ۗ̃Ot@Cւ fsync ';
+$strShowStatusInnodb_os_log_pending_writesDescr = 'ۗ̃Ot@Cւ̏݉';
+$strShowStatusInnodb_os_log_writtenDescr = 'Ot@Cɏ񂾃oCg';
+$strShowStatusInnodb_pages_createdDescr = '쐬ꂽy[W';
+$strShowStatusInnodb_page_sizeDescr = 'RpC InnoDB ̃y[WTCY (ftHg:16KB)B̒ly[WPʂŌvZ܂A̒lgΊȒPɃoCgPʂɕϊł܂';
+$strShowStatusInnodb_pages_readDescr = 'ǂݍ񂾃y[W';
+$strShowStatusInnodb_pages_writtenDescr = '񂾃y[W';
+$strShowStatusInnodb_row_lock_current_waitsDescr = 'ݑҋ@̍sbN̐';
+$strShowStatusInnodb_row_lock_time_avgDescr = 'sbN擾ɗv镽ώ (P:~b)';
+$strShowStatusInnodb_row_lock_timeDescr = 'sbN擾ɗvԂ̍v (P:~b)';
+$strShowStatusInnodb_row_lock_time_maxDescr = 'sbN擾ɗvԂ̍ől (P:~b)';
+$strShowStatusInnodb_row_lock_waitsDescr = 'sbN擾ɑҋ@';
+$strShowStatusInnodb_rows_deletedDescr = 'InnoDB e[u폜s';
+$strShowStatusInnodb_rows_insertedDescr = 'InnoDB e[uɑ}s';
+$strShowStatusInnodb_rows_readDescr = 'InnoDB e[uǂݍ񂾍s';
+$strShowStatusInnodb_rows_updatedDescr = 'InnoDB e[uōXVꂽs';
+$strShowStatusKey_blocks_not_flushedDescr = 'ύXĂfBXNɃtbVĂȂL[LbṼL[ubN̐BȑO Not_flushed_key_blocks ł';
+$strShowStatusKey_blocks_unusedDescr = 'L[LbV̖gpubN̐BL[LbV̎gp𒲂ׂƂɎg܂';
+$strShowStatusKey_blocks_usedDescr = 'L[LbV̎gpς݃ubN̐B̒l͂܂ňxɎgpꂽubN̍ő吔ł';
+$strShowStatusKey_read_requestsDescr = 'LbVL[ubNǂݍ񂾃NGXg̐';
+$strShowStatusKey_readsDescr = 'fBXNL[ubN𕨗ǂݍ݂񐔁BKey_reads 傫̂͂炭 key_buffer_size 邽߂łBLbV~X̊ Key_reads/Key_read_requests ŌvZł܂';
+$strShowStatusKey_write_requestsDescr = 'LbVɃL[ubN񂾃NGXg̐';
+$strShowStatusKey_writesDescr = 'fBXNɃL[ubN𕨗݂';
+$strShowStatusLast_query_costDescr = 'NGIveB}CU[̌vZɂAŌɃRpCꂽNG̑RXgBNG̃vςƂɃRXgǂς邩rƂɕ֗łBftHgl 0 ͂܂xNGRpCĂȂƂӖł';
+$strShowStatusNot_flushed_delayed_rowsDescr = 'INSERT DELAY L[̒ŏ܂̂҂Ăs';
+$strShowStatusOpened_tablesDescr = 'JĂe[u̐BJĂe[uꍇ͂炭e[uLbV̒l܂';
+$strShowStatusOpen_filesDescr = 'JĂt@C̐';
+$strShowStatusOpen_streamsDescr = 'JĂXg[̐ (ɃŐL^pł)';
+$strShowStatusOpen_tablesDescr = 'JĂe[u̐';
+$strShowStatusQcache_free_blocksDescr = 'NGLbV̋󂫃ubN̐';
+$strShowStatusQcache_free_memoryDescr = 'NGLbV̋󂫃';
+$strShowStatusQcache_hitsDescr = 'LbṼqbg';
+$strShowStatusQcache_insertsDescr = 'LbVɒljꂽNG̐';
+$strShowStatusQcache_lowmem_prunesDescr = 'VNGLbV邽߂ɃׂLbV폜ꂽNG̐B̏̓NGLbṼTCY𒲐Ƃɕ֗łBNGLbV͍ŌɎgꂽłÂ̂폜(LRU)헪ɏ]č폜NG߂܂';
+$strShowStatusQcache_not_cachedDescr = 'LbVȂ (LbVłȂ query_cache_type ̐ݒŃLbVȂƂɂȂĂ) NG̐';
+$strShowStatusQcache_queries_in_cacheDescr = 'LbVɓo^ĂNG̐';
+$strShowStatusQcache_total_blocksDescr = 'NGLbV̑ubN';
$strShowStatusReset = 'Zbg';
-$strShowStatusRpl_statusDescr = 'tFCZ[tvP[V̏Ԃł (Ă܂)';
-$strShowStatusSelect_full_joinDescr = 'CfbNXpȂ̐łB̒l 0 łȂꍇAe[ũCfbNX悭mFĂB';
-$strShowStatusSelect_full_range_joinDescr = '֘Ae[uŔ͈͌gp̐łB';
-$strShowStatusSelect_range_checkDescr = 'L[Ȃjoin񐔁B͊esɂ‚ăL[̎gppx`FbN̂łiꂪ0ȊȌꍇ̓e[ũCfbNX悭`FbNĂjB';
-$strShowStatusSelect_rangeDescr = 'ŏ̃e[uŔ͈͂gp̐ł (ꂪ傫Ăʏ͊댯ł͂܂)';
-$strShowStatusSelect_scanDescr = 'ŏ̃e[ůSȃXLs̐łB';
-$strShowStatusSlave_open_temp_tablesDescr = 'X[u SQL XbhɂČ݊JĂꎞIe[u̐łB';
-$strShowStatusSlave_retried_transactionsDescr = 'vP[ṼX[u SQL XbhgUNVĎs񐔂(N)vB';
-$strShowStatusSlave_runningDescr = '̃T[o}X^[ɐڑX[ułꍇA ON łB';
-$strShowStatusSlow_launch_threadsDescr = 'slow_launch_time ̕b莞Ԃč쐬ꂽXbh̐łB';
-$strShowStatusSlow_queriesDescr = 'long_query_time ̕bzƉ̐łB';
-$strShowStatusSort_merge_passesDescr = '\[gASYsȂ΂ȂȂ}[W̉񐔁B̒lꍇ́Asort_buffer_sizeVXeϐ̒l𑝂₷ƂĂB';
-$strShowStatusSort_rangeDescr = '͈͓̔Ń\[gsꂽ񐔁B';
-$strShowStatusSort_rowsDescr = '\[gς̍słB';
-$strShowStatusSort_scanDescr = 'e[ȗɂsꂽ\[głB';
-$strShowStatusTable_locks_immediateDescr = 'e[ubNɎ擾ꂽ񐔂łB';
-$strShowStatusTable_locks_waitedDescr = 'e[ubNɎ擾łȂ߂ɃEFCg񐔁B̒lAptH[}Xɖ肪Ăꍇ́A܂ƉœKĂBł߂ȂAe[u𕪊邩AvP[V𗘗pĂB';
-$strShowStatusThreads_cachedDescr = 'XbhLbṼXbhłBLbVqbg Threads_created/Connections ƂČvZ邱Ƃł܂B̒lԎɂȂĂƂ thread_cache_size グĂB';
-$strShowStatusThreads_connectedDescr = 'ݐڑ̐łB';
-$strShowStatusThreads_createdDescr = 'ڑ߂ɍ쐬ꂽXbh̐łBThreads_created 傫ꍇAl thread_cache_size 𑝉Ǝv܂B(ʏ悢XbhĂꍇA͌ȃptH[}X^܂)';
-$strShowStatusThreads_runningDescr = 'X[vĂȂXbh̐łB';
-$strShowTableDimension = 'e[ȗ傫\';
-$strShowTables = 'e[u̕\';
-$strShowThisQuery = ' sƉɕ\';
+$strShowStatusRpl_statusDescr = 'tFCZ[tvP[V̏ ()';
+$strShowStatusSelect_full_joinDescr = 'CfbNX𗘗pȂ̐B̒l 0 łȂꍇ̓e[ũCfbNX悭mFĂ';
+$strShowStatusSelect_full_range_joinDescr = 'Qƃe[uŔ͈͌̐';
+$strShowStatusSelect_range_checkDescr = 'L[w肳ĂȂ߈sƒL[gĂ邩mF̐i0 łȂꍇ̓e[ũCfbNX悭mFĂj';
+$strShowStatusSelect_rangeDescr = 'ŏ̃e[uŔ͈͎w肳ꂽ̐ (̒l͑傫Ăӂ‚肠܂)';
+$strShowStatusSelect_scanDescr = 'ŏ̃e[utXL̐';
+$strShowStatusSlave_open_temp_tablesDescr = 'X[u SQL Xbh݊JĂꎞe[u̐';
+$strShowStatusSlave_retried_transactionsDescr = 'vP[VX[u SQL XbhgUNVĎs(N̍v)';
+$strShowStatusSlave_runningDescr = '̃T[o}X^[ɐڑX[ułꍇ ON ɂȂ܂';
+$strShowStatusSlow_launch_threadsDescr = 'slow_launch_time Ŏw肳ꂽbȏɍ쐬ԂXbh̐';
+$strShowStatusSlow_queriesDescr = 'long_query_time Ŏw肳ꂽbȏɎԂ̂NG̐';
+$strShowStatusSort_merge_passesDescr = '\[gASYsȂ΂ȂȂ}[W̉񐔁B̒lꍇ sort_buffer_size VXeϐ̒l𑝂₵悢ł傤';
+$strShowStatusSort_rangeDescr = '͈͎wtŃ\[gsꂽ';
+$strShowStatusSort_rowsDescr = '\[gς̍s';
+$strShowStatusSort_scanDescr = 'e[uXLƂɎsꂽ\[g̉';
+$strShowStatusTable_locks_immediateDescr = 'e[ubNɎ擾ł';
+$strShowStatusTable_locks_waitedDescr = 'e[ubNɎ擾łEFCg񐔁B̒lAptH[}Xɖ肪Ăꍇ́A܂NGœKĂBł߂Ȃe[u𕪊邩AvP[V𗘗pĂ';
+$strShowStatusThreads_cachedDescr = 'XbhLbṼXbhBLbṼqbg Threads_created/Connections ŌvZł܂B̒lԂȂĂꍇ thread_cache_size 傫Ă';
+$strShowStatusThreads_connectedDescr = '݊JĂڑ̐';
+$strShowStatusThreads_createdDescr = 'ڑ̂߂ɍ쐬ꂽXbh̐BThreads_created 傫ꍇ thread_cache_size ̒l𑝂₵悢܂ (Xbh̎ɖ肪Ȃꍇ͂ӂ‚܂ptH[}X͌サ܂)';
+$strShowStatusThreads_runningDescr = 'X[vĂȂXbh̐';
+$strShowTableDimension = 'e[ȗ傫\\';
+$strShowTables = 'e[u\\';
+$strShowThisQuery = ' sNGɕ\\';
$strSimplifiedChinese = 'ȑ̎';
$strSingly = '(1 )';
$strSize = 'TCY';
-$strSkipQueries = 'JnXLbv郌R[h(Ɖ)̐';
+$strSkipQueries = '擪琔XLbv郌R[h(NG)̐';
$strSlovak = 'XoLA';
$strSlovenian = 'XxjA';
-$strSocketProblem = '(܂́A[J MySQL T[õ\Pbg͐mɐݒ肳܂)';
-$strSort = '\[g';
+$strSmallBigAll = 'ׂĂ傫/';
+$strSnapToGrid = 'Obhɂ킹';
+$strSocketProblem = '(邢̓[J MySQL T[õ\Pbgݒ肳Ă܂)';
$strSortByKey = 'L[Ń\[g';
-$strSorting = '\[g';
+$strSort = '\[g';
+$strSorting = '\[g';
$strSpaceUsage = 'fBXNgp';
$strSpanish = 'XyC';
-$strSplitWordsWithSpace = 'eP̓Xy[X(" ")ŋ؂ĉB';
+$strSplitWordsWithSpace = 'eP͋󔒕(" ")ŋ؂Ă';
$strSQLCompatibility = 'SQL݊[h';
$strSQLExportType = 'GNX|[g`';
$strSQLImportOptions = 'SQL IvV';
$strSQLOptions = 'SQL IvV';
-$strSQLParserBugMessage = 'Ȃ SQL p[T[̃oO邩܂BȂ̖₢킹OɊm߂āAp~X}b`Ȃ`FbN܂傤B̑̎sɂ̓eLXgGAňpOɃoCi[R[htăt@CAbv[hĂ܂悤Ȍl܂B܂AȂ̖₢킹 MySQL ̃R}hCgĎƂł܂BMySQL T[o͈ȉ̂悤ɃG[o܂Bɂ͖菕ł傤BR}hCł͐ĂA܂肪ꍇAp[T[sꍇɂ́Â SQL ₢킹ЂƂ‚̕Ɍ炵Ă݂ĉBĈȉ̃ZNVŃf[^؂ăoO񍐂𑗂ĉ:';
-$strSQLParserUserError = 'SQL ɃG[܂BMySQL T[o͈ȉ̂悤ɃG[o͂܂Bɂ͖菕ł傤B';
+$strSQLParserBugMessage = 'SQL p[TɃoO‚邱Ƃ肦܂A܂̓NG悭Ĉp̐ނɊԈႢȂmFĂBNH[gĂȂeLXg̈ɃoCit@CAbv[hNGsƂƂ肦܂BMySQL ̃R}hCC^tF[X𗘗păNGsĂ݂Ă悢ł傤B MySQL T[õG[o͂oĂ悤Ȃ̉͂ɖ𗧂‚܂BłȂAR}hCł͐̂Ƀp[Tł͎sꍇ́ASQL NG̓̓f[^ۂɖNĂNGЂƂ‚ɍi荞łAȉ́uCUTvZNVɃf[^YăoO񍐂𑗂Ă:';
+$strSQLParserUserError = 'SQL ɃG[悤łB MySQL T[õG[o͂oĂ悤Ȃ̉͂ɖ𗧂‚܂';
$strSQLQuery = 's SQL';
$strSQLResult = 'SQL ̌';
$strSQL = 'SQL';
-$strSQPBugInvalidIdentifer = 'F؂łB';
-$strSQPBugUnclosedQuote = 'p‚Ă܂B';
-$strSQPBugUnknownPunctuation = 'ȋǓ_łB';
+$strSQPBugInvalidIdentifer = 'sȎʎqł';
+$strSQPBugUnclosedQuote = 'p‚Ă܂';
+$strSQPBugUnknownPunctuation = 'ȋǓ_ł';
+$strStandInStructureForView = 'r[p̑֍\';
$strStatCheckTime = 'ŏI';
$strStatCreateTime = '쐬';
$strStatement = 'Xe[gg';
-$strStatisticsOverrun = 'rW[ȃT[oł́AoCgJE^߂邩܂B]āAMySQL T[o񍐂邻̓v͐Ȃ܂B';
+$strStatisticsOverrun = 'WT[oł̓oCgJE^߂邱Ƃ邽߁AMySQL T[o񍐂Ă铝v͕smȂƂ܂';
$strStatUpdateTime = 'ŏIXV';
$strStatus = '';
-$strStorageEngine = 'Xg[WGW';
$strStorageEngines = 'Xg[WGW';
+$strStorageEngine = 'Xg[WGW';
$strStrucCSV = 'CSV f[^';
$strStrucData = '\ƃf[^';
-$strStrucExcelCSV = 'MS Excel p CSV f[^';
-$strStrucNativeExcel = '{ MS Excel f[^';
-$strStrucNativeExcelOptions = 'Excel̃lCeBuGNX|[g̃IvV';
+$strStrucExcelCSV = 'MS Excel p CSV';
+$strStrucNativeExcel = 'MS Excel ̃lCeBu`';
+$strStrucNativeExcelOptions = 'Excel ̃lCeBuGNX|[gIvV';
$strStrucOnly = '\̂';
$strStructPropose = 'e[u\mF';
$strStructure = '\';
+$strStructureForView = 'r[p̍\';
$strSubmit = 's';
-$strSuccess = 'SQL Ɏs܂';
+$strSuccess = 'SQL ͐Ɏs܂';
$strSum = 'v';
$strSwedish = 'XEF[f';
$strSwitchToDatabase = 'Rs[f[^x[Xɐ؂ւ';
$strSwitchToTable = 'Rs[e[uɐ؂ւ';
-$strTable = 'e[u ';
$strTableAlreadyExists = 'e[u %s ͊ɑ݂܂!';
-$strTableComments = 'e[u̐';
-$strTableEmpty = 'e[u͋łB';
-$strTableHasBeenDropped = 'e[u %s 폜܂B';
-$strTableHasBeenEmptied = 'e[u %s ɂ܂B';
-$strTableHasBeenFlushed = 'e[u %s ̃LbVɂ܂B';
+$strTableComments = 'e[ũRg';
+$strTableEmpty = 'e[uł!';
+$strTable = 'e[u';
+$strTableHasBeenDropped = 'e[u %s 폜܂';
+$strTableHasBeenEmptied = 'e[u %s ɂ܂';
+$strTableHasBeenFlushed = 'e[u %s tbV܂';
+$strTableIsEmpty = 'e[û悤ł!';
$strTableMaintenance = 'e[uǗ';
+$strTableName = 'e[u';
$strTableOfContents = 'e[u̓e';
$strTableOptions = 'e[uIvV';
-$strTables = '%se[u';
+$strTables = '%s e[u';
$strTableStructure = 'e[u̍\';
-$strTakeIt = 'ɂ܂';
-$strTblPrivileges = 'e[u ';
+$strTakeIt = 'ɂ';
+$strTblPrivileges = 'e[uŗL̓';
$strTempData = 'ꎞf[^';
-$strTextAreaLength = ' ׂ̏ł̃tB[h<br /> CłȂ”\܂B';
+$strTextAreaLength = ' ɂĂ͂̃tB[h<br /> CłȂȂꍇ܂';
$strThai = '^C';
+$strThemeDefaultNotFound = 'ftHge[} %s ‚܂!';
$strTheme = 'e[} / X^C';
-$strThemeDefaultNotFound = 'ftHge[}u%s‚܂!';
-$strThemeNoPreviewAvailable = 'vr[͗pł܂B';
-$strThemeNotFound = 'e[}u%s‚܂!';
-$strThemeNoValidImgPath = 'e[}u%sŐ摜pX‚܂!';
-$strThemePathNotFound = 'e[}u%s̃e[}pX‚܂!';
+$strThemeNoPreviewAvailable = 'vr[͗pł܂';
+$strThemeNotFound = 'e[} %s ‚܂!';
+$strThemeNoValidImgPath = 'e[} %s ̉摜pXł!';
+$strThemePathNotFound = 'e[} %s ̃e[}pX‚܂!';
$strThisHost = '̃zXg';
+$strThreadSuccessfullyKilled = 'Xbh %s ͐I܂';
$strThreads = 'Xbh';
-$strThreadSuccessfullyKilled = 'Xbh %s ͏I܂B';
$strTime = '';
-$strTimeoutInfo = 'ȑOɃC|[gŃ^CAEgĂ܂BđMAʒu %d pł傤B';
-$strTimeoutNothingParsed = 'AŌ̎sł̃f[^͉͂Ă܂B́Aʏ php ̎Ԑ𑝂₳Ȃ phpMyAdmin ̃C|[gI邱ƂłȂƂƂӖ܂B';
-$strTimeoutPassed = 'XNvg^CAEg߂܂BC|[gI点ꍇAt@CđMAC|[gĊJĂB';
-$strToggleScratchboard = 'gOXNb`{[h';
-$strTotal = 'v';
+$strTimeoutInfo = 'ÕC|[g̓^CAEg܂BđMƈʒu %d ĊJ܂';
+$strTimeoutNothingParsed = 'AŌɎsƂ͂܂f[^͂ł܂łBӂ‚ PHP ̎ԐL΂Ȃ肱̃f[^̃C|[g͂ł܂';
+$strTimeoutPassed = 'XNvg^CAEg܂BC|[ĝłΓt@CđM΃C|[gĊJ܂';
+$strToFromPage = 'Jn/Iy[W';
+$strToggleScratchboard = 'XNb`{[h؂ւ';
+$strToggleSmallBig = '召؂ւ';
+$strToSelectRelation = '[VI܂:';
$strTotalUC = 'v';
-$strTraditionalChinese = '`IȒ';
-$strTraditionalSpanish = '`IȃXyC';
+$strTotal = 'v';
+$strTraditionalChinese = 'ɑ̎';
+$strTraditionalSpanish = 'XyC (`\\L)';
$strTraffic = 'gtBbN';
$strTransactionCoordinator = 'gUNVR[fBl[^';
-$strTransformation_application_octetstream__download = 'tB[h̃oCif[^_E[h郊N\܂B1 –ڂ̃IvV̓oCit@C̃t@CłB2 –ڃIvV̓t@C܂ރe[us̐tB[hłB2 –ڂ̃IvV񋟂ꍇA1 –ڂ̃IvV͋󕶎ɐݒ肷Kv܂B';
-$strTransformation_application_octetstream__hex = 'f[^ 16 i\łB';
-$strTransformation_image_jpeg__inline = 'NbN”\ȃTlC\܂; IvV: widthEheight sNZŎw (̔䗦ۂ܂)';
-$strTransformation_image_jpeg__link = '̉摜ւ̃N\ (Ⴆ blob 𒼐ڃ_E[h).';
-$strTransformation_image_png__inline = 'uimage/jpeg: inlineQƂĂB';
-$strTransformation_text_plain__external = 'LINUX ̂: OAvP[VNAW͂tB[hf[^͂܂BAvP[V̕Wo͂Ԃ܂BftHg Tidy ŁAY HTML R[ho͂܂BZLeB̗RŁA蓮Ńt@Culibraries/text_plain__external.inc.phpҏWAs‚c[}Ȃ΂Ȃ܂Bŏ̃IvV́AgpvO̐ŁA2 –ڂ̃IvV̓vÕp[^łB3 –ڂ̃IvV 1 ɐݒ肳ĂꍇAhtmlspecialchars() pďo͂ϊł傤(ftHg: 1)4 – IvV 1 ɐݒ肳ĂꍇA֑hAoׂ͂ 1 sɌ邱Ƃۏ؂ł傤(ftHg: 1).';
-$strTransformation_text_plain__formatted = 'tB[ȟ̏ۑ܂BGXP[vɏI܂B';
-$strTransformation_text_plain__imagelink = '摜ƃNAt@C܂ރtB[h\܂; 1 –ڂ̃IvV "http://domain.com/" ̂悤ȐړŁA2 –ڂ̃IvV̓sNZw̕A3 –ڂ͍łB';
-$strTransformation_text_plain__link = 't@C܂ރtB[hAN\; 1 –ڂ̃IvV "http://domain.com/" ̂悤ȐړA2 –ڂ̃IvV̓Ñ^CgłB';
-$strTransformation_text_plain__sql = 'SQL Љ ƂăeLXǧ`̕@nCCg܂B';
-$strTransformation_text_plain__substr = '̈ꕔ̂ݕ\܂B1 –ڂ̃IvV̓eLXg̏o͂ǂŊJn邩ItZbg`܂ (ftHǵu0ł)2 –ڂ̃IvV͂ǂꂾ̃eLXgԂ̃ItZbgłB̏ꍇAc̃eLXgׂĕԂ܂B3 –ڂ̃IvV́ÄꕔԂ鎞Aǂ̕o͂ɒlj邩`܂B (ftHǵu...ł)';
-$strTruncateQueries = 'Ɖ̕\؂l߂';
+$strTransformation_application_octetstream__download = 'tB[h̃oCif[^_E[h郊N\\܂B1 –ڂ̃IvVɃoCit@C̃t@Cw肷邱Ƃł܂A2 –ڂ̃IvVɃt@CێĂtB[h̖OnƂł܂B2 –ڂ̃IvVgꍇ 1 –ڂ̃IvV͋󕶎ɂKv܂';
+$strTransformation_application_octetstream__hex = 'f[^ 16 iŕ\\L܂BIvVƂčŏ̃p[^ɃXy[Xljpxw肷邱Ƃł܂ (ftHg 2 juƂł)';
+$strTransformation_image_jpeg__inline = 'NbN”\ȃTlC\\܂; IvVƂĕƍ̍őlsNZPʂŎwł܂BAXyNg͂̂܂܈ێ܂';
+$strTransformation_image_jpeg__link = '̉摜_E[h邽߂̃N\\܂';
+$strTransformation_image_png__inline = 'image/jpeg: inline';
+$strTransformation_text_plain__dateformat = 'TIMEATIMESTAMPADATETIMEA邢Unix^CX^v̒lĂtB[hɂ킹ĕ\\܂B1 –ڂ̃IvV̓^CX^vɉZ鎞ł(ftHg: 0)B2 –ڂ̃IvVɂ͓̏w肵܂B3 –ڂ̃IvV̓[J̓Ƃ݂Ȃ UTC Ƃ݂Ȃł ("local"Ȃ"utc"Ƃw肵Ă)B̒lɂē̕\\Lς܂B"local" ̏ꍇ PHP strftime() ֐̐B"utc" ̏ꍇ gmdate() 𗘗p܂'; // XXX replaced
+$strTransformation_text_plain__external = 'LINUX ̂: OAvP[VNĕW͌oRŃtB[hf[^n܂BAvP[V̕Wo͂Ԃ܂BftHg Tidy ł ( HTML R[hYɂ邽߂̂̂ł)BZLeB̗R libraries/transformations/text_plain__external.inc.php ŕҏWėpc[𖾋LĂKv܂Bŏ̃IvV͗pvO̐ŁA2 –ڂ̃IvV̓vÕp[^łB3 –ڂ̃IvV 1 ɐݒ肳Ăꍇ htmlspecialchars() pďo͂ϊ܂(ftHg 1 ł)B4 –ڂ̃IvV 1 ɐݒ肳Ăꍇ֑͋o͑Ŝ 1 sɎ܂悤ɂ܂ (ftHg 1 ł)';
+$strTransformation_text_plain__formatted = 'tB[h̓ê܂܁Ahtmlspecialchars()ʂɕ\\܂B̏ꍇAtB[hɂ͐ HTML ܂܂Ă̂Ɖ肵܂';
+$strTransformation_text_plain__imagelink = '摜ƃN\\܂BtB[hɂ̓t@CĂB1 –ڂ̃IvV "http://domain.com/" ̂悤URL̐擪łB2 –ڂ3 –ڂ̃IvVɂ͕ƍsNZPʂŎw肵܂';
+$strTransformation_text_plain__link = 'N\\܂BtB[hɂ̓t@CĂB1 –ڂ̃IvV "http://domain.com/" ̂悤 URL ̐擪A2 –ڂ̃IvV̓Ñ^Cgł';
+$strTransformation_text_plain__sql = 'eLXg̓e SQL NGƂ݂ȂA\nCCg\\܂';
+$strTransformation_text_plain__substr = '̈ꕔ݂̂\\܂B1 –ڂ̃IvV͕̐擪牽XLbv邩 (ftHg 0 ł)A2 –ڂ̃IvV͕\\eLXg̕ł (ftHg͕̖܂łł)B3 –ڂ̃IvV͕؂l߂ƂɑO^ɕ₤ȗLł (ftHg ... ł)';
+$strTruncateQueries = 'NG̕\\؂l߂';
$strTurkish = 'gR';
-$strType = 'tB[h^Cv';
+$strType = '';
$strUkrainian = 'ENCi';
-$strUncheckAll = '`FbNׂč폜';
+$strUncheckAll = 'ׂẴ`FbNO';
$strUnicode = 'UNICODE';
-$strUnique = 'Ӑ';
-$strUnknown = '';
+$strUnique = 'j[N';
+$strUnknown = 's';
$strUnselectAll = 'SI';
-$strUnsupportedCompressionDetected = 'T|[gĂȂk`(%s)̃t@C̓ǂݍ݂݂܂B̎T|[gĂȂAݒŖɂȂĂ邩̂ꂩłB';
-$strUpdatePrivMessage = '%s ̓XV܂B';
-$strUpdateProfileMessage = 'vt@CXV܂B';
-$strUpdateQuery = 'ƉXV';
-$strUpdComTab = 'Column_comments e[ũAbvO[h@̃hLgQƂĂB';
-$strUpgrade = '%s %s ȍ~ɃAbvO[hĂB';
-$strUploadLimit = '炭܂ɂ傫ȃt@CAbv[h悤Ƃ܂B̐̉iƂ %shLg%s QƂĂB';
-$strUploadsNotAllowed = '̃T[oł̓t@C̃Abv[hւĂ܂B';
+$strUnsupportedCompressionDetected = 'T|[gĂȂk`(%s)̃t@C[h悤Ƃ܂B̌`̓T|[gĂȂݒŖɂĂ܂';
+$strUpdatePrivMessage = '%s ̓XV܂';
+$strUpdateProfileMessage = 'vt@CXV܂';
+$strUpdateQuery = 'NGXV';
+$strUpdComTab = 'column_comments e[u̍XV@ɂ‚Ă̓hLg';
+$strUpgrade = '%s %s ȍ~ɃAbvO[hĂ';
+$strUploadLimit = 'Abv[h悤Ƃt@C傫悤łB΍ɂ‚Ă %shLg%s ';
+$strUploadsNotAllowed = '̃T[oł̓t@C̃Abv[h͂ł܂';
$strUsage = 'gp';
-$strUseBackquotes = 'tNI[gŃe[utB[h͂';
+$strUseBackquotes = 'e[utB[htNH[gň͂';
$strUsedPhpExtensions = 'gp PHP g';
$strUseHostTable = 'zXge[ug';
-$strUserAlreadyExists = '[Uu%s͊ɑ݂܂!';
-$strUser = '[U';
-$strUserEmpty = '[U͋łB';
-$strUserName = '[U';
-$strUserNotFound = 'Iꂽ[U͓e[uɌ‚܂łB';
+$strUserAlreadyExists = '[U %s ͊ɑ݂܂!';
+$strUserEmpty = '[Uł!';
+$strUserName = '[U';
+$strUserNotFound = 'e[uɂ͑I[U܂';
$strUserOverview = '[UT';
-$strUsersDeleted = 'Iꂽ[U͍폜܂B';
-$strUsersHavingAccessToDb = '[U &quot;%s&quot; ւ̃ANZXĂ܂B';
-$strUseTabKey = 'll܂ňڂɂ TAB L[A͂ȏꏊłړɂ CTRL + J[\gp܂B';
-$strUseTables = 'ge[u';
-$strUseTextField = 'eLXgtB[hgp';
-$strUseThisValue = '̒lgp';
+$strUsersDeleted = 'I[U𐳂폜܂';
+$strUsersHavingAccessToDb = '&quot;%s&quot; ɃANZXł郆[U';
+$strUser = '[U';
+$strUseTabKey = '̒lɈړƂ TAB L[gĂBCTRL{J[\L[gƎRɈړł܂';
+$strUseTables = 'pe[u';
+$strUseTextField = 'eLXgtB[h̒l𗘗p';
+$strUseThisValue = '̒l𗘗p';
$strValidateSQL = 'SQL ̌';
-$strValidatorError = 'SQL ̌؋@\ł܂B%shLg%s ɋLqĂ悤 PHP gCuCXg[Ă邩`FbNĂB';
+$strValidatorError = 'SQL ̌؋@\ł܂B%shLg%s ̋LڒʂɕKv PHP gCXg[Ă邩mFĂ';
$strValue = 'l';
$strVar = 'ϐ';
$strVersionInformation = 'o[W';
+$strViewDumpDatabases = 'f[^x[X̃_v(XL[})\\';
+$strViewDumpDB = 'DB ̃_v(XL[})\\';
+$strViewDump = 'e[ũ_v(XL[})\\';
+$strViewHasBeenDropped = 'r[ %s j܂';
+$strViewMaxExactCount = 'r[̍s %s z܂B%shLg%s ';
$strView = 'r[';
-$strViewDump = 'e[ũ_v(XL[})\';
-$strViewDumpDatabases = 'f[^x[X̃_vr[ (XL[})';
-$strViewDumpDB = 'DB ̃_v(XL[})\';
-$strViewHasBeenDropped = 'r[ %s j܂B';
-$strViewMaxExactCount = '̃r[ %s ȏ゠܂B%shLg%s QƂĂB';
-$strWebServerUploadDirectory = 'EFuT[oŃAbv[h';
-$strWebServerUploadDirectoryError = 'Abv[hsfBNg܂B';
+$strWebServerUploadDirectory = 'EFuT[õAbv[hfBNg';
+$strWebServerUploadDirectoryError = 'w肵Abv[hfBNgpł܂';
$strWelcome = '%s ւ悤';
$strWestEuropean = '[bp';
$strWildcard = 'ChJ[h';
-$strWindowNotFound = '^[QbguEUEBhEXV邱Ƃł܂B炭eEBhE‚A邢̓uEU[̃ZLeBݒŁANXEBhE̍XVubNĂ܂B';
+$strWindowNotFound = '^[QbgƂȂuEUEBhEXVł܂łBeEBhE‚AuEŨZLeBݒŃNXEBhE̍XVubNĂ̂Ǝv܂';
$strWithChecked = '`FbN̂:';
$strWriteRequests = '݃NGXg';
-$strWrongUser = '[U܂̓pX[h܂B<br />ANZX͋ۂ܂B';
+$strWrongUser = '[UȂpX[hԈĂ܂B<br />ANZX͋ۂ܂';
$strXkana = 'SpJi֕ϊ'; // convert to X208-kana
$strXMLOptions = 'XMLIvV';
@@ -981,55 +1029,17 @@ $strXML = 'XML';
$strYes = '͂';
-$strZeroRemovesTheLimit = ': IvV 0 ([)ɐݒ肷ƐȂȂ܂B';
-$strZip = '"zip "';
+$strZeroRemovesTheLimit = ': IvV 0 ([)ɐݒ肷Ɛ܂';
+$strZip = '"zip `"';
-$strPmaWiki = 'phpMyAdmin wiki'; //to translate
-$strTransformation_text_plain__dateformat = '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.'; //to translate
-$strDocSQL = 'DocSQL'; //to translate
-$strDocSQLOptions = 'DocSQL options'; //to translate
-$strTableName = 'Table name'; //to translate
-$strTableIsEmpty = 'Table seems to be empty!'; //to translate
-$strDbIsEmpty = 'Database seems to be empty!'; //to translate
-$strShowingPhp = 'Showing as PHP code'; //to translate
-$strShowingSQL = 'Showing SQL query'; //to translate
-$strDesigner = 'Designer'; //to translate
-$strNumberOfTables = 'Number of tables'; //to translate
-$strCreateTable = 'Create table'; //to translate
-$strCreateRelation = 'Create relation'; //to translate
-$strSavePosition = 'Save position'; //to translate
-$strSelectForeignKey = 'Select Foreign Key'; //to translate
-$strHide = 'Hide'; //to translate
-$strShowHideLeftMenu = 'Show/Hide left menu'; //to translate
-$strReload = 'Reload'; //to translate
-$strSmallBigAll = 'Small/Big All'; //to translate
-$strImportExportCoords = 'Import/Export coordinates for PDF schema'; //to translate
-$strMoveMenu = 'Move Menu'; //to translate
-$strAngularLinks = 'Angular links'; //to translate
-$strDirectLinks = 'Direct links'; //to translate
-$strHideShowAll = 'Hide/Show all'; //to translate
-$strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate
-$strInternalRelationAdded = 'Internal relation added'; //to translate
-$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate
-$strRelationDeleted = 'Relation deleted'; //to translate
-$strToSelectRelation = 'To select relation, click :'; //to translate
-$strExportImportToScale = 'Export/Import to scale'; //to translate
-$strRecommended = 'recommended'; //to translate
-$strToFromPage = 'to/from page'; //to translate
-$strSelectReferencedKey = 'Select referenced key'; //to translate
-$strPleaseSelectPrimaryOrUniqueKey = 'Please select the primary key or a unique key'; //to translate
-$strForeignKeyError = 'Error creating foreign key (check data types)'; //to translate
-$strHelp = 'Help'; //to translate
-$strCancel = 'Cancel'; //to translate
-$strDeleteRelation = 'Delete relation'; //to translate
-$strKnownExternalBug = 'The %s functionality is affected by a known bug, see %s'; //to translate
-$strStructureForView = 'Structure for view'; //to translate
-$strStandInStructureForView = 'Stand-in structure for view'; //to translate
-$strToggleSmallBig = 'Toggle small/big'; //to translate
-$strIEUnsupported = 'Internet Explorer does not support this function.'; //to translate
-$strErrorRelationAdded = 'Error: Relation not added.'; //to translate
-$strErrorRelationExists = 'Error: relation already exists.'; //to translate
-$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
-$strSnapToGrid = 'Snap to grid'; //to translate
-$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php
index bcd75dd303..cc70c97260 100644
--- a/lang/japanese-utf-8.inc.php
+++ b/lang/japanese-utf-8.inc.php
@@ -23,161 +23,165 @@ $month = array('1 月','2 月','3 月','4 月','5 月','6 月','7 月','8 月','
$datefmt = '%Y 年 %B %d 日 %H:%M';
$timespanfmt = '%s 日 %s 時間 %s 分 %s 秒';
-$strAbortedClients = '中断しました。';
-$strAccessDenied = 'アクセスは拒否されました。';
-$strAccessDeniedCreateConfig = '恐らくこの問題の理由は、設定ファイルを作成していないためです。%1$sセットアップスクリプト%2$s を使用してひとつ作成することができます。';
-$strAccessDeniedExplanation = 'MySQL サーバに接続しようとしましたが、接続が拒絶されました。config.inc.php の中のホスト、ユーザおよびパスワードがMySQL サーバの管理者から与えられた情報と一致するか確認してください。';
+$strAbortedClients = '中断';
+$strAccessDenied = 'アクセスは拒否されました';
+$strAccessDeniedCreateConfig = '設定ファイルが作成されていないものと思われます。%1$sセットアップスクリプト%2$s を利用して設定ファイルを作成してください';
+$strAccessDeniedExplanation = 'MySQL サーバに接続しようとしましたが拒否されました。config.inc.php のホスト、ユーザ名、パスワードが MySQL サーバの管理者から与えられた情報と一致するか確認してください';
$strAction = '操作';
-$strAddAutoIncrement = '「AUTO_INCREMENT値を追加する';
+$strAddAutoIncrement = 'AUTO_INCREMENT 値を追加する';
$strAddClause = '%sを追加';
-$strAddConstraints = '制限を追加する';
+$strAddConstraints = '制約を追加する';
$strAddDeleteColumn = 'フィールド列を追加・削除する';
$strAddDeleteRow = '条件行を追加・削除する';
$strAddFields = '%s 個のフィールドを追加する';
-$strAddHeaderComment = 'ヘッダーへカスタムコメントを追加 (\\n で改行)';
+$strAddHeaderComment = 'ヘッダにカスタムコメントを追加 (\\n で改行)';
$strAddIntoComments = '追加コメント';
-$strAddNewField = 'フィールドを追加する';
-$strAddPrivilegesOnDb = 'データベースへ特権の追加する';
-$strAddPrivilegesOnTbl = 'テーブルへ特権の追加する';
-$strAddSearchConditions = '検索条件文を追加してください。("where"の節文):';
-$strAddToIndex = ' &nbsp;%s&nbsp; の列をインデックスに追加しました。';
-$strAddUser = 'ユーザを追加する';
-$strAddUserMessage = 'ユーザを追加しました。';
+$strAddNewField = '新規フィールドを追加する';
+$strAddPrivilegesOnDb = 'データベースに特権を追加';
+$strAddPrivilegesOnTbl = 'テーブルに特権を追加';
+$strAddSearchConditions = '検索条件("where"節の内容)を追加してください:';
+$strAddToIndex = 'インデックスに&nbsp;%s&nbsp; の列を追加しました';
+$strAddUser = '新しいユーザを追加する';
+$strAddUserMessage = '新しいユーザを追加しました';
$strAdministration = '管理';
-$strAffectedRows = '影響された行数:';
+$strAffectedRows = '変更された行数:';
$strAfter = '指定カラムの後に %s';
-$strAfterInsertBack = '戻る';
-$strAfterInsertNewInsert = '新レコードを追加する';
+$strAfterInsertBack = '前のページに戻る';
+$strAfterInsertNewInsert = '新しいレコードを追加する';
$strAfterInsertNext = '次の行を編集する';
$strAfterInsertSame = 'このページに戻る';
$strAll = '全部';
-$strAllowInterrupt = 'それの制限時間が近づいてることをスクリプトが検知した場合、インポートへの割込みを許可します。これは大きなファイルをインポートする場合のよい手段かもしれませんが、それはトランザクションを壊すことになります。';
+$strAllowInterrupt = '制限時間が近くなったときにスクリプト側でインポートを中断できるようにします。大きなファイルをインポートする場合には便利ですが、トランザクションが壊れることもあります';
$strAllTableSameWidth = 'すべてのテーブルを同じ幅で表示しますか?';
-$strAlterOrderBy = 'テーブル順番の条件';
+$strAlterOrderBy = 'テーブルの並び順';
$strAnalyzeTable = 'テーブルを分析する';
$strAnd = 'AND';
-$strAndThen = 'そしてその後に';
-$strAnIndex = 'インデックスが「%sに追加されていました。';
+$strAndThen = '続いて';
+$strAngularLinks = '角リンク';
+$strAnIndex = '%s にインデックスを追加しました';
$strAny = 'すべて';
$strAnyHost = 'すべてのホスト';
$strAnyUser = 'すべてのユーザ';
-$strApproximateCount = '近いかもしれません。FAQ 3.11 を参照してください。';
-$strAPrimaryKey = '主キーが %s に追加されました。';
+$strApproximateCount = '正確な数字とは限りません。FAQ 3.11 をご覧ください';
+$strAPrimaryKey = '%s に主キーを追加しました';
$strArabic = 'アラビア語';
$strArmenian = 'アルメニア語';
$strAscending = '昇順';
$strAtBeginningOfTable = 'テーブルの先頭';
$strAtEndOfTable = 'テーブルの末尾';
-$strAttr = '表示する';
+$strAttr = '属性';
$strAutodetect = '自動検知する';
$strAutomaticLayout = '自動レイアウト';
$strBack = '戻る';
$strBaltic = 'バルト諸語';
-$strBeginCut = '切り取り開始';
-$strBeginRaw = 'RAW 開始';
-$strBinary = ' バイナリ ';
-$strBinaryDoNotEdit = ' バイナリ - 修正できません';
+$strBeginCut = 'BEGIN CUT';
+$strBeginRaw = 'BEGIN RAW';
+$strBinary = ' バイナリ';
+$strBinaryDoNotEdit = ' バイナリ - 編集不可';
$strBinaryLog = 'バイナリログ';
-$strBinLogEventType = 'イベントタイプ';
+$strBinLogEventType = 'イベント種別';
$strBinLogInfo = '情報';
-$strBinLogName = 'ログ';
+$strBinLogName = 'ログ名';
$strBinLogOriginalPosition = '元の位置';
$strBinLogPosition = '位置';
$strBinLogServerId = 'サーバ ID';
-$strBookmarkAllUsers = 'すべてのユーザがこのブックマークをアクセスできる';
+$strBookmarkAllUsers = 'すべてのユーザがこのブックマークを利用できるようにする';
$strBookmarkCreated = 'ブックマーク %s を作成しました';
-$strBookmarkDeleted = 'ブックマークを正常に削除しました。';
+$strBookmarkDeleted = 'ブックマークを削除しました';
$strBookmarkLabel = 'ラベル';
$strBookmarkQuery = 'ブックマークされている SQL';
-$strBookmarkReplace = '既に存在する同じ前のブックマークを置換する';
-$strBookmarkThis = 'SQL をブックマークする';
-$strBookmarkView = '表示のみ';
-$strBrowseDistinctValues = '個別に値を表示する';
+$strBookmarkReplace = '同名のブックマークは差し替える';
+$strBookmarkThis = 'この SQL をブックマークする';
+$strBookmarkView = '表示のみ'; // XXX ビュー専用?
+$strBrowseDistinctValues = '重複している値を表示しない'; // XXX
$strBrowse = '表示';
-$strBrowseForeignValues = '外部キーを表示する';
+$strBrowseForeignValues = '参照されている値を表示する';
$strBufferPool = 'バッファプール';
-$strBufferPoolActivity = 'バッファープールの活性度';
+$strBufferPoolActivity = 'バッファプールの利用状況';
$strBufferPoolUsage = 'バッファプールの使用量';
-$strBufferReadMisses = '読み込みミス数';
-$strBufferReadMissesInPercent = '% の読み込みミス数';
-$strBufferWriteWaits = '書き込み待ち数';
-$strBufferWriteWaitsInPercent = '% の書き込み待ち数';
+$strBufferReadMisses = '読み込みミス';
+$strBufferReadMissesInPercent = '読み込みミス(%)';
+$strBufferWriteWaits = '書き込み待ち';
+$strBufferWriteWaitsInPercent = '書き込み待ち(%)';
$strBulgarian = 'ブルガリア語';
-$strBusyPages = 'ビジーなページ数';
-$strBzError = 'この php バージョンは Bz2 拡張が壊れているので phpMyAdmin が圧縮ダンプできません。phpMyAdmin のコンフィグレーションファイルの <code>$cfg[\'BZipDump\']</code> を <code>FALSE</code>に設定してください。Bz2 圧縮機能を使いたい場合には php のバージョンを上げて下さい。php バグ報告 %s 詳細。';
-$strBzip = '"bzip 方式"';
+$strBusyPages = 'ビジーなページ数'; // XXX
+$strBzError = 'このバージョンの PHP は Bz2 拡張が壊れているのでダンプを圧縮できません。phpMyAdmin の設定ファイルの <code>$cfg[\'BZipDump\']</code> を <code>FALSE</code>に設定することを強く推奨します。Bz2 圧縮機能を使いたい場合は PHP のバージョンを上げて下さい。PHP のバグレポート %s もご覧ください';
+$strBzip = '"bzip 形式"';
$strCalendar = 'カレンダー';
+$strCancel = 'キャンセル';
$strCanNotLoadExportPlugins = 'エクスポートプラグインをロードできません。正しくインストールされているか確認してください!';
-$strCanNotLoadImportPlugins = 'インポートプラグインを読み込めません。インストールを確認してください!';
+$strCanNotLoadImportPlugins = 'インポートプラグインをロードできません。正しくインストールされているか確認してください!';
$strCannotLogin = 'MySQL サーバにログインできません';
-$strCantLoad = '扱えない拡張子のファイルです,<br />PHP の設定をチェックしてください。';
-$strCantLoadRecodeIconv = '文字セット変換を行うためには組み込まれていない iconv または GNU recode の拡張が必要です。php に、この拡張設定を行っておくか、phpMyAdmin では文字セット変換をしない設定にしてください。';
-$strCantRenameIdxToPrimary = 'インデックスの前を PRIMARY に変更できません。';
-$strCantUseRecodeIconv = 'iconv、libiconv、recode_string のいずれの関数も使用できません。php の設定をチェックしてください。';
+$strCantLoad = '[a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] 拡張をロードできません。PHP の設定を確認してください';
+$strCantLoadRecodeIconv = '文字セットの変換に必要な iconv ないし GNU recode 拡張をロードできません。PHP 側でこの拡張を有効にするか、phpMyAdmin 側で文字セットの変換を無効にしてください';
+$strCantRenameIdxToPrimary = 'インデックス名を PRIMARY に変更することはできません!';
+$strCantUseRecodeIconv = '必要な拡張はロードされているようですが、iconv や libiconv、recode_string の関数を利用できません。PHP の設定を確認してください';
$strCardinality = '一意な値の数';
-$strCaseInsensitive = '英字の大小を区別しない';
-$strCaseSensitive = '英字の大小を区別する';
+$strCaseInsensitive = '大文字小文字を区別しない';
+$strCaseSensitive = '大文字小文字を区別する';
$strCentralEuropean = '中央ヨーロッパ語';
$strChange = '変更';
-$strChangeCopyMode = '同じ特権を持った新規のユーザを作る...';
-$strChangeCopyModeCopy = '... 古いものを維持する';
-$strChangeCopyModeDeleteAndReload = ' ... ユーザテーブルから古いものを削除し、後で特権に再びロードする';
-$strChangeCopyModeJustDelete = ' ... ユーザテーブルから古いものを削除する';
-$strChangeCopyModeRevoke = ' ... 古いものから有効な特権をすべて無効にし、それを後で削除する';
-$strChangeCopyUser = 'ログイン情報の変更 / ユーザコピー';
-$strChangeDisplay = '表示させるフィールドを選んで下さい';
+$strChangeCopyMode = '同じ特権を持つ新しいユーザを作る';
+$strChangeCopyModeCopy = '元のユーザも残す';
+$strChangeCopyModeDeleteAndReload = 'ユーザテーブルから元のユーザを削除し、特権をリロードする';
+$strChangeCopyModeJustDelete = 'ユーザテーブルから元のユーザを削除する';
+$strChangeCopyModeRevoke = '元のユーザの特権をすべて無効にしてから削除する';
+$strChangeCopyUser = 'ログイン情報の変更 / ユーザの複製';
+$strChangeDisplay = '表示するフィールドを選択してください';
$strChangePassword = 'パスワードを変更する';
$strCharset = '文字セット';
$strCharsetOfFile = 'ファイルの文字セット:';
-$strCharsets = '文字コード';
+$strCharsets = '文字セット';
$strCharsetsAndCollations = '文字セットと照合順序';
$strCheckAll = 'すべてチェックする';
-$strCheckOverhead = 'オーバーヘッドの検査をする';
-$strCheckPrivs = '特権のチェックをする';
-$strCheckPrivsLong = 'データベース &quot;%s&quot; の特権チェック。';
+$strCheckOverhead = 'オーバーヘッドのあるテーブルを確認してください'; // XXX
+$strCheckPrivs = '特権をチェックする';
+$strCheckPrivsLong = 'データベース &quot;%s&quot; の特権を確認してください'; // XXX
$strCheckTable = 'テーブルをチェックする';
-$strChoosePage = '編集するページを選択してください。';
-$strColComFeat = '列コメント表示機能';
+$strChoosePage = '編集するページを選択してください';
+$strColComFeat = '列コメント表示機能'; // XXX
$strCollation = '照合順序';
-$strColumnNames = '列(カラム)';
-$strColumnPrivileges = 'カラム指定の特権';
+$strColumnNames = 'カラム名';
+$strColumnPrivileges = 'このカラムに固有の特権';
$strCommand = 'コマンド';
$strComments = 'コメント';
-$strCommentsForTable = 'COMMENTS FOR TABLE';
+$strCommentsForTable = 'COMMENTS FOR TABLE'; // XXX
$strCompatibleHashing = 'MySQL&nbsp;4.0 互換';
$strCompleteInserts = '完全な INSERT 文を作成する';
$strCompression = '圧縮';
-$strCompressionWillBeDetected = 'インポートされたファイル圧縮は、自動的に検知されるでしょう: %s';
-$strConfigDefaultFileError = 'デフォルト設定を読み込めませんでした: "%1$s"';
-$strConfigFileError = 'phpMyAdmin が設定ファイルを読み込むことができません! <br />文法エラーが発生したか、ファイルが見つかりません。<br />下のリンクから設定ファイルを直接読み込んで、PHP のエラーメッセージを確認してください。多くの場合、区切り文字やセミコロンを忘れています。<br />もし空白のページが現れたらすべてうまく行っています。';
-$strConfigureTableCoord = 'テーブル「%sテーブルの設定を調整してください。';
-$strConnectionError = '接続できません: 無効な設定です。';
+$strCompressionWillBeDetected = 'インポートしたファイルの圧縮方法は次の中から自動検出されます: %s';
+$strConfigDefaultFileError = 'デフォルトの設定を読み込めませんでした: "%1$s"';
+$strConfigFileError = 'phpMyAdmin の設定ファイルを読み込めませんでした! <br />文法エラーが発生したか、ファイルが見つかりません。<br />下のリンクから直接設定ファイルを読み込んで PHP のエラーメッセージを確認してください。たいていの場合はどこかに引用符やセミコロンの抜けがあります。<br />空白のページが表示されれば問題なしです';
+$strConfigureTableCoord = 'テーブル %s の座標を設定してください';
+$strConnectionError = '接続できません: 設定が無効です';
$strConnections = '接続';
-$strConstraintsForDumped = 'ダンプ済テーブルの制限';
-$strConstraintsForTable = 'テーブルの制限';
-$strCookiesRequired = 'ここから先はクッキーが許可されている必要があります。';
-$strCopy = 'コピーする';
-$strCopyDatabaseOK = 'データベース「%sは「%sにコピーされました。';
+$strConstraintsForDumped = 'ダンプしたテーブルの制約';
+$strConstraintsForTable = 'テーブルの制約';
+$strCookiesRequired = 'クッキーを有効にしてください';
+$strCopy = 'コピー';
+$strCopyDatabaseOK = 'データベース %s を %s にコピーしました';
$strCopyTable = 'テーブルを(database<b>.</b>table)にコピーする:';
-$strCopyTableOK = 'テーブル「%sを「%sにコピーしました。';
-$strCopyTableSameNames = '同じテーブルにコピーできません!';
-$strCouldNotKill = 'phpMyAdmin がスレッド %s を終了させることができませんでした。恐らく、既に終了しています。';
+$strCopyTableOK = 'テーブル %s を %s にコピーしました';
+$strCopyTableSameNames = '同じテーブルにはコピーできません!';
+$strCouldNotKill = 'スレッド %s の終了に失敗しました。すでに閉じているようです';
$strCreate = '作成';
-$strCreateDatabaseBeforeCopying = 'コピーの前に「CREATE DATABASEする';
-$strCreateIndex = '&nbsp;%s&nbsp; の列のインデックスを作成する';
-$strCreateIndexTopic = '新規インデックスを作成する';
+$strCreateDatabaseBeforeCopying = 'コピーの前に CREATE DATABASE する';
+$strCreateIndex = '&nbsp;%s&nbsp; のカラムにインデックスを作成する';
+$strCreateIndexTopic = '新しいインデックスを作成する';
$strCreateNewDatabase = '新規データベースを作成する';
-$strCreateNewTable = 'データベース「%sにテーブルを新規作成する';
-$strCreatePage = '新規ページを作成する';
-$strCreatePdfFeat = 'PDF 作成機能';
+$strCreateNewTable = 'データベース %s に新しいテーブルを作成する';
+$strCreatePage = '新しいページを作成する';
+$strCreatePdfFeat = 'PDF の作成';
+$strCreateRelation = 'リレーションを作成';
+$strCreateTable = 'テーブルを作成';
$strCreateUserDatabase = 'ユーザ専用データベース';
-$strCreateUserDatabaseName = '同のデータベースを作成してすべての特権を与えます';
+$strCreateUserDatabaseName = '同名のデータベースを作成してすべての特権を与える';
$strCreateUserDatabaseNone = 'なし';
-$strCreateUserDatabaseWildcard = 'ワイルドカードで指定されたデータベースにすべての特権を与えます(ユーザ_%)';
-$strCreationDates = '作成/更新/検査の日付を追加する';
-$strCriteria = '絞込み基準';
+$strCreateUserDatabaseWildcard = 'ワイルドカード(ユーザ名_%)に該当するデータベースにすべての特権を与える';
+$strCreationDates = '作成/更新/検査日';
+$strCriteria = '条件';
$strCroatian = 'クロアチア語';
$strCSV = 'CSV';
$strCSVImportOptions = 'CSV オプション';
@@ -189,126 +193,138 @@ $strCzechSlovak = 'チェコのスロバキア語';
$strDanish = 'デンマーク語';
$strData = 'データ';
$strDatabase = 'データベース';
-$strDatabaseEmpty = 'データベースが空です!';
+$strDatabaseEmpty = 'データベース名が空です!';
$strDatabaseExportOptions = 'データベースエクスポートオプション';
-$strDatabaseHasBeenDropped = 'データベース「%sを正常に削除しました。';
-$strDatabaseNoTable = 'このデータベースはテーブルを含んでいません!';
+$strDatabaseHasBeenDropped = 'データベース %s を削除しました';
+$strDatabaseNoTable = 'このデータベースにはテーブルがありません!';
$strDatabases = 'データベース';
-$strDatabasesDropped = 'データベース「%sは削除されました。';
+$strDatabasesDropped = 'データベース %s を正常に削除しました';
$strDatabasesStats = 'データベースの統計';
$strDatabasesStatsDisable = '統計を無効にする';
-$strDatabasesStatsEnable = '統計を許可する';
-$strDatabasesStatsHeavyTraffic = '注意: データベース統計を許可すると MySQL と WEBサーバの間で重いトラフィックが発生するかもしれません。';
+$strDatabasesStatsEnable = '統計を有効にする';
+$strDatabasesStatsHeavyTraffic = '注意: データベースの統計を有効にするとウェブサーバと MySQL サーバの間の通信量が激増することがあります';
$strDataDict = 'データ辞書';
$strDataOnly = 'データのみ';
-$strDataPages = 'データを含むページ数';
-$strDBComment = 'データベースのコメント: ';
-$strDBCopy = 'この前でデータベースをコピーする';
-$strDbPrivileges = 'データベース特定 特権';
-$strDBRename = 'この前にデータベースを変更する';
-$strDbSpecific = 'データベース仕様';
-$strDefault = '基本値';
-$strDefaultEngine = '%s は、この MySQL サーバのデフォルトストレージエンジンです。';
-$strDefaultValueHelp = 'デフォルト値のために、バックスラッシュエスケープや引用符なしの 1 個だけの値を入れて下さい, このフォーマットは: a';
+$strDataPages = 'データが含まれているページ数';
+$strDBComment = 'データベースのコメント:';
+$strDBCopy = 'データベースのコピー先';
+$strDbIsEmpty = 'データベースが空のようです!';
+$strDbPrivileges = 'データベースに固有の特権';
+$strDBRename = '新しいデータベース名';
+$strDbSpecific = 'データベース固有';
+$strDefault = 'デフォルト値';
+$strDefaultEngine = '%s はこの MySQL サーバのデフォルトストレージエンジンです';
+$strDefaultValueHelp = 'デフォルト値にはひとつの値のみ入力してください。バックスラッシュによるエスケープや引用符を含めることはできません。例: a';
$strDefragment = 'テーブルのデフラグ';
$strDelayedInserts = '遅延インサートを使用する';
$strDelete = '削除';
$strDeleteAndFlush = 'ユーザを削除して特権をリロードする';
-$strDeleteAndFlushDescr = 'これはクリアーです。特権をリロードするので少々時間がかかります。';
-$strDeleted = '選択した列を削除しました。';
-$strDeletedRows = '削除された行数:';
-$strDeleteNoUsersSelected = '削除するユーザを選択していません!';
+$strDeleteAndFlushDescr = 'これはもっともクリーンな方法ですが、特権のリロードに時間がかかることがあります';
+$strDeleted = '行を削除しました';
+$strDeletedRows = '削除した行数:';
+$strDeleteNoUsersSelected = '削除するユーザが選択されていません!';
+$strDeleteRelation = 'リレーションを削除';
$strDeleting = '%s を削除中です';
$strDelimiter = 'デリミタ';
-$strDelOld = '現在のページは、もはや存在しないテーブルに参照があります。それらの参照を削除したいですか?';
+$strDelOld = 'このページには存在しないテーブルへの参照があります。これらの参照を削除しますか?';
$strDescending = '降順';
$strDescription = '説明';
+$strDesigner = 'デザイナ';
+$strDesignerHelpDisplayField = '表示するフィールドはピンク色で表示されます。表示非表示を切り替える場合は「表示するフィールドを選択する」というアイコンをクリックしてから適切なフィールド名をクリックください';
$strDictionary = '辞書';
-$strDirtyPages = '正なページ数';
+$strDirectLinks = '直リンク';
+$strDirtyPages = 'ダーティページ';
$strDisabled = '無効';
-$strDisableForeignChecks = '外部キーの検査を無効にする';
-$strDisplayFeat = 'テーブル情報表示機能';
-$strDisplayOrder = '表示順序:';
-$strDisplayPDF = 'PDF スキーマの表示をする';
-$strDoAQuery = '"例のQUERY"を実行 (ワイルドカード: "%")';
+$strDisableForeignChecks = '外部キーのチェックを無効にする';
+$strDisplayFeat = '表示機能';
+$strDisplayOrder = '表示順:';
+$strDisplayPDF = 'PDF スキーマを表示する';
+$strDoAQuery = '"query by example"を実行 (ワイルドカード: "%")';
+$strDocSQL = 'DocSQL';
+$strDocSQLOptions = 'DocSQL オプション';
$strDocu = 'ドキュメント';
-$strDoYouReally = 'これを本当に実行しても良いですか?:';
+$strDoYouReally = '本当に実行しますか?';
$strDrop = '削除';
-$strDropDatabaseStrongWarning = '完全にデータベースを破壊するでしょう!';
-$strDropUsersDb = 'ユーザと同じ前を持つデータベースを削除する';
-$strDumpingData = 'テーブルのダンプデータ';
-$strDumpSaved = 'ダンプをファイル %s に保存しました。';
-$strDumpXRows = '%s 列をダンプします。開始列は %s です。';
-$strDynamic = 'ダイナミック';
+$strDropDatabaseStrongWarning = 'データベースを完全に削除しようとしています!';
+$strDropUsersDb = 'ユーザと同名のデータベースを削除する';
+$strDumpingData = 'テーブルのデータをダンプしています';
+$strDumpSaved = 'ダンプをファイル %s に保存しました';
+$strDumpXRows = '%s 行をダンプします(開始行: %s)';
+$strDynamic = '動的';
-$strEdit = '修正';
+$strEdit = '編集';
$strEditPDFPages = 'PDF ページを編集する';
-$strEditPrivileges = '特権を修正';
-$strEffective = '実効';
+$strEditPrivileges = '特権を編集';
+$strEffective = '実効'; // XXX
$strEmpty = '空にする';
-$strEmptyResultSet = 'MySQL が空の値を返しました (例えば行が空だった)';
+$strEmptyResultSet = '返り値が空でした(行数0)';
$strEnabled = '有効';
-$strEncloseInTransaction = 'トランザクションでエクスポートを囲む';
+$strEncloseInTransaction = 'エクスポートをトランザクションで囲む';
$strEncto = 'エンコーディングへ変換する'; // encoding convert
$strEnd = '最後';
-$strEndCut = '切り取り終了';
-$strEndRaw = 'RAW 終了';
-$strEngineAvailable = '%s は、この MySQL サーバで利用可能です。';
-$strEngineDisabled = '%s は、この MySQL サーバでは無効にされています。';
+$strEndCut = 'END CUT';
+$strEndRaw = 'END RAW';
+$strEngineAvailable = '%s は有効になっています';
+$strEngineDisabled = '%s は無効になっています';
$strEngines = 'エンジン';
-$strEngineUnsupported = 'この MySQL サーバは %s ストレージエンジンをサポートしていません。';
+$strEngineUnsupported = 'この MySQL サーバは %s ストレージエンジンをサポートしていません';
$strEnglish = '英語';
-$strEnglishPrivileges = ' 注意: MySQLの特権の前は英語で表示しています。';
+$strEnglishPrivileges = '注意: MySQL の特権名は英語で表示されます';
$strError = 'エラー';
$strErrorInZipFile = 'ZIP アーカイブにエラーがあります:';
-$strErrorRenamingTable = 'テーブルを%1$sから%2$sにリネームするときにエラーが発生しました';
-$strEscapeWildcards = 'ワイルドカード「_および「%を文字通りに使用するときは「\でエスケープしてください。';
-$strEsperanto = '国際語';
+$strErrorRelationAdded = 'エラー: リレーションを追加できませんでした';
+$strErrorRelationExists = 'エラー: リレーションはすでに存在しています';
+$strErrorRenamingTable = 'テーブルを %1$s から %2$s にリネームするときにエラーが発生しました';
+$strErrorSaveTable = 'デザイナの座標を保存するときにエラーが発生しました';
+$strEscapeWildcards = '_ や % というワイルドカードを文字として使用するときは \ でエスケープしてください';
+$strEsperanto = 'エスペラント語';
$strEstonian = 'エストニア語';
-$strExcelEdition = 'Excel の種類';
-$strExcelOptions = 'Excel オプション';
-$strExecuteBookmarked = 'ブックマークされた照会を実行する';
-$strExplain = 'SQL を分析する';
+$strExcelEdition = 'Excel のエディション';
+$strExcelOptions = 'Excel のオプション';
+$strExecuteBookmarked = 'ブックマークされたクエリを実行する';
+$strExplain = 'EXPLAIN で確認';
$strExport = 'エクスポート';
-$strExportMustBeFile = 'このエクスポート形式はファイルに保存する必要があります!';
-$strExtendedInserts = '拡張 INSERT 文を作成する';
+$strExportImportToScale = '倍率にあわせたエクスポート/インポート';
+$strExportMustBeFile = 'この形式のエクスポートはファイルに保存する必要があります!';
+$strExtendedInserts = '長い INSERT 文を作成する';
$strExtra = 'その他';
-$strFailedAttempts = '試みは失敗ました';
+$strFailedAttempts = '失敗回数';
$strField = 'フィールド';
-$strFieldHasBeenDropped = 'フィールド %s が正常に削除されました';
+$strFieldHasBeenDropped = 'フィールド %s を削除しました';
$strFields = 'フィールド';
$strFieldsEmpty = ' フィールド数が空です。 ';
$strFieldsEnclosedBy = 'フィールド囲み記号';
$strFieldsEscapedBy = 'フィールドのエスケープ記号';
$strFieldsTerminatedBy = 'フィールド区切り記号';
-$strFileAlreadyExists = 'ファイル「%sは既にサーバに存在しします。ファイルを変更するか、上書きオプションを確認してください。';
-$strFileCouldNotBeRead = 'ファイルを読めません。';
-$strFileNameTemplate = 'ファイルのテンプレート';
-$strFileNameTemplateDescription = 'この値は %1$sstrftime%2$s を用いて、判断されます。従って、時間書式の文字列を使用することができます。さらに次の文字列置換が起こるでしょう: %3$s。そのままに他のテキストは維持されるでしょう。';
-$strFileNameTemplateDescriptionDatabase = 'データベース';
-$strFileNameTemplateDescriptionServer = 'サーバ';
-$strFileNameTemplateDescriptionTable = 'テーブル';
-$strFileNameTemplateRemember = 'テンプレートを覚える';
-$strFileToImport = 'ファイルをインポートする';
+$strFileAlreadyExists = 'サーバ上に既存のファイル %s があります。ファイル名を変更するか、上書きオプションを有効にしてください';
+$strFileCouldNotBeRead = 'ファイルを読み込めませんでした';
+$strFileNameTemplate = 'ファイル名のテンプレート';
+$strFileNameTemplateDescription = 'このテンプレートは %1$sstrftime%2$s を使って解釈されます。そのため、時間の書式文字列を利用できます。また、次の変換も行われます。%3$s それ以外のテキストは修正されません';
+$strFileNameTemplateDescriptionDatabase = 'データベース名';
+$strFileNameTemplateDescriptionServer = 'サーバ名';
+$strFileNameTemplateDescriptionTable = 'テーブル名';
+$strFileNameTemplateRemember = 'テンプレートを記憶させる';
+$strFileToImport = 'インポートするファイル';
$strFixed = '固定';
-$strFlushPrivilegesNote = '注意: phpMyAdmin は MySQL の特権テーブルから直接にユーザ特権を得ます。もしマニュアルで特権が変更されていると、このテーブルの内容とは異なるかもしれません。この場合、続けるまえに %s 特権リロード %s をする必要があります。';
-$strFlushQueryCache = '照会キャッシュをフラッシュする';
-$strFlushTable = 'テーブルのキャッシュを空にする("FLUSH")';
+$strFlushPrivilegesNote = '注意: phpMyAdmin は MySQL の特権テーブルから直接ユーザ特権を取得しますが、手作業で特権を更新した場合は phpMyAdmin が利用しているテーブルの内容とサーバの特権の内容が一致しなくなることがありますので、作業を続ける前に %s特権リロード%s をしてください';
+$strFlushQueryCache = 'クエリキャッシュをフラッシュする';
+$strFlushTable = 'テーブルをフラッシュする("FLUSH")';
$strFlushTables = 'すべてのテーブルをフラッシュする(閉じる)';
$strFontSize = 'フォントサイズ';
+$strForeignKeyError = '外部キーを作成中にエラーが発生しました (データ型を確認してください)';
$strFormat = 'フォーマット';
-$strFormEmpty = 'フォームでは値がありませんでした。';
-$strFreePages = 'フリーなページ数';
+$strFormEmpty = 'フォームに入力されていない値があります!';
+$strFreePages = 'フリーページ数';
$strFullText = '全文';
$strFunction = '関数';
$strFunctions = '関数';
$strGenBy = '生成環境';
-$strGeneralRelationFeat = 'リレーション機能';
+$strGeneralRelationFeat = '一般的なリレーション機能';
$strGenerate = '生成する';
$strGeneratePassword = 'パスワードを生成する';
-$strGenTime = '作成の時間';
+$strGenTime = '生成時間';
$strGeorgian = 'グルジア語';
$strGerman = 'ドイツ語';
$strGlobal = 'グローバル';
@@ -317,18 +333,22 @@ $strGlobalValue = 'グローバル値';
$strGo = '実行する';
$strGrantOption = '権限委譲';
$strGreek = 'ギリシア語';
-$strGzip = '"gzip 方式"';
+$strGzip = '"gzip 形式"';
-$strHandler = '内部処理';
-$strHasBeenAltered = 'を変更しました。';
-$strHasBeenCreated = 'を作成しました。';
-$strHaveToShow = '表示するために、少なくてもひとつのカラムを選択しなければなりません。';
+$strHandler = 'ハンドラ';
+$strHasBeenAltered = 'を変更しました';
+$strHasBeenCreated = 'を作成しました';
+$strHaveToShow = '最低ひとつは表示するカラムを選択してください';
$strHebrew = 'ヘブライ語';
-$strHexForBinary = 'バイナリフィールドは 16 進数を使用する';
+$strHelp = 'ヘルプ';
+$strHexForBinary = 'バイナリフィールドでは 16 進数を使用する';
+$strHide = '隠す';
+$strHideShowAll = 'すべて隠す/表示';
+$strHideShowNoRelation = 'リレーションのないテーブルを隠す/表示';
$strHome = 'メインページへ';
-$strHomepageOfficial = 'phpMyAdmin ホーム';
+$strHomepageOfficial = 'phpMyAdmin のオフィシャルサイト';
$strHost = 'ホスト';
-$strHostEmpty = 'ホストは空です!';
+$strHostEmpty = 'ホスト名が空です!';
$strHTMLExcel = 'Microsoft Excel 2000';
$strHTMLExcelOptions = 'Microsoft Excel 2000 エクスポートオプション';
$strHTMLWord = 'Microsoft Word 2000';
@@ -338,642 +358,670 @@ $strHungarian = 'ハンガリー語';
$strIcelandic = 'アイスランド語';
$strId = 'ID';
$strIdxFulltext = '全文';
+$strIEUnsupported = 'Internet Explorer ではこの機能は利用できません';
$strIgnore = '無視';
-$strIgnoreDuplicates = '行の複製を無視する';
-$strIgnoreInserts = '「INSERT IGNOREを使用する';
+$strIgnoreDuplicates = '重複している行を無視する';
+$strIgnoreInserts = 'INSERT IGNORE を使用する';
$strImport = 'インポート';
+$strImportExportCoords = 'PDF スキーマの座標をインポート/エクスポートする';
$strImportFiles = 'インポートファイル';
-$strImportFormat = 'インポート済ファイルの書式';
-$strImportSuccessfullyFinished = 'インポートに成功しました。%d 個の照会を実行しました。';
+$strImportFormat = 'インポートするファイルの形式';
+$strImportSuccessfullyFinished = 'インポートは正常終了しました。%d 個のクエリを実行しました';
$strIndex = 'インデックス';
$strIndexes = 'インデックスサイズ';
-$strIndexHasBeenDropped = 'インデックス %s が削除されました';
-$strIndexName = 'インデックス&nbsp;:';
-$strIndexType = 'インデックスの種類&nbsp;:';
-$strIndexWarningMultiple = '1 個を越える INDEX キーがカラム `%s` 用に作成されました。';
-$strIndexWarningPrimary = 'カラム `%s` に PRIMARY と INDEX のキーを両方とも設定するのはよしましょう。';
-$strIndexWarningTable = 'テーブル `%s` のインデックスに関する問題です。';
-$strIndexWarningUnique = 'カラム `%s` に UNIQUE と INDEX のキーを両方とも設定するのはよしましょう。';
-$strInnoDBAutoextendIncrementDesc = ' それがいっぱいになる場合に、自動拡張するテーブルスペースのサイズを拡張するための増分量です。';
-$strInnoDBAutoextendIncrement = '自動拡張の追加増加量';
-$strInnoDBBufferPoolSize = 'バッファー蓄積サイズ';
-$strInnoDBBufferPoolSizeDesc = 'InnoDB がキャッシュデータとそのテーブルのインデックスに使うバッファメモリのサイズです。';
+$strIndexHasBeenDropped = 'インデックス %s を削除しました';
+$strIndexName = 'インデックス名:';
+$strIndexType = 'インデックスの種類:';
+$strIndexWarningMultiple = '%s というキーがカラム `%s` に複数作成されました';
+$strIndexWarningPrimary = 'カラム `%s` に PRIMARY キーと INDEX キーを両方指定することはできません';
+$strIndexWarningTable = 'テーブル `%s` のインデックスに問題があります';
+$strIndexWarningUnique = 'カラム `%s` に UNIQUE キーと INDEX キーを両方指定することはできません';
+$strInnoDBAutoextendIncrementDesc = 'スペースがいっぱいになったときに自動的にテーブルを拡張する場合に追加されるテーブルサイズ';
+$strInnoDBAutoextendIncrement = '自動拡張時に追加されるテーブルサイズ';
+$strInnoDBBufferPoolSize = 'バッファプールのサイズ';
+$strInnoDBBufferPoolSizeDesc = 'InnoDB がテーブルのデータやインデックスをキャッシュするのに使うメモリバッファ量';
$strInnoDBDataFilePath = 'データファイル';
-$strInnoDBDataHomeDir = 'データホームディレクトリ';
-$strInnoDBDataHomeDirDesc = 'すべての InnoDB データファイル用のディレクトリパスの共通部分です。';
+$strInnoDBDataHomeDir = 'データのホームディレクトリ';
+$strInnoDBDataHomeDirDesc = 'すべての InnoDB データファイルに共通するディレクトリパス';
$strInnoDBPages = 'ページ';
+$strInnoDBRelationAdded = 'InnoDB リレーションを追加しました';
$strInnodbStat = 'InnoDB ステータス';
-$strInsecureMySQL = 'あなたのコンフィグレーションファイルの設定が MySQL デフォルトの特権アカウントになっています (root ユーザでパスワードなし) 。 MySQL サーバもこのデフォルト設定で動作しているので、侵入者に対して無防備です。このセキュリティーホールは必ず閉ざしてください。';
-$strInsertAsNewRow = '新しい行として追加する';
-$strInsertedRowId = 'インサートした行 ID:';
-$strInsertedRows = '追加された行数:';
-$strInsert = '追加';
-$strInternalNotNecessary = '* InnoDB が存在する場合、内部リレーションは必要ではありません。';
+$strInsecureMySQL = 'お使いの設定ファイルに MySQL のデフォルト特権アカウントに相当する設定 (root ユーザでパスワードなし) が含まれています。お使いの MySQL サーバはこのデフォルト設定で動作しているため不正アクセス可能な状態になっています。このセキュリティーホールはかならず閉ざしてください';
+$strInsert = '挿入';
+$strInsertAsNewRow = '新しい行として挿入する';
+$strInsertedRowId = '挿入した行 ID:';
+$strInsertedRows = '挿入した行数:';
+$strInternalNotNecessary = '* InnoDB にも内部リレーションが存在している場合は不要です';
+$strInternalRelationAdded = '内部リレーションを追加しました';
$strInternalRelations = '内部リレーション';
$strInUse = '使用中';
-$strInvalidAuthMethod = '設定上で正しくない認証方法を設定しています:';
-$strInvalidColumn = '正しくない列 (%s) が指定されました!';
-$strInvalidColumnCount = 'カラム数は 0 より大きくなければいけません。';
-$strInvalidCSVFieldCount = 'CSV 入力中 に無効な項目数があります(行:%d)';
-$strInvalidCSVFormat = 'CSV 入力中 に無効な書式があります(行:%d)';
-$strInvalidCSVParameter = 'CSV インポートのパラメーターが無効です: %s';
-$strInvalidDatabase = 'データベースが正です';
-$strInvalidFieldAddCount = '少なくともひとつのフィールドを追加しなければなりません。';
-$strInvalidFieldCount = 'テーブルは少なくともひとつのフィールドが必要です。';
-$strInvalidLDIImport = 'このプラグインは圧縮済インポートをサポートしていません!';
-$strInvalidRowNumber = '%d は正しくない行番号です。';
-$strInvalidServerHostname = 'サーバ「%1$sのホストが無効です。設定を調査してください。';
-$strInvalidServerIndex = '無効なサーバインデックスです: "%s"';
-$strInvalidTableName = 'テーブルが正です';
+$strInvalidAuthMethod = '設定ファイルに無効な認証方法が指定されています:';
+$strInvalidColumn = '不正なカラム(%s)が指定されています!';
+$strInvalidColumnCount = 'カラム数は 0 より大きくなければいけません';
+$strInvalidCSVFieldCount = 'CSV 入力のフィールド数が不正です (行: %d)';
+$strInvalidCSVFormat = 'CSV 入力の書式が不正です (行: %d)';
+$strInvalidCSVParameter = 'CSV インポートのパラメータが不正です: %s';
+$strInvalidDatabase = '不正なデータベースです';
+$strInvalidFieldAddCount = '最低ひとつはフィールドを追加してください';
+$strInvalidFieldCount = 'テーブルには最低ひとつのフィールドが必要です';
+$strInvalidLDIImport = 'このプラグインでは圧縮されたファイルのインポートはできません!';
+$strInvalidRowNumber = '%d は不正な行番号です';
+$strInvalidServerHostname = 'サーバ %1$s のホスト名が不正です。設定を確認してください';
+$strInvalidServerIndex = 'サーバのインデックスが不正です: "%s"';
+$strInvalidTableName = 'テーブル名が不正です';
$strJapanese = '日本語';
$strJoins = '結合';
-$strJumpToDB = '&quot;%s&quot; データベースへジャンプ.';
-$strJustDelete = '特権テーブルからユーザを即削除する';
-$strJustDeleteDescr = '&quot;削除済&quot; ユーザは特権がリロードされるまでサーバにアクセス可能です。';
+$strJumpToDB = '&quot;%s&quot; データベースに移動';
+$strJustDelete = '特権テーブルからユーザを削除するだけにする';
+$strJustDeleteDescr = '特権がリロードされるまでは「削除」されたユーザもふつうにサーバにアクセスできます';
$strKanjiEncodConvert = '漢字コード変換'; // kanji code convert
-$strKeepPass = 'パスワードを変更しない';
+$strKeepPass = 'パスワードは変更しない';
$strKeyCache = 'キーキャッシュ';
-$strKeyname = 'キー';
+$strKeyname = 'キー名';
$strKill = '停止';
+$strKnownExternalBug = '%s の機能には既知のバグがあります。%s をご覧ください';
$strKorean = '韓国語';
-$strLandscape = 'ランドスケープ';
+$strLandscape = '横向き';
$strLanguage = '言語';
-$strLanguageFileNotFound = '言語ファイル「%1$sが見つかりません。';
-$strLanguageUnknown = '明の言語: %1$s.';
+$strLanguageFileNotFound = '言語ファイル「%1$s」が見つかりません';
+$strLanguageUnknown = '言語ファイルが登録されていません: %1$s';
$strLatchedPages = 'ラッチされているページ';
-$strLatexCaption = 'テーブルキャプション';
+$strLatexCaption = 'テーブルのキャプション';
$strLatexContent = 'テーブル __TABLE__ の内容';
-$strLatexContinued = '(続ける)';
-$strLatexContinuedCaption = '継続時のテーブルキャプション';
-$strLatexIncludeCaption = 'テーブルキャプションを含む';
+$strLatexContinued = '(続き)';
+$strLatexContinuedCaption = 'テーブルのキャプション(続き)';
+$strLatexIncludeCaption = 'テーブルのキャプションを含める';
$strLatexLabel = 'ラベルキー';
$strLaTeX = 'LaTeX';
$strLaTeXOptions = 'LaTeX オプション';
$strLatexStructure = 'テーブル __TABLE__ の構造';
$strLatvian = 'ラトビア語';
-$strLDIImportOptions = 'LOAD DATA を用いて CSV のインポートをするオプション';
-$strLDI = 'LOAD DATA を用いた CSV';
-$strLDILocal = 'ローカルキーワードを使用する';
-$strLengthSet = '長さ/セット*';
-$strLimitNumRows = 'ページの最大レコード数';
+$strLDIImportOptions = 'LOAD DATA で CSV インポートするときのオプション';
+$strLDI = 'LOAD DATA する CSV';
+$strLDILocal = 'LOCAL キーワードを使用する';
+$strLengthSet = '長さ/値';
+$strLimitNumRows = 'ページあたりの行数';
$strLinesTerminatedBy = '行の終端記号';
-$strLinkNotFound = 'リンクが見つかりません';
-$strLinksTo = 'リンク';
+$strLinkNotFound = 'リンク先が見つかりません';
+$strLinksTo = 'リンク先';
$strLithuanian = 'リトアニア語';
$strLocalhost = 'ローカル';
-$strLocationTextfile = 'テキストファイルの場所';
+$strLocationTextfile = 'テキストファイルの位置';
$strLogin = 'ログイン';
$strLoginInformation = 'ログイン情報';
$strLogout = 'ログアウト';
$strLogPassword = 'パスワード:';
$strLogServer = 'サーバ';
-$strLogUsername = 'ユーザ:';
-$strLongOperation = 'この操作は時間がかかります。それでも進みますか?';
+$strLogUsername = 'ユーザ名:';
+$strLongOperation = 'この作業には時間がかかることがあります。続行しますか?';
-$strMaxConnects = '最大並行接続';
-$strMaximalQueryLength = '作成する照会の最大長';
-$strMaximumSize = '最大サイズ: %s%s';
-$strMbExtensionMissing = 'mbstring PHP 拡張は見つかりませんでしたが、、マルチバイト文字セットを使用しているように見えます。phpMyAdmin は mbstring 拡張なしでは文字列を正確に分割することができず、また、予期しない結果が返ってくるかもしれません。';
-$strMbOverloadWarning = 'PHP の設定で mbstring.func_overload が有効です。このオプションは phpMyAdmin と互換性がなく、いくうつかのデータの破壊を引き起こすかもしれません!';
-$strMIME_available_mime = '有効な MIME タイプ';
-$strMIME_available_transform = '変換有効';
+$strMaxConnects = '最大同時接続数';
+$strMaximalQueryLength = '作成するクエリの最大長';
+$strMaximumSize = '最長: %s%s';
+$strMbExtensionMissing = 'PHP の mbstring 拡張が見つかりませんでした。マルチバイト文字セットを使用しているようですが、mbstring 拡張がないと phpMyAdmin は文字列を正しく分割できないため予期しない結果になることがあります';
+$strMbOverloadWarning = 'PHP の設定で mbstring.func_overload が有効になっています。phpMyAdmin はこのオプションに対応していないため、データが破壊されることがあります!';
+$strMIME_available_mime = '利用できる MIME タイプ';
+$strMIME_available_transform = '利用できる変換機能';
$strMIME_description = '説明';
$strMIME_MIMEtype = 'MIME タイプ';
-$strMIME_nodescription = 'この変換には有効な説明がありません。<br />作者に%sの意味をご確認ください。';
-$strMIME_transformation = 'ブラウザー変換';
-$strMIME_transformation_note = '利用可能な変換オプションの一覧、およびそれらの MIME 形式変換に関しては、%s変換の説明%s をクリックしてください。';
+$strMIME_nodescription = 'この変換機能には説明がありません。<br />%s の動作については作者にご確認ください';
+$strMIME_transformation = 'ブラウザ変換機能';
+$strMIME_transformation_note = '利用可能な変換オプションや MIME タイプの変換の一覧については %s変換機能の説明%s をご覧ください';
$strMIME_transformation_options = '変換オプション';
-$strMIME_transformation_options_note = 'この書式を使用して、変換オプションの値を入力してください: \'a\', 100, b,\'c\'...<br />バックスラッシュ("\")やシングルクォート("\'")を値に含める必要がある場合は(「\\\\xyzや「a\\\'bのように)バックスラッシュでエスケープしてください';
-$strMIMETypesForTable = 'MIME TYPES FOR TABLE';
-$strMIME_without = 'イタリック体で印刷された MIME タイプは個別の変換関数を持っていません。';
-$strModifications = 'を正しく修正しました。';
+$strMIME_transformation_options_note = '変換オプションの値の書式: \'a\',\'b\',\'c\'...<br />バックスラッシュ ("\") やシングルクォート ("\'") を値に含める必要がある場合は ( \\\\xyz や a\\\'b のように) バックスラッシュでエスケープしてください';
+$strMIMETypesForTable = 'MIME TYPES FOR TABLE'; // XXX
+$strMIME_without = 'イタリック表示されている MIME タイプには個別の変換関数はありません';
+$strModifications = '修正を保存しました';
$strModify = '修正';
-$strModifyIndexTopic = 'インデックスを変更する';
-$strMoveTable = 'テーブルを(database<b>.</b>table)に移動する:';
-$strMoveTableOK = 'テーブル「%sを「%sに移動しました。';
-$strMoveTableSameNames = '同じテーブルに移動できません!';
-$strMultilingual = '多国語';
-$strMyISAMDataPointerSize = 'データのポインターサイズ';
-$strMyISAMDataPointerSizeDesc = 'CREATE TABLE で MyISAM テーブルに使用する MAX_ROWS オプションが指定されない場合のバイト指定のデフォルトポインターサイズです。';
-$strMyISAMMaxExtraSortFileSize = 'インデックス作成用一時ファイルの最大サイズ';
-$strMyISAMMaxExtraSortFileSizeDesc = 'MyISAMのインデックスを高速作成するときに利用するテンポラリファイルの大きさが、キーキャッシュを利用するときよりここに指定した値以上大きくなる場合は、キーキャッシュ法が使われます。';
-$strMyISAMMaxSortFileSize = '一時ソートファイルの最大サイズ';
-$strMyISAMMaxSortFileSizeDesc = 'MyISAM インデックスの再作成で使用することが許された MySQL 一時ファイルの最大サイズです (REPAIR TABLE 中、ALTER TABLE か LOAD DATA INFILE)';
-$strMyISAMRecoverOptionsDesc = 'クラッシュした MyISAM テーブルの自動回復用モードで、サーバ起動オプション --myisam-recover で設定します。';
+$strModifyIndexTopic = 'インデックスを修正する';
+$strMoveMenu = 'メニューを移動する';
+$strMoveTable = 'テーブルの移動先(database<b>.</b>table):';
+$strMoveTableOK = 'テーブル %s を %s に移動しました';
+$strMoveTableSameNames = '同じテーブルには移動できません!';
+$strMultilingual = '複数言語';
+$strMyISAMDataPointerSize = 'データポインタのサイズ';
+$strMyISAMDataPointerSizeDesc = 'MAX_ROWS オプションを指定せずに MyISAM テーブルを作成するときに CREATE TABLE が使用するデフォルトのポインタサイズ (バイト単位)';
+$strMyISAMMaxExtraSortFileSize = 'インデックス作成時に利用する一時ファイルの最大サイズ';
+$strMyISAMMaxExtraSortFileSizeDesc = 'MyISAM のインデックスを高速生成するときに利用される一時ファイルとキーキャッシュの差がここで指定した値以上に大きくなる場合は、キーキャッシュ法が使われます';
+$strMyISAMMaxSortFileSize = 'ソート用の一時ファイルの最大サイズ';
+$strMyISAMMaxSortFileSizeDesc = 'MyISAM インデックスを再作成するとき (REPAIR TABLE や ALTER TABLE、LOAD DATA INFILE の最中) に利用できる一時ファイルの最大サイズ';
+$strMyISAMRecoverOptionsDesc = 'クラッシュした MyISAM テーブルを自動修復するときのモード (サーバ起動オプション --myisam-recover で設定されるもの)';
$strMyISAMRecoverOptions = '自動修復モード';
$strMyISAMRepairThreads = 'スレッドの修復';
-$strMyISAMRepairThreadsDesc = 'もしこの値が 1 以上なら、MyISAM テーブルのインデックスはソート処理の修復中に平行で(それ自身の各インデックスを)作成します。';
-$strMyISAMSortBufferSize = 'ソートバッファーサイズ';
-$strMyISAMSortBufferSizeDesc = 'このバッファーは、REPAIR TABLE の間に MyISAM インデックスをソートする場合、または CREATE INDEX か ALTER TABLE とインデックスを作成する場合に、割り付けられます。';
+$strMyISAMRepairThreadsDesc = 'この値が 1 より大きい場合は MyISAM テーブルのインデックスも修復中にソートプロセスによって (スレッドごとに) 同時作成されます';
+$strMyISAMSortBufferSize = 'ソートバッファのサイズ';
+$strMyISAMSortBufferSizeDesc = 'REPAIR TABLE の最中に MyISAM のインデックスをソートするとき、あるいは CREATE INDEX や ALTER TABLE でインデックスを作成するときに割り当てられるバッファ';
$strMySQLCharset = 'MySQL の文字セット';
-$strMysqlClientVersion = 'MySQL クライアントバージョン';
-$strMySQLConnectionCollation = 'MySQL 接続照合順序';
+$strMysqlClientVersion = 'MySQL クライアントのバージョン';
+$strMySQLConnectionCollation = 'MySQL の接続照合順序';
$strMySQLSaid = 'MySQLのメッセージ: ';
$strMySQLShowProcess = 'MySQL プロセスの表示';
$strMySQLShowStatus = 'MySQL のランタイム情報';
$strMySQLShowVars = 'MySQL のシステム変数';
-$strName = '前';
+$strName = '名前';
$strNext = '次へ';
$strNo = 'いいえ';
-$strNoActivity = '%s 秒以上操作をしませんでした。再度ログインをしてください。';
-$strNoDatabases = 'データベース数';
-$strNoDatabasesSelected = 'データベースが選択されていません。';
-$strNoDataReceived = 'インポートするデータを受信できませんでした。ファイルが送信されていないか、ファイルサイズがPHPの設定で許可された最大値を超えています。FAQ 1.16をご覧ください';
-$strNoDescription = '記述がありません';
-$strNoDetailsForEngine = 'このストレージエンジンには有効なステータスの詳細情報はありません。';
-$strNoDropDatabases = '「DROP DATABASEステートメントは禁止される';
-$strNoExplain = 'SQL の分析を飛ばす';
-$strNoFilesFoundInZip = 'ZIP アーカイブ中にファイルが見つかりません!';
-$strNoFrames = 'phpMyAdmin は<b>フレーム</b>をサポートしたブラウザでの利用をお勧めします。';
-$strNoIndex = 'インデックスは設定されていません。';
-$strNoIndexPartsDefined = 'インデックスの部分は設定されていません。';
-$strNoModification = '変更無し';
-$strNone = '無し';
-$strNoOptions = 'この書式はオプションがありません。';
-$strNoPassword = 'パスワード無し';
-$strNoPermission = 'ファイル「%sを保存するパーミッションをウェブサーバは持っていません。';
-$strNoPhp = 'PHP コード無し';
-$strNoPrivileges = '特権無し';
-$strNoRights = '現在特権を持ってないのでここに入れません。';
-$strNoRowsSelected = '行は選択されませんでした。';
-$strNoSpace = 'ファイル「%sを保存するには空き容量が十分です。';
-$strNoTablesFound = '現在のデータベースにテーブルはありません。';
-$strNoThemeSupport = 'テーマをサポートしていません。設定とテーマディレクトリ「%sを確認してください。';
-$strNotNumber = 'これは数値ではありません。';
-$strNotOK = 'OK ではありません。';
-$strNotSet = 'テーブル「<b>%s</b>が見つからないか、%s が設定されていません。';
-$strNoUsersFound = '該当ユーザは見つかりませんでした。';
-$strNoValidateSQL = 'SQL 検証をスキップ';
-$strNull = '空の値(NULL)';
+$strNoActivity = '%s 秒以上操作をしませんでした。ログインしなおしてください';
+$strNoDatabases = 'データベースが存在しません';
+$strNoDatabasesSelected = 'データベースが選択されていません';
+$strNoDataReceived = 'インポートするデータを受信できませんでした。ファイル名が送信されていないか、ファイルサイズが PHP の設定で許可された最大値を超えています。FAQ 1.16をご覧ください';
+$strNoDescription = '説明がありません';
+$strNoDetailsForEngine = 'このストレージエンジンにはステータスの詳細情報はありません';
+$strNoDropDatabases = 'DROP DATABASE 文は無効にされています';
+$strNoExplain = 'SQL の EXPLAIN 解析をスキップ';
+$strNoFilesFoundInZip = 'ZIP アーカイブにファイルが含まれていません!';
+$strNoFrames = 'phpMyAdmin は<b>フレーム対応</b>ブラウザでの利用をお勧めします';
+$strNoIndex = 'インデックスが定義されていません!';
+$strNoIndexPartsDefined = 'インデックス部分が定義されていません!';
+$strNoModification = '変更なし';
+$strNone = 'なし';
+$strNoOptions = 'この書式にはオプションはありません';
+$strNoPassword = 'パスワードなし';
+$strNoPermission = 'このウェブサーバにはファイル %s を保存する権限がありません';
+$strNoPhp = 'PHP コードを省略';
+$strNoPrivileges = '特権なし';
+$strNoRights = '特権不足でアクセスできません!';
+$strNoRowsSelected = '行が選択されていません';
+$strNoSpace = '空き容量不足でファイル %s を保存できません';
+$strNoTablesFound = 'このデータベースにはテーブルがありません';
+$strNoThemeSupport = 'テーマは利用できません。設定やテーマディレクトリ %s を確認してください';
+$strNotNumber = '数値ではありません!';
+$strNotOK = 'Not OK';
+$strNotSet = 'テーブル <b>%s</b> が見つかりません。あるいは %s には設定されていません';
+$strNoUsersFound = 'ユーザが存在しません';
+$strNoValidateSQL = 'SQL の検証をスキップ';
+$strNull = 'ヌル(NULL)';
$strNumberOfFields = 'フィールド数';
-$strNumSearchResultsInTable = 'テーブル <i>%2\$s</i> で %2\$s 件一致しました。';
-$strNumSearchResultsTotal = '<b>件数:</b> <i>%s</i> が見つかりました。';
+$strNumberOfTables = 'テーブル数';
+$strNumSearchResultsInTable = '%s 件(テーブル <i>$s</i>)';
+$strNumSearchResultsTotal = '<b>合計:</b> <i>%s</i> 件';
$strNumTables = 'テーブル';
$strOK = 'OK';
$strOpenDocumentSpreadsheet = 'スプレッドシートを開く';
-$strOpenDocumentSpreadsheetOptions = 'スプレッドシートを開くときのオプション';
+$strOpenDocumentSpreadsheetOptions = 'スプレッドシートオプション';
$strOpenDocumentText = 'テキストを開く';
-$strOpenDocumentTextOptions = 'テキストを開くときのオプション';
-$strOpenNewWindow = '新しい phpMyAdmin のウィンドウを開く';
+$strOpenDocumentTextOptions = 'テキストオプション';
+$strOpenNewWindow = '別ウィンドウで開く';
$strOperations = '操作';
-$strOperator = '操作';
+$strOperator = '演算子';
$strOptimizeTable = 'テーブルを最適化する';
$strOr = 'または';
$strOverhead = 'オーバーヘッド';
-$strOverwriteExisting = 'ファイルが存在する場合は上書き';
+$strOverwriteExisting = '既存のファイルは上書き';
$strPageNumber = 'ページ番号:';
-$strPagesToBeFlushed = 'フラッシュされたページ数';
-$strPaperSize = '紙サイズ';
-$strPartialImport = '部分的なインポート';
-$strPartialText = '部分的な文書';
+$strPagesToBeFlushed = 'フラッシュ待ちページ数';
+$strPaperSize = '用紙サイズ';
+$strPartialImport = '部分インポート';
+$strPartialText = '部分テキスト';
$strPassword = 'パスワード';
-$strPasswordChanged = '%s のパスワードは変更されました。';
-$strPasswordEmpty = 'パスワードが空です。';
+$strPasswordChanged = '%s のパスワードは正しく変更されました';
+$strPasswordEmpty = 'パスワードが空です!';
$strPasswordHashing = 'パスワードハッシュ';
-$strPasswordNotSame = 'パスワードが同じではありません。';
-$strPdfDbSchema = 'データベース「%sのスキーマ - ページ %s';
-$strPdfInvalidTblName = '"%s" テーブルがありません!';
+$strPasswordNotSame = 'パスワードが異なっています!';
+$strPdfDbSchema = 'データベース %s のスキーマ - ページ %s';
+$strPdfInvalidTblName = '"%s" テーブルは存在しません!';
$strPdfNoTables = 'テーブルがありません';
$strPDFOptions = 'PDF オプション';
$strPDF = 'PDF';
-$strPDFReportExplanation = '(単一テーブルのデータを含むレポートを生成します)';
-$strPDFReportTitle = 'レポートの題';
-$strPerHour = '時毎';
+$strPDFReportExplanation = '(ひとつのテーブルのデータを含むレポートを生成します)';
+$strPDFReportTitle = 'レポートのタイトル';
+$strPerHour = '/時';
$strPerMinute = '/分';
$strPerSecond = '/秒';
$strPersian = 'ペルシア語';
$strPhoneBook = '電話帳';
-$strPHP40203 = 'マルチバイト文字(mbstring)の扱いに重大なバグのある PHP 4.2.3 を使っています。PHP のバグレポート 19404 番です。phpMyAdmin を使用するなら、このバージョンの PHP はお奨めしません...と言うかパッチをあてなければ動作しません。';
+$strPHP40203 = 'お使いの PHP 4.2.3 にはマルチバイト文字 (mbstring) の扱いに重大なバグがあります。PHP のバグレポート 19404 番をご覧ください。このバージョンの PHP はお勧めできません';
$strPhp = 'PHP コードの作成';
-$strPHPVersion = 'PHP バージョン';
+$strPHPVersion = 'PHP のバージョン';
+$strPleaseSelectPrimaryOrUniqueKey = '主キーまたはユニークなキーを選択してください';
$strPmaDocumentation = 'phpMyAdmin のドキュメント';
-$strPmaUriError = '<tt>$cfg[\'PmaAbsoluteUri\']</tt> を必ず設定ファイルで設定してください!';
+$strPmaUriError = '<tt>$cfg[\'PmaAbsoluteUri\']</tt> はかならず設定ファイルで設定する必要があります!';
+$strPmaWiki = 'phpMyAdmin wiki';
$strPolish = 'ポーランド語';
-$strPortrait = 'ポートレイト';
-$strPos1 = '最初';
-$strPrevious = '以前';
-$strPrimary = '主要';
-$strPrimaryKeyHasBeenDropped = '主キーを削除しました。';
-$strPrimaryKeyName = '主キーの前は... PRIMARY ではなければいけません。';
-$strPrimaryKeyWarning = '("PRIMARY"はちょうど主キーの前ではなければいけません。';
+$strPortrait = '縦向き';
+$strPos1 = '先頭';
+$strPrevious = '前';
+$strPrimary = '主';
+$strPrimaryKeyHasBeenDropped = '主キーを削除しました';
+$strPrimaryKeyName = '主キーの名前は PRIMARY でなければなりません!';
+$strPrimaryKeyWarning = '(主キーはかならず "PRIMARY" という名前でなければなりません。また主キー以外に"PRIMARY"という名前を使ってはなりません!)';
$strPrint = '印刷';
-$strPrintView = '印刷用の表示';
-$strPrintViewFull = '印刷ビュー (全テキストを含む)';
-$strPrivDescAllPrivileges = 'GRANT を除くすべての特権を含みます。';
-$strPrivDescAlter = '存在するテーブル構造の変更を許可します。';
-$strPrivDescAlterRoutine = 'ストアドルーチンの変更と破棄を許可します。';
-$strPrivDescCreateDb = '新しいデータベース、テーブルの作成を許可します。';
-$strPrivDescCreateRoutine = 'ストアドルーチンの作成を許可します。';
-$strPrivDescCreateTbl = '新しいテーブルの作成を許可します。';
-$strPrivDescCreateTmpTable = 'テンポラリーテーブルの作成を許可します。';
-$strPrivDescCreateUser = 'ユーザアカウントの作成・破棄・称変更を許可します。';
-$strPrivDescCreateView = '新しいビューの作成を許可します。';
-$strPrivDescDelete = 'データの削除を許可します。';
-$strPrivDescDropDb = 'データベースとテーブルの削除を許可します。';
-$strPrivDescDropTbl = 'テーブルの削除を許可します。';
-$strPrivDescExecute5 = 'ストアドルーチンの実行を許可します。';
-$strPrivDescExecute = 'ストアードプロシジャーを実行することを許可します。この MySQL 版では意味ありません。';
-$strPrivDescFile = 'データのインポート、データのファイルへのエクスポートを許可します。';
-$strPrivDescGrant = '特権テーブルのリロードなしにユーザ、特権の追加を許可します。';
-$strPrivDescIndex = 'インデックスの作成、削除を許可します。';
-$strPrivDescInsert = 'データの挿入、入れ替えを許可します。';
-$strPrivDescLockTables = '現在のスレッドのロッキングテーブルを許可します。';
-$strPrivDescMaxConnections = '1 時間内に新しく接続可能な数を制限します。';
-$strPrivDescMaxQuestions = '1 時間内にサーバに照会を送れる数を制限します。';
-$strPrivDescMaxUpdates = '1 時間内にテーブル、データベースに対しての変更が発生するコマンドの数を制限します。';
-$strPrivDescMaxUserConnections = 'ユーザの同時の接続数を制限します。';
-$strPrivDescProcess3 = '他のユーザプロセスを停止できることを許可します。';
-$strPrivDescProcess4 = 'プロセス一覧中の完全な照会の表示を許可します。';
-$strPrivDescReferences = 'この MySQL バージョンでは意味ありません。';
-$strPrivDescReload = 'サーバのリロード、キャッシュのクリアを許可します。';
-$strPrivDescReplClient = 'スレーブかマスターを要求できる権利をユーザに与えます。';
-$strPrivDescReplSlave = 'レプリケーションスレーブが必要です。';
-$strPrivDescSelect = 'データの読み出し許可';
-$strPrivDescShowDb = 'データベースの完全な一覧へのアクセス権を与えます。';
-$strPrivDescShowView = '照会 SHOW CREATE VIEW の実行を許可します。';
-$strPrivDescShutdown = 'サーバのシャットダウンを許可します。';
-$strPrivDescSuper = '最大の接続数に達しても接続を許可します。多くの管理操作はグローバル変数や他ユーザプロセスの終了ができるような設定が必要です。';
-$strPrivDescUpdate = 'データの修正を許可します。';
-$strPrivDescUsage = '特権がありません。';
+$strPrintView = '印刷用画面';
+$strPrintViewFull = '印刷用画面 (全テキストを含む)';
+$strPrivDescAllPrivileges = 'GRANT 以外のすべての特権を付与する';
+$strPrivDescAlter = '既存のテーブル構造の変更を許可する';
+$strPrivDescAlterRoutine = 'ストアドルーチンの修正と削除を許可する';
+$strPrivDescCreateDb = '新しいデータベースやテーブルの作成を許可する';
+$strPrivDescCreateRoutine = 'ストアドルーチンの作成を許可する';
+$strPrivDescCreateTbl = '新しいテーブルの作成を許可する';
+$strPrivDescCreateTmpTable = '一時テーブルの作成を許可する';
+$strPrivDescCreateUser = 'ユーザアカウントの作成・削除・リネームを許可する';
+$strPrivDescCreateView = '新しいビューの作成を許可する';
+$strPrivDescDelete = 'データの削除を許可する';
+$strPrivDescDropDb = 'データベースとテーブルの削除を許可す';
+$strPrivDescDropTbl = 'テーブルの削除を許可する';
+$strPrivDescExecute5 = 'ストアドルーチンの実行を許可する';
+$strPrivDescExecute = 'ストアードプロシジャの実行を許可する (このバージョンの MySQL では無効です)';
+$strPrivDescFile = 'データのインポート、エクスポートを許可する';
+$strPrivDescGrant = '特権テーブルのリロードなしのユーザ・特権の追加を許可する';
+$strPrivDescIndex = 'インデックスの作成、削除を許可する';
+$strPrivDescInsert = 'データの挿入、置換を許可する';
+$strPrivDescLockTables = '現在のスレッドのテーブルロックを許可する';
+$strPrivDescMaxConnections = '単位時間内に可能な新規接続回数を制限する';
+$strPrivDescMaxQuestions = '単位時間内にサーバに送信可能なクエリ数を制限する';
+$strPrivDescMaxUpdates = '単位時間内に実行可能なテーブルないしデータベースの編集コマンド数を制限する';
+$strPrivDescMaxUserConnections = 'ユーザの同時接続数を制限する';
+$strPrivDescProcess3 = '他のユーザのプロセスの停止を許可する';
+$strPrivDescProcess4 = 'プロセス一覧で完全なクエリの表示を許可する';
+$strPrivDescReferences = 'このバージョンの MySQL では無効です';
+$strPrivDescReload = 'サーバ設定のリロード、サーバキャッシュのフラッシュを許可する';
+$strPrivDescReplClient = 'スレーブ/マスターの照会を許可する';
+$strPrivDescReplSlave = 'レプリケーションスレーブでは有効にする必要があります';
+$strPrivDescSelect = 'データの読み込みを許可する';
+$strPrivDescShowDb = 'データベース総一覧へのアクセスを許可する';
+$strPrivDescShowView = 'SHOW CREATE VIEW クエリの実行を許可する';
+$strPrivDescShutdown = 'サーバのシャットダウンを許可する';
+$strPrivDescSuper = '最大接続数に達しているときでも接続を許可する。グローバル変数の設定や他のユーザのスレッドを停止するといった管理操作をする場合はたいていこの設定が必要になります';
+$strPrivDescUpdate = 'データの修正を許可する';
+$strPrivDescUsage = '特権はありません';
$strPrivileges = '特権';
-$strPrivilegesReloaded = '特権はリロードされました。';
+$strPrivilegesReloaded = '特権を正常にリロードしました';
$strProcedures = 'プロシジャ';
$strProcesses = 'プロセス';
$strProcesslist = 'プロセス一覧';
$strProtocolVersion = 'プロトコルバージョン';
-$strPutColNames = '最初の 1 行目にフィールドを追加する';
+$strPutColNames = '1 行目にフィールド名を追加する';
-$strQBE = '照会';
+$strQBE = 'クエリ';
$strQBEDel = '削除';
$strQBEIns = '挿入';
-$strQueryCache = '照会キャッシュ';
-$strQueryFrame = '照会ウィンドウ';
-$strQueryOnDb = 'データベースの SQL <b>%s</b>:';
-$strQueryResultsOperations = '照会結果操作';
+$strQueryCache = 'クエリキャッシュ';
+$strQueryFrame = 'クエリウィンドウ';
+$strQueryOnDb = 'データベース <b>%s</b> のSQL:';
+$strQueryResultsOperations = 'クエリ結果操作';
$strQuerySQLHistory = 'SQL 履歴';
-$strQueryStatistics = '<b>照会統計</b>: 起動時から %s 個の照会がサーバに送信されています。';
-$strQueryTime = '照会の実行時間 %01.4f 秒';
-$strQueryType = '照会タイプ';
-$strQueryWindowLock = 'ウィンドウの外からこの照会を書き換えできません。';
+$strQueryStatistics = '<b>クエリ統計</b>: 起動時から数えて %s 個のクエリをサーバに送信しました';
+$strQueryTime = 'クエリの実行時間 %01.4f 秒';
+$strQueryType = 'クエリ種別';
+$strQueryWindowLock = '他のウィンドウからクエリを上書きすることはできません';
$strReadRequests = '読み込みリクエスト数';
$strReceived = '受信済';
+$strRecommended = '推奨';
$strRecords = 'レコード数';
-$strReferentialIntegrity = '結合項目のチェック:';
+$strReferentialIntegrity = '参照整合性の確認:';
$strRefresh = '再描画';
$strRelationalSchema = 'リレーショナルスキーマ';
-$strRelationNotWorking = 'phpMyAdmin の独自機能であるリレーション機能を処理するためのリンクテーブルが有効になっていません。これを解決するには %sここ%s をクリックして原因を発見してください。';
+$strRelationDeleted = 'リレーションを削除しました';
+$strRelationNotWorking = 'リンクテーブルを処理するための追加機能が無効になっています。理由については%sこちら%sをご覧ください';
$strRelations = 'リレーション';
$strRelationsForTable = 'RELATIONS FOR TABLE';
-$strRelationView = 'リレーションを表示する';
-$strReloadingThePrivileges = '特権を再読み込み中です。';
-$strReloadPrivileges = 'MySQL のリロード';
-$strRemoveSelectedUsers = '選択されたユーザを削除します';
-$strRenameDatabaseOK = 'データベース「%sは「%sに称変更しました。';
-$strRenameTable = 'テーブルの変更';
-$strRenameTableOK = '「%sを「%sに前を変更しました。';
-$strRepairTable = 'テーブルを復旧する';
-$strReplaceNULLBy = 'NULL を指定の文字列で置き換える';
-$strReplaceTable = 'ファイルでテーブルを置き換える';
+$strRelationView = 'リレーションビュー';
+$strReload = 'リロード';
+$strReloadingThePrivileges = '特権をリロードしています';
+$strReloadPrivileges = '特権をリロードする';
+$strRemoveSelectedUsers = '選択したユーザを削除する';
+$strRenameDatabaseOK = 'データベース %s を %s にリネームしました';
+$strRenameTable = 'リネーム後のテーブル名';
+$strRenameTableOK = 'テーブル %s を %s にリネームしました';
+$strRepairTable = 'テーブルを修復する';
+$strReplaceNULLBy = 'NULL の代替文字列';
+$strReplaceTable = 'テーブルデータを差し替えるファイル';
$strReplication = 'レプリケーション';
$strReset = 'リセット';
$strResourceLimits = 'リソースの制限';
-$strReType = '再入力';
-$strRevoke = '廃止';
-$strRevokeAndDelete = 'ユーザから有効な特権をすべて破棄して削除する';
-$strRevokeAndDeleteDescr = 'ユーザは特権を再読み込みするまで USAGE 特権のままです。';
-$strRevokeMessage = '%s の特権を取消しました。';
+$strReType = 'もう一度入力してください';
+$strRevoke = '取り消し';
+$strRevokeAndDelete = '特権をすべて取り消してユーザを削除する';
+$strRevokeAndDeleteDescr = 'USAGE 特権については特権をリロードするまで残ります';
+$strRevokeMessage = '%s の特権を取り消しました';
$strRomanian = 'ルーマニア語';
$strRowLength = '行の長さ';
$strRows = '行';
$strRowsFrom = '開始行';
$strRowSize = ' 行のサイズ ';
-$strRowsModeFlippedHorizontal = '水平 (回転したヘッダー)';
+$strRowsModeFlippedHorizontal = '水平 (ヘッダも回転)';
$strRowsModeHorizontal = '水平';
-$strRowsModeOptions = '方向: %s : %s 列ずつヘッダーを繰り返し表示する';
+$strRowsModeOptions = 'モード: %s (%s セルごとにヘッダを表示)';
$strRowsModeVertical = '垂直';
$strRowsStatistic = '行の統計';
-$strRunning = 'が実行中です。 %s';
-$strRunQuery = '照会の実行する';
-$strRunSQLQuery = 'データベース「%sで SQL を実行する';
-$strRunSQLQueryOnServer = 'サーバ「%sで SQL を実行する';
+$strRunning = '実行環境: %s';
+$strRunQuery = 'クエリを実行する';
+$strRunSQLQuery = 'データベース %s 上でクエリを実行する';
+$strRunSQLQueryOnServer = 'サーバ %s 上でクエリを実行する';
$strRussian = 'ロシア語';
$strSave = '保存する';
-$strSaveOnServer = 'サーバ上のディレクトリ「%sに保存する';
-$strScaleFactorSmall = '1 ページ内に図表を配置させるためには大きさが小さ過ぎます';
+$strSaveOnServer = 'サーバ上のディレクトリ %s に保存する';
+$strSavePosition = '位置を保存';
+$strScaleFactorSmall = '倍率が小さすぎるためスキーマが 1 ページに収まりません';
$strSearch = '検索';
-$strSearchFormTitle = 'データベース内を検索する';
-$strSearchInTables = 'テーブルの指定:';
-$strSearchNeedle = '検索する単語、または値 (ワイルドカードは: "%"):';
+$strSearchFormTitle = 'データベース内検索';
+$strSearchInTables = 'テーブル内検索:';
+$strSearchNeedle = '検索する単語や値 (ワイルドカード: "%"):';
$strSearchOption1 = 'いずれかの単語を含む';
$strSearchOption2 = 'すべての単語を含む';
-$strSearchOption3 = '正確なフレーズ';
+$strSearchOption3 = '完全一致';
$strSearchOption4 = '正規表現';
-$strSearchResultsFor = '検索結果 "<i>%s</i>" %s:';
+$strSearchResultsFor = '"<i>%s</i>" の検索結果 %s:';
$strSearchType = '検索条件:';
-$strSecretRequired = '設定ファイルは今は秘密パスフレーズを必要とします(blowfish_secret)。';
-$strSelectADb = 'データベースを選択してください。';
+$strSecretRequired = '設定ファイルが秘密のパスフレーズ (blowfish_secret) を必要とするようになりました';
+$strSelectADb = 'データベースを選択してください';
$strSelectAll = '全選択';
-$strSelectBinaryLog = '選択したバイナリログを閲覧する';
-$strSelectFields = 'フィールドの選択(1 つ以上):';
-$strSelectNumRows = '照会';
-$strSelectTables = 'テーブルの選択';
-$strSend = 'ファイルで保存する';
+$strSelectBinaryLog = '表示するバイナリログを選択してください';
+$strSelectFields = 'フィールドを選択してください(最低1つ):';
+$strSelectForeignKey = '外部キーを選択してください';
+$strSelectNumRows = '行/クエリ';
+$strSelectReferencedKey = '参照されているキーを選択';
+$strSelectTables = 'テーブルを選択してください';
+$strSend = 'ファイルに保存する';
$strSent = '送信済';
$strServer = 'サーバ';
-$strServerChoice = 'サーバの選択をする';
-$strServerNotResponding = 'サーバが反応しません。';
+$strServerChoice = 'サーバの選択';
+$strServerNotResponding = 'サーバが応答しません';
$strServers = 'サーバ';
$strServerStatus = 'ランタイム情報';
$strServerStatusDelayedInserts = '遅延インサート';
-$strServerStatusUptime = 'この MySQL サーバは %s 間動作中で、%s に起動しています。';
+$strServerStatusUptime = 'この MySQL サーバの稼働時間: %s (起動時刻: %s)';
$strServerTabVariables = '変数';
-$strServerTrafficNotes = '<b>サーバトラフィック</b>: このテーブルは MySQL サーバが起動してからのネットワークトラフィックの統計を表示します。';
+$strServerTrafficNotes = '<b>サーバトラフィック</b>: これらの表は MySQL サーバ起動以後のネットワークトラフィックの統計です';
$strServerVars = 'サーバ変数と設定値';
$strServerVersion = 'サーバのバージョン';
$strSessionValue = 'セッション値';
-$strSetEnumVal = 'フィールドタイプが「enum又は「setの場合は値にこの書式を使って入力してください: \'a\',\'b\',\'c\'...<br />バックスラッシュ「"\"又はクオート「"\'"を入力したいと、頭にバックスラッシュを付けて下さい(例: 「\\\\xyzもしくは「a\\\'b)';
+$strSetEnumVal = 'フィールド種別が「enum」ないし「set」の場合の値の書式: \'a\',\'b\',\'c\'...<br />バックスラッシュ("\")やシングルクォート("\'")を含める必要がある場合は ( \\\\xyz や a\\\'b のように) その前にバックスラッシュを付けてください';
$strShowAll = 'すべて表示';
$strShowColor = '色表示';
$strShowDatadictAs = 'データ辞書形式';
$strShow = '表示';
-$strShowFullQueries = '完全な照会を表示';
-$strShowGrid = 'グリッドの表示';
-$strShowingBookmark = 'ブックマークを閲覧中';
-$strShowingRecords = 'レコードを表示する';
+$strShowFullQueries = 'クエリ全体を表示';
+$strShowGrid = 'グリッドを表示';
+$strShowHideLeftMenu = '左側のメニューを表示する/隠す';
+$strShowingBookmark = '表示中のブックマーク';
+$strShowingPhp = 'PHP コードとして表示';
+$strShowingRecords = '表示中の列';
+$strShowingSQL = 'SQL クエリを表示';
$strShowOpenTables = '開いているテーブルを表示する';
$strShowPHPInfo = 'PHP 情報';
$strShowSlaveHosts = 'スレーブホストを表示する';
$strShowSlaveStatus = 'スレーブの状態を表示する';
-$strShowStatusBinlog_cache_disk_useDescr = 'テンポラリバイナリログキャッシュを利用しようとして、binlog_cache_sizeの値を超過したため、トランザクションのステートメントをテンポラリファイルに保存したトランザクションの数。';
-$strShowStatusBinlog_cache_useDescr = '一時バイナリログキャッシュを使用した処理の数です。';
-$strShowStatusCreated_tmp_disk_tablesDescr = '構文実行中にサーバによって自動的にディスクに作成された一時テーブルの数です。Created_tmp_disk_tables が大きい場合、原因の一時テーブルをディスクベースの変わりにメモリベースにさせるように、値 tmp_table_size を増やしたいでしょう。';
-$strShowStatusCreated_tmp_filesDescr = 'mysqld はどれだけの一時的ファイルを作成したかです。';
-$strShowStatusCreated_tmp_tablesDescr = 'サーバで構文の実行によって自動的に作成されたメモリ内の一時テーブルの数。';
-$strShowStatusDelayed_errorsDescr = '若干のエラーが発生した INSERT DELAYED が書かれた行数です (おそらくキーの重複)';
-$strShowStatusDelayed_insert_threadsDescr = '使用中の INSERT DELAYED ハンドラースレッドの数。INSERT DELAYED を適用する相異なるテーブルの数だけ固有のスレッドが用意されます。';
-$strShowStatusDelayed_writesDescr = 'INSERT DELAYED で列書き込みをした数です。';
-$strShowStatusFlush_commandsDescr = 'FLUSH 文を実行した数です。';
-$strShowStatusHandler_commitDescr = 'COMMIT 文の内部数です。';
-$strShowStatusHandler_deleteDescr = 'テーブルから列を削除した回数です。';
-$strShowStatusHandler_discoverDescr = 'MySQLサーバはNDBクラスタストレージエンジンに特定の前を持つテーブルについての情報を持っているか問い合わせることができます。これは開示と呼ばれています。Handler_discoverは、開示されたタイムテーブルの数を示します。';
-$strShowStatusHandler_read_firstDescr = 'インデックスからはじめのエントリを読み込んだ回数です。これが高い場合、それはサーバが多くの完全なインデックス走査を行っていると示します。例えば「SELECT col1 FROM fooは col1 はインデックスと仮定します。';
-$strShowStatusHandler_read_keyDescr = 'キーに基づいて行を読み込んだ要求の数です。これが高い場合、それはあなたの照会とテーブルが適切にインデックス付けされているというよい表示です。';
-$strShowStatusHandler_read_nextDescr = 'キーの順番通りに行を読んでいるリクエストの数。この値は範囲の制約をつけてインデックス列を照会しているか、インデックススキャンを行っているときに増えます。';
-$strShowStatusHandler_read_prevDescr = 'キーの順番通りに行を遡って読んでいるリクエストの数。この読み込みは主にORDER BY ... DESCを最適化するときに利用されます。';
-$strShowStatusHandler_read_rndDescr = '固定された位置を基準に列を読んでいるリクエストの数。この値は結果をソートする必要がある照会を大量に行うと高くなります。おそらくテーブル全体をスキャンしなければならない照会を大量に行っているか、キーを適切に利用していないjoinを行っているものと思われます。';
-$strShowStatusHandler_read_rnd_nextDescr = 'データファイル中の次の行を読み込む要求の数です。あなたが多くのテーブルスキャンをしている場合、これは高いです。一般にこれは、あなたのテーブルが適切にインデックスを付けられないか、照会がインデックスを利用するように書かれていないことを示唆します。';
-$strShowStatusHandler_rollbackDescr = '内部 ROLLBACK 文の数です。';
-$strShowStatusHandler_updateDescr = 'テーブルの行の更新を要求した数です。';
-$strShowStatusHandler_writeDescr = 'テーブルに行の挿入を要求した数です。';
-$strShowStatusInnodb_buffer_pool_pages_dataDescr = 'データを含むページの数です (dirty or clean).';
-$strShowStatusInnodb_buffer_pool_pages_dirtyDescr = '現在の汚いページの数です。';
-$strShowStatusInnodb_buffer_pool_pages_flushedDescr = 'フラッシュされることを要求したバッファプールページの数です。';
-$strShowStatusInnodb_buffer_pool_pages_freeDescr = '空きページ数です。';
-$strShowStatusInnodb_buffer_pool_pages_latchedDescr = 'InnoDBバッファプールでラッチされているページ数。これは現在読み込んでいる、あるいは書き込んでいるページ、あるいは他の何らかの理由でフラッシュしたり削除したりできなくなっているページの数です。';
-$strShowStatusInnodb_buffer_pool_pages_miscDescr = '行ロックやアダプティブハッシュインデックスといった管理オーバヘッドのせいでビジーになっているページ数。この値はInnodb_buffer_pool_pages_total - Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_dataという式でも計算できます。';
-$strShowStatusInnodb_buffer_pool_pages_totalDescr = 'ページのバッファプールのサイズの合計です。';
-$strShowStatusInnodb_buffer_pool_read_ahead_rndDescr = 'InnoDBが開始した「ランダム読み込みの回数。これは照会がテーブルの大部分をランダムな順番でスキャンするときに発生します。';
-$strShowStatusInnodb_buffer_pool_read_ahead_seqDescr = 'InnoDBが開始したシーケンシャル読み込みの回数。これはInnoDBがシーケンシャルなフルテーブルスキャンを行うときに発生します。';
-$strShowStatusInnodb_buffer_pool_read_requestsDescr = 'InnoDB が行った論理的な読み込み要求の数です。';
-$strShowStatusInnodb_buffer_pool_readsDescr = 'InnoDBがバッファプールの内容を利用できず、シングルページ読み込みを行わなければならなかった論理読み込みの回数。';
-$strShowStatusInnodb_buffer_pool_wait_freeDescr = '通常InnoDBバッファプールへの書き込みはバックグラウンドで行われますが、ページの読み込みないし作成を行う必要があるのにクリーンなページが得られない場合は、まずそのページがフラッシュされるのを待つ必要があります。このカウンタは、そのウェイトの回数をカウントするものです。バッファプールの値が適切に設定されていれば、この値は小さいはずです。';
-$strShowStatusInnodb_buffer_pool_write_requestsDescr = 'InnoDB バッファープールへの書き込みをした数です。';
-$strShowStatusInnodb_data_fsyncsDescr = 'ここまでの fsync() 操作数です。';
-$strShowStatusInnodb_data_pending_fsyncsDescr = '現在の fsync() 操作保留の数です。';
-$strShowStatusInnodb_data_pending_readsDescr = '現在の読み込み保留の数です。';
-$strShowStatusInnodb_data_pending_writesDescr = '現在の書き込み保留の数です。';
-$strShowStatusInnodb_data_readDescr = 'ここまでのデータの読み込み量です(単位:バイト)';
-$strShowStatusInnodb_data_readsDescr = '総読み込みデータの数です。';
-$strShowStatusInnodb_data_writesDescr = '総書き込みデータの数です。';
-$strShowStatusInnodb_data_writtenDescr = 'ここまでのデータの書き込み量です(単位:バイト)';
-$strShowStatusInnodb_dblwr_pages_writtenDescr = '二重書き込みが実行された回数と、二重書き込みが発生したページ数。';
-$strShowStatusInnodb_dblwr_writesDescr = '二重書き込みが実行された回数と、二重書き込みが発生したページ数。';
-$strShowStatusInnodb_log_waitsDescr = 'ログバッファが小さすぎるせいで作業を続行する前にフラッシュしなければならなくなったために発生したウェイトの回数。';
-$strShowStatusInnodb_log_write_requestsDescr = '要求されたログ書き込みの数です。';
-$strShowStatusInnodb_log_writesDescr = 'ログファイルへの物理的な書込みの数です。';
-$strShowStatusInnodb_os_log_fsyncsDescr = 'ログファイルの fsync 書き込みをした数です。';
-$strShowStatusInnodb_os_log_pending_fsyncsDescr = 'fsync 待ちのログファイル数です。';
-$strShowStatusInnodb_os_log_pending_writesDescr = 'ログファイルの書き込みの保留です。';
-$strShowStatusInnodb_os_log_writtenDescr = 'ログファイルに書き込みしたバイト数です。';
-$strShowStatusInnodb_pages_createdDescr = '作成されたページの数です。';
-$strShowStatusInnodb_page_sizeDescr = 'コンパイル時のページサイズ(デフォルト 16KB)です。多くの値がページでカウントされます; ページサイズは、それらが容易にバイトに変換されることを許可します。';
-$strShowStatusInnodb_pages_readDescr = '読み込みしたページ数です。';
-$strShowStatusInnodb_pages_writtenDescr = '書き込みしたページ数です。';
-$strShowStatusInnodb_row_lock_current_waitsDescr = '現在待たれている列ロックの数です。';
-$strShowStatusInnodb_row_lock_time_avgDescr = '列ロックを獲得する平均時間です(単位:ミリ秒)';
-$strShowStatusInnodb_row_lock_timeDescr = '列の獲得に使われた合計時です(単位:ミリ秒)';
-$strShowStatusInnodb_row_lock_time_maxDescr = '列ロックを獲得する最大時間です(単位:ミリ秒)';
-$strShowStatusInnodb_row_lock_waitsDescr = '行ロックで待たなければならなかった回数です。';
-$strShowStatusInnodb_rows_deletedDescr = 'InnoDB テーブルから削除した列数です。';
-$strShowStatusInnodb_rows_insertedDescr = 'InnoDB テーブルに挿入した列数です。';
-$strShowStatusInnodb_rows_readDescr = 'InnoDB テーブルから読み込んだ列数です。';
-$strShowStatusInnodb_rows_updatedDescr = 'InnoDB テーブルで更新された列数です。';
-$strShowStatusKey_blocks_not_flushedDescr = '変更されが、まだディスクにフラッシュされていない、キーキャッシュのキーブロックの数です。それはかつては Not_flushed_key_blocks として知られました。';
-$strShowStatusKey_blocks_unusedDescr = 'キーキャッシュの未使用ブロックの数です。どれだけ使用しているか決定するためにこの値を使用することができます。';
-$strShowStatusKey_blocks_usedDescr = 'キーキャッシュのブロックの使用数です。この値は、今まで同時に使用されたブロックの最大数を指す最高水準です。';
-$strShowStatusKey_read_requestsDescr = 'キャッシュからキーブロックを読み込んだリクエスト数です。';
-$strShowStatusKey_readsDescr = 'ディスクからのキーブロックの物理的読み込み数です。Key_reads が大きい場合、値 key_buffer_size が恐らく小さすぎます。キャッシュミス率は Key_reads/Key_read_requests として計算することができます。';
-$strShowStatusKey_write_requestsDescr = 'キャッシュへのキーブロックの書き込んだリクエスト数です。';
-$strShowStatusKey_writesDescr = 'ディスクへのキーブロックの物理的な書き込み数です。';
-$strShowStatusLast_query_costDescr = '照会オプティマイザーによって計算された、最後にコンパイルされた照会の全コストです。同じ照会の異なる照会プランのコストを比較するのに役立ちます。デフォルト値 0 は、照会がまだコンパイルされていないことを意味します。';
-$strShowStatusNot_flushed_delayed_rowsDescr = '照会 INSERT DELAY の書き込み待ちの行数です。';
-$strShowStatusOpened_tablesDescr = '開いているテーブルの数です。開いているテーブルが多い場合、恐らくテーブルキャッシュの値が小さすぎます。';
-$strShowStatusOpen_filesDescr = '開いているファイルの数です。';
-$strShowStatusOpen_streamsDescr = '開いているストリームの数です (主としてログの記録に使用されます)';
-$strShowStatusOpen_tablesDescr = '開いているテーブルの数です。';
-$strShowStatusQcache_free_blocksDescr = '照会キャッシュ内の空きメモリブロックの数です。';
-$strShowStatusQcache_free_memoryDescr = '照会キャッシュの空きメモリ量です。';
-$strShowStatusQcache_hitsDescr = 'キャッシュのヒット数です。';
-$strShowStatusQcache_insertsDescr = 'キャッシュに追加された照会数です。';
-$strShowStatusQcache_lowmem_prunesDescr = '新しい照会をキャッシュするためにメモリを解放するべく、キャッシュから削除された照会の数。この情報は照会キャッシュのサイズを調整するときに便利です。照会キャッシュがキャッシュから削除する照会を決定する際には、最後に使われた時刻が最も古いものから削除する戦略をとります。';
-$strShowStatusQcache_not_cachedDescr = 'キャッシュされない照会の数です (キャッシュできないか query_cache_type によるキャッシュしない設定)';
-$strShowStatusQcache_queries_in_cacheDescr = 'キャッシュの中で登録された照会の数です。';
-$strShowStatusQcache_total_blocksDescr = '照会キャッシュの総ブロック数です。';
+$strShowStatusBinlog_cache_disk_useDescr = '一時バイナリログキャッシュを利用したものの binlog_cache_size の値を超過したため一時ファイルにステートメントを保存したトランザクション数';
+$strShowStatusBinlog_cache_useDescr = '一時バイナリログキャッシュを使用したトランザクション数';
+$strShowStatusCreated_tmp_disk_tablesDescr = 'ステートメント実行中にサーバがディスク上に自動生成した一時テーブル数。Created_tmp_disk_tables の値が大きい場合は tmp_table_size の値を増やしてディスク上ではなくメモリ上に一時テーブルを構築した方がよいかもしれません';
+$strShowStatusCreated_tmp_filesDescr = 'mysqld が生成した一時ファイル数';
+$strShowStatusCreated_tmp_tablesDescr = 'ステートメント実行中にサーバが自動生成したメモリ上の一時テーブル数';
+$strShowStatusDelayed_errorsDescr = '何らかのエラー (たぶんキーの重複) が発生したため INSERT DELAYED された行数';
+$strShowStatusDelayed_insert_threadsDescr = '使用中の INSERT DELAYED ハンドラのスレッド数。INSERT DELAYED を適用するテーブルの数だけ固有のスレッドが用意されます';
+$strShowStatusDelayed_writesDescr = 'INSERT DELAYED で書き込まれた行数';
+$strShowStatusFlush_commandsDescr = 'FLUSH 文の実行回数';
+$strShowStatusHandler_commitDescr = '内部で COMMIT 文を実行した回数';
+$strShowStatusHandler_deleteDescr = 'テーブルから行を削除した回数';
+$strShowStatusHandler_discoverDescr = 'MySQL サーバは NDB クラスタストレージエンジンに特定の名前を持つテーブルについての情報を持っているか問い合わせることができます。これを開示と言いますが、Handler_discover はその開示されたタイムテーブルの数です';
+$strShowStatusHandler_read_firstDescr = 'インデックスの最初のエントリを読み込んだ回数。この値が高い場合はサーバが何度もインデックスのフルスキャンを実行しているものと思われます。例えば SELECT col1 FROM foo を実行した場合 (col1 はインデックスに含まれているものとします)';
+$strShowStatusHandler_read_keyDescr = 'キーに基づいて行を読み込んだリクエストの数。この値が高い場合はクエリとテーブルが適切にインデックスされているものと考えられます';
+$strShowStatusHandler_read_nextDescr = 'キーの順序通りに次の行を読み込んだリクエストの数。この値はインデックス列のクエリに範囲指定をしているか、インデックススキャンを行っているときに増加します';
+$strShowStatusHandler_read_prevDescr = 'キーの順序通りに前の行を読み込んだリクエストの数。この読み込みは主に ORDER BY ... DESC の最適化に利用されます';
+$strShowStatusHandler_read_rndDescr = '決まった位置を基準に行を読み込んだリクエストの数。この値が高いのは結果をソートする必要があるクエリを大量に実行している場合です。おそらくテーブル全体をスキャンしなければならないクエリを大量に行っているか、結合の際のキーの使い方に不適切なところがあります';
+$strShowStatusHandler_read_rnd_nextDescr = 'データファイルの次の行を読み込んだリクエストの数。この値が高いのはテーブルスキャンを大量に実行しているためです。一般にこれはテーブルのインデックスが不適切か、クエリがインデックスを利用するように書かれていないことを意味します';
+$strShowStatusHandler_rollbackDescr = '内部で ROLLBACK 文を実行した回数';
+$strShowStatusHandler_updateDescr = 'テーブル内の行を更新したリクエストの数';
+$strShowStatusHandler_writeDescr = 'テーブル内に行を挿入したリクエストの数';
+$strShowStatusInnodb_buffer_pool_pages_dataDescr = 'データが含まれるページの数 (ダーティページ、クリーンページの別を問わず)';
+$strShowStatusInnodb_buffer_pool_pages_dirtyDescr = '現在のダーティページの数';
+$strShowStatusInnodb_buffer_pool_pages_flushedDescr = 'フラッシュリクエストを受けたバッファプールのページ数';
+$strShowStatusInnodb_buffer_pool_pages_freeDescr = '空きページ数';
+$strShowStatusInnodb_buffer_pool_pages_latchedDescr = 'InnoDBバッファプールでラッチされているページ数。これは現在読み込んでいる、あるいは書き込んでいるページ、あるいは他の何らかの理由でフラッシュしたり削除したりできなくなっているページの数です';
+$strShowStatusInnodb_buffer_pool_pages_miscDescr = '行ロックやアダプティブハッシュインデックスといった管理オーバヘッドのせいでビジーになっているページ数。この値はInnodb_buffer_pool_pages_total - Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_dataという式でも計算できます';
+$strShowStatusInnodb_buffer_pool_pages_totalDescr = 'ページのバッファプールサイズの合計';
+$strShowStatusInnodb_buffer_pool_read_ahead_rndDescr = 'InnoDBが開始したランダム読み込みの回数。これはクエリがテーブルの大部分をランダムな順番でスキャンするときに発生します';
+$strShowStatusInnodb_buffer_pool_read_ahead_seqDescr = 'InnoDBが開始したシーケンシャル読み込みの回数。これはInnoDBがシーケンシャルなフルテーブルスキャンを行うときに発生します';
+$strShowStatusInnodb_buffer_pool_read_requestsDescr = 'InnoDB が実行した論理読み込みリクエストの数';
+$strShowStatusInnodb_buffer_pool_readsDescr = 'InnoDB がバッファプールの内容を利用できず、シングルページ読み込みを行わなければならなかった論理読み込みの回数';
+$strShowStatusInnodb_buffer_pool_wait_freeDescr = '通常 InnoDB バッファプールへの書き込みはバックグラウンドで行われますが、ページの読み込みないし作成を行う必要があるのにクリーンなページが得られない場合は、まずそのページがフラッシュされるのを待つ必要があります。このカウンタは、そのウェイトの回数をカウントするものです。バッファプールの値が適切に設定されていれば、この値は小さいはずです';
+$strShowStatusInnodb_buffer_pool_write_requestsDescr = 'InnoDB バッファプールへの書き込み回数';
+$strShowStatusInnodb_data_fsyncsDescr = 'これまでに fsync() を実行した回数';
+$strShowStatusInnodb_data_pending_fsyncsDescr = '現在保留されている fsync() の回数';
+$strShowStatusInnodb_data_pending_readsDescr = '現在保留されている読み込みの数';
+$strShowStatusInnodb_data_pending_writesDescr = '現在保留されている書き込みの数';
+$strShowStatusInnodb_data_readDescr = 'これまでのデータ読み込み量 (単位:バイト)';
+$strShowStatusInnodb_data_readsDescr = 'データ読み込み回数の合計';
+$strShowStatusInnodb_data_writesDescr = 'データ書き込み回数の合計';
+$strShowStatusInnodb_data_writtenDescr = 'これまでのデータの書き込み量 (単位:バイト)';
+$strShowStatusInnodb_dblwr_pages_writtenDescr = '二重書き込みの実行回数と二重書き込みが発生したページ数';
+$strShowStatusInnodb_dblwr_writesDescr = '二重書き込みの実行回数と二重書き込みが発生したページ数';
+$strShowStatusInnodb_log_waitsDescr = 'ログバッファが小さすぎてフラッシュしないと作業を続行できなくなったために発生したウェイトの回数';
+$strShowStatusInnodb_log_write_requestsDescr = 'ログ書き込みリクエストの数';
+$strShowStatusInnodb_log_writesDescr = 'ログファイルへの物理書き込みの回数';
+$strShowStatusInnodb_os_log_fsyncsDescr = 'ログファイルへの fsync 書き込みの回数';
+$strShowStatusInnodb_os_log_pending_fsyncsDescr = '保留中のログファイルへの fsync 回数';
+$strShowStatusInnodb_os_log_pending_writesDescr = '保留中のログファイルへの書き込み回数';
+$strShowStatusInnodb_os_log_writtenDescr = 'ログファイルに書き込んだバイト数';
+$strShowStatusInnodb_pages_createdDescr = '作成されたページ数';
+$strShowStatusInnodb_page_sizeDescr = 'コンパイル時の InnoDB のページサイズ (デフォルト:16KB)。多くの値がページ単位で計算されますが、この値を使えば簡単にバイト単位に変換できます';
+$strShowStatusInnodb_pages_readDescr = '読み込んだページ数';
+$strShowStatusInnodb_pages_writtenDescr = '書き込んだページ数';
+$strShowStatusInnodb_row_lock_current_waitsDescr = '現在待機中の行ロックの数';
+$strShowStatusInnodb_row_lock_time_avgDescr = '行ロック取得に要する平均時間 (単位:ミリ秒)';
+$strShowStatusInnodb_row_lock_timeDescr = '行ロック取得に要した時間の合計 (単位:ミリ秒)';
+$strShowStatusInnodb_row_lock_time_maxDescr = '行ロック取得に要した時間の最大値 (単位:ミリ秒)';
+$strShowStatusInnodb_row_lock_waitsDescr = '行ロック取得時に待機した回数';
+$strShowStatusInnodb_rows_deletedDescr = 'InnoDB テーブルから削除した行数';
+$strShowStatusInnodb_rows_insertedDescr = 'InnoDB テーブルに挿入した行数';
+$strShowStatusInnodb_rows_readDescr = 'InnoDB テーブルから読み込んだ行数';
+$strShowStatusInnodb_rows_updatedDescr = 'InnoDB テーブルで更新された行数';
+$strShowStatusKey_blocks_not_flushedDescr = '変更されてからディスクにフラッシュされていないキーキャッシュのキーブロックの数。以前は Not_flushed_key_blocks でした';
+$strShowStatusKey_blocks_unusedDescr = 'キーキャッシュの未使用ブロックの数。キーキャッシュの使用率を調べるときに使えます';
+$strShowStatusKey_blocks_usedDescr = 'キーキャッシュの使用済みブロックの数。この値はこれまで一度に使用されたブロックの最大数です';
+$strShowStatusKey_read_requestsDescr = 'キャッシュからキーブロックを読み込んだリクエストの数';
+$strShowStatusKey_readsDescr = 'ディスクからキーブロックを物理読み込みした回数。Key_reads が大きいのはおそらく key_buffer_size が小さすぎるためです。キャッシュミスの割合は Key_reads/Key_read_requests で計算できます';
+$strShowStatusKey_write_requestsDescr = 'キャッシュにキーブロックを書き込んだリクエストの数';
+$strShowStatusKey_writesDescr = 'ディスクにキーブロックを物理書き込みした回数';
+$strShowStatusLast_query_costDescr = 'クエリオプティマイザーの計算による、最後にコンパイルされたクエリの総コスト。クエリのプランを変えたときにコストがどう変わるか比較するときに便利です。デフォルト値の 0 はまだ一度もクエリをコンパイルしていないという意味です';
+$strShowStatusNot_flushed_delayed_rowsDescr = 'INSERT DELAY キューの中で書き込まれるのを待っている行数';
+$strShowStatusOpened_tablesDescr = '開いているテーブルの数。開いているテーブルが多い場合はおそらくテーブルキャッシュの値が小さすぎます';
+$strShowStatusOpen_filesDescr = '開いているファイルの数';
+$strShowStatusOpen_streamsDescr = '開いているストリームの数 (主にログの記録用です)';
+$strShowStatusOpen_tablesDescr = '開いているテーブルの数';
+$strShowStatusQcache_free_blocksDescr = 'クエリキャッシュ内の空きメモリブロックの数';
+$strShowStatusQcache_free_memoryDescr = 'クエリキャッシュの空きメモリ量';
+$strShowStatusQcache_hitsDescr = 'キャッシュのヒット数';
+$strShowStatusQcache_insertsDescr = 'キャッシュに追加されたクエリの数';
+$strShowStatusQcache_lowmem_prunesDescr = '新しいクエリをキャッシュするためにメモリを解放するべくキャッシュから削除されたクエリの数。この情報はクエリキャッシュのサイズを調整するときに便利です。クエリキャッシュは最後に使われた時刻が最も古いものから削除する(LRU)戦略に従って削除するクエリを決めます';
+$strShowStatusQcache_not_cachedDescr = 'キャッシュされなかった (キャッシュできないか query_cache_type の設定でキャッシュしないことになっている) クエリの数';
+$strShowStatusQcache_queries_in_cacheDescr = 'キャッシュに登録されているクエリの数';
+$strShowStatusQcache_total_blocksDescr = 'クエリキャッシュの総ブロック数';
$strShowStatusReset = 'リセット';
-$strShowStatusRpl_statusDescr = 'フェイルセーフレプリケーションの状態です (実装されていません)';
-$strShowStatusSelect_full_joinDescr = 'インデックスを用いない結合の数です。この値が 0 でない場合、テーブルのインデックスをよく確認してください。';
-$strShowStatusSelect_full_range_joinDescr = '関連テーブルで範囲検索を使用した結合の数です。';
-$strShowStatusSelect_range_checkDescr = 'キーなしでjoinした回数。これは各行についてキーの使用頻度をチェックするものです(これが0以外の場合はテーブルのインデックスをよくチェックしてください)。';
-$strShowStatusSelect_rangeDescr = '最初のテーブルで範囲を使用した結合の数です (これが大きくても通常は危険ではありません)';
-$strShowStatusSelect_scanDescr = '最初のテーブルの完全なスキャンを行った結合の数です。';
-$strShowStatusSlave_open_temp_tablesDescr = 'スレーブ SQL スレッドによって現在開いている一時的テーブルの数です。';
-$strShowStatusSlave_retried_transactionsDescr = 'レプリケーションのスレーブ SQL スレッドがトランザクションを再試行した回数の(起動からの)合計数。';
-$strShowStatusSlave_runningDescr = 'このサーバがマスターに接続されるスレーブである場合、これは ON です。';
-$strShowStatusSlow_launch_threadsDescr = 'slow_launch_time の秒数より時間がかかって作成されたスレッドの数です。';
-$strShowStatusSlow_queriesDescr = 'long_query_time の秒数を越えた照会の数です。';
-$strShowStatusSort_merge_passesDescr = 'ソートアルゴリズムが実行しなければならなかったマージの回数。この値が高い場合は、sort_buffer_sizeシステム変数の値を増やすことを検討してください。';
-$strShowStatusSort_rangeDescr = 'その範囲内でソートが行われた回数。';
-$strShowStatusSort_rowsDescr = 'ソート済の行数です。';
-$strShowStatusSort_scanDescr = 'テーブルの走査により行われたソート数です。';
-$strShowStatusTable_locks_immediateDescr = 'テーブルロックがすぐに取得された回数です。';
-$strShowStatusTable_locks_waitedDescr = 'テーブルロックがすぐに取得できなかったためにウェイトが発生した回数。この値が高く、パフォーマンスに問題が生じている場合は、まず照会を最適化してください。それでもだめなら、テーブルを分割するか、レプリケーションを利用してください。';
-$strShowStatusThreads_cachedDescr = 'スレッドキャッシュ中のスレッド数です。キャッシュヒット率は Threads_created/Connections として計算することができます。この値が赤字になっているときは thread_cache_size を上げてください。';
-$strShowStatusThreads_connectedDescr = '現在接続中の数です。';
-$strShowStatusThreads_createdDescr = '接続を扱うために作成されたスレッドの数です。Threads_created が大きい場合、値 thread_cache_size を増加させたいと思うかもしれません。(通常よいスレッド実装をしている場合、これは顕著なパフォーマンス向上を与えません)';
-$strShowStatusThreads_runningDescr = 'スリープしていないスレッドの数です。';
+$strShowStatusRpl_statusDescr = 'フェイルセーフレプリケーションの状態 (未実装)';
+$strShowStatusSelect_full_joinDescr = 'インデックスを利用しなかった結合の数。この値が 0 でない場合はテーブルのインデックスをよく確認してください';
+$strShowStatusSelect_full_range_joinDescr = '参照テーブルで範囲検索をした結合の数';
+$strShowStatusSelect_range_checkDescr = 'キーが指定されていなかったため一行ずつキーが使われているか確認した結合の数(0 でない場合はテーブルのインデックスをよく確認してください)';
+$strShowStatusSelect_rangeDescr = '最初のテーブルで範囲指定された結合の数 (この値は大きくてもふつう問題ありません)';
+$strShowStatusSelect_scanDescr = '最初のテーブルをフルスキャンした結合の数';
+$strShowStatusSlave_open_temp_tablesDescr = 'スレーブの SQL スレッドが現在開いている一時テーブルの数';
+$strShowStatusSlave_retried_transactionsDescr = 'レプリケーションスレーブの SQL スレッドがトランザクションを再試行した回数(起動時からの合計)';
+$strShowStatusSlave_runningDescr = 'このサーバがマスターに接続するスレーブである場合は ON になります';
+$strShowStatusSlow_launch_threadsDescr = 'slow_launch_time で指定された秒数以上に作成時間がかかったスレッドの数';
+$strShowStatusSlow_queriesDescr = 'long_query_time で指定された秒数以上に時間のかかったクエリの数';
+$strShowStatusSort_merge_passesDescr = 'ソートアルゴリズムが実行しなければならなかったマージの回数。この値が高い場合は sort_buffer_size システム変数の値を増やした方がよいでしょう';
+$strShowStatusSort_rangeDescr = '範囲指定付きでソートが行われた回数';
+$strShowStatusSort_rowsDescr = 'ソート済の行数';
+$strShowStatusSort_scanDescr = 'テーブルをスキャンしたときに実行されたソートの回数';
+$strShowStatusTable_locks_immediateDescr = 'テーブルロックをすぐに取得できた回数';
+$strShowStatusTable_locks_waitedDescr = 'テーブルロックをすぐに取得できずウェイトが発生した回数。この値が高く、パフォーマンスに問題が生じている場合は、まずクエリを最適化してください。それでもだめならテーブルを分割するか、レプリケーションを利用してください';
+$strShowStatusThreads_cachedDescr = 'スレッドキャッシュ内のスレッド数。キャッシュのヒット率は Threads_created/Connections で計算できます。この値が赤くなっている場合は thread_cache_size を大きくしてください';
+$strShowStatusThreads_connectedDescr = '現在開いている接続の数';
+$strShowStatusThreads_createdDescr = '接続処理のために作成されたスレッドの数。Threads_created が大きい場合は thread_cache_size の値を増やした方がよいかもしれません (スレッドの実装に問題がない場合はふつうあまりパフォーマンスは向上しません)';
+$strShowStatusThreads_runningDescr = 'スリープしていないスレッドの数';
$strShowTableDimension = 'テーブルの大きさを表示する';
-$strShowTables = 'テーブルの表示する';
-$strShowThisQuery = ' 実行した照会をここに表示する';
+$strShowTables = 'テーブルを表示する';
+$strShowThisQuery = ' 実行したクエリをここに表示する';
$strSimplifiedChinese = '簡体字中国語';
$strSingly = '(1 回)';
$strSize = 'サイズ';
-$strSkipQueries = '開始からスキップするレコード(照会)の数';
+$strSkipQueries = '先頭から数えたスキップするレコード(クエリ)の数';
$strSlovak = 'スロバキア語';
$strSlovenian = 'スロベニア語';
-$strSocketProblem = '(または、ローカルの MySQL サーバのソケットは正確に設定されません)';
+$strSmallBigAll = 'すべてを大きく/小さく';
+$strSnapToGrid = 'グリッドにあわせる';
+$strSocketProblem = '(あるいはローカルの MySQL サーバのソケットが正しく設定されていません)';
$strSort = 'ソート';
$strSortByKey = 'キーでソート';
-$strSorting = 'ソート';
+$strSorting = 'ソート中';
$strSpaceUsage = 'ディスク使用量';
$strSpanish = 'スペイン語';
-$strSplitWordsWithSpace = '各単語はスペース文字(" ")で区切って下さい。';
+$strSplitWordsWithSpace = '各単語は空白文字(" ")で区切ってください';
$strSQLCompatibility = 'SQL互換モード';
$strSQLExportType = 'エクスポート形式';
$strSQLImportOptions = 'SQL オプション';
$strSQLOptions = 'SQL オプション';
-$strSQLParserBugMessage = 'あなたは SQL パーサーのバグを見けられるかもしれません。あなたの問い合わせを念入りに確かめて、引用符が正しくミスマッチがないかチェックしましょう。その他の失敗にはテキストエリアで引用した外側にバイナリーコードが付いてファイルがアップロードされてしまったような原因が考えられます。また、あなたの問い合わせを MySQL のコマンドラインを使って試すこともできます。MySQL サーバは以下のようにエラーを出します。そこには問題を解決する手助けがあるでしょう。コマンドラインでは成功しても、まだ問題がある場合、パーサーが失敗する場合には、問題のある SQL 問い合わせをひとつの文に減らしてみて下さい。そして以下のセクションでデータを切り取ってバグ報告を送って下さい:';
-$strSQLParserUserError = 'SQL にエラーがあります。MySQL サーバは以下のようにエラーを出力しました。そこには問題を解決する手助けがあるでしょう。';
+$strSQLParserBugMessage = 'SQL パーサにバグが見つかることもありえますが、まずはクエリをよく見て引用符の数や種類に間違いがないか確認してください。クォートされていないテキスト領域にバイナリファイルをアップロードしたからクエリが失敗したということもありえます。MySQL のコマンドラインインタフェースを利用してクエリを実行してみてもよいでしょう。下に MySQL サーバのエラー出力が出ているようなら問題の解析に役立つかもしれません。それでも解決しないか、コマンドラインでは成功するのにパーサでは失敗する場合は、SQL クエリの入力データを実際に問題を起こしているクエリひとつに絞り込んでから、以下の「CUT」セクションにデータを添えてバグ報告を送ってください:';
+$strSQLParserUserError = 'SQL にエラーがあるようです。下に MySQL サーバのエラー出力が出ているようなら問題の解析に役立つかもしれません';
$strSQLQuery = '実行した SQL';
$strSQLResult = 'SQL の結果';
$strSQL = 'SQL';
-$strSQPBugInvalidIdentifer = '認証が無効です。';
-$strSQPBugUnclosedQuote = '引用符が閉じていません。';
-$strSQPBugUnknownPunctuation = '無効な句読点文字です。';
+$strSQPBugInvalidIdentifer = '不正な識別子です';
+$strSQPBugUnclosedQuote = '引用符が閉じていません';
+$strSQPBugUnknownPunctuation = '無効な句読点文字です';
+$strStandInStructureForView = 'ビュー用の代替構造';
$strStatCheckTime = '最終検査';
$strStatCreateTime = '作成日時';
$strStatement = 'ステートメント';
-$strStatisticsOverrun = 'ビジーなサーバでは、バイトカウンタが超過するかもしれません。従って、MySQL サーバが報告するそれらの統計は正しくないかもしれません。';
+$strStatisticsOverrun = '処理が集中するサーバではバイトカウンタが超過することがあるため、MySQL サーバが報告してくる統計は不正確なことがあります';
$strStatUpdateTime = '最終更新';
$strStatus = '状態';
$strStorageEngine = 'ストレージエンジン';
$strStorageEngines = 'ストレージエンジン';
$strStrucCSV = 'CSV データ';
$strStrucData = '構造とデータ';
-$strStrucExcelCSV = 'MS Excel 用 CSV データ';
-$strStrucNativeExcel = '本来の MS Excel データ';
-$strStrucNativeExcelOptions = 'Excelのネイティブエクスポートのオプション';
+$strStrucExcelCSV = 'MS Excel 用の CSV';
+$strStrucNativeExcel = 'MS Excel のネイティブ形式';
+$strStrucNativeExcelOptions = 'Excel のネイティブエクスポートオプション';
$strStrucOnly = '構造のみ';
$strStructPropose = 'テーブル構造を確認する';
$strStructure = '構造';
+$strStructureForView = 'ビュー用の構造';
$strSubmit = '実行する';
-$strSuccess = 'SQL が正常に実行されました';
+$strSuccess = 'SQL は正常に実行されました';
$strSum = '合計';
$strSwedish = 'スウェーデン語';
$strSwitchToDatabase = 'コピーしたデータベースに切り替える';
$strSwitchToTable = 'コピーしたテーブルに切り替える';
-$strTable = 'テーブル ';
+$strTable = 'テーブル';
$strTableAlreadyExists = 'テーブル %s は既に存在します!';
-$strTableComments = 'テーブルの説明';
-$strTableEmpty = 'テーブルは空です。';
-$strTableHasBeenDropped = 'テーブル %s を削除しました。';
-$strTableHasBeenEmptied = 'テーブル %s を空にしました。';
-$strTableHasBeenFlushed = 'テーブル %s のキャッシュを空にしました。';
+$strTableComments = 'テーブルのコメント';
+$strTableEmpty = 'テーブル名が空です!';
+$strTableHasBeenDropped = 'テーブル %s を削除しました';
+$strTableHasBeenEmptied = 'テーブル %s を空にしました';
+$strTableHasBeenFlushed = 'テーブル %s をフラッシュしました';
+$strTableIsEmpty = 'テーブルが空のようです!';
$strTableMaintenance = 'テーブル管理';
+$strTableName = 'テーブル名';
$strTableOfContents = 'テーブルの内容';
$strTableOptions = 'テーブルオプション';
-$strTables = '%sテーブル';
+$strTables = '%s テーブル';
$strTableStructure = 'テーブルの構造';
-$strTakeIt = 'それにします';
-$strTblPrivileges = 'テーブル特定 特権';
+$strTakeIt = 'これにする';
+$strTblPrivileges = 'テーブル固有の特権';
$strTempData = '一時データ';
-$strTextAreaLength = ' 長さの所為でこのフィールドを<br /> 修正できない可能性があります。';
+$strTextAreaLength = ' 長さによってはこのフィールドを<br /> 修正できなくなる場合もあります';
$strThai = 'タイ語';
$strTheme = 'テーマ / スタイル';
-$strThemeDefaultNotFound = 'デフォルトテーマ「%sが見つかりません!';
-$strThemeNoPreviewAvailable = 'プレビューは利用できません。';
-$strThemeNotFound = 'テーマ「%sが見つかりません!';
-$strThemeNoValidImgPath = 'テーマ「%sで正しい画像パスが見つかりません!';
-$strThemePathNotFound = 'テーマ「%sのテーマパスが見つかりません!';
+$strThemeDefaultNotFound = 'デフォルトテーマ %s が見つかりません!';
+$strThemeNoPreviewAvailable = 'プレビューは利用できません';
+$strThemeNotFound = 'テーマ %s が見つかりません!';
+$strThemeNoValidImgPath = 'テーマ %s の画像パスが無効です!';
+$strThemePathNotFound = 'テーマ %s のテーマパスが見つかりません!';
$strThisHost = 'このホスト';
$strThreads = 'スレッド';
-$strThreadSuccessfullyKilled = 'スレッド %s は終了しました。';
+$strThreadSuccessfullyKilled = 'スレッド %s は正常終了しました';
$strTime = '時間';
-$strTimeoutInfo = '以前にインポートでタイムアウトしています。再送信後、位置 %d より継続するでしょう。';
-$strTimeoutNothingParsed = 'しかし、最後の実行でのデータは解析されていません。これは、通常 php の時間制限を増やさなければ phpMyAdmin がこのインポートを終了することができなということを意味します。';
-$strTimeoutPassed = 'スクリプトがタイムアウトを過ぎました。インポートを終わらせたい場合、同じファイルを再送信し、インポートを再開させてください。';
-$strToggleScratchboard = 'トグルスクラッチボード';
+$strTimeoutInfo = '直前のインポートはタイムアウトしました。再送信すると位置 %d から再開されます';
+$strTimeoutNothingParsed = 'ただし、最後に実行したときはまったくデータを解析できませんでした。ふつうは PHP の時間制限を伸ばさない限りこのデータのインポートはできません';
+$strTimeoutPassed = 'スクリプトがタイムアウトしました。インポートを完了させたいのであれば同じファイルを再送信すればインポートが再開されます';
+$strToFromPage = '開始/終了ページ';
+$strToggleScratchboard = 'スクラッチボードを切り替える';
+$strToggleSmallBig = '大小を切り替える';
+$strToSelectRelation = 'リレーションを選択します:';
$strTotal = '合計';
$strTotalUC = '合計';
-$strTraditionalChinese = '伝統的な中国語';
-$strTraditionalSpanish = '伝統的なスペイン語';
+$strTraditionalChinese = '繁体字中国語';
+$strTraditionalSpanish = 'スペイン語 (伝統表記)';
$strTraffic = 'トラフィック';
$strTransactionCoordinator = 'トランザクションコーディネータ';
-$strTransformation_application_octetstream__download = 'フィールドのバイナリデータをダウンロードするリンクを表示します。1 つ目のオプションはバイナリファイルのファイルです。2 つ目オプションはファイルを含むテーブル行の正しいフィールドです。2 つ目のオプションを提供する場合、1 つ目のオプションは空文字列に設定する必要があります。';
-$strTransformation_application_octetstream__hex = 'データの 16 進数表示です。';
-$strTransformation_image_jpeg__inline = 'クリック可能なサムネイルを表示します; オプション: width・height をピクセルで指定 (元の比率を保ちます)';
-$strTransformation_image_jpeg__link = 'この画像へのリンクを表示 (例えば blob を直接ダウンロード).';
-$strTransformation_image_png__inline = '「image/jpeg: inlineを参照してください。';
-$strTransformation_text_plain__external = 'LINUX のみ: 外部アプリケーションを起動し、標準入力からフィールドデータを入力します。アプリケーションの標準出力が返ります。デフォルトは Tidy で、綺麗な HTML コードを出力します。セキュリティの理由で、手動でファイル「libraries/text_plain__external.inc.phpを編集し、実行するを許可するツールを挿入しなければなりません。最初のオプションは、使用するプログラムの数で、2 つ目のオプションはプログラムのパラメータです。3 つ目のオプションが 1 に設定されていた場合、htmlspecialchars() を用いて出力を変換するでしょう(デフォルト: 1)4 つ目 オプションが 1 に設定されていた場合、禁則処理を防ぎ、出力がすべて 1 行に見えることを保証するでしょう(デフォルト: 1).';
-$strTransformation_text_plain__formatted = 'フィールドの元の書式を保存します。エスケープせずに終了します。';
-$strTransformation_text_plain__imagelink = '画像とリンク、ファイルを含むフィールドを表示します; 1 つ目のオプションは "http://domain.com/" のような接頭語で、2 つ目のオプションはピクセル指定の幅、3 つ目は高さです。';
-$strTransformation_text_plain__link = 'ファイルを含むフィールド、リンクを表示; 1 つ目のオプションは "http://domain.com/" のような接頭語、2 つ目のオプションはリンクのタイトルです。';
-$strTransformation_text_plain__sql = 'SQL 紹介 としてテキストの形式の文法をハイライトします。';
-$strTransformation_text_plain__substr = '文字列の一部のみ表示します。1 つ目のオプションはテキストの出力がどこで開始するかオフセットを定義します (デフォルトは「0です)2 つ目のオプションはどれだけのテキストを返すかのオフセットです。空の場合、残りのテキストをすべて返します。3 つ目のオプションは、文字列の一部が返される時、どの文字を出力に追加するか定義します。 (デフォルトは「...です)';
-$strTruncateQueries = '照会の表示を切り詰める';
+$strTransformation_application_octetstream__download = 'フィールドのバイナリデータをダウンロードするリンクを表示します。1 つ目のオプションにバイナリファイルのファイル名を指定することもできますし、2 つ目のオプションにファイル名を保持しているフィールドの名前を渡すこともできます。2 つ目のオプションを使う場合は 1 つ目のオプションは空文字列にする必要があります';
+$strTransformation_application_octetstream__hex = 'データを 16 進数で表記します。オプションとして最初のパラメータにスペースを追加する頻度を指定することもできます (デフォルトは 2 ニブルごとです)';
+$strTransformation_image_jpeg__inline = 'クリック可能なサムネイルを表示します; オプションとして幅と高さの最大値をピクセル単位で指定できます。アスペクト比はそのまま維持されます';
+$strTransformation_image_jpeg__link = 'この画像をダウンロードするためのリンクを表示します';
+$strTransformation_image_png__inline = 'image/jpeg: inlineをご覧ください';
+$strTransformation_text_plain__dateformat = 'TIME、TIMESTAMP、DATETIME、あるいはUnixタイムスタンプの値が入っているフィールドを書式にあわせて表示します。1 つ目のオプションはタイムスタンプに加算する時差です(デフォルト: 0)。2 つ目のオプションには日時の書式文字列を指定します。3 つ目のオプションはローカルの日時とみなすか UTC とみなすかです ("local"ないし"utc"という文字列を指定してください)。この値によって日時の表記が変わります。"local" の場合は PHP の strftime() 関数の説明をご覧ください。"utc" の場合は gmdate() を利用します'; // XXX replaced
+$strTransformation_text_plain__external = 'LINUX のみ: 外部アプリケーションを起動して標準入力経由でフィールドデータを渡します。アプリケーションの標準出力が返ります。デフォルトは Tidy です (これは HTML コードを綺麗にするためのものです)。セキュリティ上の理由から libraries/transformations/text_plain__external.inc.php を自分で編集して利用したいツールを明記しておく必要があります。最初のオプションは利用したいプログラムの数で、2 つ目のオプションはプログラムのパラメータです。3 つ目のオプションが 1 に設定されている場合は htmlspecialchars() を用いて出力を変換します(デフォルトは 1 です)。4 つ目のオプションが 1 に設定されている場合は禁則処理をせず出力全体が 1 行に収まるようにします (デフォルトは 1 です)';
+$strTransformation_text_plain__formatted = 'フィールドの内容をそのまま、htmlspecialchars()を通さずに表示します。この場合、フィールドには正しい HTML が含まれているものと仮定します';
+$strTransformation_text_plain__imagelink = '画像とリンクを表示します。フィールドにはファイル名を入れてください。1 つ目のオプションは "http://domain.com/" のようなURLの先頭部分です。2 つ目と3 つ目のオプションには幅と高さをピクセル単位で指定します';
+$strTransformation_text_plain__link = 'リンクを表示します。フィールドにはファイル名を入れてください。1 つ目のオプションは "http://domain.com/" のような URL の先頭部分、2 つ目のオプションはリンクのタイトルです';
+$strTransformation_text_plain__sql = 'テキストの内容を SQL クエリとみなし、構文ハイライト表示します';
+$strTransformation_text_plain__substr = '文字列の一部のみを表示します。1 つ目のオプションは文字列の先頭から何文字スキップするか (デフォルトは 0 です)、2 つ目のオプションは表示するテキストの文字数です (デフォルトは文字列の末尾までです)。3 つ目のオプションは文字列を切り詰めるときに前/後に補う省略記号です (デフォルトは ... です)';
+$strTruncateQueries = 'クエリの表示を切り詰める';
$strTurkish = 'トルコ語';
-$strType = 'フィールドタイプ';
+$strType = '種別';
$strUkrainian = 'ウクライナ語';
-$strUncheckAll = 'チェックをすべて削除する';
+$strUncheckAll = 'すべてのチェックを外す';
$strUnicode = 'UNICODE';
-$strUnique = '一意性';
-$strUnknown = '明';
+$strUnique = 'ユニーク';
+$strUnknown = '不明';
$strUnselectAll = '全選択解除';
-$strUnsupportedCompressionDetected = 'サポートされていない圧縮形式(%s)のファイルの読み込みを試みました。その実装がサポートされていないか、設定で無効になっているかのいずれかです。';
-$strUpdatePrivMessage = '%s の特権を更新しました。';
-$strUpdateProfileMessage = 'プロファイルを更新しました。';
-$strUpdateQuery = '照会を更新する';
-$strUpdComTab = 'Column_comments テーブルのアップグレード方法のドキュメントを参照してください。';
-$strUpgrade = '%s %s かそれ以降にアップグレードしてください。';
-$strUploadLimit = '恐らくあまりにも大きなファイルをアップロードしようとしました。この制限の回避手段として %sドキュメント%s を参照してください。';
-$strUploadsNotAllowed = 'このサーバではファイルのアップロードが禁じられています。';
+$strUnsupportedCompressionDetected = 'サポートされていない圧縮形式(%s)のファイルをロードしようとしました。この形式はサポートされていないか設定で無効にされています';
+$strUpdatePrivMessage = '%s の特権を更新しました';
+$strUpdateProfileMessage = 'プロファイルを更新しました';
+$strUpdateQuery = 'クエリを更新する';
+$strUpdComTab = 'column_comments テーブルの更新方法についてはドキュメントをご覧ください';
+$strUpgrade = '%s を %s 以降にアップグレードしてください';
+$strUploadLimit = 'アップロードしようとしたファイルが大きすぎるようです。対策については %sドキュメント%s をご覧ください';
+$strUploadsNotAllowed = 'このサーバではファイルのアップロードはできません';
$strUsage = '使用量';
-$strUseBackquotes = '逆クオートでテーブルやフィールドを囲む';
+$strUseBackquotes = 'テーブル名やフィールド名を逆クォートで囲む';
$strUsedPhpExtensions = '使用中の PHP 拡張';
$strUseHostTable = 'ホストテーブルを使う';
-$strUserAlreadyExists = 'ユーザ「%sは既に存在します!';
+$strUserAlreadyExists = 'ユーザ %s は既に存在します!';
$strUser = 'ユーザ';
-$strUserEmpty = 'ユーザは空です。';
-$strUserName = 'ユーザ';
-$strUserNotFound = '選択されたユーザは特権テーブルに見つかりませんでした。';
+$strUserEmpty = 'ユーザ名が空です!';
+$strUserName = 'ユーザ名';
+$strUserNotFound = '特権テーブルには選択したユーザがいません';
$strUserOverview = 'ユーザ概略';
-$strUsersDeleted = '選択されたユーザは削除されました。';
-$strUsersHavingAccessToDb = 'ユーザは &quot;%s&quot; へのアクセス権限を所持しています。';
-$strUseTabKey = '値から値まで移るには TAB キーを、もしくはいろんな場所でも移動するには CTRL + カーソルを使用します。';
-$strUseTables = '使うテーブル';
-$strUseTextField = 'テキストフィールドを使用';
-$strUseThisValue = 'この値を使用';
+$strUsersDeleted = '選択したユーザを正しく削除しました';
+$strUsersHavingAccessToDb = '&quot;%s&quot; にアクセスできるユーザ';
+$strUseTabKey = '次の値に移動するときは TAB キーを使ってください。CTRL+カーソルキーを使うと自由に移動できます';
+$strUseTables = '利用するテーブル';
+$strUseTextField = 'テキストフィールドの値を利用する';
+$strUseThisValue = 'この値を利用する';
$strValidateSQL = 'SQL の検証';
-$strValidatorError = 'SQL の検証機能を初期化できません。%sドキュメント%s に記述されているように PHP 拡張ライブラリがインストールされているかチェックしてください。';
+$strValidatorError = 'SQL の検証機能を初期化できません。%sドキュメント%s の記載通りに必要な PHP 拡張がインストールされているか確認してください';
$strValue = '値';
$strVar = '変数';
$strVersionInformation = 'バージョン情報';
$strView = 'ビュー';
$strViewDump = 'テーブルのダンプ(スキーマ)表示';
-$strViewDumpDatabases = 'データベースのダンプビュー (スキーマ)';
+$strViewDumpDatabases = 'データベースのダンプ(スキーマ)表示';
$strViewDumpDB = 'DB のダンプ(スキーマ)表示';
-$strViewHasBeenDropped = 'ビュー %s を破棄しました。';
-$strViewMaxExactCount = 'このビューは %s 列以上あります。%sドキュメント%s を参照してください。';
+$strViewHasBeenDropped = 'ビュー %s を破棄しました';
+$strViewMaxExactCount = 'ビューの行数が %s を越えました。%sドキュメント%s をご覧ください';
-$strWebServerUploadDirectory = 'ウェブサーバ上でアップロードする';
-$strWebServerUploadDirectoryError = 'アップロードを行うディレクトリがありません。';
+$strWebServerUploadDirectory = 'ウェブサーバ上のアップロードディレクトリ';
+$strWebServerUploadDirectoryError = '指定したアップロードディレクトリが利用できません';
$strWelcome = '%s へようこそ';
$strWestEuropean = '西ヨーロッパ言語';
$strWildcard = 'ワイルドカード';
-$strWindowNotFound = 'ターゲットブラウザウィンドウを更新することができません。恐らく親ウィンドウを閉じたか、あるいはブラウザーのセキュリティ設定で、クロスウィンドウの更新をブロックしています。';
+$strWindowNotFound = 'ターゲットとなるブラウザウィンドウを更新できませんでした。親ウィンドウを閉じたか、ブラウザのセキュリティ設定でクロスウィンドウの更新をブロックしているものと思われます';
$strWithChecked = 'チェックしたものを:';
$strWriteRequests = '書き込みリクエスト数';
-$strWrongUser = 'ユーザまたはパスワードが正しくありません。<br />アクセスは拒否されました。';
+$strWrongUser = 'ユーザ名ないしパスワードが間違っています。<br />アクセスは拒否されました';
$strXkana = '全角カナへ変換する'; // convert to X208-kana
$strXMLOptions = 'XMLオプション';
@@ -981,55 +1029,17 @@ $strXML = 'XML';
$strYes = 'はい';
-$strZeroRemovesTheLimit = '注意: オプションを 0 (ゼロ)に設定すると制限がなくなります。';
-$strZip = '"zip 方式"';
+$strZeroRemovesTheLimit = '注意: オプションを 0 (ゼロ)に設定すると制限を解除します';
+$strZip = '"zip 形式"';
-$strPmaWiki = 'phpMyAdmin wiki'; //to translate
-$strTransformation_text_plain__dateformat = '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.'; //to translate
-$strDocSQL = 'DocSQL'; //to translate
-$strDocSQLOptions = 'DocSQL options'; //to translate
-$strTableName = 'Table name'; //to translate
-$strTableIsEmpty = 'Table seems to be empty!'; //to translate
-$strDbIsEmpty = 'Database seems to be empty!'; //to translate
-$strShowingPhp = 'Showing as PHP code'; //to translate
-$strShowingSQL = 'Showing SQL query'; //to translate
-$strDesigner = 'Designer'; //to translate
-$strNumberOfTables = 'Number of tables'; //to translate
-$strCreateTable = 'Create table'; //to translate
-$strCreateRelation = 'Create relation'; //to translate
-$strSavePosition = 'Save position'; //to translate
-$strSelectForeignKey = 'Select Foreign Key'; //to translate
-$strHide = 'Hide'; //to translate
-$strShowHideLeftMenu = 'Show/Hide left menu'; //to translate
-$strReload = 'Reload'; //to translate
-$strSmallBigAll = 'Small/Big All'; //to translate
-$strImportExportCoords = 'Import/Export coordinates for PDF schema'; //to translate
-$strMoveMenu = 'Move Menu'; //to translate
-$strAngularLinks = 'Angular links'; //to translate
-$strDirectLinks = 'Direct links'; //to translate
-$strHideShowAll = 'Hide/Show all'; //to translate
-$strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate
-$strInternalRelationAdded = 'Internal relation added'; //to translate
-$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate
-$strRelationDeleted = 'Relation deleted'; //to translate
-$strToSelectRelation = 'To select relation, click :'; //to translate
-$strExportImportToScale = 'Export/Import to scale'; //to translate
-$strRecommended = 'recommended'; //to translate
-$strToFromPage = 'to/from page'; //to translate
-$strSelectReferencedKey = 'Select referenced key'; //to translate
-$strPleaseSelectPrimaryOrUniqueKey = 'Please select the primary key or a unique key'; //to translate
-$strForeignKeyError = 'Error creating foreign key (check data types)'; //to translate
-$strHelp = 'Help'; //to translate
-$strCancel = 'Cancel'; //to translate
-$strDeleteRelation = 'Delete relation'; //to translate
-$strKnownExternalBug = 'The %s functionality is affected by a known bug, see %s'; //to translate
-$strStructureForView = 'Structure for view'; //to translate
-$strStandInStructureForView = 'Stand-in structure for view'; //to translate
-$strToggleSmallBig = 'Toggle small/big'; //to translate
-$strIEUnsupported = 'Internet Explorer does not support this function.'; //to translate
-$strErrorRelationAdded = 'Error: Relation not added.'; //to translate
-$strErrorRelationExists = 'Error: relation already exists.'; //to translate
-$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
-$strSnapToGrid = 'Snap to grid'; //to translate
-$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/korean-euc-kr.inc.php b/lang/korean-euc-kr.inc.php
index aaba7232d2..a3ace15426 100644
--- a/lang/korean-euc-kr.inc.php
+++ b/lang/korean-euc-kr.inc.php
@@ -1048,4 +1048,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php
index c938aa83e4..4cbc39bd89 100644
--- a/lang/korean-utf-8.inc.php
+++ b/lang/korean-utf-8.inc.php
@@ -1049,4 +1049,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php
index b286970be3..1125d850ad 100644
--- a/lang/latvian-utf-8.inc.php
+++ b/lang/latvian-utf-8.inc.php
@@ -1051,4 +1051,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/latvian-windows-1257.inc.php b/lang/latvian-windows-1257.inc.php
index e1cd1ef27d..f657b9c701 100644
--- a/lang/latvian-windows-1257.inc.php
+++ b/lang/latvian-windows-1257.inc.php
@@ -1050,4 +1050,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php
index 5a9899d8c4..b4b3d1699b 100644
--- a/lang/lithuanian-utf-8.inc.php
+++ b/lang/lithuanian-utf-8.inc.php
@@ -1044,4 +1044,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/lithuanian-windows-1257.inc.php b/lang/lithuanian-windows-1257.inc.php
index 27cb0d0a24..1bf067450b 100644
--- a/lang/lithuanian-windows-1257.inc.php
+++ b/lang/lithuanian-windows-1257.inc.php
@@ -1043,4 +1043,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/malay-iso-8859-1.inc.php b/lang/malay-iso-8859-1.inc.php
index 485195cbdd..890dbd0675 100644
--- a/lang/malay-iso-8859-1.inc.php
+++ b/lang/malay-iso-8859-1.inc.php
@@ -1065,4 +1065,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php
index fc11f53899..0f171384cf 100644
--- a/lang/malay-utf-8.inc.php
+++ b/lang/malay-utf-8.inc.php
@@ -1066,4 +1066,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php
index 3e158d2526..aeb59fa0a4 100644
--- a/lang/mongolian-utf-8.inc.php
+++ b/lang/mongolian-utf-8.inc.php
@@ -1049,4 +1049,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/norwegian-iso-8859-1.inc.php b/lang/norwegian-iso-8859-1.inc.php
index b8a33c1433..42f6d6c900 100644
--- a/lang/norwegian-iso-8859-1.inc.php
+++ b/lang/norwegian-iso-8859-1.inc.php
@@ -1025,4 +1025,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php
index 8abb645bac..6cad135da8 100644
--- a/lang/norwegian-utf-8.inc.php
+++ b/lang/norwegian-utf-8.inc.php
@@ -1026,4 +1026,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php
index 52b96bd180..3bc95bcb70 100644
--- a/lang/persian-utf-8.inc.php
+++ b/lang/persian-utf-8.inc.php
@@ -1051,4 +1051,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/persian-windows-1256.inc.php b/lang/persian-windows-1256.inc.php
index e47d477cd7..53bda7f9c5 100644
--- a/lang/persian-windows-1256.inc.php
+++ b/lang/persian-windows-1256.inc.php
@@ -1050,4 +1050,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/polish-iso-8859-2.inc.php b/lang/polish-iso-8859-2.inc.php
index a92902d6af..5aaacb23ac 100644
--- a/lang/polish-iso-8859-2.inc.php
+++ b/lang/polish-iso-8859-2.inc.php
@@ -1021,4 +1021,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php
index 29c02182a4..7af5527e5c 100644
--- a/lang/polish-utf-8.inc.php
+++ b/lang/polish-utf-8.inc.php
@@ -1022,4 +1022,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/polish-windows-1250.inc.php b/lang/polish-windows-1250.inc.php
index 97c6c531b5..5df92e8365 100644
--- a/lang/polish-windows-1250.inc.php
+++ b/lang/polish-windows-1250.inc.php
@@ -1021,4 +1021,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/portuguese-iso-8859-1.inc.php b/lang/portuguese-iso-8859-1.inc.php
index fcf80662ed..cdb7b874df 100644
--- a/lang/portuguese-iso-8859-1.inc.php
+++ b/lang/portuguese-iso-8859-1.inc.php
@@ -1054,4 +1054,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/portuguese-iso-8859-15.inc.php b/lang/portuguese-iso-8859-15.inc.php
index 1a63a2f42a..a86629abef 100644
--- a/lang/portuguese-iso-8859-15.inc.php
+++ b/lang/portuguese-iso-8859-15.inc.php
@@ -1054,4 +1054,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php
index 7a6be77e47..b989f6839a 100644
--- a/lang/portuguese-utf-8.inc.php
+++ b/lang/portuguese-utf-8.inc.php
@@ -1055,4 +1055,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/romanian-iso-8859-1.inc.php b/lang/romanian-iso-8859-1.inc.php
index 53c3289b79..0867d5d976 100644
--- a/lang/romanian-iso-8859-1.inc.php
+++ b/lang/romanian-iso-8859-1.inc.php
@@ -1046,4 +1046,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php
index 866209b7ca..4306c34203 100644
--- a/lang/romanian-utf-8.inc.php
+++ b/lang/romanian-utf-8.inc.php
@@ -1047,4 +1047,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/russian-cp-866.inc.php b/lang/russian-cp-866.inc.php
index 175789a9d4..7b32636784 100644
--- a/lang/russian-cp-866.inc.php
+++ b/lang/russian-cp-866.inc.php
@@ -1048,4 +1048,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/russian-koi8-r.inc.php b/lang/russian-koi8-r.inc.php
index 8bb62798d4..d521d9b729 100644
--- a/lang/russian-koi8-r.inc.php
+++ b/lang/russian-koi8-r.inc.php
@@ -1048,4 +1048,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php
index 0f816b1afb..773d87eed3 100644
--- a/lang/russian-utf-8.inc.php
+++ b/lang/russian-utf-8.inc.php
@@ -1049,4 +1049,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/russian-windows-1251.inc.php b/lang/russian-windows-1251.inc.php
index 5a21f7e7c7..efe8fe4e33 100644
--- a/lang/russian-windows-1251.inc.php
+++ b/lang/russian-windows-1251.inc.php
@@ -1048,4 +1048,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php
index 0f7227b235..a126bc402c 100644
--- a/lang/serbian_cyrillic-utf-8.inc.php
+++ b/lang/serbian_cyrillic-utf-8.inc.php
@@ -1050,4 +1050,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/serbian_cyrillic-windows-1251.inc.php b/lang/serbian_cyrillic-windows-1251.inc.php
index 893ffac49f..df7cc215a7 100644
--- a/lang/serbian_cyrillic-windows-1251.inc.php
+++ b/lang/serbian_cyrillic-windows-1251.inc.php
@@ -1049,4 +1049,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php
index 4b9c05e525..4974aed716 100644
--- a/lang/serbian_latin-utf-8.inc.php
+++ b/lang/serbian_latin-utf-8.inc.php
@@ -1050,4 +1050,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/serbian_latin-windows-1250.inc.php b/lang/serbian_latin-windows-1250.inc.php
index 64097f21bd..d21e31e323 100644
--- a/lang/serbian_latin-windows-1250.inc.php
+++ b/lang/serbian_latin-windows-1250.inc.php
@@ -1049,4 +1049,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/slovak-iso-8859-2.inc.php b/lang/slovak-iso-8859-2.inc.php
index 81da2a6240..5d08890329 100644
--- a/lang/slovak-iso-8859-2.inc.php
+++ b/lang/slovak-iso-8859-2.inc.php
@@ -1028,4 +1028,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php
index fc5a5cf728..b4767aaed3 100644
--- a/lang/slovak-utf-8.inc.php
+++ b/lang/slovak-utf-8.inc.php
@@ -1029,4 +1029,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/slovak-windows-1250.inc.php b/lang/slovak-windows-1250.inc.php
index f6e949c773..f35afada75 100644
--- a/lang/slovak-windows-1250.inc.php
+++ b/lang/slovak-windows-1250.inc.php
@@ -1028,4 +1028,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/slovenian-iso-8859-2.inc.php b/lang/slovenian-iso-8859-2.inc.php
index e7e73dcdea..2c5ebc93e0 100644
--- a/lang/slovenian-iso-8859-2.inc.php
+++ b/lang/slovenian-iso-8859-2.inc.php
@@ -1047,4 +1047,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php
index eec4c0e2af..d2a275bc9a 100644
--- a/lang/slovenian-utf-8.inc.php
+++ b/lang/slovenian-utf-8.inc.php
@@ -1048,4 +1048,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/slovenian-windows-1250.inc.php b/lang/slovenian-windows-1250.inc.php
index 712cda100d..f9f5b45d66 100644
--- a/lang/slovenian-windows-1250.inc.php
+++ b/lang/slovenian-windows-1250.inc.php
@@ -1047,4 +1047,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/spanish-iso-8859-1.inc.php b/lang/spanish-iso-8859-1.inc.php
index 76a2ba5c06..7102103cb0 100644
--- a/lang/spanish-iso-8859-1.inc.php
+++ b/lang/spanish-iso-8859-1.inc.php
@@ -51,6 +51,7 @@ $strAlterOrderBy = 'Modificar el ORDER BY de la tabla';
$strAnalyzeTable = 'Analizar la tabla';
$strAndThen = 'y luego';
$strAnd = 'y luego';
+$strAngularLinks = 'Enlaces angulares';
$strAnIndex = 'Se aadi un ndice en %s';
$strAny = 'cualquiera';
$strAnyHost = 'Cualquier servidor';
@@ -103,6 +104,7 @@ $strBzError = 'Si desea usar las opciones de compresin Bz2, deber actualizar s
$strBzip = '"Comprimido con bzip"';
$strCalendar = 'Calendario';
+$strCancel = 'Cancelar';
$strCanNotLoadExportPlugins = 'No se cargaron los plugins de exportacin. Por favor, revise su instalacin!';
$strCanNotLoadImportPlugins = 'No se pudieron cargar los plugins de importacin, por favor revise su instalacin';
$strCannotLogin = 'El servidor MySQL no autoriz su ingreso';
@@ -166,6 +168,8 @@ $strCreateNewDatabase = 'Crear nueva base de datos';
$strCreateNewTable = 'Crear nueva tabla en la base de datos %s';
$strCreatePage = 'Crear una nueva pgina';
$strCreatePdfFeat = 'Creacin de los PDF';
+$strCreateRelation = 'Crear relacin';
+$strCreateTable = 'Crear tabla';
$strCreateUserDatabase = 'Base de datos para el usuario';
$strCreateUserDatabaseName = 'Crear base de datos con el mismo nombre y otorgue todos los privilegios';
$strCreateUserDatabaseNone = 'Ninguna';
@@ -198,6 +202,7 @@ $strDataOnly = 'Solamente datos';
$strDataPages = 'Pginas que contienen datos';
$strDBComment = 'Comentario de la base de datos: ';
$strDBCopy = 'Copiar la base de datos a';
+$strDbIsEmpty = 'La base de datos, parece estar vaca!';
$strDbPrivileges = 'Privilegios especficos para la base de datos';
$strDBRename = 'Cambiar el nombre de la base de datos a';
$strDbSpecific = 'especfico para la base de datos';
@@ -212,12 +217,16 @@ $strDelete = 'Borrar';
$strDeleted = 'La fila se ha borrado';
$strDeletedRows = 'Filas borradas: ';
$strDeleteNoUsersSelected = 'No se han seleccionado usuarios para eliminar!';
+$strDeleteRelation = 'Eliminar la relacin';
$strDeleting = 'Borrando %s';
$strDelimiter = 'Delimitador';
$strDelOld = 'La pgina actual tiene referencias a tablas que ya no existen. Desea eliminar esas referencias?';
$strDescending = 'Descendente';
$strDescription = 'Descripcin';
+$strDesigner = 'Diseador';
+$strDesignerHelpDisplayField = 'El campo Display se halla en color rosado. Para activar o desactivar un campo como un campo Display, d clic en el cono "Seleccione el campo a mostrar", luego d clic en el nombre apropiado del campo.';
$strDictionary = 'diccionario';
+$strDirectLinks = 'Enlaces directos';
$strDirtyPages = 'Pginas que requieren ser depuradas';
$strDisabled = 'Deshabilitado';
$strDisableForeignChecks = 'Deshabilitar la revisin de las llaves extranjeras (foreign keys)';
@@ -225,6 +234,8 @@ $strDisplayFeat = 'Mostrar las opciones'; //Features = opciones, componentes?
$strDisplayOrder = 'Mostrar en este orden:';
$strDisplayPDF = 'Mostrar esquema PDF';
$strDoAQuery = 'Hacer una consulta (comodn: "%")';
+$strDocSQL = 'DocSQL';
+$strDocSQLOptions = 'Opciones DocSQL';
$strDocu = 'Documentacin';
$strDoYouReally = 'Realmente desea ';
$strDropDatabaseStrongWarning = 'Est a punto de DESTRUIR una base de datos completa!';
@@ -254,7 +265,10 @@ $strEnglish = 'Ingls';
$strEnglishPrivileges = ' Nota: Los nombres de los privilegios de MySQL estn expresados en ingls ';
$strError = 'Error';
$strErrorInZipFile = 'Error en el archivo ZIP:';
+$strErrorRelationAdded = 'Error: no se aadi la relacin.';
+$strErrorRelationExists = 'Error: la relacin ya existe.';
$strErrorRenamingTable = 'Error al cambiar el nombre de la tabla %1$s a %2$s';
+$strErrorSaveTable = 'Error guardando las coordenadas para el Diseador.';
$strEscapeWildcards = 'Los comodines _ y % deben acompaarse de \ para usarlos de manera literal';
$strEsperanto = 'Esperanto';
$strEstonian = 'Estonio';
@@ -263,6 +277,7 @@ $strExcelOptions = 'Opciones de Excel';
$strExecuteBookmarked = 'Ejecute la consulta marcada previamente';
$strExplain = 'Explicar el SQL';
$strExport = 'Exportar';
+$strExportImportToScale = 'Exporte/Importe a escala';
$strExportMustBeFile = 'El formato de exportacin seleccionado debe grabarse en el archivo!';
$strExtendedInserts = 'INSERTs extendidos';
$strExtra = 'Extra';
@@ -290,6 +305,7 @@ $strFlushQueryCache = 'Vaciar el cache de consultas';
$strFlushTables = 'Vaciar el cache de todas las tablas';
$strFlushTable = 'Vaciar el cach de la tabla ("FLUSH")';
$strFontSize = 'Tamao del font';
+$strForeignKeyError = 'Error creando llaves extranjeras (foreign keys). Revise los tipos de datos';
$strFormat = 'Formato';
$strFormEmpty = 'Falta un valor en el formulario!';
$strFreePages = 'Pginas libres';
@@ -317,7 +333,11 @@ $strHasBeenAltered = 'fue modificada.';
$strHasBeenCreated = 'se cre.';
$strHaveToShow = 'Debe elegir al menos una columna para mostrar';
$strHebrew = 'Hebreo';
+$strHelp = 'Ayuda';
$strHexForBinary = 'Usar hexadecimal para campos binarios';
+$strHide = 'Ocultar';
+$strHideShowAll = 'Ocultar/mostrar todo';
+$strHideShowNoRelation = 'Ocultar/mostrar Tablas que no tengan relacin';
$strHomepageOfficial = 'Pgina oficial de phpMyAdmin';
$strHome = 'Pgina de inicio';
$strHostEmpty = 'El nombre del servidor est vaco!!';
@@ -331,9 +351,11 @@ $strHungarian = 'Hngaro';
$strIcelandic = 'Islands';
$strId = 'Identificacin';
$strIdxFulltext = 'Texto completo';
+$strIEUnsupported = 'Internet Explorer no reconoce esa funcin.';
$strIgnoreDuplicates = 'Ignore las filas duplicadas';
$strIgnore = 'Ignorar';
$strIgnoreInserts = 'Usar la opcin ignore inserts';
+$strImportExportCoords = 'Importar/Exportar coordenadas para el esquema PDF';
$strImportFiles = 'Importar archivos';
$strImportFormat = 'Formato del archivo importado';
$strImport = 'Importar';
@@ -355,6 +377,7 @@ $strInnoDBDataFilePath = 'Archivos de datos';
$strInnoDBDataHomeDirDesc = 'La parte constante de la ruta del directorio para todos los archivos de datos InnoDB.';
$strInnoDBDataHomeDir = 'Directorio raz de los datos';
$strInnoDBPages = 'pginas';
+$strInnoDBRelationAdded = 'Se aadi la relacin InnoDB';
$strInnodbStat = 'Estado del InnoDB';
$strInsecureMySQL = 'Su archivo de configuracin contiene parmetros (root sin contrasea) que corresponden a la cuenta privilegiada predeterminada de MySQL. Su servidor de MySQL est usando estos valores, lo que constituye una vulnerabilidad. Se le recomienda corregir esta brecha de seguridad. Por ejemplo, desde la pgina de inicio de phpMyAdmin seleccione Privilegios y agregue la contrasea a root@localhost. Deber escribir la misma contrasea en config.inc.php de phpMyAdmin';
$strInsertAsNewRow = 'Insertar como una nueva fila';
@@ -362,6 +385,7 @@ $strInsertedRowId = 'Se insert la ID de la fila:';
$strInsertedRows = 'Filas insertadas:';
$strInsert = 'Insertar';
$strInternalNotNecessary = '* No es necesaria una relacin interna cuando tambin existe en InnoDB.';
+$strInternalRelationAdded = 'Se aadi la relacin interna';
$strInternalRelations = 'Relaciones internas';
$strInUse = 'en uso';
$strInvalidAuthMethod = 'El mtodo de autenticacin no es vlido en la configuracin actual:';
@@ -389,6 +413,7 @@ $strKeepPass = 'No cambiar la contrasea';
$strKeyCache = 'Cache principal';
$strKeyname = 'Nombre de la clave';
$strKill = 'Matar el proceso';
+$strKnownExternalBug = 'La funcionalidad %s est afectada por un fallo conocido, vea %s';
$strKorean = 'Coreano';
$strLandscape = 'Orientacin horizontal';
@@ -444,6 +469,7 @@ $strMIME_without = 'MIME-types impresos en itlicas no tienen una funcin de tra
$strModifications = 'Se han guardado las modificaciones';
$strModifyIndexTopic = 'Modificar un ndice';
$strModify = 'Modificar';
+$strMoveMenu = 'Mover el Men';
$strMoveTable = 'Mover tabla a (Base de datos<b>.</b>tabla):';
$strMoveTableOK = 'La tabla %s ha sido movida a %s.';
$strMoveTableSameNames = 'No es posible mover la tabla a la misma!';
@@ -502,6 +528,7 @@ $strNoUsersFound = 'Usuario(s) no encontrado(s).';
$strNoValidateSQL = 'Salir de la validacin del SQL';
$strNull = 'Nulo';
$strNumberOfFields = 'Nmero de campos';
+$strNumberOfTables = 'Nmero de tablas';
$strNumSearchResultsInTable = '%s resultado(s) en la tabla <i>%s</i>';
$strNumSearchResultsTotal = '<b>Total:</b> <i>%s</i> resultado(s)';
$strNumTables = 'Tablas';
@@ -544,8 +571,10 @@ $strPhoneBook = 'directorio telefnico';
$strPHP40203 = 'Usted est usando PHP 4.2.3, el cual tiene un error de codificacin en cuanto a las "cadenas de caracteres multi-byte" (mbstring). Lea el reporte 19404 de PHP. No se recomienda el uso de phpMyAdmin con esta versin de PHP.';
$strPhp = 'Crear cdigo PHP';
$strPHPVersion = 'Versin de PHP';
+$strPleaseSelectPrimaryOrUniqueKey = 'Por favor, seleccione la clave primaria o una clave nica';
$strPmaDocumentation = 'Documentacin de phpMyAdmin';
$strPmaUriError = 'El contenido de <tt>$cfg[\'PmaAbsoluteUri\']</tt> DEBE constar en config.inc.php!';
+$strPmaWiki = 'Wiki del phpMyAdmin';
$strPolish = 'Polaco';
$strPortrait = 'Orientacin vertical';
$strPos1 = 'Empezar';
@@ -616,14 +645,17 @@ $strQueryWindowLock = 'No sobreescribir esta consulta desde fuera de la ventana'
$strReadRequests = 'Lea las solicitudes';
$strReceived = 'Recibido';
+$strRecommended = 'recomendado';
$strRecords = 'Registros';
$strReferentialIntegrity = 'Comprobar la integridad referencial:';
$strRefresh = 'Actualizar';
$strRelationalSchema = 'Esquema relacionado';
+$strRelationDeleted = 'La relacin fue eliminada';
$strRelationNotWorking = 'Las opciones adicionales para trabajar con tablas vinculadas fueron desactivadas. Para saber porqu, d clic %saqu%s.'; //Features = opciones, componentes?
$strRelationsForTable = 'RELACIONES PARA LA TABLA';
$strRelations = 'Relaciones';
$strRelationView = 'Vista de relaciones';
+$strReload = 'Cargar nuevamente';
$strReloadingThePrivileges = 'Cargando los privilegios nuevamente';
$strReloadPrivileges = 'Cargar los privilegios nuevamente';
$strRemoveSelectedUsers = 'Eliminar a los usuarios seleccionados';
@@ -659,6 +691,7 @@ $strRussian = 'Ruso';
$strSave = 'Grabar';
$strSaveOnServer = 'Guardar en el servidor, en el directorio %s ';
+$strSavePosition = 'Guardar posicin';
$strScaleFactorSmall = 'El factor de la escala es demasiado pequeo para poner el esquema en una pgina';
$strSearch = 'Buscar';
$strSearchFormTitle = 'Buscar en la base de datos';
@@ -675,7 +708,9 @@ $strSelectADb = 'Seleccionar una base de datos';
$strSelectAll = 'Seleccionar todo';
$strSelectBinaryLog = 'Seleccionar el log binario que desea examinar';
$strSelectFields = 'Seleccionar campos (al menos uno):';
+$strSelectForeignKey = 'Seleccione la llave extranjera (foreign key)';
$strSelectNumRows = 'en la consulta';
+$strSelectReferencedKey = 'Seleccione la llave de referencia';
$strSelectTables = 'Seleccionar tablas';
$strSend = 'Enviar (genera un archivo descargable)';
$strSent = 'Enviado';
@@ -697,8 +732,11 @@ $strShowColor = 'Mostrar color';
$strShowDatadictAs = 'Formato del Diccionario de Datos';
$strShowFullQueries = 'Mostrar las consultas enteras';
$strShowGrid = 'Mostrar la cuadrcula';
+$strShowHideLeftMenu = 'Ocultar/mostrar men izquierdo';
$strShowingBookmark = 'Mostrando el favorito';
+$strShowingPhp = 'Mostrar como cdigo PHP';
$strShowingRecords = 'Mostrando registros ';
+$strShowingSQL = 'Mostrando la consulta SQL';
$strShow = 'Mostrar';
$strShowOpenTables = 'Mostrar las tablas que estn abiertas';
$strShowPHPInfo = 'Mostrar la informacin de PHP';
@@ -820,6 +858,8 @@ $strSize = 'Tamao';
$strSkipQueries = 'Nmero de registros (consultas) a saltarse desde el inicio';
$strSlovak = 'Eslovaco';
$strSlovenian = 'Esloveno';
+$strSmallBigAll = 'Pequeo/grande todos';
+$strSnapToGrid = 'Cuadrcula magntica';
$strSocketProblem = '(o el socket del servidor MySQL local no est configurado correctamente)';
$strSortByKey = 'Organizar segn la clave';
$strSorting = 'Organizando (sorting)';
@@ -839,6 +879,7 @@ $strSQL = 'SQL';
$strSQPBugInvalidIdentifer = 'El identificador no es vlido';
$strSQPBugUnclosedQuote = 'Comillas sin cerrar';
$strSQPBugUnknownPunctuation = 'Signo de puntuacin desconocido';
+$strStandInStructureForView = 'Estructura Stand-in para la vista';
$strStatCheckTime = 'ltima revisin';
$strStatCreateTime = 'Creacin';
$strStatement = 'Enunciado';
@@ -855,6 +896,7 @@ $strStrucNativeExcelOptions = 'Opciones de exportacin nativas para Excel';
$strStrucOnly = 'nicamente la estructura ';
$strStructPropose = 'Planteamiento de la estructura de tabla';
$strStructure = 'Estructura';
+$strStructureForView = 'Estructura para la vista';
$strSubmit = 'Enviar';
$strSuccess = 'Su consulta se ejecut con xito';
$strSum = 'Nmero de filas';
@@ -868,7 +910,9 @@ $strTableEmpty = 'El nombre de la tabla est vaco!';
$strTableHasBeenDropped = 'Se ha eliminado la tabla %s';
$strTableHasBeenEmptied = 'Se ha vaciado la tabla %s';
$strTableHasBeenFlushed = 'Se ha vaciado el cach de la tabla %s';
+$strTableIsEmpty = 'La tabla, parece estar vaca!';
$strTableMaintenance = 'Mantenimiento de la tabla';
+$strTableName = 'Nombre de la tabla';
$strTableOfContents = 'Tabla de contenidos';
$strTableOptions = 'Opciones de la tabla';
$strTables = '%s tabla(s)';
@@ -892,7 +936,10 @@ $strTimeoutInfo = 'Se agot el tiempo de ejecucin en la importacin previa; si
$strTimeoutNothingParsed = 'Sin embargo, en la ejecucin ms reciente no se procesaron datos. Esto usualmente significa que phpMyAdmin no ser capaz de completar esta importacin a menos que usted incremente el tiempo de ejecucin de php.';
$strTimeoutPassed = 'Se ha agotado el tiempo de ejecucin del script; si desea completar la importacin, por favor, reenve el mismo archivo y la importacin continuar.';
$strTime = 'Tiempo';
+$strToFromPage = 'pgina de/a la';
$strToggleScratchboard = 'cambiar el estado del scratchboard';
+$strToggleSmallBig = 'Alterne entre pequeo y grande';
+$strToSelectRelation = 'Para seleccionar la relacin, d clic en:';
$strTotal = 'total';
$strTotalUC = 'Total';
$strTraditionalChinese = 'Chino tradicional';
@@ -904,6 +951,7 @@ $strTransformation_application_octetstream__hex = 'Muestra los datos en represen
$strTransformation_image_jpeg__inline = 'Muestra un thumbnail que puede abrirse mediante un clic; opciones: width, height en pxeles (mantiene la proporcin original)';
$strTransformation_image_jpeg__link = 'Muestra un enlace a esta imagen (i.e., blob descarga directa).';
$strTransformation_image_png__inline = 'Ver imagen/jpeg: inline';
+$strTransformation_text_plain__dateformat = 'Toma un campo TIME, TIMESTAMP o DATETIME y lo formatea usando su formato de fechas local. La primera opcin es el offset (en horas) que se aadir al timestamp (Predeterminado: 0). La segunda opcin es un dateformat diferente de acuerdo con los parmetros disponibles para el strftime() del PHP. La tercera opcin determina si usted quiere ver la fecha local o la UTC (use strings "local" o "utc") para eso. Segn eso, el formato de la fecha tendr un valor diferente - para "local" mire la documentacin para la funcin strftime() del PHP y para "utc" se hace usando la funcin gmdate().';
$strTransformation_text_plain__external = 'LINUX SOLAMENTE: Ejecuta una aplicacin externa y alimenta el fielddata mediante input estndar. Retorna el output estndar de la aplicacin. El predeterminado es Tidy, para mostrar cdigo HTML agradable para la impresin. Por razones de seguridad, debe editar manualmente el archivo libraries/transformations/text_plain__external.inc.php e insertar las herramientas que permitir se ejecuten. La primera opcin ser el nmero del programa que querr utilizar y la segunda opcin son los parmetros para el programa. El tercer parmetro, de ser 1 convertir el output usando htmlspecialchars() (el predeterminado es 1). Un cuarto parmetro, de ser 1 pondr un NOWRAP a la celda de contenido para que todo el output se muestre sin reformatear (Predeterminado 1)';
$strTransformation_text_plain__formatted = 'Mantiene el formato original del campo. No se puede hacer Escape.';
$strTransformation_text_plain__imagelink = 'Muestra una imagen y un enlace, el campo contiene el nombre del archivo; la primera opcin es un prefijo como "http://dominio.com/", la segunda opcin es el ancho en pxeles, el tercero es el alto.';
@@ -975,66 +1023,14 @@ $strYes = 'S';
$strZeroRemovesTheLimit = 'Nota: si cambia los parmetros de estas opciones a 0 (cero), remueve el lmite.';
$strZip = '"comprimido con zip"';
-// To translate:
-$strAngularLinks = 'Angular links'; //to translate
-
-$strCancel = 'Cancel'; //to translate
-$strCreateRelation = 'Create relation'; //to translate
-$strCreateTable = 'Create table'; //to translate
-
-$strDbIsEmpty = 'Database seems to be empty!'; //to translate
-$strDeleteRelation = 'Delete relation'; //to translate
-$strDesigner = 'Designer'; //to translate
-$strDirectLinks = 'Direct links'; //to translate
-$strDocSQL = 'DocSQL'; //to translate
-$strDocSQLOptions = 'DocSQL options'; //to translate
-
-$strExportImportToScale = 'Export/Import to scale'; //to translate
-
-$strForeignKeyError = 'Error creating foreign key (check data types)'; //to translate
-
-$strHelp = 'Help'; //to translate
-$strHide = 'Hide'; //to translate
-$strHideShowAll = 'Hide/Show all'; //to translate
-$strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate
-
-$strImportExportCoords = 'Import/Export coordinates for PDF schema'; //to translate
-$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate
-$strInternalRelationAdded = 'Internal relation added'; //to translate
-
-$strMoveMenu = 'Move Menu'; //to translate
-
-$strNumberOfTables = 'Number of tables'; //to translate
-
-$strPleaseSelectPrimaryOrUniqueKey = 'Please select the primary key or a unique key'; //to translate
-$strPmaWiki = 'phpMyAdmin wiki'; //to translate
-
-$strRecommended = 'recommended'; //to translate
-$strRelationDeleted = 'Relation deleted'; //to translate
-$strReload = 'Reload'; //to translate
-
-$strSavePosition = 'Save position'; //to translate
-$strSelectForeignKey = 'Select Foreign Key'; //to translate
-$strSelectReferencedKey = 'Select referenced key'; //to translate
-$strShowHideLeftMenu = 'Show/Hide left menu'; //to translate
-$strShowingPhp = 'Showing as PHP code'; //to translate
-$strShowingSQL = 'Showing SQL query'; //to translate
-$strSmallBigAll = 'Small/Big All'; //to translate
-
-$strTableIsEmpty = 'Table seems to be empty!'; //to translate
-$strTableName = 'Table name'; //to translate
-$strToFromPage = 'to/from page'; //to translate
-$strToSelectRelation = 'To select relation, click :'; //to translate
-$strTransformation_text_plain__dateformat = 'Toma un campo TIME, TIMESTAMP o DATETIME y lo formatea usando su formato de fechas local. La primera opcin es el offset (en horas) que se aadir al timestamp (Predeterminado: 0). La segunda opcin es un dateformat diferente de acuerdo con los parmetros disponibles para el strftime() del PHP. 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.'; //to translate
-
-$strKnownExternalBug = 'The %s functionality is affected by a known bug, see %s'; //to translate
-$strStructureForView = 'Structure for view'; //to translate
-$strStandInStructureForView = 'Stand-in structure for view'; //to translate
-$strToggleSmallBig = 'Toggle small/big'; //to translate
-$strIEUnsupported = 'Internet Explorer does not support this function.'; //to translate
-$strErrorRelationAdded = 'Error: Relation not added.'; //to translate
-$strErrorRelationExists = 'Error: relation already exists.'; //to translate
-$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
-$strSnapToGrid = 'Snap to grid'; //to translate
-$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/spanish-iso-8859-15.inc.php b/lang/spanish-iso-8859-15.inc.php
index 6fba9a703e..3332716802 100644
--- a/lang/spanish-iso-8859-15.inc.php
+++ b/lang/spanish-iso-8859-15.inc.php
@@ -51,6 +51,7 @@ $strAlterOrderBy = 'Modificar el ORDER BY de la tabla';
$strAnalyzeTable = 'Analizar la tabla';
$strAndThen = 'y luego';
$strAnd = 'y luego';
+$strAngularLinks = 'Enlaces angulares';
$strAnIndex = 'Se aadi un ndice en %s';
$strAny = 'cualquiera';
$strAnyHost = 'Cualquier servidor';
@@ -103,6 +104,7 @@ $strBzError = 'Si desea usar las opciones de compresin Bz2, deber actualizar s
$strBzip = '"Comprimido con bzip"';
$strCalendar = 'Calendario';
+$strCancel = 'Cancelar';
$strCanNotLoadExportPlugins = 'No se cargaron los plugins de exportacin. Por favor, revise su instalacin!';
$strCanNotLoadImportPlugins = 'No se pudieron cargar los plugins de importacin, por favor revise su instalacin';
$strCannotLogin = 'El servidor MySQL no autoriz su ingreso';
@@ -166,6 +168,8 @@ $strCreateNewDatabase = 'Crear nueva base de datos';
$strCreateNewTable = 'Crear nueva tabla en la base de datos %s';
$strCreatePage = 'Crear una nueva pgina';
$strCreatePdfFeat = 'Creacin de los PDF';
+$strCreateRelation = 'Crear relacin';
+$strCreateTable = 'Crear tabla';
$strCreateUserDatabase = 'Base de datos para el usuario';
$strCreateUserDatabaseName = 'Crear base de datos con el mismo nombre y otorgue todos los privilegios';
$strCreateUserDatabaseNone = 'Ninguna';
@@ -198,6 +202,7 @@ $strDataOnly = 'Solamente datos';
$strDataPages = 'Pginas que contienen datos';
$strDBComment = 'Comentario de la base de datos: ';
$strDBCopy = 'Copiar la base de datos a';
+$strDbIsEmpty = 'La base de datos, parece estar vaca!';
$strDbPrivileges = 'Privilegios especficos para la base de datos';
$strDBRename = 'Cambiar el nombre de la base de datos a';
$strDbSpecific = 'especfico para la base de datos';
@@ -212,12 +217,16 @@ $strDelete = 'Borrar';
$strDeleted = 'La fila se ha borrado';
$strDeletedRows = 'Filas borradas: ';
$strDeleteNoUsersSelected = 'No se han seleccionado usuarios para eliminar!';
+$strDeleteRelation = 'Eliminar la relacin';
$strDeleting = 'Borrando %s';
$strDelimiter = 'Delimitador';
$strDelOld = 'La pgina actual tiene referencias a tablas que ya no existen. Desea eliminar esas referencias?';
$strDescending = 'Descendente';
$strDescription = 'Descripcin';
+$strDesigner = 'Diseador';
+$strDesignerHelpDisplayField = 'El campo Display se halla en color rosado. Para activar o desactivar un campo como un campo Display, d clic en el cono "Seleccione el campo a mostrar", luego d clic en el nombre apropiado del campo.';
$strDictionary = 'diccionario';
+$strDirectLinks = 'Enlaces directos';
$strDirtyPages = 'Pginas que requieren ser depuradas';
$strDisabled = 'Deshabilitado';
$strDisableForeignChecks = 'Deshabilitar la revisin de las llaves extranjeras (foreign keys)';
@@ -225,6 +234,8 @@ $strDisplayFeat = 'Mostrar las opciones'; //Features = opciones, componentes?
$strDisplayOrder = 'Mostrar en este orden:';
$strDisplayPDF = 'Mostrar esquema PDF';
$strDoAQuery = 'Hacer una consulta (comodn: "%")';
+$strDocSQL = 'DocSQL';
+$strDocSQLOptions = 'Opciones DocSQL';
$strDocu = 'Documentacin';
$strDoYouReally = 'Realmente desea ';
$strDropDatabaseStrongWarning = 'Est a punto de DESTRUIR una base de datos completa!';
@@ -254,7 +265,10 @@ $strEnglish = 'Ingls';
$strEnglishPrivileges = ' Nota: Los nombres de los privilegios de MySQL estn expresados en ingls ';
$strError = 'Error';
$strErrorInZipFile = 'Error en el archivo ZIP:';
+$strErrorRelationAdded = 'Error: no se aadi la relacin.';
+$strErrorRelationExists = 'Error: la relacin ya existe.';
$strErrorRenamingTable = 'Error al cambiar el nombre de la tabla %1$s a %2$s';
+$strErrorSaveTable = 'Error guardando las coordenadas para el Diseador.';
$strEscapeWildcards = 'Los comodines _ y % deben acompaarse de \ para usarlos de manera literal';
$strEsperanto = 'Esperanto';
$strEstonian = 'Estonio';
@@ -263,6 +277,7 @@ $strExcelOptions = 'Opciones de Excel';
$strExecuteBookmarked = 'Ejecute la consulta marcada previamente';
$strExplain = 'Explicar el SQL';
$strExport = 'Exportar';
+$strExportImportToScale = 'Exporte/Importe a escala';
$strExportMustBeFile = 'El formato de exportacin seleccionado debe grabarse en el archivo!';
$strExtendedInserts = 'INSERTs extendidos';
$strExtra = 'Extra';
@@ -290,6 +305,7 @@ $strFlushQueryCache = 'Vaciar el cache de consultas';
$strFlushTables = 'Vaciar el cache de todas las tablas';
$strFlushTable = 'Vaciar el cach de la tabla ("FLUSH")';
$strFontSize = 'Tamao del font';
+$strForeignKeyError = 'Error creando llaves extranjeras (foreign keys). Revise los tipos de datos';
$strFormat = 'Formato';
$strFormEmpty = 'Falta un valor en el formulario!';
$strFreePages = 'Pginas libres';
@@ -317,7 +333,11 @@ $strHasBeenAltered = 'fue modificada.';
$strHasBeenCreated = 'se cre.';
$strHaveToShow = 'Debe elegir al menos una columna para mostrar';
$strHebrew = 'Hebreo';
+$strHelp = 'Ayuda';
$strHexForBinary = 'Usar hexadecimal para campos binarios';
+$strHide = 'Ocultar';
+$strHideShowAll = 'Ocultar/mostrar todo';
+$strHideShowNoRelation = 'Ocultar/mostrar Tablas que no tengan relacin';
$strHomepageOfficial = 'Pgina oficial de phpMyAdmin';
$strHome = 'Pgina de inicio';
$strHostEmpty = 'El nombre del servidor est vaco!!';
@@ -331,9 +351,11 @@ $strHungarian = 'Hngaro';
$strIcelandic = 'Islands';
$strId = 'Identificacin';
$strIdxFulltext = 'Texto completo';
+$strIEUnsupported = 'Internet Explorer no reconoce esa funcin.';
$strIgnoreDuplicates = 'Ignore las filas duplicadas';
$strIgnore = 'Ignorar';
$strIgnoreInserts = 'Usar la opcin ignore inserts';
+$strImportExportCoords = 'Importar/Exportar coordenadas para el esquema PDF';
$strImportFiles = 'Importar archivos';
$strImportFormat = 'Formato del archivo importado';
$strImport = 'Importar';
@@ -355,6 +377,7 @@ $strInnoDBDataFilePath = 'Archivos de datos';
$strInnoDBDataHomeDirDesc = 'La parte constante de la ruta del directorio para todos los archivos de datos InnoDB.';
$strInnoDBDataHomeDir = 'Directorio raz de los datos';
$strInnoDBPages = 'pginas';
+$strInnoDBRelationAdded = 'Se aadi la relacin InnoDB';
$strInnodbStat = 'Estado del InnoDB';
$strInsecureMySQL = 'Su archivo de configuracin contiene parmetros (root sin contrasea) que corresponden a la cuenta privilegiada predeterminada de MySQL. Su servidor de MySQL est usando estos valores, lo que constituye una vulnerabilidad. Se le recomienda corregir esta brecha de seguridad. Por ejemplo, desde la pgina de inicio de phpMyAdmin seleccione Privilegios y agregue la contrasea a root@localhost. Deber escribir la misma contrasea en config.inc.php de phpMyAdmin';
$strInsertAsNewRow = 'Insertar como una nueva fila';
@@ -362,6 +385,7 @@ $strInsertedRowId = 'Se insert la ID de la fila:';
$strInsertedRows = 'Filas insertadas:';
$strInsert = 'Insertar';
$strInternalNotNecessary = '* No es necesaria una relacin interna cuando tambin existe en InnoDB.';
+$strInternalRelationAdded = 'Se aadi la relacin interna';
$strInternalRelations = 'Relaciones internas';
$strInUse = 'en uso';
$strInvalidAuthMethod = 'El mtodo de autenticacin no es vlido en la configuracin actual:';
@@ -389,6 +413,7 @@ $strKeepPass = 'No cambiar la contrasea';
$strKeyCache = 'Cache principal';
$strKeyname = 'Nombre de la clave';
$strKill = 'Matar el proceso';
+$strKnownExternalBug = 'La funcionalidad %s est afectada por un fallo conocido, vea %s';
$strKorean = 'Coreano';
$strLandscape = 'Orientacin horizontal';
@@ -444,6 +469,7 @@ $strMIME_without = 'MIME-types impresos en itlicas no tienen una funcin de tra
$strModifications = 'Se han guardado las modificaciones';
$strModifyIndexTopic = 'Modificar un ndice';
$strModify = 'Modificar';
+$strMoveMenu = 'Mover el Men';
$strMoveTable = 'Mover tabla a (Base de datos<b>.</b>tabla):';
$strMoveTableOK = 'La tabla %s ha sido movida a %s.';
$strMoveTableSameNames = 'No es posible mover la tabla a la misma!';
@@ -502,6 +528,7 @@ $strNoUsersFound = 'Usuario(s) no encontrado(s).';
$strNoValidateSQL = 'Salir de la validacin del SQL';
$strNull = 'Nulo';
$strNumberOfFields = 'Nmero de campos';
+$strNumberOfTables = 'Nmero de tablas';
$strNumSearchResultsInTable = '%s resultado(s) en la tabla <i>%s</i>';
$strNumSearchResultsTotal = '<b>Total:</b> <i>%s</i> resultado(s)';
$strNumTables = 'Tablas';
@@ -544,8 +571,10 @@ $strPhoneBook = 'directorio telefnico';
$strPHP40203 = 'Usted est usando PHP 4.2.3, el cual tiene un error de codificacin en cuanto a las "cadenas de caracteres multi-byte" (mbstring). Lea el reporte 19404 de PHP. No se recomienda el uso de phpMyAdmin con esta versin de PHP.';
$strPhp = 'Crear cdigo PHP';
$strPHPVersion = 'Versin de PHP';
+$strPleaseSelectPrimaryOrUniqueKey = 'Por favor, seleccione la clave primaria o una clave nica';
$strPmaDocumentation = 'Documentacin de phpMyAdmin';
$strPmaUriError = 'El contenido de <tt>$cfg[\'PmaAbsoluteUri\']</tt> DEBE constar en config.inc.php!';
+$strPmaWiki = 'Wiki del phpMyAdmin';
$strPolish = 'Polaco';
$strPortrait = 'Orientacin vertical';
$strPos1 = 'Empezar';
@@ -616,14 +645,17 @@ $strQueryWindowLock = 'No sobreescribir esta consulta desde fuera de la ventana'
$strReadRequests = 'Lea las solicitudes';
$strReceived = 'Recibido';
+$strRecommended = 'recomendado';
$strRecords = 'Registros';
$strReferentialIntegrity = 'Comprobar la integridad referencial:';
$strRefresh = 'Actualizar';
$strRelationalSchema = 'Esquema relacionado';
+$strRelationDeleted = 'La relacin fue eliminada';
$strRelationNotWorking = 'Las opciones adicionales para trabajar con tablas vinculadas fueron desactivadas. Para saber porqu, d clic %saqu%s.'; //Features = opciones, componentes?
$strRelationsForTable = 'RELACIONES PARA LA TABLA';
$strRelations = 'Relaciones';
$strRelationView = 'Vista de relaciones';
+$strReload = 'Cargar nuevamente';
$strReloadingThePrivileges = 'Cargando los privilegios nuevamente';
$strReloadPrivileges = 'Cargar los privilegios nuevamente';
$strRemoveSelectedUsers = 'Eliminar a los usuarios seleccionados';
@@ -659,6 +691,7 @@ $strRussian = 'Ruso';
$strSave = 'Grabar';
$strSaveOnServer = 'Guardar en el servidor, en el directorio %s ';
+$strSavePosition = 'Guardar posicin';
$strScaleFactorSmall = 'El factor de la escala es demasiado pequeo para poner el esquema en una pgina';
$strSearch = 'Buscar';
$strSearchFormTitle = 'Buscar en la base de datos';
@@ -675,7 +708,9 @@ $strSelectADb = 'Seleccionar una base de datos';
$strSelectAll = 'Seleccionar todo';
$strSelectBinaryLog = 'Seleccionar el log binario que desea examinar';
$strSelectFields = 'Seleccionar campos (al menos uno):';
+$strSelectForeignKey = 'Seleccione la llave extranjera (foreign key)';
$strSelectNumRows = 'en la consulta';
+$strSelectReferencedKey = 'Seleccione la llave de referencia';
$strSelectTables = 'Seleccionar tablas';
$strSend = 'Enviar (genera un archivo descargable)';
$strSent = 'Enviado';
@@ -697,8 +732,11 @@ $strShowColor = 'Mostrar color';
$strShowDatadictAs = 'Formato del Diccionario de Datos';
$strShowFullQueries = 'Mostrar las consultas enteras';
$strShowGrid = 'Mostrar la cuadrcula';
+$strShowHideLeftMenu = 'Ocultar/mostrar men izquierdo';
$strShowingBookmark = 'Mostrando el favorito';
+$strShowingPhp = 'Mostrar como cdigo PHP';
$strShowingRecords = 'Mostrando registros ';
+$strShowingSQL = 'Mostrando la consulta SQL';
$strShow = 'Mostrar';
$strShowOpenTables = 'Mostrar las tablas que estn abiertas';
$strShowPHPInfo = 'Mostrar la informacin de PHP';
@@ -820,6 +858,8 @@ $strSize = 'Tamao';
$strSkipQueries = 'Nmero de registros (consultas) a saltarse desde el inicio';
$strSlovak = 'Eslovaco';
$strSlovenian = 'Esloveno';
+$strSmallBigAll = 'Pequeo/grande todos';
+$strSnapToGrid = 'Cuadrcula magntica';
$strSocketProblem = '(o el socket del servidor MySQL local no est configurado correctamente)';
$strSortByKey = 'Organizar segn la clave';
$strSorting = 'Organizando (sorting)';
@@ -839,6 +879,7 @@ $strSQL = 'SQL';
$strSQPBugInvalidIdentifer = 'El identificador no es vlido';
$strSQPBugUnclosedQuote = 'Comillas sin cerrar';
$strSQPBugUnknownPunctuation = 'Signo de puntuacin desconocido';
+$strStandInStructureForView = 'Estructura Stand-in para la vista';
$strStatCheckTime = 'ltima revisin';
$strStatCreateTime = 'Creacin';
$strStatement = 'Enunciado';
@@ -855,6 +896,7 @@ $strStrucNativeExcelOptions = 'Opciones de exportacin nativas para Excel';
$strStrucOnly = 'nicamente la estructura ';
$strStructPropose = 'Planteamiento de la estructura de tabla';
$strStructure = 'Estructura';
+$strStructureForView = 'Estructura para la vista';
$strSubmit = 'Enviar';
$strSuccess = 'Su consulta se ejecut con xito';
$strSum = 'Nmero de filas';
@@ -868,7 +910,9 @@ $strTableEmpty = 'El nombre de la tabla est vaco!';
$strTableHasBeenDropped = 'Se ha eliminado la tabla %s';
$strTableHasBeenEmptied = 'Se ha vaciado la tabla %s';
$strTableHasBeenFlushed = 'Se ha vaciado el cach de la tabla %s';
+$strTableIsEmpty = 'La tabla, parece estar vaca!';
$strTableMaintenance = 'Mantenimiento de la tabla';
+$strTableName = 'Nombre de la tabla';
$strTableOfContents = 'Tabla de contenidos';
$strTableOptions = 'Opciones de la tabla';
$strTables = '%s tabla(s)';
@@ -892,7 +936,10 @@ $strTimeoutInfo = 'Se agot el tiempo de ejecucin en la importacin previa; si
$strTimeoutNothingParsed = 'Sin embargo, en la ejecucin ms reciente no se procesaron datos. Esto usualmente significa que phpMyAdmin no ser capaz de completar esta importacin a menos que usted incremente el tiempo de ejecucin de php.';
$strTimeoutPassed = 'Se ha agotado el tiempo de ejecucin del script; si desea completar la importacin, por favor, reenve el mismo archivo y la importacin continuar.';
$strTime = 'Tiempo';
+$strToFromPage = 'pgina de/a la';
$strToggleScratchboard = 'cambiar el estado del scratchboard';
+$strToggleSmallBig = 'Alterne entre pequeo y grande';
+$strToSelectRelation = 'Para seleccionar la relacin, d clic en:';
$strTotal = 'total';
$strTotalUC = 'Total';
$strTraditionalChinese = 'Chino tradicional';
@@ -904,6 +951,7 @@ $strTransformation_application_octetstream__hex = 'Muestra los datos en represen
$strTransformation_image_jpeg__inline = 'Muestra un thumbnail que puede abrirse mediante un clic; opciones: width, height en pxeles (mantiene la proporcin original)';
$strTransformation_image_jpeg__link = 'Muestra un enlace a esta imagen (i.e., blob descarga directa).';
$strTransformation_image_png__inline = 'Ver imagen/jpeg: inline';
+$strTransformation_text_plain__dateformat = 'Toma un campo TIME, TIMESTAMP o DATETIME y lo formatea usando su formato de fechas local. La primera opcin es el offset (en horas) que se aadir al timestamp (Predeterminado: 0). La segunda opcin es un dateformat diferente de acuerdo con los parmetros disponibles para el strftime() del PHP. La tercera opcin determina si usted quiere ver la fecha local o la UTC (use strings "local" o "utc") para eso. Segn eso, el formato de la fecha tendr un valor diferente - para "local" mire la documentacin para la funcin strftime() del PHP y para "utc" se hace usando la funcin gmdate().';
$strTransformation_text_plain__external = 'LINUX SOLAMENTE: Ejecuta una aplicacin externa y alimenta el fielddata mediante input estndar. Retorna el output estndar de la aplicacin. El predeterminado es Tidy, para mostrar cdigo HTML agradable para la impresin. Por razones de seguridad, debe editar manualmente el archivo libraries/transformations/text_plain__external.inc.php e insertar las herramientas que permitir se ejecuten. La primera opcin ser el nmero del programa que querr utilizar y la segunda opcin son los parmetros para el programa. El tercer parmetro, de ser 1 convertir el output usando htmlspecialchars() (el predeterminado es 1). Un cuarto parmetro, de ser 1 pondr un NOWRAP a la celda de contenido para que todo el output se muestre sin reformatear (Predeterminado 1)';
$strTransformation_text_plain__formatted = 'Mantiene el formato original del campo. No se puede hacer Escape.';
$strTransformation_text_plain__imagelink = 'Muestra una imagen y un enlace, el campo contiene el nombre del archivo; la primera opcin es un prefijo como "http://dominio.com/", la segunda opcin es el ancho en pxeles, el tercero es el alto.';
@@ -975,66 +1023,14 @@ $strYes = 'S';
$strZeroRemovesTheLimit = 'Nota: si cambia los parmetros de estas opciones a 0 (cero), remueve el lmite.';
$strZip = '"comprimido con zip"';
-// To translate:
-$strAngularLinks = 'Angular links'; //to translate
-
-$strCancel = 'Cancel'; //to translate
-$strCreateRelation = 'Create relation'; //to translate
-$strCreateTable = 'Create table'; //to translate
-
-$strDbIsEmpty = 'Database seems to be empty!'; //to translate
-$strDeleteRelation = 'Delete relation'; //to translate
-$strDesigner = 'Designer'; //to translate
-$strDirectLinks = 'Direct links'; //to translate
-$strDocSQL = 'DocSQL'; //to translate
-$strDocSQLOptions = 'DocSQL options'; //to translate
-
-$strExportImportToScale = 'Export/Import to scale'; //to translate
-
-$strForeignKeyError = 'Error creating foreign key (check data types)'; //to translate
-
-$strHelp = 'Help'; //to translate
-$strHide = 'Hide'; //to translate
-$strHideShowAll = 'Hide/Show all'; //to translate
-$strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate
-
-$strImportExportCoords = 'Import/Export coordinates for PDF schema'; //to translate
-$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate
-$strInternalRelationAdded = 'Internal relation added'; //to translate
-
-$strMoveMenu = 'Move Menu'; //to translate
-
-$strNumberOfTables = 'Number of tables'; //to translate
-
-$strPleaseSelectPrimaryOrUniqueKey = 'Please select the primary key or a unique key'; //to translate
-$strPmaWiki = 'phpMyAdmin wiki'; //to translate
-
-$strRecommended = 'recommended'; //to translate
-$strRelationDeleted = 'Relation deleted'; //to translate
-$strReload = 'Reload'; //to translate
-
-$strSavePosition = 'Save position'; //to translate
-$strSelectForeignKey = 'Select Foreign Key'; //to translate
-$strSelectReferencedKey = 'Select referenced key'; //to translate
-$strShowHideLeftMenu = 'Show/Hide left menu'; //to translate
-$strShowingPhp = 'Showing as PHP code'; //to translate
-$strShowingSQL = 'Showing SQL query'; //to translate
-$strSmallBigAll = 'Small/Big All'; //to translate
-
-$strTableIsEmpty = 'Table seems to be empty!'; //to translate
-$strTableName = 'Table name'; //to translate
-$strToFromPage = 'to/from page'; //to translate
-$strToSelectRelation = 'To select relation, click :'; //to translate
-$strTransformation_text_plain__dateformat = 'Toma un campo TIME, TIMESTAMP o DATETIME y lo formatea usando su formato de fechas local. La primera opcin es el offset (en horas) que se aadir al timestamp (Predeterminado: 0). La segunda opcin es un dateformat diferente de acuerdo con los parmetros disponibles para el strftime() del PHP. 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.'; //to translate
-
-$strKnownExternalBug = 'The %s functionality is affected by a known bug, see %s'; //to translate
-$strStructureForView = 'Structure for view'; //to translate
-$strStandInStructureForView = 'Stand-in structure for view'; //to translate
-$strToggleSmallBig = 'Toggle small/big'; //to translate
-$strIEUnsupported = 'Internet Explorer does not support this function.'; //to translate
-$strErrorRelationAdded = 'Error: Relation not added.'; //to translate
-$strErrorRelationExists = 'Error: relation already exists.'; //to translate
-$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
-$strSnapToGrid = 'Snap to grid'; //to translate
-$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php
index 7bd34d7122..92bcc3c158 100644
--- a/lang/spanish-utf-8.inc.php
+++ b/lang/spanish-utf-8.inc.php
@@ -52,6 +52,7 @@ $strAlterOrderBy = 'Modificar el ORDER BY de la tabla';
$strAnalyzeTable = 'Analizar la tabla';
$strAndThen = 'y luego';
$strAnd = 'y luego';
+$strAngularLinks = 'Enlaces angulares';
$strAnIndex = 'Se añadió un índice en %s';
$strAny = 'cualquiera';
$strAnyHost = 'Cualquier servidor';
@@ -104,6 +105,7 @@ $strBzError = 'Si desea usar las opciones de compresión Bz2, deberá actualizar
$strBzip = '"Comprimido con bzip"';
$strCalendar = 'Calendario';
+$strCancel = 'Cancelar';
$strCanNotLoadExportPlugins = 'No se cargaron los plugins de exportación. Por favor, ¡revise su instalación!';
$strCanNotLoadImportPlugins = 'No se pudieron cargar los plugins de importación, por favor revise su instalación';
$strCannotLogin = 'El servidor MySQL no autorizó su ingreso';
@@ -167,6 +169,8 @@ $strCreateNewDatabase = 'Crear nueva base de datos';
$strCreateNewTable = 'Crear nueva tabla en la base de datos %s';
$strCreatePage = 'Crear una nueva página';
$strCreatePdfFeat = 'Creación de los PDF';
+$strCreateRelation = 'Crear relación';
+$strCreateTable = 'Crear tabla';
$strCreateUserDatabase = 'Base de datos para el usuario';
$strCreateUserDatabaseName = 'Crear base de datos con el mismo nombre y otorgue todos los privilegios';
$strCreateUserDatabaseNone = 'Ninguna';
@@ -199,6 +203,7 @@ $strDataOnly = 'Solamente datos';
$strDataPages = 'Páginas que contienen datos';
$strDBComment = 'Comentario de la base de datos: ';
$strDBCopy = 'Copiar la base de datos a';
+$strDbIsEmpty = 'La base de datos, ¡parece estar vacía!';
$strDbPrivileges = 'Privilegios específicos para la base de datos';
$strDBRename = 'Cambiar el nombre de la base de datos a';
$strDbSpecific = 'específico para la base de datos';
@@ -213,12 +218,16 @@ $strDelete = 'Borrar';
$strDeleted = 'La fila se ha borrado';
$strDeletedRows = 'Filas borradas: ';
$strDeleteNoUsersSelected = '¡No se han seleccionado usuarios para eliminar!';
+$strDeleteRelation = 'Eliminar la relación';
$strDeleting = 'Borrando %s';
$strDelimiter = 'Delimitador';
$strDelOld = 'La página actual tiene referencias a tablas que ya no existen. ¿Desea eliminar esas referencias?';
$strDescending = 'Descendente';
$strDescription = 'Descripción';
+$strDesigner = 'Diseñador';
+$strDesignerHelpDisplayField = 'El campo Display se halla en color rosado. Para activar o desactivar un campo como un campo Display, dé clic en el ícono "Seleccione el campo a mostrar", luego dé clic en el nombre apropiado del campo.';
$strDictionary = 'diccionario';
+$strDirectLinks = 'Enlaces directos';
$strDirtyPages = 'Páginas que requieren ser depuradas';
$strDisabled = 'Deshabilitado';
$strDisableForeignChecks = 'Deshabilitar la revisión de las llaves extranjeras (foreign keys)';
@@ -226,6 +235,8 @@ $strDisplayFeat = 'Mostrar las opciones'; //Features = ¿opciones, componentes?
$strDisplayOrder = 'Mostrar en este orden:';
$strDisplayPDF = 'Mostrar esquema PDF';
$strDoAQuery = 'Hacer una consulta (comodín: "%")';
+$strDocSQL = 'DocSQL';
+$strDocSQLOptions = 'Opciones DocSQL';
$strDocu = 'Documentación';
$strDoYouReally = 'Realmente desea ';
$strDropDatabaseStrongWarning = '¡Está a punto de DESTRUIR una base de datos completa!';
@@ -255,7 +266,10 @@ $strEnglish = 'Inglés';
$strEnglishPrivileges = ' Nota: Los nombres de los privilegios de MySQL están expresados en inglés ';
$strError = 'Error';
$strErrorInZipFile = 'Error en el archivo ZIP:';
+$strErrorRelationAdded = 'Error: no se añadió la relación.';
+$strErrorRelationExists = 'Error: la relación ya existe.';
$strErrorRenamingTable = 'Error al cambiar el nombre de la tabla %1$s a %2$s';
+$strErrorSaveTable = 'Error guardando las coordenadas para el Diseñador.';
$strEscapeWildcards = 'Los comodines _ y % deben acompañarse de \ para usarlos de manera literal';
$strEsperanto = 'Esperanto';
$strEstonian = 'Estonio';
@@ -264,6 +278,7 @@ $strExcelOptions = 'Opciones de Excel';
$strExecuteBookmarked = 'Ejecute la consulta marcada previamente';
$strExplain = 'Explicar el SQL';
$strExport = 'Exportar';
+$strExportImportToScale = 'Exporte/Importe a escala';
$strExportMustBeFile = 'El formato de exportación seleccionado ¡debe grabarse en el archivo!';
$strExtendedInserts = 'INSERTs extendidos';
$strExtra = 'Extra';
@@ -291,6 +306,7 @@ $strFlushQueryCache = 'Vaciar el cache de consultas';
$strFlushTables = 'Vaciar el cache de todas las tablas';
$strFlushTable = 'Vaciar el caché de la tabla ("FLUSH")';
$strFontSize = 'Tamaño del font';
+$strForeignKeyError = 'Error creando llaves extranjeras (foreign keys). Revise los tipos de datos';
$strFormat = 'Formato';
$strFormEmpty = '¡Falta un valor en el formulario!';
$strFreePages = 'Páginas libres';
@@ -318,7 +334,11 @@ $strHasBeenAltered = 'fue modificada.';
$strHasBeenCreated = 'se creó.';
$strHaveToShow = 'Debe elegir al menos una columna para mostrar';
$strHebrew = 'Hebreo';
+$strHelp = 'Ayuda';
$strHexForBinary = 'Usar hexadecimal para campos binarios';
+$strHide = 'Ocultar';
+$strHideShowAll = 'Ocultar/mostrar todo';
+$strHideShowNoRelation = 'Ocultar/mostrar Tablas que no tengan relación';
$strHomepageOfficial = 'Página oficial de phpMyAdmin';
$strHome = 'Página de inicio';
$strHostEmpty = '¡¡El nombre del servidor está vacío!!';
@@ -332,9 +352,11 @@ $strHungarian = 'Húngaro';
$strIcelandic = 'Islandés';
$strId = 'Identificación';
$strIdxFulltext = 'Texto completo';
+$strIEUnsupported = 'Internet Explorer no reconoce esa función.';
$strIgnoreDuplicates = 'Ignore las filas duplicadas';
$strIgnore = 'Ignorar';
$strIgnoreInserts = 'Usar la opción ignore inserts';
+$strImportExportCoords = 'Importar/Exportar coordenadas para el esquema PDF';
$strImportFiles = 'Importar archivos';
$strImportFormat = 'Formato del archivo importado';
$strImport = 'Importar';
@@ -356,6 +378,7 @@ $strInnoDBDataFilePath = 'Archivos de datos';
$strInnoDBDataHomeDirDesc = 'La parte constante de la ruta del directorio para todos los archivos de datos InnoDB.';
$strInnoDBDataHomeDir = 'Directorio raíz de los datos';
$strInnoDBPages = 'páginas';
+$strInnoDBRelationAdded = 'Se añadió la relación InnoDB';
$strInnodbStat = 'Estado del InnoDB';
$strInsecureMySQL = 'Su archivo de configuración contiene parámetros (root sin contraseña) que corresponden a la cuenta privilegiada predeterminada de MySQL. Su servidor de MySQL está usando estos valores, lo que constituye una vulnerabilidad. Se le recomienda corregir esta brecha de seguridad. Por ejemplo, desde la página de inicio de phpMyAdmin seleccione Privilegios y agregue la contraseña a root@localhost. Deberá escribir la misma contraseña en config.inc.php de phpMyAdmin';
$strInsertAsNewRow = 'Insertar como una nueva fila';
@@ -363,6 +386,7 @@ $strInsertedRowId = 'Se insertó la ID de la fila:';
$strInsertedRows = 'Filas insertadas:';
$strInsert = 'Insertar';
$strInternalNotNecessary = '* No es necesaria una relación interna cuando también existe en InnoDB.';
+$strInternalRelationAdded = 'Se añadió la relación interna';
$strInternalRelations = 'Relaciones internas';
$strInUse = 'en uso';
$strInvalidAuthMethod = 'El método de autenticación no es válido en la configuración actual:';
@@ -390,6 +414,7 @@ $strKeepPass = 'No cambiar la contraseña';
$strKeyCache = 'Cache principal';
$strKeyname = 'Nombre de la clave';
$strKill = 'Matar el proceso';
+$strKnownExternalBug = 'La funcionalidad %s está afectada por un fallo conocido, vea %s';
$strKorean = 'Coreano';
$strLandscape = 'Orientación horizontal';
@@ -445,6 +470,7 @@ $strMIME_without = 'MIME-types impresos en itálicas no tienen una función de t
$strModifications = 'Se han guardado las modificaciones';
$strModifyIndexTopic = 'Modificar un índice';
$strModify = 'Modificar';
+$strMoveMenu = 'Mover el Menú';
$strMoveTable = 'Mover tabla a (Base de datos<b>.</b>tabla):';
$strMoveTableOK = 'La tabla %s ha sido movida a %s.';
$strMoveTableSameNames = '¡No es posible mover la tabla a la misma!';
@@ -503,6 +529,7 @@ $strNoUsersFound = 'Usuario(s) no encontrado(s).';
$strNoValidateSQL = 'Salir de la validación del SQL';
$strNull = 'Nulo';
$strNumberOfFields = 'Número de campos';
+$strNumberOfTables = 'Número de tablas';
$strNumSearchResultsInTable = '%s resultado(s) en la tabla <i>%s</i>';
$strNumSearchResultsTotal = '<b>Total:</b> <i>%s</i> resultado(s)';
$strNumTables = 'Tablas';
@@ -545,8 +572,10 @@ $strPhoneBook = 'directorio telefónico';
$strPHP40203 = 'Usted está usando PHP 4.2.3, el cual tiene un error de codificación en cuanto a las "cadenas de caracteres multi-byte" (mbstring). Lea el reporte 19404 de PHP. No se recomienda el uso de phpMyAdmin con esta versión de PHP.';
$strPhp = 'Crear código PHP';
$strPHPVersion = 'Versión de PHP';
+$strPleaseSelectPrimaryOrUniqueKey = 'Por favor, seleccione la clave primaria o una clave única';
$strPmaDocumentation = 'Documentación de phpMyAdmin';
$strPmaUriError = 'El contenido de <tt>$cfg[\'PmaAbsoluteUri\']</tt> ¡DEBE constar en config.inc.php!';
+$strPmaWiki = 'Wiki del phpMyAdmin';
$strPolish = 'Polaco';
$strPortrait = 'Orientación vertical';
$strPos1 = 'Empezar';
@@ -617,14 +646,17 @@ $strQueryWindowLock = 'No sobreescribir esta consulta desde fuera de la ventana'
$strReadRequests = 'Lea las solicitudes';
$strReceived = 'Recibido';
+$strRecommended = 'recomendado';
$strRecords = 'Registros';
$strReferentialIntegrity = 'Comprobar la integridad referencial:';
$strRefresh = 'Actualizar';
$strRelationalSchema = 'Esquema relacionado';
+$strRelationDeleted = 'La relación fue eliminada';
$strRelationNotWorking = 'Las opciones adicionales para trabajar con tablas vinculadas fueron desactivadas. Para saber porqué, dé clic %saquí%s.'; //Features = ¿opciones, componentes?
$strRelationsForTable = 'RELACIONES PARA LA TABLA';
$strRelations = 'Relaciones';
$strRelationView = 'Vista de relaciones';
+$strReload = 'Cargar nuevamente';
$strReloadingThePrivileges = 'Cargando los privilegios nuevamente';
$strReloadPrivileges = 'Cargar los privilegios nuevamente';
$strRemoveSelectedUsers = 'Eliminar a los usuarios seleccionados';
@@ -660,6 +692,7 @@ $strRussian = 'Ruso';
$strSave = 'Grabar';
$strSaveOnServer = 'Guardar en el servidor, en el directorio %s ';
+$strSavePosition = 'Guardar posición';
$strScaleFactorSmall = 'El factor de la escala es demasiado pequeño para poner el esquema en una página';
$strSearch = 'Buscar';
$strSearchFormTitle = 'Buscar en la base de datos';
@@ -676,7 +709,9 @@ $strSelectADb = 'Seleccionar una base de datos';
$strSelectAll = 'Seleccionar todo';
$strSelectBinaryLog = 'Seleccionar el log binario que desea examinar';
$strSelectFields = 'Seleccionar campos (al menos uno):';
+$strSelectForeignKey = 'Seleccione la llave extranjera (foreign key)';
$strSelectNumRows = 'en la consulta';
+$strSelectReferencedKey = 'Seleccione la llave de referencia';
$strSelectTables = 'Seleccionar tablas';
$strSend = 'Enviar (genera un archivo descargable)';
$strSent = 'Enviado';
@@ -698,8 +733,11 @@ $strShowColor = 'Mostrar color';
$strShowDatadictAs = 'Formato del Diccionario de Datos';
$strShowFullQueries = 'Mostrar las consultas enteras';
$strShowGrid = 'Mostrar la cuadrícula';
+$strShowHideLeftMenu = 'Ocultar/mostrar menú izquierdo';
$strShowingBookmark = 'Mostrando el favorito';
+$strShowingPhp = 'Mostrar como código PHP';
$strShowingRecords = 'Mostrando registros ';
+$strShowingSQL = 'Mostrando la consulta SQL';
$strShow = 'Mostrar';
$strShowOpenTables = 'Mostrar las tablas que están abiertas';
$strShowPHPInfo = 'Mostrar la información de PHP';
@@ -821,6 +859,8 @@ $strSize = 'Tamaño';
$strSkipQueries = 'Número de registros (consultas) a saltarse desde el inicio';
$strSlovak = 'Eslovaco';
$strSlovenian = 'Esloveno';
+$strSmallBigAll = 'Pequeño/grande todos';
+$strSnapToGrid = 'Cuadrícula magnética';
$strSocketProblem = '(o el socket del servidor MySQL local no está configurado correctamente)';
$strSortByKey = 'Organizar según la clave';
$strSorting = 'Organizando (sorting)';
@@ -840,6 +880,7 @@ $strSQL = 'SQL';
$strSQPBugInvalidIdentifer = 'El identificador no es válido';
$strSQPBugUnclosedQuote = 'Comillas sin cerrar';
$strSQPBugUnknownPunctuation = 'Signo de puntuación desconocido';
+$strStandInStructureForView = 'Estructura Stand-in para la vista';
$strStatCheckTime = 'Última revisión';
$strStatCreateTime = 'Creación';
$strStatement = 'Enunciado';
@@ -856,6 +897,7 @@ $strStrucNativeExcelOptions = 'Opciones de exportación nativas para Excel';
$strStrucOnly = 'Únicamente la estructura ';
$strStructPropose = 'Planteamiento de la estructura de tabla';
$strStructure = 'Estructura';
+$strStructureForView = 'Estructura para la vista';
$strSubmit = 'Enviar';
$strSuccess = 'Su consulta se ejecutó con éxito';
$strSum = 'Número de filas';
@@ -869,7 +911,9 @@ $strTableEmpty = '¡El nombre de la tabla está vacío!';
$strTableHasBeenDropped = 'Se ha eliminado la tabla %s';
$strTableHasBeenEmptied = 'Se ha vaciado la tabla %s';
$strTableHasBeenFlushed = 'Se ha vaciado el caché de la tabla %s';
+$strTableIsEmpty = 'La tabla, ¡parece estar vacía!';
$strTableMaintenance = 'Mantenimiento de la tabla';
+$strTableName = 'Nombre de la tabla';
$strTableOfContents = 'Tabla de contenidos';
$strTableOptions = 'Opciones de la tabla';
$strTables = '%s tabla(s)';
@@ -893,7 +937,10 @@ $strTimeoutInfo = 'Se agotó el tiempo de ejecución en la importación previa;
$strTimeoutNothingParsed = 'Sin embargo, en la ejecución más reciente no se procesaron datos. Esto usualmente significa que phpMyAdmin no será capaz de completar esta importación a menos que usted incremente el tiempo de ejecución de php.';
$strTimeoutPassed = 'Se ha agotado el tiempo de ejecución del script; si desea completar la importación, por favor, reenvíe el mismo archivo y la importación continuará.';
$strTime = 'Tiempo';
+$strToFromPage = 'página de/a la';
$strToggleScratchboard = 'cambiar el estado del scratchboard';
+$strToggleSmallBig = 'Alterne entre pequeño y grande';
+$strToSelectRelation = 'Para seleccionar la relación, dé clic en:';
$strTotal = 'total';
$strTotalUC = 'Total';
$strTraditionalChinese = 'Chino tradicional';
@@ -905,6 +952,7 @@ $strTransformation_application_octetstream__hex = 'Muestra los datos en represen
$strTransformation_image_jpeg__inline = 'Muestra un thumbnail que puede abrirse mediante un clic; opciones: width, height en píxeles (mantiene la proporción original)';
$strTransformation_image_jpeg__link = 'Muestra un enlace a esta imagen (i.e., blob descarga directa).';
$strTransformation_image_png__inline = 'Ver imagen/jpeg: inline';
+$strTransformation_text_plain__dateformat = 'Toma un campo TIME, TIMESTAMP o DATETIME y lo formatea usando su formato de fechas local. La primera opción es el offset (en horas) que se añadirá al timestamp (Predeterminado: 0). La segunda opción es un dateformat diferente de acuerdo con los parámetros disponibles para el strftime() del PHP. La tercera opción determina si usted quiere ver la fecha local o la UTC (use strings "local" o "utc") para eso. Según eso, el formato de la fecha tendrá un valor diferente - para "local" mire la documentación para la función strftime() del PHP y para "utc" se hace usando la función gmdate().';
$strTransformation_text_plain__external = 'LINUX SOLAMENTE: Ejecuta una aplicación externa y alimenta el fielddata mediante input estándar. Retorna el output estándar de la aplicación. El predeterminado es Tidy, para mostrar código HTML agradable para la impresión. Por razones de seguridad, debe editar manualmente el archivo libraries/transformations/text_plain__external.inc.php e insertar las herramientas que permitirá se ejecuten. La primera opción será el número del programa que querrá utilizar y la segunda opción son los parámetros para el programa. El tercer parámetro, de ser 1 convertirá el output usando htmlspecialchars() (el predeterminado es 1). Un cuarto parámetro, de ser 1 pondrá un NOWRAP a la celda de contenido para que todo el output se muestre sin reformatear (Predeterminado 1)';
$strTransformation_text_plain__formatted = 'Mantiene el formato original del campo. No se puede hacer Escape.';
$strTransformation_text_plain__imagelink = 'Muestra una imagen y un enlace, el campo contiene el nombre del archivo; la primera opción es un prefijo como "http://dominio.com/", la segunda opción es el ancho en píxeles, el tercero es el alto.';
@@ -976,66 +1024,14 @@ $strYes = 'Sí';
$strZeroRemovesTheLimit = 'Nota: si cambia los parámetros de estas opciones a 0 (cero), remueve el límite.';
$strZip = '"comprimido con zip"';
-// To translate:
-$strAngularLinks = 'Angular links'; //to translate
-
-$strCancel = 'Cancel'; //to translate
-$strCreateRelation = 'Create relation'; //to translate
-$strCreateTable = 'Create table'; //to translate
-
-$strDbIsEmpty = 'Database seems to be empty!'; //to translate
-$strDeleteRelation = 'Delete relation'; //to translate
-$strDesigner = 'Designer'; //to translate
-$strDirectLinks = 'Direct links'; //to translate
-$strDocSQL = 'DocSQL'; //to translate
-$strDocSQLOptions = 'DocSQL options'; //to translate
-
-$strExportImportToScale = 'Export/Import to scale'; //to translate
-
-$strForeignKeyError = 'Error creating foreign key (check data types)'; //to translate
-
-$strHelp = 'Help'; //to translate
-$strHide = 'Hide'; //to translate
-$strHideShowAll = 'Hide/Show all'; //to translate
-$strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate
-
-$strImportExportCoords = 'Import/Export coordinates for PDF schema'; //to translate
-$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate
-$strInternalRelationAdded = 'Internal relation added'; //to translate
-
-$strMoveMenu = 'Move Menu'; //to translate
-
-$strNumberOfTables = 'Number of tables'; //to translate
-
-$strPleaseSelectPrimaryOrUniqueKey = 'Please select the primary key or a unique key'; //to translate
-$strPmaWiki = 'phpMyAdmin wiki'; //to translate
-
-$strRecommended = 'recommended'; //to translate
-$strRelationDeleted = 'Relation deleted'; //to translate
-$strReload = 'Reload'; //to translate
-
-$strSavePosition = 'Save position'; //to translate
-$strSelectForeignKey = 'Select Foreign Key'; //to translate
-$strSelectReferencedKey = 'Select referenced key'; //to translate
-$strShowHideLeftMenu = 'Show/Hide left menu'; //to translate
-$strShowingPhp = 'Showing as PHP code'; //to translate
-$strShowingSQL = 'Showing SQL query'; //to translate
-$strSmallBigAll = 'Small/Big All'; //to translate
-
-$strTableIsEmpty = 'Table seems to be empty!'; //to translate
-$strTableName = 'Table name'; //to translate
-$strToFromPage = 'to/from page'; //to translate
-$strToSelectRelation = 'To select relation, click :'; //to translate
-$strTransformation_text_plain__dateformat = 'Toma un campo TIME, TIMESTAMP o DATETIME y lo formatea usando su formato de fechas local. La primera opción es el offset (en horas) que se añadirá al timestamp (Predeterminado: 0). La segunda opción es un dateformat diferente de acuerdo con los parámetros disponibles para el strftime() del PHP. 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.'; //to translate
-
-$strKnownExternalBug = 'The %s functionality is affected by a known bug, see %s'; //to translate
-$strStructureForView = 'Structure for view'; //to translate
-$strStandInStructureForView = 'Stand-in structure for view'; //to translate
-$strToggleSmallBig = 'Toggle small/big'; //to translate
-$strIEUnsupported = 'Internet Explorer does not support this function.'; //to translate
-$strErrorRelationAdded = 'Error: Relation not added.'; //to translate
-$strErrorRelationExists = 'Error: relation already exists.'; //to translate
-$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
-$strSnapToGrid = 'Snap to grid'; //to translate
-$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/swedish-iso-8859-1.inc.php b/lang/swedish-iso-8859-1.inc.php
index 7707c559c1..33c591b87c 100644
--- a/lang/swedish-iso-8859-1.inc.php
+++ b/lang/swedish-iso-8859-1.inc.php
@@ -1025,4 +1025,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php
index c9ade98a33..e3506d6327 100644
--- a/lang/swedish-utf-8.inc.php
+++ b/lang/swedish-utf-8.inc.php
@@ -1026,4 +1026,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/tatarish-iso-8859-9.inc.php b/lang/tatarish-iso-8859-9.inc.php
index 84b50a665d..a332e75c10 100644
--- a/lang/tatarish-iso-8859-9.inc.php
+++ b/lang/tatarish-iso-8859-9.inc.php
@@ -1039,4 +1039,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php
index bf9b6313db..7f04c75ef6 100644
--- a/lang/tatarish-utf-8.inc.php
+++ b/lang/tatarish-utf-8.inc.php
@@ -1040,4 +1040,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/thai-tis-620.inc.php b/lang/thai-tis-620.inc.php
index 0f51a5e6fa..ed906a9cff 100644
--- a/lang/thai-tis-620.inc.php
+++ b/lang/thai-tis-620.inc.php
@@ -1049,4 +1049,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php
index 26385aadb7..b10ef9b70c 100644
--- a/lang/thai-utf-8.inc.php
+++ b/lang/thai-utf-8.inc.php
@@ -1050,4 +1050,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/turkish-iso-8859-9.inc.php b/lang/turkish-iso-8859-9.inc.php
index ca386acb27..b92dae9e6f 100644
--- a/lang/turkish-iso-8859-9.inc.php
+++ b/lang/turkish-iso-8859-9.inc.php
@@ -1033,4 +1033,14 @@ $strZeroRemovesTheLimit = 'Not: Bu seeneklerin 0 (sfr)\'a ayarlanmas snr
$strZip = '"zip olarak"';
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php
index 6871798070..999e7537cf 100644
--- a/lang/turkish-utf-8.inc.php
+++ b/lang/turkish-utf-8.inc.php
@@ -1034,4 +1034,14 @@ $strZeroRemovesTheLimit = 'Not: Bu seçeneklerin 0 (sıfır)\'a ayarlanması sı
$strZip = '"zip olarak"';
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php
index ee44ec342d..0a7f352e29 100644
--- a/lang/ukrainian-utf-8.inc.php
+++ b/lang/ukrainian-utf-8.inc.php
@@ -1048,4 +1048,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/lang/ukrainian-windows-1251.inc.php b/lang/ukrainian-windows-1251.inc.php
index 87541f0187..c15efac96e 100644
--- a/lang/ukrainian-windows-1251.inc.php
+++ b/lang/ukrainian-windows-1251.inc.php
@@ -1047,4 +1047,14 @@ $strErrorRelationExists = 'Error: relation already exists.'; //to translate
$strErrorSaveTable = 'Error saving coordinates for Designer.'; //to translate
$strSnapToGrid = 'Snap to grid'; //to translate
$strDesignerHelpDisplayField = '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.'; //to translate
+$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate
+$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate
+$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate
+$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate
+$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate
+$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate
+$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate
+$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate
+$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate
+$strViewName = 'VIEW name'; //to translate
?>
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index d60f3e223b..6bb8a8288c 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -81,7 +81,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '2.10.0-dev');
+ $this->set('PMA_VERSION', '2.11.0-dev');
/**
* @deprecated
*/
diff --git a/libraries/PMA_Sql.class.php b/libraries/PMA_Sql.class.php
new file mode 100644
index 0000000000..d69ad84189
--- /dev/null
+++ b/libraries/PMA_Sql.class.php
@@ -0,0 +1,2493 @@
+<?php
+// vim: expandtab sw=4 ts=4 sts=4:
+/**
+ * holds PMA_Sql class
+ *
+ * @version $Id$
+ */
+
+/**
+ * Include the string library as we use it heavily
+ */
+require_once './libraries/string.lib.php';
+
+/**
+ * Include data for the SQL Parser
+ */
+require_once './libraries/sqlparser.data.php';
+require_once './libraries/mysql_charsets.lib.php';
+
+if (! isset($mysql_charsets)) {
+ $mysql_charsets = array();
+ $mysql_charsets_count = 0;
+ $mysql_collations_flat = array();
+ $mysql_collations_count = 0;
+}
+
+/**
+ * This class hanldes all tasks related to SQL queries
+ * - analyzing
+ * - parsing
+ * - printing text/html
+ * - formating
+ * - splitting
+ * - executing
+ * - saving (bookmark)
+ *
+ * @todo handle subquerys as own objects of type PMQ_Sql
+ * @todo move hard coded arrays of defined names and type into sqlparser.data.php
+ * @add function to inject SQL_CALC_FOUND_ROWS sql.php#480
+ * @add function for EXPLAIN
+ * @add function to print as PHP
+ */
+class PMA_Sql
+{
+ /**
+ * @var string error message
+ * @access protected
+ */
+ var $_error_message = '';
+
+ /**
+ * @var string raw SQL query
+ * @access protected
+ */
+ var $_raw = null;
+
+ /**
+ * @var array analyze data of SQL
+ * @access protected
+ */
+ var $_analyzed = null;
+
+ /**
+ * @var array parsed data of SQL
+ * @access protected
+ */
+ var $_parsed = null;
+
+ /**
+ * @var integer size of $_parsed array
+ * @access protected
+ */
+ var $_parsed_size = 0;
+
+ /**
+ * @var array
+ * @access protected
+ */
+ var $_tokens = array();
+
+ /**
+ * old PHP 4 style constructor
+ * @deprecated
+ * @access public
+ * @see PMA_sql::__construct()
+ */
+ function PMA_sql($sql)
+ {
+ $this->__construct($sql);
+ }
+
+ /**
+ * Constructor
+ *
+ * @access public
+ * @uses PMA_Sql::$_raw to set it
+ * @uses PMA_Sql::$_tokens to set it
+ * @param string SQL query
+ */
+ function __construct($sql)
+ {
+ $this->_raw = $sql;
+
+ $this->_tokens['puncts']['queryend'] = ';';
+ $this->_tokens['puncts']['qualifier'] = '.';
+ $this->_tokens['puncts']['listsep'] = ',';
+ //$this->_tokens['puncts']['level_plus'] = '(';
+ //$this->_tokens['puncts']['level_minus'] = ')';
+ $this->_tokens['puncts']['minus'] = '-';
+ $this->_tokens['puncts']['colon'] = ':';
+ $this->_tokens['puncts']['negator'] = '!';
+ $this->_tokens['puncts']['questionmark'] = '?';
+ $this->_tokens['puncts']['divisor'] = '/';
+ $this->_tokens['puncts']['potenz'] = '^';
+ $this->_tokens['puncts']['level_minus'] = '~';
+ $this->_tokens['puncts']['escape'] = '\\';
+ $this->_tokens['puncts']['m'] = '*';
+ $this->_tokens['puncts']['and'] = '&';
+ $this->_tokens['puncts']['percent'] = '%';
+ $this->_tokens['puncts']['plus'] = '+';
+ $this->_tokens['puncts']['less'] = '<';
+ $this->_tokens['puncts']['equal'] = '=';
+ $this->_tokens['puncts']['greater'] = '>';
+ $this->_tokens['puncts']['or'] = '|';
+
+ $this->_tokens['punctpairs']['NEQ'] = '!=';
+ $this->_tokens['punctpairs']['AND'] = '&&';
+ $this->_tokens['punctpairs']['COL'] = ':=';
+ $this->_tokens['punctpairs']['SHIFTL'] = '<<';
+ $this->_tokens['punctpairs']['LTE'] = '<=';
+ $this->_tokens['punctpairs']['NEQ2'] = '<=>';
+ $this->_tokens['punctpairs']['NEQ3'] = '<>';
+ $this->_tokens['punctpairs']['GTE'] = '>=';
+ $this->_tokens['punctpairs']['SHIFTR'] = '>>';
+ $this->_tokens['punctpairs']['OR'] = '||';
+
+ //$this->_tokens['digit']['floatdecimal'] = '.';
+ //$this->_tokens['digit']['hexset'] = 'x';
+
+ $this->_tokens['brackets']['round_open'] = '(';
+ $this->_tokens['brackets']['round_close'] = ')';
+ $this->_tokens['brackets']['square_open'] = '[';
+ $this->_tokens['brackets']['square_close'] = ']';
+ $this->_tokens['brackets']['brace_open'] = '{';
+ $this->_tokens['brackets']['brace_close'] = '}';
+
+ $this->_tokens['quotes']['single'] = "'";
+ $this->_tokens['quotes']['double'] = '"';
+ $this->_tokens['quotes']['backtick'] = '`';
+ }
+
+ /**
+ * everytime called it adds an array element to the array which holds the parse info
+ * usally called for every token found in a sql query by PMA_Sql::parse()
+ *
+ * @access protected
+ * @uses PMA_Sql::$_parsed
+ * @uses PMA_Sql::$_parsed_size
+ * @uses DEBUG_TIMING
+ * @uses defined()
+ * @uses microtime()
+ * @uses $GLOBALS['timer']
+ * @param string $type type of the token
+ * @param string $data content of this token
+ */
+ function _addParseInfo($type, $data)
+ {
+ $this->_parsed[$this->_parsed_size] = array('type' => $type, 'data' => $data);
+
+ if (defined('DEBUG_TIMING')) {
+ $this->_parsed[$this->_parsed_size]['time'] = $GLOBALS['timer'];
+ $GLOBALS['timer'] = microtime();
+ }
+
+ $this->_parsed_size++;
+ } // end of the "_addParseInfo()" function
+
+ /**
+ * Reset the error variable for the SQL parser
+ * Added, Robbat2 - 13 Janurary 2003, 2:59PM
+ *
+ * @access public
+ * @uses PMA_Sql::$_error_message to set it
+ */
+ function resetError()
+ {
+ $this->_error_message = '';
+ }
+
+ /**
+ * Get the contents of the error variable for the SQL parser
+ * Added, Robbat2 - 13 Janurary 2003, 2:59PM
+ *
+ * @return string Error string from SQL parser
+ * @access public
+ * @uses PMA_Sql::$_error_message to read it
+ */
+ function getErrorMessage()
+ {
+ return $this->_error_message;
+ }
+
+ /**
+ * Check if the SQL parser hit an error
+ * Added, Robbat2 - 13 Janurary 2003, 2:59PM
+ *
+ * @access public
+ * @uses PMA_Sql::$_error_message to check it
+ * @return boolean error state
+ */
+ function isError()
+ {
+ return ! empty($this->_error_message);
+ }
+
+ /**
+ * Set an error message for the system
+ * Added, Robbat2 - 13 Janurary 2003, 2:59PM
+ *
+ * @uses PMA_Sql::$_error_message to set it
+ * @uses PMA_Sql::$_raw to read it
+ * @uses $GLOBALS['strSQLParserUserError']
+ * @uses htmlspecialchars()
+ * @access protected
+ * @scope SQL Parser internal
+ * @param string $message The error message
+ */
+ function _throwError($message)
+ {
+ $this->_error_message = '<p>'.$GLOBALS['strSQLParserUserError'] . '</p>' . "\n"
+ . '<pre>' . "\n"
+ . 'ERROR: ' . $message . "\n"
+ . 'SQL: ' . htmlspecialchars($this->_raw) . "\n"
+ . '</pre>' . "\n";
+ } // end of the "_throwError()" function
+
+ /**
+ * generate the bug report and ncludes compressed debug info
+ *
+ * @access public
+ * @uses PMA_Sql::$_raw to read it
+ * @uses PMA_Sql::$_error_message to set it
+ * @uses PMA_MYSQL_STR_VERSION
+ * @uses PMA_USR_OS
+ * @uses PMA_USR_BROWSER_AGENT
+ * @uses PMA_VERSION
+ * @uses PMA_PHP_STR_VERSION
+ * @uses PHP_OS
+ * @uses $GLOBALS['strSQLParserBugMessage']
+ * @uses $GLOBALS['strBeginCut']
+ * @uses $GLOBALS['strEndCut']
+ * @uses $GLOBALS['strBeginRaw']
+ * @uses $GLOBALS['strEndRaw']
+ * @uses $GLOBALS['lang']
+ * @uses htmlspecialchars()
+ * @uses function_exists()
+ * @uses gzcompress()
+ * @uses preg_replace()
+ * @uses chunk_split()
+ * @uses base64_encode()
+ * @param string $message The error message
+ */
+ function generateBugReport($message)
+ {
+ $debugstr = 'ERROR: ' . $message . "\n";
+ $debugstr .= 'SVN: $Id$' . "\n";
+ $debugstr .= 'MySQL: ' . PMA_MYSQL_STR_VERSION . "\n";
+ $debugstr .= 'USR OS, AGENT, VER: ' . PMA_USR_OS . ' ' . PMA_USR_BROWSER_AGENT . ' ' . PMA_USR_BROWSER_VER . "\n";
+ $debugstr .= 'PMA: ' . PMA_VERSION . "\n";
+ $debugstr .= 'PHP VER,OS: ' . PMA_PHP_STR_VERSION . ' ' . PHP_OS . "\n";
+ $debugstr .= 'LANG: ' . $GLOBALS['lang'] . "\n";
+ $debugstr .= 'SQL: ' . htmlspecialchars($this->_raw);
+
+ $encodedstr = $debugstr;
+ if (@function_exists('gzcompress')) {
+ $encodedstr = gzcompress($debugstr, 9);
+ }
+ $encodedstr = preg_replace("/(\015\012)|(\015)|(\012)/", '<br />' . "\n",
+ chunk_split(base64_encode($encodedstr)));
+
+ $this->_error_message .= $GLOBALS['strSQLParserBugMessage'] . '<br />' . "\n"
+ . '----' . $GLOBALS['strBeginCut'] . '----' . '<br />' . "\n"
+ . $encodedstr . "\n"
+ . '----' . $GLOBALS['strEndCut'] . '----' . '<br />' . "\n";
+
+ $this->_error_message .= '----' . $GLOBALS['strBeginRaw'] . '----<br />' . "\n"
+ . '<pre>' . "\n"
+ . $debugstr
+ . '</pre>' . "\n"
+ . '----' . $GLOBALS['strEndRaw'] . '----<br />' . "\n";
+ } // end of the "generateBugReport()" function
+
+ /**
+ * Parses the SQL queries
+ *
+ * @todo split into smaller methods
+ * @access public
+ * @global array The current PMA configuration
+ * @global array MySQL column attributes
+ * @global array MySQL reserved words
+ * @global array MySQL column types
+ * @global array MySQL function names
+ * @global integer MySQL column attributes count
+ * @global integer MySQL reserved words count
+ * @global integer MySQL column types count
+ * @global integer MySQL function names count
+ * @global array List of available character sets
+ * @global array List of available collations
+ * @global integer Character sets count
+ * @global integer Collations count
+ * @return mixed Most of times, nothing...
+ */
+ function parse()
+ {
+ global
+ $cfg,
+ $PMA_SQPdata_column_attrib, $PMA_SQPdata_reserved_word,
+ $PMA_SQPdata_column_type, $PMA_SQPdata_function_name,
+ $PMA_SQPdata_column_attrib_cnt, $PMA_SQPdata_reserved_word_cnt,
+ $PMA_SQPdata_column_type_cnt, $PMA_SQPdata_function_name_cnt,
+ $PMA_SQPdata_forbidden_word, $PMA_SQPdata_forbidden_word_cnt,
+ $mysql_charsets, $mysql_collations_flat, $mysql_charsets_count,
+ $mysql_collations_count;
+
+ $sql = $this->_raw;
+
+ // rabus: Convert all line feeds to Unix style
+ $sql = str_replace("\r\n", "\n", $sql);
+ $sql = str_replace("\r", "\n", $sql);
+
+ $this->_parsed = array();
+ $this->_parsed_size = 0;
+
+ // there is nothing to do if empty or only spaces
+ if (PMA_strlen(trim($sql)) === 0) {
+ return $this->_parsed;
+ }
+ // but we will not cut off spaces if there are not only spaces
+ $sql_len = PMA_strlen($sql);
+
+ $bracket_list = implode($this->_tokens['brackets']);
+ $allpunct_list = implode($this->_tokens['puncts']);
+ $quote_list = implode($this->_tokens['quotes']);
+
+ $punctpairs_count = count($this->_tokens['punctpairs']);
+
+ $sql_pos = 0;
+ while ($sql_pos < $sql_len) {
+ $c = PMA_substr($sql, $sql_pos, 1);
+
+ // Checks for white space
+ if (PMA_STR_isSpace($c)) {
+ $sql_pos++;
+ continue;
+ }
+
+ if (($c == "\n")) {
+ $sql_pos++;
+ $this->_addParseInfo('white_newline', '');
+ continue;
+ }
+
+ $token_start = $sql_pos;
+
+ // Checks for comment lines.
+ // MySQL style #
+ // C style /* */
+ // ANSI style --
+ if (($c == '#')
+ || (($sql_pos + 1 < $sql_len) && (PMA_substr($sql, $sql_pos, 2) == '/*'))
+ || (($sql_pos + 2 == $sql_len) && ($c == '-') && (PMA_substr($sql, $sql_pos + 1, 1) == '-'))
+ || (($sql_pos + 2 < $sql_len) && ($c == '-') && (PMA_substr($sql, $sql_pos + 1, 1) == '-') && ((PMA_substr($sql, $sql_pos + 2, 1) <= ' ')))) {
+ $sql_pos++;
+ $pos = 0;
+ $type = 'bad';
+ switch ($c) {
+ case '#':
+ $type = 'mysql';
+ case '-':
+ $type = 'ansi';
+ $pos = $GLOBALS['PMA_strpos']($sql, "\n", $sql_pos);
+ break;
+ case '/':
+ $type = 'c';
+ $pos = $GLOBALS['PMA_strpos']($sql, '*/', $sql_pos);
+ $pos += 2;
+ break;
+ default:
+ break;
+ } // end switch
+ $sql_pos = ($pos < $sql_pos) ? $sql_len : $pos;
+ $this->_addParseInfo('comment_' . $type,
+ PMA_substr($sql, $token_start, $sql_pos - $token_start));
+ continue;
+ } // end if
+
+ // Checks for something inside quotation marks
+ if (PMA_STR_strInStr($c, $quote_list)) {
+ // some examples of valid quotes:
+ // "'" -> '
+ // "\"" -> "
+ // 'blah''blaj' -> blah'blaj
+ // """" -> "
+
+ $startquotepos = $sql_pos;
+ $quotetype = $c;
+ $sql_pos++;
+ $escaped = FALSE;
+ $escaped_escaped = FALSE;
+ $pos = $sql_pos;
+ $oldpos = 0;
+ do {
+ $oldpos = $pos;
+ $pos = $GLOBALS['PMA_strpos'](' ' . $sql, $quotetype, $oldpos + 1) - 1;
+ // ($pos === FALSE)
+ if ($pos < 0) {
+ $debugstr = $GLOBALS['strSQPBugUnclosedQuote'] . ' @ ' . $startquotepos. "\n"
+ . 'STR: ' . htmlspecialchars($quotetype);
+ $this->_throwError($debugstr);
+ return array();
+ }
+
+ // If the quote is the first character, it can't be
+ // escaped, so don't do the rest of the code
+ if ($pos == 0) {
+ break;
+ }
+
+ // Checks for MySQL escaping using a \
+ // And checks for ANSI escaping using the $quotetype character
+ if (($pos < $sql_len) && PMA_STR_charIsEscaped($sql, $pos)) {
+ $pos ++;
+ continue;
+ } elseif (($pos + 1 < $sql_len) && (PMA_substr($sql, $pos, 1) == $quotetype) && (PMA_substr($sql, $pos + 1, 1) == $quotetype)) {
+ $pos = $pos + 2;
+ continue;
+ } else {
+ break;
+ }
+ } while ($sql_len > $pos); // end do
+
+ $sql_pos = $pos;
+ $sql_pos++;
+ $type = 'quote_';
+ switch ($quotetype) {
+ case '\'':
+ $type .= 'single';
+ break;
+ case '"':
+ $type .= 'double';
+ break;
+ case '`':
+ $type .= 'backtick';
+ break;
+ default:
+ break;
+ } // end switch
+ $this->_addParseInfo($type,
+ PMA_substr($sql, $token_start, $sql_pos - $token_start));
+ continue;
+ }
+
+ // Checks for brackets
+ if (PMA_STR_strInStr($c, $bracket_list)) {
+ // All bracket tokens are only one item long
+ $sql_pos++;
+ $type = 'punct_bracket_';
+ if (PMA_STR_strInStr($c, '([{')) {
+ $type .= 'open';
+ } else {
+ $type .= 'close';
+ }
+
+ if (PMA_STR_strInStr($c, '()')) {
+ $type .= '_round';
+ } elseif (PMA_STR_strInStr($c, '[]')) {
+ $type .= '_square';
+ } else {
+ $type .= '_curly';
+ }
+
+ $this->_addParseInfo($type, $c);
+ continue;
+ }
+
+ // Checks for identifier (alpha or numeric)
+ if (PMA_STR_isSqlIdentifier($c, FALSE) || $c == '@' || $c == '.' && PMA_STR_isDigit(PMA_substr($sql, $sql_pos + 1, 1))) {
+ $sql_pos ++;
+
+ /**
+ * @todo a @ can also be present in expressions like
+ * FROM 'user'@'%' or TO 'user'@'%'
+ * in this case, the @ is wrongly marked as alpha_variable
+ */
+
+ $is_sql_variable = $c == '@';
+ $is_digit = !$is_sql_variable && PMA_STR_isDigit($c);
+ $is_hex_digit = $is_digit && $c == '.' && $c == '0' && $sql_pos < $sql_len && PMA_substr($sql, $sql_pos, 1) == 'x';
+ $is_float_digit = $c == '.';
+ $is_float_digit_exponent = FALSE;
+
+ // Nijel: Fast skip is especially needed for huge BLOB data, requires PHP at least 4.3.0:
+ if (PMA_PHP_INT_VERSION >= 40300) {
+ if ($is_hex_digit) {
+ $sql_pos++;
+ $pos = strspn($sql, '0123456789abcdefABCDEF', $sql_pos);
+ if ($pos > $sql_pos) {
+ $sql_pos = $pos;
+ }
+ unset($pos);
+ } elseif ($is_digit) {
+ $pos = strspn($sql, '0123456789', $sql_pos);
+ if ($pos > $sql_pos) {
+ $sql_pos = $pos;
+ }
+ unset($pos);
+ }
+ }
+
+ while (($sql_pos < $sql_len)
+ && PMA_STR_isSqlIdentifier(PMA_substr($sql, $sql_pos, 1), ($is_sql_variable || $is_digit))) {
+ $c2 = PMA_substr($sql, $sql_pos, 1);
+ if ($is_sql_variable && ($c2 == '.')) {
+ $sql_pos++;
+ continue;
+ }
+ if ($is_digit && (!$is_hex_digit) && ($c2 == '.')) {
+ $sql_pos++;
+ if (!$is_float_digit) {
+ $is_float_digit = TRUE;
+ continue;
+ } else {
+ $debugstr = $GLOBALS['strSQPBugInvalidIdentifer'] . ' @ ' . ($token_start + 1) . "\n"
+ . 'STR: ' . htmlspecialchars(PMA_substr($sql, $token_start, $sql_pos - $token_start));
+ $this->_throwError($debugstr);
+ return array();
+ }
+ }
+ if ($is_digit && (!$is_hex_digit) && (($c2 == 'e') || ($c2 == 'E'))) {
+ if (!$is_float_digit_exponent) {
+ $is_float_digit_exponent = TRUE;
+ $is_float_digit = TRUE;
+ $sql_pos++;
+ continue;
+ } else {
+ $is_digit = FALSE;
+ $is_float_digit = FALSE;
+ }
+ }
+ if (($is_hex_digit && PMA_STR_isHexDigit($c2)) || ($is_digit && PMA_STR_isDigit($c2))) {
+ $sql_pos++;
+ continue;
+ } else {
+ $is_digit = FALSE;
+ $is_hex_digit = FALSE;
+ }
+
+ $sql_pos++;
+ } // end while
+
+ if ($is_digit) {
+ if ($is_float_digit) {
+ $type = 'digit_float';
+ } elseif ($is_hex_digit) {
+ $type = 'digit_hex';
+ } else {
+ $type = 'digit_integer';
+ }
+ } else {
+ $type = 'alpha';
+ if ($is_sql_variable != FALSE) {
+ $type .= '_variable';
+ }
+ } // end if... else....
+ $this->_addParseInfo($type,
+ PMA_substr($sql, $token_start, $sql_pos - $token_start));
+
+ continue;
+ }
+
+ // Checks for punct
+ if (PMA_STR_strInStr($c, $allpunct_list)) {
+ while (($sql_pos < $sql_len) && PMA_STR_strInStr(PMA_substr($sql, $sql_pos, 1), $allpunct_list)) {
+ $sql_pos++;
+ }
+ $l = $sql_pos - $token_start;
+ if ($l == 1) {
+ $punct_data = $c;
+ } else {
+ $punct_data = PMA_substr($sql, $token_start, $l);
+ }
+
+ // Special case, sometimes, althought two characters are
+ // adjectent directly, they ACTUALLY need to be seperate
+ $t_suffix = '';
+ if ($l == 1) {
+ switch ($punct_data) {
+ case $this->_tokens['puncts']['queryend']:
+ $t_suffix = '_queryend';
+ break;
+ case $this->_tokens['puncts']['qualifier']:
+ $t_suffix = '_qualifier';
+ break;
+ case $this->_tokens['puncts']['listsep']:
+ $t_suffix = '_listsep';
+ break;
+ default:
+ break;
+ }
+ } elseif (PMA_STR_binarySearchInArr($punct_data, $this->_tokens['punctpairs'], $punctpairs_count)) {
+ // Ok, we have one of the valid combined punct expressions
+ } else {
+ // Bad luck, lets split it up more
+ $first = $punct_data[0];
+ $first2 = $punct_data[0] . $punct_data[1];
+ $last2 = $punct_data[$l - 2] . $punct_data[$l - 1];
+ $last = $punct_data[$l - 1];
+ if (($first == ',') || ($first == ';') || ($first == '.') || ($first == '*')) {
+ $sql_pos = $token_start + 1;
+ $punct_data = $first;
+ } elseif ($last2 == '/*' || ($last2 == '--' && ($sql_pos == $sql_len || PMA_substr($sql, $sql_pos, 1) <= ' '))) {
+ $sql_pos -= 2;
+ $punct_data = PMA_substr($sql, $token_start, $sql_pos - $token_start);
+ } elseif (($last == '-') || ($last == '+') || ($last == '!')) {
+ $sql_pos--;
+ $punct_data = PMA_substr($sql, $token_start, $sql_pos - $token_start);
+ /**
+ * @todo for negation operator, split in 2 tokens ?
+ * "select x&~1 from t"
+ * becomes "select x & ~ 1 from t" ?
+ */
+
+ } elseif ($last != '~') {
+ $debugstr = $GLOBALS['strSQPBugUnknownPunctuation'] . ' @ ' . ($token_start + 1) . "\n"
+ . 'STR: ' . htmlspecialchars($punct_data);
+ $this->_throwError($debugstr);
+ return array();
+ }
+ } // end if... elseif... else
+ $this->_addParseInfo('punct' . $t_suffix, $punct_data);
+ continue;
+ }
+
+ // we reach this point only in case of error
+ $sql_pos++;
+
+ // DEBUG
+ $debugstr = 'C1 C2 LEN: ' . $token_start . ' ' . $sql_pos . ' ' . $sql_len . "\n"
+ . 'STR: ' . PMA_substr($sql, $token_start, $sql_pos - $token_start) . "\n";
+ $this->generateBugReport($debugstr);
+ return array();
+ } // end while ($sql_pos < $sql_len)
+
+
+ if ($this->_parsed_size > 0) {
+ $t_next = $this->_parsed[0]['type'];
+ $t_prev = '';
+ $t_bef_prev = '';
+ $t_cur = '';
+ $d_next = $this->_parsed[0]['data'];
+ $d_prev = '';
+ $d_bef_prev = '';
+ $d_cur = '';
+ $d_next_upper = $t_next == 'alpha' ? strtoupper($d_next) : $d_next;
+ $d_prev_upper = '';
+ $d_bef_prev_upper = '';
+ $d_cur_upper = '';
+ }
+
+ foreach ($this->_parsed as $pos => $each_parsed) {
+// for ($i = 0; $i < $this->_parsed_size; $i++) {
+ $t_bef_prev = $t_prev;
+ $t_prev = $t_cur;
+ $t_cur = $t_next;
+ $d_bef_prev = $d_prev;
+ $d_prev = $d_cur;
+ $d_cur = $d_next;
+ $d_bef_prev_upper = $d_prev_upper;
+ $d_prev_upper = $d_cur_upper;
+ $d_cur_upper = $d_next_upper;
+ if (($pos + 1) < $this->_parsed_size) {
+ $t_next = $this->_parsed[$pos + 1]['type'];
+ $d_next = $this->_parsed[$pos + 1]['data'];
+ $d_next_upper = $t_next == 'alpha' ? strtoupper($d_next) : $d_next;
+ } else {
+ $t_next = '';
+ $d_next = '';
+ $d_next_upper = '';
+ }
+
+ //DEBUG echo "[prev: <b>".$d_prev."</b> ".$t_prev."][cur: <b>".$d_cur."</b> ".$t_cur."][next: <b>".$d_next."</b> ".$t_next."]<br />";
+
+ if ($t_cur == 'alpha') {
+ $t_suffix = '_identifier';
+ if (($t_next == 'punct_qualifier') || ($t_prev == 'punct_qualifier')) {
+ $t_suffix = '_identifier';
+ } elseif (($t_next == 'punct_bracket_open_round')
+ && PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_function_name, $PMA_SQPdata_function_name_cnt)) {
+ /**
+ * @todo 2005-10-16: in the case of a CREATE TABLE containing
+ * a TIMESTAMP, since TIMESTAMP() is also a function, it's
+ * found here and the token is wrongly marked as alpha_functionName.
+ * But we compensate for this when analysing for timestamp_not_null
+ * later in this script.
+ *
+ * Same applies to CHAR vs. CHAR() function.
+ */
+ $t_suffix = '_functionName';
+ /* There are functions which might be as well column types */
+ if (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_column_type, $PMA_SQPdata_column_type_cnt)) {
+ }
+ } elseif (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_column_type, $PMA_SQPdata_column_type_cnt)) {
+ $t_suffix = '_columnType';
+
+ /**
+ * Temporary fix for BUG #621357
+ *
+ * @todo FIX PROPERLY NEEDS OVERHAUL OF SQL TOKENIZER
+ */
+ if ($d_cur_upper == 'SET' && $t_next != 'punct_bracket_open_round') {
+ $t_suffix = '_reservedWord';
+ }
+ //END OF TEMPORARY FIX
+
+ // CHARACTER is a synonym for CHAR, but can also be meant as
+ // CHARACTER SET. In this case, we have a reserved word.
+ if ($d_cur_upper == 'CHARACTER' && $d_next_upper == 'SET') {
+ $t_suffix = '_reservedWord';
+ }
+
+ // experimental
+ // current is a column type, so previous must not be
+ // a reserved word but an identifier
+ // CREATE TABLE SG_Persons (first varchar(64))
+
+ //if ($this->_parsed[$pos-1]['type'] =='alpha_reservedWord') {
+ // $this->_parsed[$pos-1]['type'] = 'alpha_identifier';
+ //}
+ } elseif (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_reserved_word, $PMA_SQPdata_reserved_word_cnt)) {
+ $t_suffix = '_reservedWord';
+ } elseif (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_column_attrib, $PMA_SQPdata_column_attrib_cnt)) {
+ $t_suffix = '_columnAttrib';
+ // INNODB is a MySQL table type, but in "SHOW INNODB STATUS",
+ // it should be regarded as a reserved word.
+ if ($d_cur_upper == 'INNODB' && $d_prev_upper == 'SHOW' && $d_next_upper == 'STATUS') {
+ $t_suffix = '_reservedWord';
+ }
+
+ if ($d_cur_upper == 'DEFAULT' && $d_next_upper == 'CHARACTER') {
+ $t_suffix = '_reservedWord';
+ }
+ // Binary as character set
+ if ($d_cur_upper == 'BINARY' && (
+ ($d_bef_prev_upper == 'CHARACTER' && $d_prev_upper == 'SET')
+ || ($d_bef_prev_upper == 'SET' && $d_prev_upper == '=')
+ || ($d_bef_prev_upper == 'CHARSET' && $d_prev_upper == '=')
+ || $d_prev_upper == 'CHARSET'
+ ) && PMA_STR_binarySearchInArr($d_cur, $mysql_charsets, count($mysql_charsets))) {
+ $t_suffix = '_charset';
+ }
+ } elseif (PMA_STR_binarySearchInArr($d_cur, $mysql_charsets, $mysql_charsets_count)
+ || PMA_STR_binarySearchInArr($d_cur, $mysql_collations_flat, $mysql_collations_count)
+ || ($d_cur{0} == '_' && PMA_STR_binarySearchInArr(substr($d_cur, 1), $mysql_charsets, $mysql_charsets_count))) {
+ $t_suffix = '_charset';
+ } else {
+ // Do nothing
+ }
+ // check if present in the list of forbidden words
+ if ($t_suffix == '_reservedWord'
+ && PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_forbidden_word, $PMA_SQPdata_forbidden_word_cnt)) {
+ $this->_parsed['forbidden'] = TRUE;
+ } else {
+ $this->_parsed['forbidden'] = FALSE;
+ }
+ $this->_parsed['type'] .= $t_suffix;
+ }
+ } // end for
+
+ // Stores the size of the array inside the array, as count() is a slow
+ // operation.
+ //$this->_parsed['len'] = $this->_parsed_size;
+
+ // DEBUG echo 'After parsing<pre>'; print_r($this->_parsed); echo '</pre>';
+ // Sends the data back
+ return $this->_parsed;
+ } // end of the "parse()" function
+
+ /**
+ * returns SQL query analyzed
+ *
+ * @access public
+ * @param string $sql the SQL query
+ */
+ function getAnalyzed($sql = null)
+ {
+ if (null !== $sql) {
+ $pma_sql = new PMA_Sql($sql);
+ } else {
+ $pma_sql = $this;
+ }
+
+ if (null === $pma_sql->_analyzed) {
+ $pma_sql->analyze();
+ }
+
+ return $pma_sql->_analyzed;
+ }
+
+ /**
+ * Analyzes SQL queries
+ *
+ * db, table, column, alias
+ * ------------------------
+ *
+ * Inside the $subresult array, we create ['select_expr'] and ['table_ref'] arrays.
+ *
+ * The SELECT syntax (simplified) is
+ *
+ * SELECT
+ * select_expression,...
+ * [FROM [table_references]
+ *
+ *
+ * ['select_expr'] is filled with each expression, the key represents the
+ * expression position in the list (0-based) (so we don't lose track of
+ * multiple occurences of the same column).
+ *
+ * ['table_ref'] is filled with each table ref, same thing for the key.
+ *
+ * I create all sub-values empty, even if they are
+ * not present (for example no select_expression alias).
+ *
+ * There is a debug section at the end of loop #1, if you want to
+ * see the exact contents of select_expr and table_ref
+ *
+ * queryflags
+ * ----------
+ *
+ * In $subresult, array 'queryflags' is filled, according to what we
+ * find in the query.
+ *
+ * Currently, those are generated:
+ *
+ * ['queryflags']['need_confirm'] = 1; if the query needs confirmation
+ * ['queryflags']['select_from'] = 1; if this is a real SELECT...FROM
+ * ['queryflags']['distinct'] = 1; for a DISTINCT
+ * ['queryflags']['union'] = 1; for a UNION
+ * ['queryflags']['join'] = 1; for a JOIN
+ * ['queryflags']['offset'] = 1; for the presence of OFFSET
+ *
+ * query clauses
+ * -------------
+ *
+ * The select is splitted in those clauses:
+ * ['select_expr_clause']
+ * ['from_clause']
+ * ['group_by_clause']
+ * ['order_by_clause']
+ * ['having_clause']
+ * ['where_clause']
+ *
+ * The identifiers of the WHERE clause are put into the array
+ * ['where_clause_identifier']
+ *
+ * For a SELECT, the whole query without the ORDER BY clause is put into
+ * ['unsorted_query']
+ *
+ * foreign keys
+ * ------------
+ * The CREATE TABLE may contain FOREIGN KEY clauses, so they get
+ * analyzed and ['foreign_keys'] is an array filled with
+ * the constraint name, the index list,
+ * the REFERENCES table name and REFERENCES index list,
+ * and ON UPDATE | ON DELETE clauses
+ *
+ * position_of_first_select
+ * ------------------------
+ *
+ * The array index of the first SELECT we find. Will be used to
+ * insert a SQL_CALC_FOUND_ROWS.
+ *
+ * create_table_fields
+ * -------------------
+ *
+ * For now, mostly used to detect the DEFAULT CURRENT_TIMESTAMP and
+ * ON UPDATE CURRENT_TIMESTAMP clauses of the CREATE TABLE query.
+ * An array, each element is the identifier name.
+ * Note that for now, the timestamp_not_null element is created
+ * even for non-TIMESTAMP fields.
+ *
+ * Sub-elements: ['type'] which contains the column type
+ * optional (currently they are never false but can be absent):
+ * ['default_current_timestamp'] boolean
+ * ['on_update_current_timestamp'] boolean
+ * ['timestamp_not_null'] boolean
+ *
+ * section_before_limit, section_after_limit
+ * -----------------------------------------
+ *
+ * Marks the point of the query where we can insert a LIMIT clause;
+ * so the section_before_limit will contain the left part before
+ * a possible LIMIT clause
+ *
+ * @access public
+ * @param array The SQL queries
+ * @return array The analyzed SQL queries
+ */
+ function analyze()
+ {
+ if (empty($this->_parsed)) {
+ return array();
+ }
+
+ $this->_analyzed = array();
+ $subresult = array(
+ 'querytype' => '',
+ 'select_expr_clause'=> '', // the whole stuff between SELECT and FROM , except DISTINCT
+ 'position_of_first_select' => '', // the array index
+ 'from_clause'=> '',
+ 'group_by_clause'=> '',
+ 'order_by_clause'=> '',
+ 'having_clause' => '',
+ 'where_clause' => '',
+ 'where_clause_identifiers' => array(),
+ 'unsorted_query' => '',
+ 'queryflags' => array(),
+ 'select_expr' => array(),
+ 'table_ref' => array(),
+ 'foreign_keys' => array(),
+ 'create_table_fields' => array()
+ );
+ $subresult_empty = $subresult;
+ $seek_queryend = FALSE;
+ $seen_end_of_table_ref = FALSE;
+ $number_of_brackets_in_extract = 0;
+ $number_of_brackets_in_group_concat = 0;
+
+ // for SELECT EXTRACT(YEAR_MONTH FROM CURDATE())
+ // we must not use CURDATE as a table_ref
+ // so we track wether we are in the EXTRACT()
+ $in_extract = FALSE;
+
+ // for GROUP_CONCAT( ... )
+ $in_group_concat = FALSE;
+
+ // must be sorted
+ // TODO: current logic checks for only one word, so I put only the
+ // first word of the reserved expressions that end a table ref;
+ // maybe this is not ok (the first word might mean something else)
+// $words_ending_table_ref = array(
+// 'FOR UPDATE',
+// 'GROUP BY',
+// 'HAVING',
+// 'LIMIT',
+// 'LOCK IN SHARE MODE',
+// 'ORDER BY',
+// 'PROCEDURE',
+// 'UNION',
+// 'WHERE'
+// );
+ $words_ending_table_ref = array(
+ 'FOR',
+ 'GROUP',
+ 'HAVING',
+ 'LIMIT',
+ 'LOCK',
+ 'ORDER',
+ 'PROCEDURE',
+ 'UNION',
+ 'WHERE'
+ );
+ $words_ending_table_ref_cnt = 9; //count($words_ending_table_ref);
+
+ $words_ending_clauses = array(
+ 'FOR',
+ 'LIMIT',
+ 'LOCK',
+ 'PROCEDURE',
+ 'UNION'
+ );
+ $words_ending_clauses_cnt = 5; //count($words_ending_clauses);
+
+ // must be sorted
+ $supported_query_types = array(
+ 'SELECT'
+ /*
+ // Support for these additional query types will come later on.
+ 'DELETE',
+ 'INSERT',
+ 'REPLACE',
+ 'TRUNCATE',
+ 'UPDATE'
+ 'EXPLAIN',
+ 'DESCRIBE',
+ 'SHOW',
+ 'CREATE',
+ 'SET',
+ 'ALTER'
+ */
+ );
+ $supported_query_types_cnt = count($supported_query_types);
+
+ // loop #1 for each token: select_expr, table_ref for SELECT
+
+ foreach ($this->_parsed as $pos => $each_parsed) {
+//DEBUG echo "Loop1 <b>" . $each_parsed['data'] . "</b> (" . $each_parsed['type'] . ")<br />";
+
+ // High speed seek for locating the end of the current query
+ if ($seek_queryend == TRUE) {
+ if ($each_parsed['type'] === 'punct_queryend') {
+ $seek_queryend = FALSE;
+ } else {
+ continue;
+ } // end if (type == punct_queryend)
+ } // end if ($seek_queryend)
+
+ /**
+ * Note: do not split if this is a punct_queryend for the first and only query
+ * @todo when we find a UNION, should we split in another subresult?
+ */
+ if ($each_parsed['type'] == 'punct_queryend'
+ && ($pos + 1 != $this->_parsed_size)) {
+ $this->_analyzed[] = $subresult;
+ $subresult = $subresult_empty;
+ continue;
+ } // end if (type == punct_queryend)
+
+// ==============================================================
+ if ($each_parsed['type'] == 'punct_bracket_open_round') {
+ if ($in_extract) {
+ $number_of_brackets_in_extract++;
+ }
+ if ($in_group_concat) {
+ $number_of_brackets_in_group_concat++;
+ }
+ }
+// ==============================================================
+ if ($each_parsed['type'] == 'punct_bracket_close_round') {
+ if ($in_extract) {
+ $number_of_brackets_in_extract--;
+ if ($number_of_brackets_in_extract == 0) {
+ $in_extract = FALSE;
+ }
+ }
+ if ($in_group_concat) {
+ $number_of_brackets_in_group_concat--;
+ if ($number_of_brackets_in_group_concat == 0) {
+ $in_group_concat = FALSE;
+ }
+ }
+ }
+// ==============================================================
+ if ($each_parsed['type'] == 'alpha_functionName') {
+ $upper_data = strtoupper($each_parsed['data']);
+ if ($upper_data === 'EXTRACT') {
+ $in_extract = TRUE;
+ $number_of_brackets_in_extract = 0;
+ }
+ if ($upper_data === 'GROUP_CONCAT') {
+ $in_group_concat = TRUE;
+ $number_of_brackets_in_group_concat = 0;
+ }
+ }
+
+// ==============================================================
+ if ($each_parsed['type'] == 'alpha_reservedWord'
+// && $each_parsed['forbidden'] == FALSE) {
+ ) {
+ // upper once
+ $upper_data = strtoupper($each_parsed['data']);
+
+ // We don't know what type of query yet, so run this
+ if ($subresult['querytype'] === '') {
+ $subresult['querytype'] = $upper_data;
+
+ // Check if we support this type of query
+ if (! PMA_STR_binarySearchInArr($subresult['querytype'],
+ $supported_query_types, $supported_query_types_cnt)) {
+ // Skip ahead to the next one if we don't
+ $seek_queryend = TRUE;
+ continue;
+ } // end if (query not supported)
+ } // end if (querytype was empty)
+
+ /**
+ * @todo reset for each query?
+ */
+
+ if ($upper_data == 'SELECT') {
+ $seen_from = FALSE;
+ $previous_was_identifier = FALSE;
+ $current_select_expr = -1;
+ $seen_end_of_table_ref = FALSE;
+ } // end if ( data == SELECT)
+
+ if ($upper_data =='FROM' && ! $in_extract) {
+ $current_table_ref = -1;
+ $seen_from = TRUE;
+ $previous_was_identifier = FALSE;
+ $save_table_ref = TRUE;
+ } // end if (data == FROM)
+
+ // here, do not 'continue' the loop, as we have more work for
+ // reserved words below
+ } // end if (type == alpha_reservedWord)
+
+// ==============================
+ if ($each_parsed['type'] == 'quote_backtick'
+ || $each_parsed['type'] == 'quote_double'
+ || $each_parsed['type'] == 'quote_single'
+ || $each_parsed['type'] == 'alpha_identifier'
+ || ($each_parsed['type'] == 'alpha_reservedWord'
+ && $each_parsed['forbidden'] == FALSE)) {
+
+ switch ($each_parsed['type']) {
+ case 'alpha_identifier':
+ case 'alpha_reservedWord':
+ /**
+ * this is not a real reservedWord, because it's not
+ * present in the list of forbidden words, for example
+ * "storage" which can be used as an identifier
+ *
+ * @todo avoid the pretty printing in color in this case
+ */
+ $identifier = $each_parsed['data'];
+ break;
+
+ case 'quote_backtick':
+ case 'quote_double':
+ case 'quote_single':
+ $identifier = PMA_unQuote($each_parsed['data']);
+ break;
+ } // end switch
+
+ if ($subresult['querytype'] == 'SELECT' && ! $in_group_concat) {
+ if (! $seen_from) {
+ if ($previous_was_identifier && isset($chain)) {
+ // found alias for this select_expr, save it
+ // but only if we got something in $chain
+ // (for example, SELECT COUNT(*) AS cnt
+ // puts nothing in $chain, so we avoid
+ // setting the alias)
+ $alias_for_select_expr = $identifier;
+ } else {
+ $chain[] = $identifier;
+ $previous_was_identifier = TRUE;
+
+ } // end if !$previous_was_identifier
+ } else {
+ // ($seen_from)
+ if ($save_table_ref && !$seen_end_of_table_ref) {
+ if ($previous_was_identifier) {
+ // found alias for table ref
+ // save it for later
+ $alias_for_table_ref = $identifier;
+ } else {
+ $chain[] = $identifier;
+ $previous_was_identifier = TRUE;
+
+ } // end if ($previous_was_identifier)
+ } // end if ($save_table_ref &&!$seen_end_of_table_ref)
+ } // end if (!$seen_from)
+ } // end if (querytype SELECT)
+ } // end if ( quote_backtick or double quote or alpha_identifier)
+
+// ===================================
+ if ($each_parsed['type'] == 'punct_qualifier') {
+ // to be able to detect an identifier following another
+ $previous_was_identifier = FALSE;
+ continue;
+ } // end if (punct_qualifier)
+
+ /**
+ * @todo check if 3 identifiers following one another -> error
+ */
+
+ // s a v e a s e l e c t e x p r
+ // finding a list separator or FROM
+ // means that we must save the current chain of identifiers
+ // into a select expression
+
+ // for now, we only save a select expression if it contains
+ // at least one identifier, as we are interested in checking
+ // the columns and table names, so in "select * from persons",
+ // the "*" is not saved
+
+ if (isset($chain)
+ && !$seen_end_of_table_ref
+ && ((! $seen_from
+ && $each_parsed['type'] == 'punct_listsep')
+ || ($each_parsed['type'] == 'alpha_reservedWord'
+ && $upper_data == 'FROM'))) {
+ $size_chain = count($chain);
+ $current_select_expr++;
+ $subresult['select_expr'][$current_select_expr] = array(
+ 'expr' => '',
+ 'alias' => '',
+ 'db' => '',
+ 'table_name' => '',
+ 'table_true_name' => '',
+ 'column' => ''
+ );
+
+ if (isset($alias_for_select_expr) && strlen($alias_for_select_expr)) {
+ // we had found an alias for this select expression
+ $subresult['select_expr'][$current_select_expr]['alias'] = $alias_for_select_expr;
+ unset($alias_for_select_expr);
+ }
+ // there is at least a column
+ $subresult['select_expr'][$current_select_expr]['column'] = $chain[$size_chain - 1];
+ $subresult['select_expr'][$current_select_expr]['expr'] = $chain[$size_chain - 1];
+
+ // maybe a table
+ if ($size_chain > 1) {
+ $subresult['select_expr'][$current_select_expr]['table_name'] = $chain[$size_chain - 2];
+ // we assume for now that this is also the true name
+ $subresult['select_expr'][$current_select_expr]['table_true_name'] = $chain[$size_chain - 2];
+ $subresult['select_expr'][$current_select_expr]['expr']
+ = $subresult['select_expr'][$current_select_expr]['table_name']
+ . '.' . $subresult['select_expr'][$current_select_expr]['expr'];
+ } // end if ($size_chain > 1)
+
+ // maybe a db
+ if ($size_chain > 2) {
+ $subresult['select_expr'][$current_select_expr]['db'] = $chain[$size_chain - 3];
+ $subresult['select_expr'][$current_select_expr]['expr']
+ = $subresult['select_expr'][$current_select_expr]['db']
+ . '.' . $subresult['select_expr'][$current_select_expr]['expr'];
+ } // end if ($size_chain > 2)
+ unset($chain);
+
+ /**
+ * @todo explain this:
+ * even if this was a reservedWord it is possible this is just an alias
+ * wihtout using 'AS'
+ */
+ if (($each_parsed['type'] == 'alpha_reservedWord')
+ && ($upper_data != 'FROM')) {
+ $previous_was_identifier = TRUE;
+ }
+
+ } // end if (save a select expr)
+
+
+ //======================================
+ // s a v e a t a b l e r e f
+ //======================================
+
+ // maybe we just saw the end of table refs
+ // but the last table ref has to be saved
+ // or we are at the last token
+ // or we just got a reserved word
+ /**
+ * @todo there could be another query after this one
+ */
+
+ if (isset($chain) && $seen_from && $save_table_ref
+ && ($each_parsed['type'] == 'punct_listsep'
+ || ($each_parsed['type'] == 'alpha_reservedWord' && $upper_data != "AS")
+ || $seen_end_of_table_ref
+ || $pos == $this->_parsed_size - 1)) {
+
+ $size_chain = count($chain);
+ $current_table_ref++;
+ $subresult['table_ref'][$current_table_ref] = array(
+ 'expr' => '',
+ 'db' => '',
+ 'table_name' => '',
+ 'table_alias' => '',
+ 'table_true_name' => ''
+ );
+ if (isset($alias_for_table_ref) && strlen($alias_for_table_ref)) {
+ $subresult['table_ref'][$current_table_ref]['table_alias'] = $alias_for_table_ref;
+ unset($alias_for_table_ref);
+ }
+ $subresult['table_ref'][$current_table_ref]['table_name'] = $chain[$size_chain - 1];
+ // we assume for now that this is also the true name
+ $subresult['table_ref'][$current_table_ref]['table_true_name'] = $chain[$size_chain - 1];
+ $subresult['table_ref'][$current_table_ref]['expr']
+ = $subresult['table_ref'][$current_table_ref]['table_name'];
+ // maybe a db
+ if ($size_chain > 1) {
+ $subresult['table_ref'][$current_table_ref]['db'] = $chain[$size_chain - 2];
+ $subresult['table_ref'][$current_table_ref]['expr']
+ = $subresult['table_ref'][$current_table_ref]['db']
+ . '.' . $subresult['table_ref'][$current_table_ref]['expr'];
+ } // end if ($size_chain > 1)
+
+ // add the table alias into the whole expression
+ $subresult['table_ref'][$current_table_ref]['expr']
+ .= ' ' . $subresult['table_ref'][$current_table_ref]['table_alias'];
+
+ unset($chain);
+ $previous_was_identifier = TRUE;
+ //continue;
+
+ } // end if (save a table ref)
+
+
+ // when we have found all table refs,
+ // for each table_ref alias, put the true name of the table
+ // in the corresponding select expressions
+
+ if (isset($current_table_ref)
+ && ($seen_end_of_table_ref || $pos == $this->_parsed_size - 1)
+ && $subresult != $subresult_empty) {
+ for ($tr=0; $tr <= $current_table_ref; $tr++) {
+ $alias = $subresult['table_ref'][$tr]['table_alias'];
+ $truename = $subresult['table_ref'][$tr]['table_true_name'];
+ for ($se=0; $se <= $current_select_expr; $se++) {
+ if (isset($alias) && strlen($alias)
+ && $subresult['select_expr'][$se]['table_true_name'] == $alias) {
+ $subresult['select_expr'][$se]['table_true_name'] = $truename;
+ } // end if (found the alias)
+ } // end for (select expressions)
+
+ } // end for (table refs)
+ } // end if (set the true names)
+
+
+ // e n d i n g l o o p #1
+ // set the $previous_was_identifier to FALSE if the current
+ // token is not an identifier
+ if (($each_parsed['type'] != 'alpha_identifier')
+ && ($each_parsed['type'] != 'quote_double')
+ && ($each_parsed['type'] != 'quote_single')
+ && ($each_parsed['type'] != 'quote_backtick')) {
+ $previous_was_identifier = FALSE;
+ } // end if
+
+ // however, if we are on AS, we must keep the $previous_was_identifier
+ if (($each_parsed['type'] == 'alpha_reservedWord')
+ && ($upper_data == 'AS')) {
+ $previous_was_identifier = TRUE;
+ }
+
+ if (($each_parsed['type'] == 'alpha_reservedWord')
+ && ($upper_data =='ON' || $upper_data === 'USING')) {
+ $save_table_ref = FALSE;
+ } // end if (data == ON)
+
+ if (($each_parsed['type'] == 'alpha_reservedWord')
+ && ($upper_data =='JOIN' || $upper_data === 'FROM')) {
+ $save_table_ref = TRUE;
+ } // end if (data == JOIN)
+
+ /**
+ * no need to check the end of table ref if we already did
+ *
+ * @todo maybe add "&& $seen_from"
+ */
+ if (!$seen_end_of_table_ref) {
+ // if this is the last token, it implies that we have
+ // seen the end of table references
+ // Check for the end of table references
+ //
+ // Note: if we are analyzing a GROUP_CONCAT clause,
+ // we might find a word that seems to indicate that
+ // we have found the end of table refs (like ORDER)
+ // but it's a modifier of the GROUP_CONCAT so
+ // it's not the real end of table refs
+ if (($pos == $this->_parsed_size - 1)
+ || ($each_parsed['type'] == 'alpha_reservedWord'
+ && !$in_group_concat
+ && PMA_STR_binarySearchInArr($upper_data, $words_ending_table_ref, $words_ending_table_ref_cnt))) {
+ $seen_end_of_table_ref = TRUE;
+ // to be able to save the last table ref, but do not
+ // set it true if we found a word like "ON" that has
+ // already set it to false
+ if (isset($save_table_ref) && $save_table_ref != FALSE) {
+ $save_table_ref = TRUE;
+ } //end if
+
+ } // end if (check for end of table ref)
+ } //end if (!$seen_end_of_table_ref)
+
+ if ($seen_end_of_table_ref) {
+ $save_table_ref = FALSE;
+ } // end if
+ } // end for $i (loop #1)
+
+ // -------------------------------------------------------
+ // This is a big hunk of debugging code by Marc for this.
+ // -------------------------------------------------------
+ /*
+ if (isset($current_select_expr)) {
+ for ($trace=0; $trace<=$current_select_expr; $trace++) {
+ echo "<br />";
+ reset ($subresult['select_expr'][$trace]);
+ while (list ($key, $val) = each ($subresult['select_expr'][$trace]))
+ echo "sel expr $trace $key => $val<br />\n";
+ }
+ }
+
+ if (isset($current_table_ref)) {
+ echo "current_table_ref = " . $current_table_ref . "<br>";
+ for ($trace=0; $trace<=$current_table_ref; $trace++) {
+
+ echo "<br />";
+ reset ($subresult['table_ref'][$trace]);
+ while (list ($key, $val) = each ($subresult['table_ref'][$trace]))
+ echo "table ref $trace $key => $val<br />\n";
+ }
+ }
+ */
+ // -------------------------------------------------------
+
+
+ // loop #2: - queryflags
+ // - querytype (for queries != 'SELECT')
+ // - section_before_limit, section_after_limit
+ //
+ // we will also need this queryflag in loop 2
+ // so set it here
+ if (isset($current_table_ref) && $current_table_ref > -1) {
+ $subresult['queryflags']['select_from'] = 1;
+ }
+
+ $collect_section_before_limit = TRUE;
+ $section_before_limit = '';
+ $section_after_limit = '';
+ $seen_reserved_word = FALSE;
+ $seen_group = FALSE;
+ $seen_order = FALSE;
+ $in_group_by = FALSE; // true when we are inside the GROUP BY clause
+ $in_order_by = FALSE; // true when we are inside the ORDER BY clause
+ $in_having = FALSE; // true when we are inside the HAVING clause
+ $in_select_expr = FALSE; // true when we are inside the select expr clause
+ $in_where = FALSE; // true when we are inside the WHERE clause
+ $in_from = FALSE;
+ $in_group_concat = FALSE;
+ $unsorted_query = '';
+ $first_reserved_word = '';
+ $current_identifier = '';
+
+ foreach ($this->_parsed as $pos => $each_parsed) {
+//DEBUG echo "Loop2 <b>" . $each_parsed['data'] . "</b> (" . $each_parsed['type'] . ")<br />";
+
+ // need_confirm
+ //
+ // check for reserved words that will have to generate
+ // a confirmation request later in sql.php
+ // the cases are:
+ // DROP TABLE
+ // DROP DATABASE
+ // ALTER TABLE... DROP
+ // DELETE FROM...
+ //
+ // this code is not used for confirmations coming from functions.js
+
+ /**
+ * @todo check for punct_queryend
+ * @todo verify C-style comments?
+ */
+ if ($each_parsed['type'] == 'comment_ansi') {
+ $collect_section_before_limit = FALSE;
+ }
+
+ if ($each_parsed['type'] == 'alpha_reservedWord') {
+ $upper_data = strtoupper($each_parsed['data']);
+ if (!$seen_reserved_word) {
+ $first_reserved_word = $upper_data;
+ $subresult['querytype'] = $upper_data;
+ $seen_reserved_word = TRUE;
+
+ // if the first reserved word is DROP or DELETE,
+ // we know this is a query that needs to be confirmed
+ if ($first_reserved_word=='DROP'
+ || $first_reserved_word == 'DELETE'
+ || $first_reserved_word == 'TRUNCATE') {
+ $subresult['queryflags']['need_confirm'] = 1;
+ }
+
+ if ($first_reserved_word=='SELECT'){
+ $position_of_first_select = $pos;
+ }
+
+ } else {
+ if ($upper_data=='DROP' && $first_reserved_word=='ALTER') {
+ $subresult['queryflags']['need_confirm'] = 1;
+ }
+ }
+
+ if ($upper_data == 'PROCEDURE') {
+ $collect_section_before_limit = FALSE;
+ }
+ /**
+ * @todo set also to FALSE if we find FOR UPDATE or LOCK IN SHARE MODE
+ */
+ if ($upper_data == 'SELECT') {
+ $in_select_expr = TRUE;
+ $select_expr_clause = '';
+ }
+ if ($upper_data == 'DISTINCT' && !$in_group_concat) {
+ $subresult['queryflags']['distinct'] = 1;
+ }
+
+ if ($upper_data == 'UNION') {
+ $subresult['queryflags']['union'] = 1;
+ }
+
+ if ($upper_data == 'JOIN') {
+ $subresult['queryflags']['join'] = 1;
+ }
+
+ if ($upper_data == 'OFFSET') {
+ $subresult['queryflags']['offset'] = 1;
+ }
+
+ // if this is a real SELECT...FROM
+ if ($upper_data == 'FROM'
+ && isset($subresult['queryflags']['select_from'])
+ && $subresult['queryflags']['select_from'] == 1) {
+ $in_from = TRUE;
+ $from_clause = '';
+ $in_select_expr = FALSE;
+ }
+
+
+ // (we could have less resetting of variables to FALSE
+ // if we trust that the query respects the standard
+ // MySQL order for clauses)
+
+ // we use $seen_group and $seen_order because we are looking
+ // for the BY
+ if ($upper_data == 'GROUP') {
+ $seen_group = TRUE;
+ $seen_order = FALSE;
+ $in_having = FALSE;
+ $in_order_by = FALSE;
+ $in_where = FALSE;
+ $in_select_expr = FALSE;
+ $in_from = FALSE;
+ }
+ if ($upper_data == 'ORDER' && !$in_group_concat) {
+ $seen_order = TRUE;
+ $seen_group = FALSE;
+ $in_having = FALSE;
+ $in_group_by = FALSE;
+ $in_where = FALSE;
+ $in_select_expr = FALSE;
+ $in_from = FALSE;
+ }
+ if ($upper_data == 'HAVING') {
+ $in_having = TRUE;
+ $having_clause = '';
+ $seen_group = FALSE;
+ $seen_order = FALSE;
+ $in_group_by = FALSE;
+ $in_order_by = FALSE;
+ $in_where = FALSE;
+ $in_select_expr = FALSE;
+ $in_from = FALSE;
+ }
+
+ if ($upper_data == 'WHERE') {
+ $in_where = TRUE;
+ $where_clause = '';
+ $where_clause_identifiers = array();
+ $seen_group = FALSE;
+ $seen_order = FALSE;
+ $in_group_by = FALSE;
+ $in_order_by = FALSE;
+ $in_having = FALSE;
+ $in_select_expr = FALSE;
+ $in_from = FALSE;
+ }
+
+ if ($upper_data == 'BY') {
+ if ($seen_group) {
+ $in_group_by = TRUE;
+ $group_by_clause = '';
+ }
+ if ($seen_order) {
+ $in_order_by = TRUE;
+ $order_by_clause = '';
+ }
+ }
+
+ // if we find one of the words that could end the clause
+ if (PMA_STR_binarySearchInArr($upper_data, $words_ending_clauses, $words_ending_clauses_cnt)) {
+ $in_group_by = FALSE;
+ $in_order_by = FALSE;
+ $in_having = FALSE;
+ $in_where = FALSE;
+ $in_select_expr = FALSE;
+ $in_from = FALSE;
+ }
+
+ } // endif (reservedWord)
+
+
+ // do not add a space after a function name
+ /**
+ * @todo can we combine loop 2 and loop 1? some code is repeated here...
+ */
+
+ $sep = ' ';
+ if ($each_parsed['type'] == 'alpha_functionName') {
+ $sep='';
+ $upper_data = strtoupper($each_parsed['data']);
+ if ($upper_data =='GROUP_CONCAT') {
+ $in_group_concat = TRUE;
+ $number_of_brackets_in_group_concat = 0;
+ }
+ }
+
+ if ($each_parsed['type'] == 'punct_bracket_open_round') {
+ if ($in_group_concat) {
+ $number_of_brackets_in_group_concat++;
+ }
+ }
+ if ($each_parsed['type'] == 'punct_bracket_close_round') {
+ if ($in_group_concat) {
+ $number_of_brackets_in_group_concat--;
+ if ($number_of_brackets_in_group_concat == 0) {
+ $in_group_concat = FALSE;
+ }
+ }
+ }
+
+ // do not add a space after an identifier if followed by a dot
+ if ($each_parsed['type'] == 'alpha_identifier'
+ && $pos < $this->_parsed_size - 1
+ && $this->_parsed[$pos + 1]['data'] == '.') {
+ $sep = '';
+ }
+
+ // do not add a space after a dot if followed by an identifier
+ if ($each_parsed['data'] == '.'
+ && $pos < $this->_parsed_size - 1
+ && $this->_parsed[$pos + 1]['type'] == 'alpha_identifier') {
+ $sep = '';
+ }
+
+ if ($in_select_expr && $upper_data != 'SELECT' && $upper_data != 'DISTINCT') {
+ $select_expr_clause .= $each_parsed['data'] . $sep;
+ }
+ if ($in_from && $upper_data != 'FROM') {
+ $from_clause .= $each_parsed['data'] . $sep;
+ }
+ if ($in_group_by && $upper_data != 'GROUP' && $upper_data != 'BY') {
+ $group_by_clause .= $each_parsed['data'] . $sep;
+ }
+ if ($in_order_by && $upper_data != 'ORDER' && $upper_data != 'BY') {
+ // add a space only before ASC or DESC
+ // not around the dot between dbname and tablename
+ if ($each_parsed['type'] == 'alpha_reservedWord') {
+ $order_by_clause .= $sep;
+ }
+ $order_by_clause .= $each_parsed['data'];
+ }
+ if ($in_having && $upper_data != 'HAVING') {
+ $having_clause .= $each_parsed['data'] . $sep;
+ }
+ if ($in_where && $upper_data != 'WHERE') {
+ $where_clause .= $each_parsed['data'] . $sep;
+
+ if (($each_parsed['type'] == 'quote_backtick')
+ || ($each_parsed['type'] == 'alpha_identifier')) {
+ $where_clause_identifiers[] = $each_parsed['data'];
+ }
+ }
+
+ if (isset($subresult['queryflags']['select_from'])
+ && $subresult['queryflags']['select_from'] == 1
+ && !$seen_order) {
+ $unsorted_query .= $each_parsed['data'];
+
+ if ($each_parsed['type'] != 'punct_bracket_open_round'
+ && $each_parsed['type'] != 'punct_bracket_close_round'
+ && $each_parsed['type'] != 'punct') {
+ $unsorted_query .= $sep;
+ }
+ }
+
+ // clear $upper_data for next iteration
+ $upper_data='';
+
+ if ($collect_section_before_limit && $each_parsed['type'] != 'punct_queryend') {
+ $section_before_limit .= $each_parsed['data'] . $sep;
+ } else {
+ $section_after_limit .= $each_parsed['data'] . $sep;
+ }
+
+
+ } // end for $i (loop #2)
+
+
+ // -----------------------------------------------------
+ // loop #3: foreign keys and MySQL 4.1.2+ TIMESTAMP options
+ // (for now, check only the first query)
+ // (for now, identifiers are assumed to be backquoted)
+
+ // If we find that we are dealing with a CREATE TABLE query,
+ // we look for the next punct_bracket_open_round, which
+ // introduces the fields list. Then, when we find a
+ // quote_backtick, it must be a field, so we put it into
+ // the create_table_fields array. Even if this field is
+ // not a timestamp, it will be useful when logic has been
+ // added for complete field attributes analysis.
+
+ $seen_foreign = FALSE;
+ $seen_references = FALSE;
+ $seen_constraint = FALSE;
+ $foreign_key_number = -1;
+ $seen_create_table = FALSE;
+ $seen_create = FALSE;
+ $in_create_table_fields = FALSE;
+ $brackets_level = 0;
+ $in_timestamp_options = FALSE;
+ $seen_default = FALSE;
+
+ foreach ($this->_parsed as $pos => $each_parsed) {
+ // DEBUG echo "Loop 3 <b>" . $each_parsed['data'] . "</b> " . $each_parsed['type'] . "<br />";
+
+ if ($each_parsed['type'] == 'alpha_reservedWord') {
+ $upper_data = strtoupper($each_parsed['data']);
+
+ if ($upper_data == 'NOT' && $in_timestamp_options) {
+ $create_table_fields[$current_identifier]['timestamp_not_null'] = TRUE;
+
+ }
+
+ if ($upper_data == 'CREATE') {
+ $seen_create = TRUE;
+ }
+
+ if ($upper_data == 'TABLE' && $seen_create) {
+ $seen_create_table = TRUE;
+ $create_table_fields = array();
+ }
+
+ if ($upper_data == 'CURRENT_TIMESTAMP') {
+ if ($in_timestamp_options) {
+ if ($seen_default) {
+ $create_table_fields[$current_identifier]['default_current_timestamp'] = TRUE;
+ }
+ }
+ }
+
+ if ($upper_data == 'CONSTRAINT') {
+ $foreign_key_number++;
+ $seen_foreign = FALSE;
+ $seen_references = FALSE;
+ $seen_constraint = TRUE;
+ }
+ if ($upper_data == 'FOREIGN') {
+ $seen_foreign = TRUE;
+ $seen_references = FALSE;
+ $seen_constraint = FALSE;
+ }
+ if ($upper_data == 'REFERENCES') {
+ $seen_foreign = FALSE;
+ $seen_references = TRUE;
+ $seen_constraint = FALSE;
+ }
+
+
+ // Cases covered:
+
+ // [ON DELETE {CASCADE | SET NULL | NO ACTION | RESTRICT}]
+ // [ON UPDATE {CASCADE | SET NULL | NO ACTION | RESTRICT}]
+
+ // but we set ['on_delete'] or ['on_cascade'] to
+ // CASCADE | SET_NULL | NO_ACTION | RESTRICT
+
+ // ON UPDATE CURRENT_TIMESTAMP
+
+ if ($upper_data == 'ON') {
+ if ($this->_parsed[$pos + 1]['type'] == 'alpha_reservedWord') {
+ $second_upper_data = strtoupper($this->_parsed[$pos + 1]['data']);
+ if ($second_upper_data == 'DELETE') {
+ $clause = 'on_delete';
+ }
+ if ($second_upper_data == 'UPDATE') {
+ $clause = 'on_update';
+ }
+ if (isset($clause)
+ && ($this->_parsed[$pos + 2]['type'] == 'alpha_reservedWord'
+
+ // ugly workaround because currently, NO is not
+ // in the list of reserved words in sqlparser.data
+ // (we got a bug report about not being able to use
+ // 'no' as an identifier)
+ || ($this->_parsed[$pos + 2]['type'] == 'alpha_identifier'
+ && strtoupper($this->_parsed[$pos + 2]['data'])=='NO') )
+ ) {
+ $third_upper_data = strtoupper($this->_parsed[$pos + 2]['data']);
+ if ($third_upper_data == 'CASCADE'
+ || $third_upper_data == 'RESTRICT') {
+ $value = $third_upper_data;
+ } elseif ($third_upper_data == 'SET'
+ || $third_upper_data == 'NO') {
+ if ($this->_parsed[$pos + 3]['type'] == 'alpha_reservedWord') {
+ $value = $third_upper_data . '_'
+ . strtoupper($this->_parsed[$pos + 3]['data']);
+ }
+ } elseif ($third_upper_data == 'CURRENT_TIMESTAMP') {
+ if ($clause == 'on_update'
+ && $in_timestamp_options) {
+ $create_table_fields[$current_identifier]['on_update_current_timestamp'] = TRUE;
+ $seen_default = FALSE;
+ }
+
+ } else {
+ $value = '';
+ }
+ if (!empty($value)) {
+ $foreign[$foreign_key_number][$clause] = $value;
+ }
+ unset($clause);
+ } // endif (isset($clause))
+ }
+ }
+
+ } // end of reserved words analysis
+
+
+ if ($each_parsed['type'] == 'punct_bracket_open_round') {
+ $brackets_level++;
+ if ($seen_create_table && $brackets_level == 1) {
+ $in_create_table_fields = TRUE;
+ }
+ }
+
+
+ if ($each_parsed['type'] == 'punct_bracket_close_round') {
+ $brackets_level--;
+ if ($seen_references) {
+ $seen_references = FALSE;
+ }
+ if ($seen_create_table && $brackets_level == 0) {
+ $in_create_table_fields = FALSE;
+ }
+ }
+
+ if (($each_parsed['type'] == 'alpha_columnAttrib')) {
+ $upper_data = strtoupper($each_parsed['data']);
+ if ($seen_create_table && $in_create_table_fields) {
+ if ($upper_data == 'DEFAULT') {
+ $seen_default = TRUE;
+ }
+ }
+ }
+
+ /**
+ * @see @todo 2005-10-16 note: the "or" part here is a workaround for a bug
+ */
+ if ($each_parsed['type'] == 'alpha_columnType'
+ || ($each_parsed['type'] == 'alpha_functionName'
+ && $seen_create_table)) {
+ $upper_data = strtoupper($each_parsed['data']);
+ if ($seen_create_table && $in_create_table_fields && isset($current_identifier)) {
+ $create_table_fields[$current_identifier]['type'] = $upper_data;
+ if ($upper_data == 'TIMESTAMP') {
+ $each_parsed['type'] = 'alpha_columnType';
+ $in_timestamp_options = TRUE;
+ } else {
+ $in_timestamp_options = FALSE;
+ if ($upper_data == 'CHAR') {
+ $each_parsed['type'] = 'alpha_columnType';
+ }
+ }
+ }
+ }
+
+
+ if ($each_parsed['type'] == 'quote_backtick'
+ || $each_parsed['type'] == 'alpha_identifier') {
+
+ if ($each_parsed['type'] == 'quote_backtick') {
+ // remove backquotes
+ $identifier = PMA_unQuote($each_parsed['data']);
+ } else {
+ $identifier = $each_parsed['data'];
+ }
+
+ if ($seen_create_table && $in_create_table_fields) {
+ $current_identifier = $identifier;
+ // warning: we set this one even for non TIMESTAMP type
+ $create_table_fields[$current_identifier]['timestamp_not_null'] = FALSE;
+ }
+
+ if ($seen_constraint) {
+ $foreign[$foreign_key_number]['constraint'] = $identifier;
+ }
+
+ if ($seen_foreign && $brackets_level > 0) {
+ $foreign[$foreign_key_number]['index_list'][] = $identifier;
+ }
+
+ if ($seen_references) {
+ // here, the first bracket level corresponds to the
+ // bracket of CREATE TABLE
+ // so if we are on level 2, it must be the index list
+ // of the foreign key REFERENCES
+ if ($brackets_level > 1) {
+ $foreign[$foreign_key_number]['ref_index_list'][] = $identifier;
+ } else {
+ // for MySQL 4.0.18, identifier is
+ // `table` or `db`.`table`
+ // the first pass will pick the db name
+ // the next pass will execute the else and pick the
+ // db name in $db_table[0]
+ if ($this->_parsed[$pos + 1]['type'] == 'punct_qualifier') {
+ $foreign[$foreign_key_number]['ref_db_name'] = $identifier;
+ } else {
+ // for MySQL 4.0.16, identifier is
+ // `table` or `db.table`
+ $db_table = explode('.', $identifier);
+ if (isset($db_table[1])) {
+ $foreign[$foreign_key_number]['ref_db_name'] = $db_table[0];
+ $foreign[$foreign_key_number]['ref_table_name'] = $db_table[1];
+ } else {
+ $foreign[$foreign_key_number]['ref_table_name'] = $db_table[0];
+ }
+ }
+ }
+ }
+ }
+ } // end for $i (loop #3)
+
+
+ // Fill the $subresult array
+
+ if (isset($create_table_fields)) {
+ $subresult['create_table_fields'] = $create_table_fields;
+ }
+
+ if (isset($foreign)) {
+ $subresult['foreign_keys'] = $foreign;
+ }
+
+ if (isset($select_expr_clause)) {
+ $subresult['select_expr_clause'] = $select_expr_clause;
+ }
+ if (isset($from_clause)) {
+ $subresult['from_clause'] = $from_clause;
+ }
+ if (isset($group_by_clause)) {
+ $subresult['group_by_clause'] = $group_by_clause;
+ }
+ if (isset($order_by_clause)) {
+ $subresult['order_by_clause'] = $order_by_clause;
+ }
+ if (isset($having_clause)) {
+ $subresult['having_clause'] = $having_clause;
+ }
+ if (isset($where_clause)) {
+ $subresult['where_clause'] = $where_clause;
+ }
+ if (isset($unsorted_query) && !empty($unsorted_query)) {
+ $subresult['unsorted_query'] = $unsorted_query;
+ }
+ if (isset($where_clause_identifiers)) {
+ $subresult['where_clause_identifiers'] = $where_clause_identifiers;
+ }
+
+ if (isset($position_of_first_select)) {
+ $subresult['position_of_first_select'] = $position_of_first_select;
+ $subresult['section_before_limit'] = $section_before_limit;
+ $subresult['section_after_limit'] = $section_after_limit;
+ }
+
+ // They are naughty and didn't have a trailing semi-colon,
+ // then still handle it properly
+ if ($subresult['querytype'] != '') {
+ $this->_analyzed[] = $subresult;
+ }
+ return $this->_analyzed;
+ } // end of the "analyze()" function
+
+ /**
+ * Colorizes SQL queries html formatted
+ *
+ * @todo check why adding a "\n" after the </span> would cause extra blanks
+ * to be displayed: SELECT p . person_name
+ *
+ * @access public
+ * @param array The SQL queries html formatted
+ * @return array The colorized SQL queries
+ */
+ function getFormatedHtmlColored($parsed)
+ {
+ $i = $GLOBALS['PMA_strpos']($parsed['type'], '_');
+ $class = '';
+ if ($i > 0) {
+ $class = 'syntax_' . PMA_substr($parsed['type'], 0, $i) . ' ';
+ }
+
+ $class .= 'syntax_' . $parsed['type'];
+
+ return '<span class="' . $class . '">' . htmlspecialchars($parsed['data']) . '</span>';
+ } // end of the "getFormatedHtmlColored()" function
+
+ /**
+ * Formats SQL queries to html
+ *
+ * @access public
+ * @param array The SQL queries
+ * @param string mode
+ * @param integer starting token
+ * @param integer number of tokens to format, -1 = all
+ * @return string The formatted SQL queries
+ */
+ function getFormatedHtml($mode = 'color', $start_token = 0, $number_of_tokens = -1)
+ {
+ //DEBUG echo 'in Format<pre>'; print_r($this->_parsed); echo '</pre>';
+ // then check for an array
+ if (!is_array($this->_parsed)) {
+ return htmlspecialchars($this->_parsed);
+ }
+ // first check for the SQL parser having hit an error
+ if (PMA_SQP_isError()) {
+ return htmlspecialchars($this->_raw);
+ }
+ // else do it properly
+ switch ($mode) {
+ case 'color':
+ $str = '<span class="syntax">';
+ $html_line_break = '<br />';
+ break;
+ case 'query_only':
+ $str = '';
+ $html_line_break = "\n";
+ break;
+ case 'text':
+ $str = '';
+ $html_line_break = '<br />';
+ break;
+ } // end switch
+ $indent = 0;
+ $bracketlevel = 0;
+ $functionlevel = 0;
+ $infunction = FALSE;
+ $space_punct_listsep = ' ';
+ $space_punct_listsep_function_name = ' ';
+ // $space_alpha_reserved_word = '<br />'."\n";
+ $space_alpha_reserved_word = ' ';
+
+ $keywords_with_brackets_1before = array(
+ 'INDEX',
+ 'KEY',
+ 'ON',
+ 'USING'
+ );
+ $keywords_with_brackets_1before_cnt = 4;
+
+ $keywords_with_brackets_2before = array(
+ 'IGNORE',
+ 'INDEX',
+ 'INTO',
+ 'KEY',
+ 'PRIMARY',
+ 'PROCEDURE',
+ 'REFERENCES',
+ 'UNIQUE',
+ 'USE'
+ );
+ // $keywords_with_brackets_2before_cnt = count($keywords_with_brackets_2before);
+ $keywords_with_brackets_2before_cnt = 9;
+
+ // These reserved words do NOT get a newline placed near them.
+ $keywords_no_newline = array(
+ 'AS',
+ 'ASC',
+ 'DESC',
+ 'DISTINCT',
+ 'DUPLICATE',
+ 'HOUR',
+ 'INTERVAL',
+ 'IS',
+ 'LIKE',
+ 'NOT',
+ 'NULL',
+ 'ON',
+ 'REGEXP'
+ );
+ $keywords_no_newline_cnt = 12;
+
+ // These reserved words introduce a privilege list
+ $keywords_priv_list = array(
+ 'GRANT',
+ 'REVOKE'
+ );
+ $keywords_priv_list_cnt = 2;
+
+ if ($number_of_tokens == -1) {
+ $number_of_tokens = $this->_parsed_size;
+ }
+ $typearr = array();
+ if ($number_of_tokens >= 0) {
+ $typearr[0] = '';
+ $typearr[1] = '';
+ $typearr[2] = '';
+ //$typearr[3] = $this->_parsed[0]['type'];
+ $typearr[3] = $this->_parsed[$start_token]['type'];
+ }
+
+ $in_priv_list = FALSE;
+ for ($i = $start_token; $i < $number_of_tokens; $i++) {
+ $each_parsed = $this->_parsed[$i];
+// DEBUG echo "Loop format <b>" . $each_parsed['data'] . "</b> " . $each_parsed['type'] . "<br />";
+ $before = '';
+ $after = '';
+ $indent = 0;
+ // array_shift($typearr);
+ /*
+ 0 prev2
+ 1 prev
+ 2 current
+ 3 next
+ */
+ if (($i + 1) < $number_of_tokens) {
+ // array_push($typearr, $this->_parsed[$i + 1]['type']);
+ $typearr[4] = $this->_parsed[$i + 1]['type'];
+ } else {
+ //array_push($typearr, null);
+ $typearr[4] = '';
+ }
+
+ for ($j = 0; $j < 4; $j++) {
+ $typearr[$j] = $typearr[$j + 1];
+ }
+
+ switch ($typearr[2]) {
+ case 'white_newline':
+ $before = '';
+ break;
+ case 'punct_bracket_open_round':
+ $bracketlevel++;
+ $infunction = FALSE;
+ // Make sure this array is sorted!
+ if ($typearr[1] == 'alpha_functionName'
+ || $typearr[1] == 'alpha_columnType'
+ || $typearr[1] == 'punct'
+ || $typearr[3] == 'digit_integer'
+ || $typearr[3] == 'digit_hex'
+ || $typearr[3] == 'digit_float'
+ || ($typearr[0] == 'alpha_reservedWord'
+ && PMA_STR_binarySearchInArr(strtoupper($this->_parsed[$i - 2]['data']), $keywords_with_brackets_2before, $keywords_with_brackets_2before_cnt))
+ || ($typearr[1] == 'alpha_reservedWord'
+ && PMA_STR_binarySearchInArr(strtoupper($this->_parsed[$i - 1]['data']), $keywords_with_brackets_1before, $keywords_with_brackets_1before_cnt))
+ ) {
+ $functionlevel++;
+ $infunction = TRUE;
+ $after .= ' ';
+ } else {
+ $indent++;
+ $after .= ($mode != 'query_only' ? '<div class="syntax_indent' . $indent . '">' : ' ');
+ }
+ break;
+ case 'alpha_identifier':
+ if ($typearr[1] == 'punct_qualifier'
+ || $typearr[3] == 'punct_qualifier') {
+ $after = '';
+ $before = '';
+ }
+ if ($typearr[3] == 'alpha_columnType'
+ || $typearr[3] == 'alpha_identifier') {
+ $after .= ' ';
+ }
+ break;
+ case 'punct_qualifier':
+ $before = '';
+ $after = '';
+ break;
+ case 'punct_listsep':
+ if ($infunction == TRUE) {
+ $after .= $space_punct_listsep_function_name;
+ } else {
+ $after .= $space_punct_listsep;
+ }
+ break;
+ case 'punct_queryend':
+ if ($typearr[3] != 'comment_mysql'
+ && $typearr[3] != 'comment_ansi'
+ && $typearr[3] != 'comment_c') {
+ $after .= $html_line_break;
+ $after .= $html_line_break;
+ }
+ $space_punct_listsep = ' ';
+ $space_punct_listsep_function_name = ' ';
+ $space_alpha_reserved_word = ' ';
+ $in_priv_list = FALSE;
+ break;
+ case 'comment_mysql':
+ case 'comment_ansi':
+ $after .= $html_line_break;
+ break;
+ case 'punct':
+ $before .= ' ';
+ // workaround for
+ // select * from mytable limit 0,-1
+ // (a side effect of this workaround is that
+ // select 20 - 9
+ // becomes
+ // select 20 -9
+ // )
+ if ($typearr[3] != 'digit_integer') {
+ $after .= ' ';
+ }
+ break;
+ case 'punct_bracket_close_round':
+ $bracketlevel--;
+ if ($infunction == TRUE) {
+ $functionlevel--;
+ $after .= ' ';
+ $before .= ' ';
+ } else {
+ $indent--;
+ $before .= ($mode != 'query_only' ? '</div>' : ' ');
+ }
+ $infunction = ($functionlevel > 0) ? TRUE : FALSE;
+ break;
+ case 'alpha_columnType':
+ if ($typearr[3] == 'alpha_columnAttrib') {
+ $after .= ' ';
+ }
+ if ($typearr[1] == 'alpha_columnType') {
+ $before .= ' ';
+ }
+ break;
+ case 'alpha_columnAttrib':
+
+ // ALTER TABLE tbl_name AUTO_INCREMENT = 1
+ // COLLATE LATIN1_GENERAL_CI DEFAULT
+ if ($typearr[1] == 'alpha_identifier'
+ || $typearr[1] == 'alpha_charset') {
+ $before .= ' ';
+ }
+ if ($typearr[3] == 'alpha_columnAttrib'
+ || $typearr[3] == 'quote_single'
+ || $typearr[3] == 'digit_integer') {
+ $after .= ' ';
+ }
+ // workaround for
+ // AUTO_INCREMENT = 31DEFAULT_CHARSET = utf-8
+
+ if ($typearr[2] == 'alpha_columnAttrib'
+ && $typearr[3] == 'alpha_reservedWord') {
+ $before .= ' ';
+ }
+ // workaround for
+ // select * from mysql.user where binary user="root"
+ // binary is marked as alpha_columnAttrib
+ // but should be marked as a reserved word
+ if (strtoupper($each_parsed['data']) == 'BINARY'
+ && $typearr[3] == 'alpha_identifier') {
+ $after .= ' ';
+ }
+ break;
+ case 'alpha_reservedWord':
+ // do not uppercase the reserved word if we are calling
+ // this function in query_only mode, because we need
+ // the original query (otherwise we get problems with
+ // semi-reserved words like "storage" which is legal
+ // as an identifier name)
+
+ if ($mode != 'query_only') {
+ $each_parsed['data'] = strtoupper($each_parsed['data']);
+ }
+
+ if (($typearr[1] != 'alpha_reservedWord'
+ || ($typearr[1] == 'alpha_reservedWord'
+ && PMA_STR_binarySearchInArr(strtoupper($this->_parsed[$i - 1]['data']), $keywords_no_newline, $keywords_no_newline_cnt)))
+ && $typearr[1] != 'punct_level_plus'
+ && !PMA_STR_binarySearchInArr($each_parsed['data'], $keywords_no_newline, $keywords_no_newline_cnt)) {
+ // do not put a space before the first token, because
+ // we use a lot of eregi() checking for the first
+ // reserved word at beginning of query
+ // so do not put a newline before
+ //
+ // also we must not be inside a privilege list
+ if ($i > 0) {
+ // the alpha_identifier exception is there to
+ // catch cases like
+ // GRANT SELECT ON mydb.mytable TO myuser@localhost
+ // (else, we get mydb.mytableTO )
+ //
+ // the quote_single exception is there to
+ // catch cases like
+ // GRANT ... TO 'marc'@'domain.com' IDENTIFIED...
+ /**
+ * @todo fix all cases and find why this happens
+ */
+
+ if (!$in_priv_list
+ || $typearr[1] == 'alpha_identifier'
+ || $typearr[1] == 'quote_single'
+ || $typearr[1] == 'white_newline') {
+ $before .= $space_alpha_reserved_word;
+ }
+ } else {
+ // on first keyword, check if it introduces a
+ // privilege list
+ if (PMA_STR_binarySearchInArr($each_parsed['data'], $keywords_priv_list, $keywords_priv_list_cnt)) {
+ $in_priv_list = TRUE;
+ }
+ }
+ } else {
+ $before .= ' ';
+ }
+
+ switch ($each_parsed['data']) {
+ case 'CREATE':
+ if (!$in_priv_list) {
+ $space_punct_listsep = $html_line_break;
+ $space_alpha_reserved_word = ' ';
+ }
+ break;
+ case 'EXPLAIN':
+ case 'DESCRIBE':
+ case 'SET':
+ case 'ALTER':
+ case 'DELETE':
+ case 'SHOW':
+ case 'DROP':
+ case 'UPDATE':
+ case 'TRUNCATE':
+ case 'ANALYZE':
+ case 'ANALYSE':
+ if (!$in_priv_list) {
+ $space_punct_listsep = $html_line_break;
+ $space_alpha_reserved_word = ' ';
+ }
+ break;
+ case 'INSERT':
+ case 'REPLACE':
+ if (!$in_priv_list) {
+ $space_punct_listsep = $html_line_break;
+ $space_alpha_reserved_word = $html_line_break;
+ }
+ break;
+ case 'VALUES':
+ $space_punct_listsep = ' ';
+ $space_alpha_reserved_word = $html_line_break;
+ break;
+ case 'SELECT':
+ $space_punct_listsep = ' ';
+ $space_alpha_reserved_word = $html_line_break;
+ break;
+ default:
+ break;
+ } // end switch ($each_parsed['data'])
+
+ $after .= ' ';
+ break;
+ case 'digit_integer':
+ case 'digit_float':
+ case 'digit_hex':
+ /**
+ * @todo could there be other types preceding a digit?
+ */
+ if ($typearr[1] == 'alpha_reservedWord') {
+ $after .= ' ';
+ }
+ if ($infunction && $typearr[3] == 'punct_bracket_close_round') {
+ $after .= ' ';
+ }
+ if ($typearr[1] == 'alpha_columnAttrib') {
+ $before .= ' ';
+ }
+ break;
+ case 'alpha_variable':
+ // other workaround for a problem similar to the one
+ // explained below for quote_single
+ if (!$in_priv_list && $typearr[3] != 'quote_backtick') {
+ $after = ' ';
+ }
+ break;
+ case 'quote_double':
+ case 'quote_single':
+ // workaround: for the query
+ // REVOKE SELECT ON `base2\_db`.* FROM 'user'@'%'
+ // the @ is incorrectly marked as alpha_variable
+ // in the parser, and here, the '%' gets a blank before,
+ // which is a syntax error
+ if ($typearr[1] !='alpha_variable') {
+ $before .= ' ';
+ }
+ if ($infunction && $typearr[3] == 'punct_bracket_close_round') {
+ $after .= ' ';
+ }
+ break;
+ case 'quote_backtick':
+ if ($typearr[3] != 'punct_qualifier'
+ && $typearr[3] != 'alpha_variable') {
+ $after .= ' ';
+ }
+ if ($typearr[1] != 'punct_qualifier'
+ && $typearr[1] != 'alpha_variable') {
+ $before .= ' ';
+ }
+ break;
+ default:
+ break;
+ } // end switch ($typearr[2])
+
+ /*
+ if ($typearr[3] != 'punct_qualifier') {
+ $after .= ' ';
+ }
+ $after .= "\n";
+ */
+ $str .= $before
+ . ($mode == 'color' ? $this->getFormatedHtmlColored($each_parsed) : $each_parsed['data'])
+ . $after;
+ } // end for
+ if ($mode == 'color') {
+ $str .= '</span>';
+ }
+
+ return $str;
+ } // end of the "getFormatedHtml()" function
+
+ /**
+ * Builds a CSS rule used for html formatted SQL queries
+ *
+ * @param string The class name
+ * @param string The property name
+ * @param string The property value
+ * @return string The CSS rule
+ * @access public
+ * @see PMA_Sql::getCssData()
+ */
+ function getCssRule($classname, $property, $value)
+ {
+ $str = '.' . $classname . ' {';
+ if ($value != '') {
+ $str .= $property . ': ' . $value . ';';
+ }
+ $str .= '}' . "\n";
+
+ return $str;
+ } // end of the "getCssRule()" function
+
+ /**
+ * Builds CSS rules used for html formatted SQL queries
+ *
+ * @return string The CSS rules set
+ * @access public
+ * @global array The current PMA configuration
+ * @see PMA_Sql::getCssRule()
+ */
+ function getCssData()
+ {
+ global $cfg;
+
+ $css_string = '';
+ foreach ($cfg['SQP']['fmtColor'] as $key => $col) {
+ $css_string .= $this->getCssRule('syntax_' . $key, 'color', $col);
+ }
+
+ for ($i = 0; $i < 8; $i++) {
+ $css_string .= $this->getCssRule('syntax_indent' . $i, 'margin-left',
+ ($i * $cfg['SQP']['fmtInd']) . $cfg['SQP']['fmtIndUnit']);
+ }
+
+ return $css_string;
+ } // end of the "getCssData()" function
+
+ /**
+ * Gets SQL queries with no format
+ *
+ * @param array The SQL queries list
+ * @return string The SQL queries with no format
+ * @access public
+ */
+ function getFormatedNone()
+ {
+ $formatted_sql = htmlspecialchars($this->_raw);
+ $formatted_sql = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n",
+ $formatted_sql);
+
+ return $formatted_sql;
+ } // end of the "getFormatedNone()" function
+
+ /**
+ * Gets SQL queries in text format
+ *
+ * @todo WRITE THIS!
+ * @param array The SQL queries list
+ * @return string The SQL queries in text format
+ * @access public
+ */
+ function getFormatedText()
+ {
+ return $this->getFormatedNone();
+ } // end of the "getFormatedText()" function
+}
+?>
diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index 196a249ebc..a8a1d117ef 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -1,49 +1,73 @@
<?php
-/* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4:
-
+/**
+ * hold PMA_Theme class
+ *
+ * @version $Id$
+ */
+
+/**
+ * handles theme
+ *
+ * @todo add the possibility to make a theme depends on another theme and by default on orignal
+ * @todo make all components optional - taking missing compnents from 'parent' theme
+ * @todo make css optionaly replacing 'parent' css or extending it (by appending at the end)
+ * @todo add an optional global css file - which will be used for both frames
+ *
+ */
class PMA_Theme {
/**
- * @var string version
+ * @var string theme version
+ * @access protected
*/
var $version = '0.0.0.0';
/**
- * @var string name
+ * @var string theme name
+ * @access protected
*/
var $name = '';
/**
- * @var string id
+ * @var string theme id
+ * @access protected
*/
var $id = '';
/**
- * @var string
+ * @var string theme path
+ * @access protected
*/
var $path = '';
/**
- * @var string
+ * @var string image path
+ * @access protected
*/
var $img_path = '';
/**
* @var array valid css types
+ * @access protected
*/
var $types = array('left', 'right', 'print');
/**
* @var integer last modification time for info file
+ * @access protected
*/
var $mtime_info = 0;
- function __wakeup()
- {
- $this->loadInfo();
- $this->checkImgPath();
- }
-
+ /**
+ * @access public
+ * @uses PMA_Theme::getPath()
+ * @uses PMA_Theme::$mtime_info
+ * @uses PMA_Theme::setVersion()
+ * @uses PMA_Theme::setName()
+ * @uses filemtime()
+ * @uses file_exists()
+ * @return boolean whether loading them info was successful or not
+ */
function loadInfo()
{
if (! file_exists($this->getPath() . '/info.inc.php')) {
@@ -78,12 +102,16 @@ class PMA_Theme {
* or false if theme is invalid
*
* @static
- * @param string path to theme
+ * @access public
+ * @uses PMA_Theme
+ * @uses PMA_Theme::setPath()
+ * @uses PMA_Theme::loadInfo()
+ * @uses PMA_Theme::checkImgPath()
+ * @param string $folder path to theme
* @return object PMA_Theme
*/
function load($folder)
{
-
$theme = new PMA_Theme();
$theme->setPath($folder);
@@ -97,6 +125,19 @@ class PMA_Theme {
return $theme;
}
+ /**
+ * checks image path for existance - if not found use img from original theme
+ *
+ * @access public
+ * @uses PMA_Theme::getPath()
+ * @uses PMA_Theme::setImgPath()
+ * @uses PMA_Theme::getName()
+ * @uses $GLOBALS['cfg']['ThemePath']
+ * @uses $GLOBALS['PMA_errors']
+ * @uses $GLOBALS['strThemeNoValidImgPath']
+ * @uses is_dir()
+ * @uses sprintf()
+ */
function checkImgPath()
{
if (is_dir($this->getPath() . '/img/')) {
@@ -108,16 +149,20 @@ class PMA_Theme {
} else {
$GLOBALS['PMA_errors'][] =
sprintf($GLOBALS['strThemeNoValidImgPath'], $this->getName());
+ /*
trigger_error(
sprintf($GLOBALS['strThemeNoValidImgPath'], $this->getName()),
E_USER_WARNING);
+ */
return false;
}
}
/**
* returns path to theme
- * @uses $this->$path as return value
+ *
+ * @access public
+ * @uses PMA_Theme::$path as return value
* @return string $path path to theme
*/
function getPath()
@@ -128,6 +173,8 @@ class PMA_Theme {
/**
* returns layout file
*
+ * @access public
+ * @uses PMA_Theme::getPath()
* @return string layout file
*/
function getLayoutFile()
@@ -137,7 +184,9 @@ class PMA_Theme {
/**
* set path to theme
- * @uses $this->$path to set it
+ *
+ * @access public
+ * @uses PMA_Theme::$path to set it
* @param string $path path to theme
*/
function setPath($path)
@@ -147,7 +196,9 @@ class PMA_Theme {
/**
* sets version
- * @uses $this->version
+ *
+ * @access public
+ * @uses PMA_Theme::$version
* @param string new version
*/
function setVersion($version)
@@ -157,7 +208,9 @@ class PMA_Theme {
/**
* returns version
- * @uses $this->version
+ *
+ * @access public
+ * @uses PMA_Theme::$version
* @return string version
*/
function getVersion()
@@ -169,8 +222,9 @@ class PMA_Theme {
* checks theme version agaisnt $version
* returns true if theme version is equal or higher to $version
*
+ * @access public
* @uses version_compare()
- * @uses $this->getVersion()
+ * @uses PMA_Theme::getVersion()
* @param string $version version to compare to
* @return boolean
*/
@@ -181,6 +235,10 @@ class PMA_Theme {
/**
* sets name
+ *
+ * @access public
+ * @uses PMA_Theme::$name to set it
+ * @uses trim()
* @param string $name new name
*/
function setName($name)
@@ -190,6 +248,9 @@ class PMA_Theme {
/**
* returns name
+ *
+ * @access public
+ * @uses PMA_Theme::$name as return value
* @return string name
*/
function getName()
@@ -199,6 +260,9 @@ class PMA_Theme {
/**
* sets id
+ *
+ * @access public
+ * @uses PMA_Theme::$id to set it
* @param string $id new id
*/
function setId($id)
@@ -208,18 +272,31 @@ class PMA_Theme {
/**
* returns id
- * @return string id
+ *
+ * @access public
+ * @uses PMA_Theme::$id as return value
+ * @return string id
*/
function getId()
{
return $this->id;
}
+ /**
+ * @access public
+ * @uses PMA_Theme::$img_path to set it
+ * @param string path to images for this theme
+ */
function setImgPath($path)
{
$this->img_path = $path;
}
+ /**
+ * @access public
+ * @uses PMA_Theme::$img_path as retunr value
+ * @return string image path for this theme
+ */
function getImgPath()
{
return $this->img_path;
@@ -228,8 +305,9 @@ class PMA_Theme {
/**
* load css (send to stdout, normaly the browser)
*
- * @uses $this->getPath()
- * @uses $this->types
+ * @access public
+ * @uses PMA_Theme::getPath()
+ * @uses PMA_Theme::$types
* @uses PMA_SQP_buildCssData()
* @uses file_exists()
* @uses in_array()
@@ -267,10 +345,11 @@ class PMA_Theme {
/**
* prints out the preview for this theme
*
- * @uses $this->getName()
- * @uses $this->getVersion()
- * @uses $this->getId()
- * @uses $this->getPath()
+ * @access public
+ * @uses PMA_Theme::getName()
+ * @uses PMA_Theme::getVersion()
+ * @uses PMA_Theme::getId()
+ * @uses PMA_Theme::getPath()
* @uses $GLOBALS['strThemeNoPreviewAvailable']
* @uses $GLOBALS['strTakeIt']
* @uses PMA_generate_common_url()
@@ -303,5 +382,4 @@ class PMA_Theme {
.'</div>';
}
}
-
?> \ No newline at end of file
diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php
index 594e09f34f..077d7769f4 100644
--- a/libraries/auth/http.auth.lib.php
+++ b/libraries/auth/http.auth.lib.php
@@ -41,7 +41,7 @@ function PMA_auth() {
<body>
<?php if (file_exists('./config.header.inc.php')) {
require('./config.header.inc.php');
- }
+ }
?>
<br /><br />
@@ -196,8 +196,7 @@ function PMA_auth_fails()
{
$error = PMA_DBI_getError();
if ($error && $GLOBALS['errno'] != 1045) {
- PMA_sendHeaderLocation('error.php?error=' . urlencode($error));
- exit;
+ PMA_fatalError($error);
} else {
PMA_auth();
return true;
diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php
index 2a66e28d3f..9ba906733c 100644
--- a/libraries/auth/signon.auth.lib.php
+++ b/libraries/auth/signon.auth.lib.php
@@ -20,7 +20,7 @@
*/
function PMA_auth() {
if (empty($GLOBALS['cfg']['Server']['SignonURL'])) {
- PMA_sendHeaderLocation('error.php?error=' . urlencode('You must set SignonURL!'));
+ PMA_fatalError('You must set SignonURL!');
} elseif (!empty($_REQUEST['old_usr']) && !empty($GLOBALS['cfg']['Server']['LogoutURL'])) {
/* Perform logout to custom URL */
PMA_sendHeaderLocation($GLOBALS['cfg']['Server']['LogoutURL']);
@@ -53,7 +53,7 @@ function PMA_auth() {
function PMA_auth_check()
{
global $PHP_AUTH_USER, $PHP_AUTH_PW;
-
+
/* Session name */
$session_name = $GLOBALS['cfg']['Server']['SignonSession'];
@@ -68,7 +68,7 @@ function PMA_auth_check()
session_write_close();
/* Load single signon session */
- session_name($session_name);
+ session_name($session_name);
session_id($_COOKIE[$session_name]);
session_start();
@@ -104,7 +104,7 @@ function PMA_auth_check()
session_start();
/* Restore our token */
- if (!empty($pma_token)) {
+ if (!empty($pma_token)) {
$_SESSION[' PMA_token '] = $pma_token;
}
}
@@ -154,8 +154,7 @@ function PMA_auth_fails()
{
$error = PMA_DBI_getError();
if ($error && $GLOBALS['errno'] != 1045) {
- PMA_sendHeaderLocation('error.php?error=' . urlencode($error));
- exit;
+ PMA_fatalError($error);
} else {
PMA_auth();
return true;
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index ac58892cbe..a5b5aff4be 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1,13 +1,11 @@
<?php
-/* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4:
-
/**
- * Misc stuff and functions used by almost all the scripts.
+ * Misc stuff and functions used by ALL the scripts.
+ * MUST be included by every script
+ *
* Among other things, it contains the advanced authentication work.
- */
-
-/**
+ *
* Order of sections for common.lib.php:
*
* the include of libraries/defines_mysql.lib.php must be after the connection
@@ -34,13 +32,14 @@
* - authentication work
* - load of the libraries/defines_mysql.lib.php library to get the MySQL
* release number
+ *
+ * @version $Id$
*/
/**
* For now, avoid warnings of E_STRICT mode
* (this must be done before function definitions)
*/
-
if (defined('E_STRICT')) {
$old_error_reporting = error_reporting(0);
if ($old_error_reporting & E_STRICT) {
@@ -54,14 +53,12 @@ if (defined('E_STRICT')) {
/**
* Avoid object cloning errors
*/
-
-@ini_set('zend.ze1_compatibility_mode',false);
+@ini_set('zend.ze1_compatibility_mode', false);
/**
* Avoid problems with magic_quotes_runtime
*/
-
-@ini_set('magic_quotes_runtime',false);
+@ini_set('magic_quotes_runtime', false);
/******************************************************************************/
@@ -87,8 +84,77 @@ function PMA_securePath($path)
} // end function
/**
+ * displays the given error message on phpMyAdmin error page in foreign language,
+ * ends script execution and closes session
+ *
+ * @todo use detected argument separator (PMA_Config)
+ * @uses $GLOBALS['session_name']
+ * @uses $GLOBALS['text_dir']
+ * @uses $GLOBALS['strError']
+ * @uses $GLOBALS['available_languages']
+ * @uses $GLOBALS['lang']
+ * @uses PMA_removeCookie()
+ * @uses select_lang.lib.php
+ * @uses $_COOKIE
+ * @uses substr()
+ * @uses header()
+ * @uses urlencode()
+ * @param string $error_message the error message or named error message
+ */
+function PMA_fatalError($error_message, $message_args = null)
+{
+ if (! isset($GLOBALS['available_languages'])) {
+ $GLOBALS['cfg'] = array('DefaultLang' => 'en-iso-8859-1',
+ 'AllowAnywhereRecoding' => false);
+ // Loads the language file
+ require_once './libraries/select_lang.lib.php';
+ if (isset($strError)) {
+ $GLOBALS['strError'] = $strError;
+ }
+ if (isset($text_dir)) {
+ $GLOBALS['text_dir'] = $text_dir;
+ }
+ }
+
+ if (substr($error_message, 0, 3) === 'str') {
+ if (isset($$error_message)) {
+ $error_message = $$error_message;
+ } elseif (isset($GLOBALS[$error_message])) {
+ $error_message = $GLOBALS[$error_message];
+ }
+ }
+
+ if (is_string($message_args)) {
+ $error_message = sprintf($error_message, $message_args);
+ } elseif (is_array($message_args)) {
+ $error_message = vsprintf($error_message, $message_args);
+ }
+ $error_message = strtr($error_message, array('<br />' => '[br]'));
+
+ // Displays the error message
+ // (do not use &amp; for parameters sent by header)
+ header('Location: error.php'
+ . '?lang=' . urlencode($GLOBALS['available_languages'][$GLOBALS['lang']][2])
+ . '&dir=' . urlencode($GLOBALS['text_dir'])
+ . '&type=' . urlencode($GLOBALS['strError'])
+ . '&error=' . urlencode($error_message));
+
+ // on fatal errors it cannot hurt to always delete the current session
+ if (isset($GLOBALS['session_name']) && isset($_COOKIE[$GLOBALS['session_name']])) {
+ PMA_removeCookie($GLOBALS['session_name']);
+ }
+
+ exit;
+}
+
+/**
* returns count of tables in given db
*
+ * @uses PMA_DBI_try_query()
+ * @uses PMA_backquote()
+ * @uses PMA_DBI_QUERY_STORE()
+ * @uses PMA_DBI_num_rows()
+ * @uses PMA_DBI_free_result()
* @param string $db database to count tables for
* @return integer count of tables in $db
*/
@@ -113,6 +179,9 @@ function PMA_getTableCount($db)
* (renamed with PMA prefix to avoid double definition when embedded
* in Moodle)
*
+ * @uses each()
+ * @uses strlen()
+ * @uses substr()
* @param string $size
* @return integer $size
*/
@@ -266,6 +335,9 @@ function PMA_array_merge_recursive()
/**
* calls $function vor every element in $array recursively
*
+ * @uses PMA_arrayWalkRecursive()
+ * @uses is_array()
+ * @uses is_string()
* @param array $array array to walk
* @param string $function function to call for every array element
*/
@@ -327,6 +399,11 @@ function PMA_checkPageValidity(&$page, $whitelist)
* searchs in $_SERVER, $_ENV than trys getenv() and apache_getenv()
* in this order
*
+ * @uses $_SERVER
+ * @uses $_ENV
+ * @uses getenv()
+ * @uses function_exists()
+ * @uses apache_getenv()
* @param string $var_name variable name
* @return string value of $var or empty string
*/
@@ -347,7 +424,7 @@ function PMA_getenv($var_name) {
/**
* include here only libraries which contain only function definitions
- * no code im main()!
+ * no code in main()!
*/
/**
* Input sanitizing
@@ -371,10 +448,14 @@ require_once './libraries/Config.class.php';
require_once './libraries/Table.class.php';
-
if (!defined('PMA_MINIMUM_COMMON')) {
/**
+ * Java script escaping.
+ */
+ require_once './libraries/js_escape.lib.php';
+
+ /**
* string PMA_getIcon(string $icon)
*
* @uses $GLOBALS['pmaThemeImage']
@@ -395,6 +476,9 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/**
* Displays the maximum size for an upload
*
+ * @uses $GLOBALS['strMaximumSize']
+ * @uses PMA_formatByteDown()
+ * @uses sprintf()
* @param integer the size
*
* @return string the message
@@ -426,6 +510,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
* Add slashes before "'" and "\" characters so a value containing them can
* be used in a sql comparison.
*
+ * @uses str_replace()
* @param string the string to slash
* @param boolean whether the string will be used in a 'LIKE' clause
* (it then requires two more escaped sequences) or not
@@ -468,6 +553,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
* database, table and field names.
* Note: This function does not escape backslashes!
*
+ * @uses str_replace()
* @param string the string to escape
*
* @return string the escaped string
@@ -486,6 +572,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
* removes slashes before "_" and "%" characters
* Note: This function does not unescape backslashes!
*
+ * @uses str_replace()
* @param string $name the string to escape
* @return string the escaped string
* @access public
@@ -503,6 +590,8 @@ if (!defined('PMA_MINIMUM_COMMON')) {
*
* checks if the sting is quoted and removes this quotes
*
+ * @uses str_replace()
+ * @uses substr()
* @param string $quoted_string string to remove quotes from
* @param string $quote type of quote to remove
* @return string unqoted string
@@ -535,6 +624,11 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/**
* format sql strings
*
+ * @todo move into PMA_Sql
+ * @uses PMA_SQP_isError()
+ * @uses PMA_SQP_formatHtml()
+ * @uses PMA_SQP_formatNone()
+ * @uses is_array()
* @param mixed pre-parsed SQL structure
*
* @return string the formatted sql
@@ -594,6 +688,17 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/**
* Displays a link to the official MySQL documentation
*
+ * @uses $cfg['MySQLManualType']
+ * @uses $cfg['MySQLManualBase']
+ * @uses $cfg['ReplaceHelpImg']
+ * @uses $GLOBALS['mysql_4_1_doc_lang']
+ * @uses $GLOBALS['mysql_5_1_doc_lang']
+ * @uses $GLOBALS['mysql_5_0_doc_lang']
+ * @uses $GLOBALS['strDocu']
+ * @uses $GLOBALS['pmaThemeImage']
+ * @uses PMA_MYSQL_INT_VERSION
+ * @uses strtolower()
+ * @uses str_replace()
* @param string chapter of "HTML, one page per chapter" documentation
* @param string contains name of page/anchor that is being linked
* @param bool whether to use big icon (like in left frame)
@@ -671,34 +776,71 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/**
* Displays a hint icon, on mouse over show the hint
*
+ * @uses $GLOBALS['pmaThemeImage']
+ * @uses PMA_jsFormat()
* @param string the error message
*
* @access public
*/
- function PMA_showHint($hint_message)
- {
- //return '<img class="lightbulb" src="' . $GLOBALS['pmaThemeImage'] . 'b_tipp.png" width="16" height="16" border="0" alt="' . $hint_message . '" title="' . $hint_message . '" align="middle" onclick="alert(\'' . PMA_jsFormat($hint_message, false) . '\');" />';
- return '<img class="lightbulb" src="' . $GLOBALS['pmaThemeImage'] . 'b_tipp.png" width="16" height="16" alt="Tip" title="Tip" onmouseover="pmaTooltip(\'' . PMA_jsFormat($hint_message, false) . '\'); return false;" onmouseout="swapTooltip(\'default\'); return false;" />';
- }
+ function PMA_showHint($hint_message)
+ {
+ //return '<img class="lightbulb" src="' . $GLOBALS['pmaThemeImage'] . 'b_tipp.png" width="16" height="16" border="0" alt="' . $hint_message . '" title="' . $hint_message . '" align="middle" onclick="alert(\'' . PMA_jsFormat($hint_message, false) . '\');" />';
+ return '<img class="lightbulb" src="' . $GLOBALS['pmaThemeImage']
+ . 'b_tipp.png" width="16" height="16" alt="Tip" title="Tip" onmouseover="pmaTooltip(\''
+ . PMA_jsFormat($hint_message, false) . '\'); return false;" onmouseout="swapTooltip(\'default\'); return false;" />';
+ }
/**
* Displays a MySQL error message in the right frame.
*
+ * @uses footer.inc.php
+ * @uses header.inc.php
+ * @uses $GLOBALS['sql_query']
+ * @uses $GLOBALS['strError']
+ * @uses $GLOBALS['strSQLQuery']
+ * @uses $GLOBALS['pmaThemeImage']
+ * @uses $GLOBALS['strEdit']
+ * @uses $GLOBALS['strMySQLSaid']
+ * @uses $cfg['PropertiesIconic']
+ * @uses PMA_backquote()
+ * @uses PMA_DBI_getError()
+ * @uses PMA_formatSql()
+ * @uses PMA_generate_common_hidden_inputs()
+ * @uses PMA_generate_common_url()
+ * @uses PMA_showMySQLDocu()
+ * @uses PMA_sqlAddslashes()
+ * @uses PMA_SQP_isError()
+ * @uses PMA_SQP_parse()
+ * @uses PMA_SQP_getErrorString()
+ * @uses strtolower()
+ * @uses urlencode()
+ * @uses str_replace()
+ * @uses nl2br()
+ * @uses substr()
+ * @uses preg_replace()
+ * @uses preg_match()
+ * @uses explode()
+ * @uses implode()
+ * @uses is_array()
+ * @uses function_exists()
+ * @uses htmlspecialchars()
+ * @uses trim()
+ * @uses strstr()
* @param string the error message
* @param string the sql query that failed
* @param boolean whether to show a "modify" link or not
* @param string the "back" link url (full path is not required)
* @param boolean EXIT the page?
*
- * @global array the configuration array
+ * @global string the curent table
+ * @global string the current db
*
* @access public
*/
function PMA_mysqlDie($error_message = '', $the_query = '',
- $is_modify_link = true, $back_url = '',
- $exit = true)
+ $is_modify_link = true, $back_url = '', $exit = true)
{
- global $cfg, $table, $db, $sql_query;
+ global $table, $db;
/**
* start http output, display html headers
@@ -839,7 +981,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
unset($error_table, $error_fields, $duplicate_value);
echo ' <form method="post" action="import.php" style="padding: 0; margin: 0">' ."\n"
- .' <input type="hidden" name="sql_query" value="' . htmlentities($sql) . '" />' . "\n"
+ .' <input type="hidden" name="sql_query" value="' . htmlspecialchars($sql) . '" />' . "\n"
.' ' . PMA_generate_common_hidden_inputs($db, $table) . "\n"
.' <input type="submit" name="submit" value="' . $GLOBALS['strBrowse'] . '" />' . "\n"
.' </form>' . "\n";
@@ -867,6 +1009,9 @@ if (!defined('PMA_MINIMUM_COMMON')) {
* Returns a string formatted with CONVERT ... USING
* if MySQL supports it
*
+ * @uses PMA_MYSQL_INT_VERSION
+ * @uses $GLOBALS['collation_connection']
+ * @uses explode()
* @param string the string itself
* @param string the mode: quoted or unquoted (this one by default)
*
@@ -894,6 +1039,19 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/**
* Send HTTP header, taking IIS limits into account (600 seems ok)
*
+ * @uses PMA_IS_IIS
+ * @uses PMA_COMING_FROM_COOKIE_LOGIN
+ * @uses PMA_get_arg_separator()
+ * @uses SID
+ * @uses strlen()
+ * @uses strpos()
+ * @uses header()
+ * @uses session_write_close()
+ * @uses headers_sent()
+ * @uses function_exists()
+ * @uses debug_print_backtrace()
+ * @uses trigger_error()
+ * @uses defined()
* @param string $uri the header to send
* @return boolean always true
*/
@@ -951,10 +1109,10 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/**
* returns array with tables of given db with extended infomation and grouped
*
- * @uses $GLOBALS['cfg']['LeftFrameTableSeparator']
- * @uses $GLOBALS['cfg']['LeftFrameTableLevel']
- * @uses $GLOBALS['cfg']['ShowTooltipAliasTB']
- * @uses $GLOBALS['cfg']['NaturalOrder']
+ * @uses $cfg['LeftFrameTableSeparator']
+ * @uses $cfg['LeftFrameTableLevel']
+ * @uses $cfg['ShowTooltipAliasTB']
+ * @uses $cfg['NaturalOrder']
* @uses PMA_backquote()
* @uses count()
* @uses array_merge
@@ -1072,10 +1230,16 @@ if (!defined('PMA_MINIMUM_COMMON')) {
* Adds backquotes on both sides of a database, table or field name.
* and escapes backquotes inside the name with another backquote
*
+ * example:
* <code>
* echo PMA_backquote('owner`s db'); // `owner``s db`
+ *
* </code>
*
+ * @uses PMA_backquote()
+ * @uses is_array()
+ * @uses strlen()
+ * @uses str_replace()
* @param mixed $a_name the database, table or field name to "backquote"
* or array of it
* @param boolean $do_it a flag to bypass this function (used by dump
@@ -1100,7 +1264,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
}
// '0' is also empty for php :-(
- if (strlen($a_name) && $a_name != '*') {
+ if (strlen($a_name) && $a_name !== '*') {
return '`' . str_replace('`', '``', $a_name) . '`';
} else {
return $a_name;
@@ -1109,59 +1273,9 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/**
- * Format a string so it can be a string inside JavaScript code inside an
- * eventhandler (onclick, onchange, on..., ).
- * This function is used to displays a javascript confirmation box for
- * "DROP/DELETE/ALTER" queries.
- *
- * @uses PMA_escapeJsString()
- * @uses PMA_backquote()
- * @uses is_string()
- * @uses htmlspecialchars()
- * @uses str_replace()
- * @param string $a_string the string to format
- * @param boolean $add_backquotes whether to add backquotes to the string or not
- *
- * @return string the formatted string
- *
- * @access public
- */
- function PMA_jsFormat($a_string = '', $add_backquotes = true)
- {
- if (is_string($a_string)) {
- $a_string = htmlspecialchars($a_string);
- $a_string = PMA_escapeJsString($a_string);
- /**
- * @todo what is this good for?
- */
- $a_string = str_replace('#', '\\#', $a_string);
- }
-
- return (($add_backquotes) ? PMA_backquote($a_string) : $a_string);
- } // end of the 'PMA_jsFormat()' function
-
- /**
- * escapes a string to be inserted as string a JavaScript block
- * enclosed by <![CDATA[ ... ]]>
- * this requires only to escape ' with \' and end of script block
- *
- * @uses strtr()
- * @param string $string the string to be escaped
- * @return string the escaped string
- */
- function PMA_escapeJsString($string)
- {
- return strtr($string, array(
- '\\' => '\\\\',
- '\'' => '\\\'',
- "\n" => '\n',
- "\r" => '\r',
- '</script' => '</\' + \'script'));
- }
-
- /**
* Defines the <CR><LF> value depending on the user OS.
*
+ * @uses PMA_USR_OS
* @return string the <CR><LF> value to use
*
* @access public
@@ -1186,8 +1300,10 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/**
* Reloads navigation if needed.
*
- * @global mixed configuration
- * @global bool whether to reload
+ * @uses $GLOBALS['reload']
+ * @uses $GLOBALS['db']
+ * @uses PMA_generate_common_url()
+ * @global array configuration
*
* @access public
*/
@@ -1220,7 +1336,7 @@ if (typeof(window.parent) != 'undefined'
* @param string $message the message to display
* @param string $sql_query the query to display
* @global array the configuration array
- * @uses $GLOBALS['cfg']
+ * @uses $cfg
* @access public
*/
function PMA_showMessage($message, $sql_query = null)
@@ -1566,6 +1682,8 @@ if (typeof(window.parent) != 'undefined'
* $comma is not substracted from the length
* with a $length of 0 no truncation occurs, number is only formated
* to the current locale
+ *
+ * examples:
* <code>
* echo PMA_formatNumber(123456789, 6); // 123,457 k
* echo PMA_formatNumber(-123456789, 4, 2); // -123.46 M
@@ -1573,6 +1691,7 @@ if (typeof(window.parent) != 'undefined'
* echo PMA_formatNumber(0.003, 3, 3); // 0.003
* echo PMA_formatNumber(0.00003, 3, 2); // 0.03 m
* echo PMA_formatNumber(0, 6); // 0
+ *
* </code>
* @param double $value the value to format
* @param integer $length the max length
@@ -1713,21 +1832,20 @@ if (typeof(window.parent) != 'undefined'
* returns a tab for tabbed navigation.
* If the variables $link and $args ar left empty, an inactive tab is created
*
+ * @uses $GLOBALS['strEmpty']
+ * @uses $GLOBALS['strDrop']
+ * @uses $GLOBALS['active_page']
+ * @uses $GLOBALS['url_query']
+ * @uses $cfg['MainPageIconic']
+ * @uses $GLOBALS['pmaThemeImage']
+ * @uses PMA_generate_common_url()
+ * @uses E_USER_NOTICE
+ * @uses htmlentities()
+ * @uses urlencode()
+ * @uses sprintf()
+ * @uses trigger_error()
* @uses array_merge()
- * basename()
- * $GLOBALS['strEmpty']
- * $GLOBALS['strDrop']
- * $GLOBALS['active_page']
- * $GLOBALS['PHP_SELF']
- * htmlentities()
- * PMA_generate_common_url()
- * $GLOBALS['url_query']
- * urlencode()
- * $GLOBALS['cfg']['MainPageIconic']
- * $GLOBALS['pmaThemeImage']
- * sprintf()
- * trigger_error()
- * E_USER_NOTICE
+ * @uses basename()
* @param array $tab array with all options
* @return string html code for one tab, a link if valid otherwise a span
* @access public
@@ -1959,6 +2077,9 @@ if (typeof(window.parent) != 'undefined'
/**
* Returns a given timespan value in a readable format.
*
+ * @uses $GLOBALS['timespanfmt']
+ * @uses sprintf()
+ * @uses floor()
* @param int the timespan
*
* @return string the formatted value
@@ -1988,6 +2109,8 @@ if (typeof(window.parent) != 'undefined'
* Fulfills todo-item
* http://sf.net/tracker/?func=detail&aid=544361&group_id=23067&atid=377411
*
+ * @todo add a multibyte safe function PMA_STR_split()
+ * @uses strlen
* @param string The string
* @param string The Separator (defaults to "<br />\n")
*
@@ -2036,6 +2159,11 @@ if (typeof(window.parent) != 'undefined'
* Not sure we could use a strMissingParameter message here,
* would have to check if the error message file is always available
*
+ * @todo localize error message
+ * @todo use PMA_fatalError() if $die === true?
+ * @uses PMA_getenv()
+ * @uses header_meta_style.inc.php
+ * basename
* @param array The names of the parameters needed by the calling
* script.
* @param boolean Stop the execution?
@@ -2050,13 +2178,13 @@ if (typeof(window.parent) != 'undefined'
*/
function PMA_checkParameters($params, $die = true, $request = true)
{
- global $PHP_SELF, $checked_special;
+ global $checked_special;
if (!isset($checked_special)) {
$checked_special = false;
}
- $reported_script_name = basename($PHP_SELF);
+ $reported_script_name = basename(PMA_getenv('PHP_SELF'));
$found_error = false;
$error_message = '';
@@ -2066,7 +2194,10 @@ if (typeof(window.parent) != 'undefined'
}
if (!isset($GLOBALS[$param])) {
- $error_message .= $reported_script_name . ': Missing parameter: ' . $param . ' <a href="./Documentation.html#faqmissingparameters" target="documentation"> (FAQ 2.8)</a><br />';
+ $error_message .= $reported_script_name
+ . ': Missing parameter: ' . $param
+ . ' <a href="./Documentation.html#faqmissingparameters"'
+ . ' target="documentation"> (FAQ 2.8)</a><br />';
$found_error = true;
}
}
@@ -2201,6 +2332,9 @@ if (typeof(window.parent) != 'undefined'
/**
* Generate a button or image tag
*
+ * @uses PMA_USR_BROWSER_AGENT
+ * @uses $GLOBALS['pmaThemeImage']
+ * @uses $GLOBALS['cfg']['PropertiesIconic']
* @param string name of button element
* @param string class of button element
* @param string name of image element
@@ -2213,30 +2347,30 @@ if (typeof(window.parent) != 'undefined'
function PMA_buttonOrImage($button_name, $button_class, $image_name, $text,
$image)
{
- global $pmaThemeImage, $propicon;
-
/* Opera has trouble with <input type="image"> */
/* IE has trouble with <button> */
if (PMA_USR_BROWSER_AGENT != 'IE') {
echo '<button class="' . $button_class . '" type="submit"'
.' name="' . $button_name . '" value="' . $text . '"'
.' title="' . $text . '">' . "\n"
- .'<img class="icon" src="' . $pmaThemeImage . $image . '"'
+ .'<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . $image . '"'
.' title="' . $text . '" alt="' . $text . '" width="16"'
.' height="16" />'
- .($propicon == 'both' ? '&nbsp;' . $text : '') . "\n"
+ .($GLOBALS['cfg']['PropertiesIconic'] === 'both' ? '&nbsp;' . $text : '') . "\n"
.'</button>' . "\n";
} else {
echo '<input type="image" name="' . $image_name . '" value="'
- . $text . '" title="' . $text . '" src="' . $pmaThemeImage
+ . $text . '" title="' . $text . '" src="' . $GLOBALS['pmaThemeImage']
. $image . '" />'
- . ($propicon == 'both' ? '&nbsp;' . $text : '') . "\n";
+ . ($GLOBALS['cfg']['PropertiesIconic'] == 'both' ? '&nbsp;' . $text : '') . "\n";
}
} // end function
/**
* Generate a pagination selector for browsing resultsets
*
+ * @uses $GLOBALS['strPageNumber']
+ * @uses range()
* @param string URL for the JavaScript
* @param string Number of rows in the pagination set
* @param string current page number
@@ -2332,26 +2466,40 @@ if (typeof(window.parent) != 'undefined'
} // end function
/**
- * @todo add documentation
+ * replaces %u in given path with current user name
+ *
+ * example:
+ * <code>
+ * $user_dir = PMA_userDir('/var/pma_tmp/%u/'); // '/var/pma_tmp/root/'
+ *
+ * </code>
+ * @uses $cfg['Server']['user']
+ * @uses substr()
+ * @uses str_replace()
+ * @param string $dir with wildcard for user
+ * @return string per user directory
*/
function PMA_userDir($dir)
{
- global $cfg;
-
+ // add trailing slash
if (substr($dir, -1) != '/') {
$dir .= '/';
}
- return str_replace('%u', $cfg['Server']['user'], $dir);
+ return str_replace('%u', $GLOBALS['cfg']['Server']['user'], $dir);
}
/**
* returns html code for db link to default db page
*
- * @uses $GLOBALS['cfg']['DefaultTabDatabase']
+ * @uses $cfg['DefaultTabDatabase']
* @uses $GLOBALS['db']
* @uses $GLOBALS['strJumpToDB']
* @uses PMA_generate_common_url()
+ * @uses PMA_unescape_mysql_wildcards()
+ * @uses strlen()
+ * @uses sprintf()
+ * @uses htmlspecialchars()
* @param string $database
* @return string html link to default db page
*/
@@ -2446,7 +2594,10 @@ if (typeof(window.parent) != 'undefined'
* Displays a lightbulb hint explaining a known external bug
* that affects a functionality
*
+ * @uses PMA_MYSQL_INT_VERSION
+ * @uses $GLOBALS['strKnownExternalBug']
* @uses PMA_showHint()
+ * @uses sprintf()
* @param string $functionality localized message explaining the func.
* @param string $component 'mysql' (eventually, 'php')
* @param string $minimum_version of this component
@@ -2786,17 +2937,8 @@ if (empty($_SESSION['PMA_Config'])) {
/**
* We really need this one!
*/
- if (!function_exists('preg_replace')) {
- header('Location: error.php'
- . '?lang=' . urlencode($available_languages[$lang][2])
- . '&dir=' . urlencode($text_dir)
- . '&type=' . urlencode($strError)
- . '&error=' . urlencode(
- strtr(sprintf($strCantLoad, 'pcre'),
- array('<br />' => '[br]')))
- . '&' . SID
- );
- exit();
+ if (! function_exists('preg_replace')) {
+ PMA_fatalError('strCantLoad', 'pcre');
}
/**
@@ -3047,7 +3189,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
}
$GLOBALS['url_params']['server'] = $GLOBALS['server'];
-
if (! empty($cfg['Server'])) {
/**
@@ -3063,17 +3204,8 @@ if (! defined('PMA_MINIMUM_COMMON')) {
// to allow HTTP or http
$cfg['Server']['auth_type'] = strtolower($cfg['Server']['auth_type']);
- if (!file_exists('./libraries/auth/' . $cfg['Server']['auth_type'] . '.auth.lib.php')) {
- header('Location: error.php'
- . '?lang=' . urlencode($available_languages[$lang][2])
- . '&dir=' . urlencode($text_dir)
- . '&type=' . urlencode($strError)
- . '&error=' . urlencode(
- $strInvalidAuthMethod . ' '
- . $cfg['Server']['auth_type'])
- . '&' . SID
- );
- exit();
+ if (! file_exists('./libraries/auth/' . $cfg['Server']['auth_type'] . '.auth.lib.php')) {
+ PMA_fatalError($strInvalidAuthMethod . ' ' . $cfg['Server']['auth_type']);
}
/**
* the required auth type plugin
@@ -3198,6 +3330,9 @@ if (! defined('PMA_MINIMUM_COMMON')) {
&& strpos(' ' . $lang, 'ja-')
&& file_exists('./libraries/kanji-encoding.lib.php')) {
require_once './libraries/kanji-encoding.lib.php';
+ /**
+ * enable multibyte string support
+ */
define('PMA_MULTIBYTE_ENCODING', 1);
} // end if
diff --git a/libraries/config.default.php b/libraries/config.default.php
index a3ea495912..b406de3f55 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -1,18 +1,22 @@
<?php
-
-/* !!! DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!! */
-
-/* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4:
-
/**
+ * N N OOO !! DDDD OOO N N OOO TTTTT EEEE DDDD I TTTTT !!
+ * NN N O O !! D D O O NN N O O T E D D I T !!
+ * N N N O O !! D D O O N N N O O T EEEE D D I T !!
+ * N NN O O D D O O N NN O O T E D D I T
+ * N N OOO !! DDDD OOO N N OOO T EEEE DDDD I T !!
+ *
+ * DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!!
+ *
* phpMyAdmin default configuration, you can copy values from here to your
* config.inc.php
*
* All directives are explained in Documentation.html
+ *
+ * @version $Id$
*/
-
/**
* Your phpMyAdmin URL.
*
@@ -27,350 +31,1449 @@
* test to see that the auto-detection code works in your system. A good
* test is to browse a table, then edit a row and save it. There will be
* an error message if phpMyAdmin cannot auto-detect the correct value.
+ *
+ * @global string $cfg['PmaAbsoluteUri']
*/
$cfg['PmaAbsoluteUri'] = '';
/**
* Disable the default warning that is displayed on the DB Details Structure page if
* any of the required Tables for the relationfeatures could not be found
+ *
+ * @global boolean $cfg['PmaNoRelation_DisableWarning']
*/
-$cfg['PmaNoRelation_DisableWarning'] = FALSE;
+$cfg['PmaNoRelation_DisableWarning'] = false;
/**
* The 'cookie' auth_type uses blowfish algorithm to encrypt the password. If
* at least one server configuration uses 'cookie' auth_type, enter here a
* passphrase that will be used by blowfish. The maximum length seems to be 46
* characters.
+ *
+ * @global string $cfg['blowfish_secret']
*/
$cfg['blowfish_secret'] = '';
-/**
+
+/*******************************************************************************
* Server(s) configuration
+ *
+ * The $cfg['Servers'] array starts with $cfg['Servers'][1]. Do not use
+ * $cfg['Servers'][0]. You can disable a server config entry by setting host
+ * to ''. If you want more than one server, just copy following section
+ * (including $i incrementation) serveral times. There is no need to define
+ * full server array, just define values you need to change.
+ *
+ * @global array $cfg['Servers']
+ */
+$cfg['Servers'] = array();
+
+$i = 1;
+
+/**
+ * MySQL hostname or IP address
+ *
+ * @global string $cfg['Servers'][$i]['host']
+ */
+$cfg['Servers'][$i]['host'] = 'localhost';
+
+/**
+ * MySQL port - leave blank for default port
+ *
+ * @global string $cfg['Servers'][$i]['port']
+ */
+$cfg['Servers'][$i]['port'] = '';
+
+/**
+ * Path to the socket - leave blank for default socket
+ *
+ * @global string $cfg['Servers'][$i]['socket']
+ */
+$cfg['Servers'][$i]['socket'] = '';
+
+/**
+ * Use SSL for connecting to MySQL server?
+ *
+ * @global boolean $cfg['Servers'][$i]['ssl']
+ */
+$cfg['Servers'][$i]['ssl'] = true;
+
+/**
+ * How to connect to MySQL server ('tcp' or 'socket')
+ *
+ * @global string $cfg['Servers'][$i]['connect_type']
+ */
+$cfg['Servers'][$i]['connect_type'] = 'tcp';
+
+/**
+ * The php MySQL extension to use ('mysql' or 'mysqli')
+ *
+ * @global string $cfg['Servers'][$i]['extension']
+ */
+$cfg['Servers'][$i]['extension'] = 'mysql';
+
+/**
+ * Use compressed protocol for the MySQL connection (requires PHP >= 4.3.0)
+ *
+ * @global boolean $cfg['Servers'][$i]['compress']
+ */
+$cfg['Servers'][$i]['compress'] = false;
+
+/**
+ * MySQL control user settings (this user must have read-only
+ *
+ * @global string $cfg['Servers'][$i]['controluser']
+ */
+$cfg['Servers'][$i]['controluser'] = '';
+
+/**
+ * access to the "mysql/user" and "mysql/db" tables). The controluser is also
+ * used for all relational features (pmadb)
+ *
+ * @global string $cfg['Servers'][$i]['controlpass']
+ */
+$cfg['Servers'][$i]['controlpass'] = '';
+
+/**
+ * Authentication method (valid choices: config, http, HTTP, signon or cookie)
+ *
+ * @global string $cfg['Servers'][$i]['auth_type']
+ */
+$cfg['Servers'][$i]['auth_type'] = 'config';
+
+/**
+ * MySQL user
+ *
+ * @global string $cfg['Servers'][$i]['user']
+ */
+$cfg['Servers'][$i]['user'] = 'root';
+
+/**
+ * MySQL password (only needed with 'config' auth_type)
+ *
+ * @global string $cfg['Servers'][$i]['password']
+ */
+$cfg['Servers'][$i]['password'] = '';
+
+/**
+ * Session to use for 'signon' auth method
+ *
+ * @global string $cfg['Servers'][$i]['SignonSession']
+ */
+$cfg['Servers'][$i]['SignonSession'] = '';
+
+/**
+ * URL where to redirect user to login for 'signon' auth method
+ *
+ * @global string $cfg['Servers'][$i]['SignonURL']
+ */
+$cfg['Servers'][$i]['SignonURL'] = '';
+
+/**
+ * URL where to redirect user after logout
+ *
+ * @global string $cfg['Servers'][$i]['LogoutURL']
+ */
+$cfg['Servers'][$i]['LogoutURL'] = '';
+
+/**
+ * Whether to try to connect without password
+ *
+ * @global boolean $cfg['Servers'][$i]['nopassword']
+ */
+$cfg['Servers'][$i]['nopassword'] = false;
+
+/**
+ * If set to a db-name, only this db is displayed in left frame
+ * It may also be an array of db-names, where sorting order is relevant.
+ *
+ * @global string $cfg['Servers'][$i]['only_db']
+ */
+$cfg['Servers'][$i]['only_db'] = '';
+
+/**
+ * Database name to be hidden from listings
+ *
+ * @global string $cfg['Servers'][$i]['hide_db']
+ */
+$cfg['Servers'][$i]['hide_db'] = '';
+
+/**
+ * Verbose name for this host - leave blank to show the hostname
+ *
+ * @global string $cfg['Servers'][$i]['verbose']
+ */
+$cfg['Servers'][$i]['verbose'] = '';
+
+/**
+ * Database used for Relation, Bookmark and PDF Features
+ * (see scripts/create_tables.sql)
+ * - leave blank for no support
+ * DEFAULT: 'phpmyadmin'
+ *
+ * @global string $cfg['Servers'][$i]['pmadb']
+ */
+$cfg['Servers'][$i]['pmadb'] = '';
+
+/**
+ * Bookmark table
+ * - leave blank for no bookmark support
+ * DEFAULT: 'pma_bookmark'
+ *
+ * @global string $cfg['Servers'][$i]['bookmarktable']
+ */
+$cfg['Servers'][$i]['bookmarktable'] = '';
+
+/**
+ * table to describe the relation between links (see doc)
+ * - leave blank for no relation-links support
+ * DEFAULT: 'pma_relation'
+ *
+ * @global string $cfg['Servers'][$i]['relation']
+ */
+$cfg['Servers'][$i]['relation'] = '';
+
+/**
+ * table to describe the display fields
+ * - leave blank for no display fields support
+ * DEFAULT: 'pma_table_info'
+ *
+ * @global string $cfg['Servers'][$i]['table_info']
+ */
+$cfg['Servers'][$i]['table_info'] = '';
+
+/**
+ * table to describe the tables position for the PDF schema
+ * - leave blank for no PDF schema support
+ * DEFAULT: 'pma_table_coords'
+ *
+ * @global string $cfg['Servers'][$i]['table_coords']
*/
-$i = 0;
-// The $cfg['Servers'] array starts with $cfg['Servers'][1]. Do not use
-// $cfg['Servers'][0]. You can disable a server config entry by setting host
-// to ''. If you want more than one server, just copy following section
-// (including $i incrementation) serveral times. There is no need to define
-// full server array, just define values you need to change.
-$i++;
-$cfg['Servers'][$i]['host'] = 'localhost'; // MySQL hostname or IP address
-$cfg['Servers'][$i]['port'] = ''; // MySQL port - leave blank for default port
-$cfg['Servers'][$i]['socket'] = ''; // Path to the socket - leave blank for default socket
-$cfg['Servers'][$i]['ssl'] = true; // Use SSL for connecting to MySQL server?
-$cfg['Servers'][$i]['connect_type'] = 'tcp'; // How to connect to MySQL server ('tcp' or 'socket')
-$cfg['Servers'][$i]['extension'] = 'mysql'; // The php MySQL extension to use ('mysql' or 'mysqli')
-$cfg['Servers'][$i]['compress'] = FALSE; // Use compressed protocol for the MySQL connection
- // (requires PHP >= 4.3.0)
-$cfg['Servers'][$i]['controluser'] = ''; // MySQL control user settings
- // (this user must have read-only
-$cfg['Servers'][$i]['controlpass'] = ''; // access to the "mysql/user"
- // and "mysql/db" tables).
- // The controluser is also
- // used for all relational
- // features (pmadb)
-$cfg['Servers'][$i]['auth_type'] = 'config'; // Authentication method (valid choices: config, http, HTTP, signon or cookie)
-$cfg['Servers'][$i]['user'] = 'root'; // MySQL user
-$cfg['Servers'][$i]['password'] = ''; // MySQL password (only needed
- // with 'config' auth_type)
-$cfg['Servers'][$i]['SignonSession'] = ''; // Session to use for 'signon' auth method
-$cfg['Servers'][$i]['SignonURL'] = ''; // URL where to redirect user to login for 'signon' auth method
-$cfg['Servers'][$i]['LogoutURL'] = ''; // URL where to redirect user after logout
-$cfg['Servers'][$i]['nopassword'] = FALSE; // Whether to try to connect without password
-$cfg['Servers'][$i]['only_db'] = ''; // If set to a db-name, only
- // this db is displayed in left frame
- // It may also be an array of db-names, where sorting order is relevant.
-$cfg['Servers'][$i]['hide_db'] = ''; // Database name to be hidden from listings
-$cfg['Servers'][$i]['verbose'] = ''; // Verbose name for this host - leave blank to show the hostname
-
-$cfg['Servers'][$i]['pmadb'] = ''; // Database used for Relation, Bookmark and PDF Features
- // (see scripts/create_tables.sql)
- // - leave blank for no support
- // DEFAULT: 'phpmyadmin'
-$cfg['Servers'][$i]['bookmarktable'] = ''; // Bookmark table
- // - leave blank for no bookmark support
- // DEFAULT: 'pma_bookmark'
-$cfg['Servers'][$i]['relation'] = ''; // table to describe the relation between links (see doc)
- // - leave blank for no relation-links support
- // DEFAULT: 'pma_relation'
-$cfg['Servers'][$i]['table_info'] = ''; // table to describe the display fields
- // - leave blank for no display fields support
- // DEFAULT: 'pma_table_info'
-$cfg['Servers'][$i]['table_coords'] = ''; // table to describe the tables position for the PDF schema
- // - leave blank for no PDF schema support
- // DEFAULT: 'pma_table_coords'
-$cfg['Servers'][$i]['pdf_pages'] = ''; // table to describe pages of relationpdf
- // - leave blank if you don't want to use this
- // DEFAULT: 'pma_pdf_pages'
-$cfg['Servers'][$i]['column_info'] = ''; // table to store column information
- // - leave blank for no column comments/mime types
- // DEFAULT: 'pma_column_info'
-$cfg['Servers'][$i]['history'] = ''; // table to store SQL history
- // - leave blank for no SQL query history
- // DEFAULT: 'pma_history'
-$cfg['Servers'][$i]['designer_coords'] = ''; // table to store the coordinates for Designer
- // - leave blank for no Designer feature
- // DEFAULT: 'pma_designer_coords'
-$cfg['Servers'][$i]['verbose_check'] = TRUE; // set to FALSE if you know that your pma_* tables
- // are up to date. This prevents compatibility
- // checks and thereby increases performance.
-$cfg['Servers'][$i]['AllowRoot'] = TRUE; // whether to allow root login
-$cfg['Servers'][$i]['AllowDeny']['order'] // Host authentication order, leave blank to not use
- = '';
-$cfg['Servers'][$i]['AllowDeny']['rules'] // Host authentication rules, leave blank for defaults
- = array();
-
-// If you have more than one server configured, you can set $cfg['ServerDefault']
-// to any one of them to autoconnect to that server when phpMyAdmin is started,
-// or set it to 0 to be given a list of servers without logging in
-// If you have only one server configured, $cfg['ServerDefault'] *MUST* be
-// set to that server.
-$cfg['ServerDefault'] = 1; // Default server (0 = no default server)
+$cfg['Servers'][$i]['table_coords'] = '';
/**
+ * table to describe pages of relationpdf
+ * - leave blank if you don't want to use this
+ * DEFAULT: 'pma_pdf_pages'
+ *
+ * @global string $cfg['Servers'][$i]['pdf_pages']
+ */
+$cfg['Servers'][$i]['pdf_pages'] = '';
+
+/**
+ * table to store column information
+ * - leave blank for no column comments/mime types
+ * DEFAULT: 'pma_column_info'
+ *
+ * @global string $cfg['Servers'][$i]['column_info']
+ */
+$cfg['Servers'][$i]['column_info'] = '';
+
+/**
+ * table to store SQL history
+ * - leave blank for no SQL query history
+ * DEFAULT: 'pma_history'
+ *
+ * @global string $cfg['Servers'][$i]['history']
+ */
+$cfg['Servers'][$i]['history'] = '';
+
+/**
+ * table to store the coordinates for Designer
+ * - leave blank for no Designer feature
+ * DEFAULT: 'pma_designer_coords'
+ *
+ * @global string $cfg['Servers'][$i]['designer_coords']
+ */
+$cfg['Servers'][$i]['designer_coords'] = '';
+
+/**
+ * set to false if you know that your pma_* tables are up to date.
+ * This prevents compatibility checks and thereby increases performance.
+ *
+ * @global boolean $cfg['Servers'][$i]['verbose_check']
+ */
+$cfg['Servers'][$i]['verbose_check'] = true;
+
+/**
+ * whether to allow root login
+ *
+ * @global boolean $cfg['Servers'][$i]['AllowRoot']
+ */
+$cfg['Servers'][$i]['AllowRoot'] = true;
+
+/**
+ * Host authentication order, leave blank to not use
+ *
+ * @global string $cfg['Servers'][$i]['AllowDeny']['order']
+ */
+$cfg['Servers'][$i]['AllowDeny']['order'] = '';
+
+/**
+ * Host authentication rules, leave blank for defaults
+ *
+ * @global array $cfg['Servers'][$i]['AllowDeny']['rules']
+ */
+$cfg['Servers'][$i]['AllowDeny']['rules'] = array();
+
+/**
+ * Default server (0 = no default server)
+ *
+ * If you have more than one server configured, you can set $cfg['ServerDefault']
+ * to any one of them to autoconnect to that server when phpMyAdmin is started,
+ * or set it to 0 to be given a list of servers without logging in
+ * If you have only one server configured, $cfg['ServerDefault'] *MUST* be
+ * set to that server.
+ *
+ * @global integer $cfg['ServerDefault']
+ */
+$cfg['ServerDefault'] = 1;
+
+/*
* Other core phpMyAdmin settings
*/
-$cfg['MaxDbList'] = 100; // maximum number of db's displayed in left frame and databaes list
-$cfg['OBGzip'] = 'auto'; // use GZIP output buffering if possible (TRUE|FALSE|'auto')
-$cfg['PersistentConnections'] = FALSE; // use persistent connections to MySQL database
-$cfg['ForceSSL'] = FALSE; // whether to force using https
-$cfg['ExecTimeLimit'] = 300; // maximum execution time in seconds (0 for no limit)
-$cfg['MemoryLimit'] = 0; // maximum allocated bytes (0 for no limit)
-$cfg['SkipLockedTables'] = FALSE; // mark used tables, make possible to show
- // locked tables (since MySQL 3.23.30)
-$cfg['ShowSQL'] = TRUE; // show SQL queries as run
-$cfg['AllowUserDropDatabase'] = FALSE; // show a 'Drop database' link to normal users
-$cfg['Confirm'] = TRUE; // confirm 'DROP TABLE' & 'DROP DATABASE'
-$cfg['LoginCookieRecall'] = TRUE; // recall previous login in cookie auth. mode or not
-$cfg['LoginCookieValidity'] = 1800; // validity of cookie login (in seconds)
-$cfg['LoginCookieStore'] = 0; // how long login cookie should be stored (in seconds)
-$cfg['LoginCookieDeleteAll'] = TRUE; // whether to delete all login cookies on logout
-$cfg['UseDbSearch'] = TRUE; // whether to enable the "database search" feature
- // or not
-$cfg['IgnoreMultiSubmitErrors'] = FALSE; // if set to true, PMA continues computing multiple-statement queries
- // even if one of the queries failed
-$cfg['VerboseMultiSubmit'] = TRUE; // if set to true, PMA will show the affected rows of EACH statement on
- // multiple-statement queries. See the libraries/import.php file for
- // hardcoded defaults on how many queries a statement may contain!
-$cfg['AllowArbitraryServer'] = FALSE; // allow login to any user entered server in cookie based auth
-
-// Left frame setup
-$cfg['LeftFrameLight'] = TRUE; // use a select-based menu and display only the
- // current tables in the left frame.
-$cfg['LeftFrameDBTree'] = TRUE; // turn the select-based light menu into a tree
-$cfg['LeftFrameDBSeparator'] = '_'; // the separator to sub-tree the select-based light menu tree
-$cfg['LeftFrameTableSeparator']= '__'; // Which string will be used to generate table prefixes
- // to split/nest tables into multiple categories
-$cfg['LeftFrameTableLevel'] = '1'; // How many sublevels should be displayed when splitting
- // up tables by the above Separator
-$cfg['ShowTooltip'] = TRUE; // display table comment as tooltip in left frame
-$cfg['ShowTooltipAliasDB'] = FALSE; // if ShowToolTip is enabled, this defines that table/db comments
-$cfg['ShowTooltipAliasTB'] = FALSE; // are shown (in the left menu and db_structure) instead of
- // table/db names. Setting ShowTooltipAliasTB to 'nested' will only
- // use the Aliases for nested descriptors, not the table itself.
-
-$cfg['LeftDisplayLogo'] = TRUE; // display logo at top of left frame
-$cfg['LeftLogoLink'] = 'http://www.phpmyadmin.net/'; // where should logo link point to
-$cfg['LeftDisplayServers'] = FALSE; // display server choice at top of left frame
-$cfg['DisplayServersList'] = FALSE; // server choice as links
-$cfg['DisplayDatabasesList'] = FALSE; // database choice in light as links
-
-// In the main frame, at startup...
-$cfg['ShowStats'] = TRUE; // allow to display statistics and space usage in
- // the pages about database details and table
- // properties
-$cfg['ShowPhpInfo'] = FALSE; // show php info link
-$cfg['ShowServerInfo'] = TRUE; // show MySQL server information
-$cfg['ShowChgPassword'] = FALSE; // show change password link
-$cfg['ShowCreateDb'] = TRUE; // show create database form
-$cfg['SuggestDBName'] = TRUE; // suggest a new DB name if possible (false = keep empty)
-
-// In browse mode...
-$cfg['ShowBlob'] = FALSE; // display blob field contents
-$cfg['NavigationBarIconic'] = 'both'; // Use icons instead of text for the navigation bar buttons
- // and on right panel top menu (server db table) (TRUE|FALSE|'both')
-$cfg['ShowAll'] = FALSE; // allows to display all the rows
-$cfg['MaxRows'] = 30; // maximum number of rows to display
-$cfg['Order'] = 'ASC'; // default for 'ORDER BY' clause (valid
- // values are 'ASC', 'DESC' or 'SMART' -ie
- // descending order for fields of type
- // TIME, DATE, DATETIME & TIMESTAMP,
- // ascending order else-)
-
-// In edit mode...
-$cfg['ProtectBinary'] = 'blob'; // disallow editing of binary fields
- // valid values are:
- // FALSE allow editing
- // 'blob' allow editing except for BLOB fields
- // 'all' disallow editing
-$cfg['ShowFunctionFields'] = TRUE; // Display the function fields in edit/insert mode
-$cfg['CharEditing'] = 'input';
- // Which editor should be used for CHAR/VARCHAR fields:
- // input - allows limiting of input length
- // textarea - allows newlines in fields
-$cfg['InsertRows'] = 2; // How many rows can be inserted at one time
-
-$cfg['ForeignKeyDropdownOrder'] = // Sort order for items in a foreign-key dropdown box.
- array( 'content-id', 'id-content'); // 'content' is the referenced data, 'id' is the key value.
-$cfg['ForeignKeyMaxLimit'] = 100; // A dropdown will be used if fewer items are present
-
-
-// For the export features...
-$cfg['ZipDump'] = TRUE; // Allow the use of zip/gzip/bzip
-$cfg['GZipDump'] = TRUE; // compression for
-$cfg['BZipDump'] = TRUE; // dump files
-$cfg['CompressOnFly'] = TRUE; // Will compress gzip/bzip2 exports on
- // fly without need for much memory.
- // If you encounter problems with
- // created gzip/bzip2 files disable
- // this feature.
-
-// Tabs display settings
-$cfg['LightTabs'] = FALSE; // use graphically less intense menu tabs
-$cfg['PropertiesIconic'] = TRUE; // Use icons instead of text for the table display of a database (TRUE|FALSE|'both')
-$cfg['PropertiesNumColumns'] = 1; // How many columns should be used for table display of a database?
- // (a value larger than 1 results in some information being hidden)
-
-$cfg['DefaultTabServer'] = 'main.php';
- // Possible values:
- // 'main.php' = the welcome page
- // (recommended for multiuser setups)
- // 'server_databases.php' = list of databases
- // 'server_status.php' = runtime information
- // 'server_variables.php' = MySQL server variables
- // 'server_privileges.php' = user management
- // 'server_processlist.php' = process list
-$cfg['DefaultTabDatabase'] = 'db_structure.php';
- // Possible values:
- // 'db_structure.php' = tables list
- // 'db_sql.php' = sql form
- // 'db_search.php' = search query
- // 'db_operations.php' = operations on database
-$cfg['DefaultTabTable'] = 'tbl_structure.php';
- // Possible values:
- // 'tbl_structure.php' = fields list
- // 'tbl_sql.php' = sql form
- // 'tbl_select.php' = select page
- // 'tbl_change.php' = insert row page
- // 'sql.php' = browse page
+/**
+ * maximum number of db's displayed in left frame and databaes list
+ *
+ * @global integer $cfg['MaxDbList']
+ */
+$cfg['MaxDbList'] = 100;
+
+/**
+ * use GZIP output buffering if possible (true|false|'auto')
+ *
+ * @global string $cfg['OBGzip']
+ */
+$cfg['OBGzip'] = 'auto';
+
+/**
+ * use persistent connections to MySQL database
+ *
+ * @global boolean $cfg['PersistentConnections']
+ */
+$cfg['PersistentConnections'] = false;
+
+/**
+ * whether to force using https
+ *
+ * @global boolean $cfg['ForceSSL']
+ */
+$cfg['ForceSSL'] = false;
+
+/**
+ * maximum execution time in seconds (0 for no limit)
+ *
+ * @global integer $cfg['ExecTimeLimit']
+ */
+$cfg['ExecTimeLimit'] = 300;
+
+/**
+ * maximum allocated bytes (0 for no limit)
+ *
+ * @global integer $cfg['MemoryLimit']
+ */
+$cfg['MemoryLimit'] = 0;
+
+/**
+ * mark used tables, make possible to show locked tables (since MySQL 3.23.30)
+ *
+ * @global boolean $cfg['SkipLockedTables']
+ */
+$cfg['SkipLockedTables'] = false;
+
+/**
+ * show SQL queries as run
+ *
+ * @global boolean $cfg['ShowSQL']
+ */
+$cfg['ShowSQL'] = true;
+
+/**
+ * show a 'Drop database' link to normal users
+ *
+ * @global boolean $cfg['AllowUserDropDatabase']
+ */
+$cfg['AllowUserDropDatabase'] = false;
+
+/**
+ * confirm 'DROP TABLE' & 'DROP DATABASE'
+ *
+ * @global boolean $cfg['Confirm']
+ */
+$cfg['Confirm'] = true;
+
+/**
+ * recall previous login in cookie auth. mode or not
+ *
+ * @global boolean $cfg['LoginCookieRecall']
+ */
+$cfg['LoginCookieRecall'] = true;
+
+/**
+ * validity of cookie login (in seconds)
+ *
+ * @global integer $cfg['LoginCookieValidity']
+ */
+$cfg['LoginCookieValidity'] = 1800;
+
+/**
+ * how long login cookie should be stored (in seconds)
+ *
+ * @global integer $cfg['LoginCookieStore']
+ */
+$cfg['LoginCookieStore'] = 0;
+
+/**
+ * whether to delete all login cookies on logout
+ *
+ * @global boolean $cfg['LoginCookieDeleteAll']
+ */
+$cfg['LoginCookieDeleteAll'] = true;
+
+/**
+ * whether to enable the "database search" feature or not
+ *
+ * @global boolean $cfg['UseDbSearch']
+ */
+$cfg['UseDbSearch'] = true;
+
+/**
+ * if set to true, PMA continues computing multiple-statement queries
+ * even if one of the queries failed
+ *
+ * @global boolean $cfg['IgnoreMultiSubmitErrors']
+ */
+$cfg['IgnoreMultiSubmitErrors'] = false;
+
+/**
+ * if set to true, PMA will show the affected rows of EACH statement on
+ * multiple-statement queries. See the libraries/import.php file for
+ * hardcoded defaults on how many queries a statement may contain!
+ *
+ * @global boolean $cfg['VerboseMultiSubmit']
+ */
+$cfg['VerboseMultiSubmit'] = true;
+
+/**
+ * allow login to any user entered server in cookie based auth
+ *
+ * @global boolean $cfg['AllowArbitraryServer']
+ */
+$cfg['AllowArbitraryServer'] = false;
+
+
+/*******************************************************************************
+ * Left frame setup
+ */
+
+/**
+ * use a select-based menu and display only the current tables in the left frame.
+ *
+ * @global boolean $cfg['LeftFrameLight']
+ */
+$cfg['LeftFrameLight'] = true;
+
+/**
+ * turn the select-based light menu into a tree
+ *
+ * @global boolean $cfg['LeftFrameDBTree']
+ */
+$cfg['LeftFrameDBTree'] = true;
+
+/**
+ * the separator to sub-tree the select-based light menu tree
+ *
+ * @global string $cfg['LeftFrameDBSeparator']
+ */
+$cfg['LeftFrameDBSeparator'] = '_';
+
+/**
+ * Which string will be used to generate table prefixes
+ * to split/nest tables into multiple categories
+ *
+ * @global string $cfg['LeftFrameTableSeparator']
+ */
+$cfg['LeftFrameTableSeparator']= '__';
+
+/**
+ * How many sublevels should be displayed when splitting up tables by the above Separator
+ *
+ * @global integer $cfg['LeftFrameTableLevel']
+ */
+$cfg['LeftFrameTableLevel'] = '1';
+
+/**
+ * display table comment as tooltip in left frame
+ *
+ * @global boolean $cfg['ShowTooltip']
+ */
+$cfg['ShowTooltip'] = true;
+
+/**
+ * if ShowToolTip is enabled, this defines that table/db comments
+ *
+ * @global boolean $cfg['ShowTooltipAliasDB']
+ */
+$cfg['ShowTooltipAliasDB'] = false;
+
+/**
+ * are shown (in the left menu and db_structure) instead of table/db names.
+ * Setting ShowTooltipAliasTB to 'nested' will only use the Aliases for nested
+ * descriptors, not the table itself.
+ *
+ * @global boolean $cfg['ShowTooltipAliasTB']
+ */
+$cfg['ShowTooltipAliasTB'] = false;
+
+/**
+ * display logo at top of left frame
+ *
+ * @global boolean $cfg['LeftDisplayLogo']
+ */
+$cfg['LeftDisplayLogo'] = true;
+
+/**
+ * where should logo link point to (can also contain an external URL)
+ *
+ * @global string $cfg['LeftLogoLink']
+ */
+$cfg['LeftLogoLink'] = 'main.php';
+
+/**
+ * whether to open the linked page in the main window ('main') or
+ * in a new window ('new')
+ *
+ * @global string $cfg['LeftLogoLinkWindow']
+ */
+$cfg['LeftLogoLinkWindow'] = 'main';
+
+/**
+ * display server choice at top of left frame
+ *
+ * @global boolean $cfg['LeftDisplayServers']
+ */
+$cfg['LeftDisplayServers'] = false;
+
+/**
+ * server choice as links
+ *
+ * @global boolean $cfg['DisplayServersList']
+ */
+$cfg['DisplayServersList'] = false;
+
+/**
+ * database choice in light as links
+ *
+ * @global boolean $cfg['DisplayDatabasesList']
+ */
+$cfg['DisplayDatabasesList'] = false;
+
+
+/*******************************************************************************
+ * In the main frame, at startup...
+ */
+
+/**
+ * allow to display statistics and space usage in the pages about database
+ * details and table properties
+ *
+ * @global boolean $cfg['ShowStats']
+ */
+$cfg['ShowStats'] = true;
+
+/**
+ * show php info link
+ *
+ * @global boolean $cfg['ShowPhpInfo']
+ */
+$cfg['ShowPhpInfo'] = false;
+
+/**
+ * show MySQL server information
+ *
+ * @global boolean $cfg['ShowServerInfo']
+ */
+$cfg['ShowServerInfo'] = true;
+
+/**
+ * show change password link
+ *
+ * @global boolean $cfg['ShowChgPassword']
+ */
+$cfg['ShowChgPassword'] = false;
+
+/**
+ * show create database form
+ *
+ * @global boolean $cfg['ShowCreateDb']
+ */
+$cfg['ShowCreateDb'] = true;
+
+/**
+ * suggest a new DB name if possible (false = keep empty)
+ *
+ * @global boolean $cfg['SuggestDBName']
+ */
+$cfg['SuggestDBName'] = true;
+
+
+/*******************************************************************************
+ * In browse mode...
+ */
+
+/**
+ * display blob field contents
+ *
+ * @global boolean $cfg['ShowBlob']
+ */
+$cfg['ShowBlob'] = false;
+
+/**
+ * Use icons instead of text for the navigation bar buttons
+ * and on right panel top menu (server db table) (true|false|'both')
+ *
+ * @global string $cfg['NavigationBarIconic']
+ */
+$cfg['NavigationBarIconic'] = 'both';
+
+/**
+ * allows to display all the rows
+ *
+ * @global boolean $cfg['ShowAll']
+ */
+$cfg['ShowAll'] = false;
+
+/**
+ * maximum number of rows to display
+ *
+ * @global integer $cfg['MaxRows']
+ */
+$cfg['MaxRows'] = 30;
+
+/**
+ * default for 'ORDER BY' clause (valid values are 'ASC', 'DESC' or 'SMART' -ie
+ * descending order for fields of type TIME, DATE, DATETIME & TIMESTAMP,
+ * ascending order else-)
+ *
+ * @global string $cfg['Order']
+ */
+$cfg['Order'] = 'ASC';
+
+
+/*******************************************************************************
+ * In edit mode...
+ */
+
+/**
+ * disallow editing of binary fields
+ * valid values are:
+ * false allow editing
+ * 'blob' allow editing except for BLOB fields
+ * 'all' disallow editing
+ *
+ * @global string $cfg['ProtectBinary']
+ */
+$cfg['ProtectBinary'] = 'blob';
+
+/**
+ * Display the function fields in edit/insert mode
+ *
+ * @global boolean $cfg['ShowFunctionFields']
+ */
+$cfg['ShowFunctionFields'] = true;
+
+/**
+ * Which editor should be used for CHAR/VARCHAR fields:
+ * input - allows limiting of input length
+ * textarea - allows newlines in fields
+ *
+ * @global string $cfg['CharEditing']
+ */
+$cfg['CharEditing'] = 'input';
+
+/**
+ * How many rows can be inserted at one time
+ *
+ * @global integer $cfg['InsertRows']
+ */
+$cfg['InsertRows'] = 2;
+
+/**
+ * Sort order for items in a foreign-key dropdown box.
+ * 'content' is the referenced data, 'id' is the key value.
+ *
+ * @global array $cfg['ForeignKeyDropdownOrder']
+ */
+$cfg['ForeignKeyDropdownOrder'] = array('content-id', 'id-content');
+
+/**
+ * A dropdown will be used if fewer items are present
+ *
+ * @global integer $cfg['ForeignKeyMaxLimit']
+ */
+$cfg['ForeignKeyMaxLimit'] = 100;
+
+
+/*******************************************************************************
+ * For the export features...
+ */
+
+/**
+ * Allow the use of zip/gzip/bzip
+ *
+ * @global boolean $cfg['ZipDump']
+ */
+$cfg['ZipDump'] = true;
+
+/**
+ * compression for
+ *
+ * @global boolean $cfg['GZipDump']
+ */
+$cfg['GZipDump'] = true;
+
+/**
+ * dump files
+ *
+ * @global boolean $cfg['BZipDump']
+ */
+$cfg['BZipDump'] = true;
/**
+ * Will compress gzip/bzip2 exports on fly without need for much memory.
+ * If you encounter problems with created gzip/bzip2 files disable this feature.
+ *
+ * @global boolean $cfg['CompressOnFly']
+ */
+$cfg['CompressOnFly'] = true;
+
+
+/*******************************************************************************
+ * Tabs display settings
+ */
+
+/**
+ * use graphically less intense menu tabs
+ *
+ * @global boolean $cfg['LightTabs']
+ */
+$cfg['LightTabs'] = false;
+
+/**
+ * Use icons instead of text for the table display of a database (true|false|'both')
+ *
+ * @global boolean $cfg['PropertiesIconic']
+ */
+$cfg['PropertiesIconic'] = true;
+
+/**
+ * How many columns should be used for table display of a database?
+ * (a value larger than 1 results in some information being hidden)
+ *
+ * @global integer $cfg['PropertiesNumColumns']
+ */
+$cfg['PropertiesNumColumns'] = 1;
+
+/**
+ * Possible values:
+ * 'main.php' = the welcome page
+ * (recommended for multiuser setups)
+ * 'server_databases.php' = list of databases
+ * 'server_status.php' = runtime information
+ * 'server_variables.php' = MySQL server variables
+ * 'server_privileges.php' = user management
+ * 'server_processlist.php' = process list
+ *
+ * @global string $cfg['DefaultTabServer']
+ */
+$cfg['DefaultTabServer'] = 'main.php';
+
+/**
+ * Possible values:
+ * 'db_structure.php' = tables list
+ * 'db_sql.php' = sql form
+ * 'db_search.php' = search query
+ * 'db_operations.php' = operations on database
+ *
+ * @global string $cfg['DefaultTabDatabase']
+ */
+$cfg['DefaultTabDatabase'] = 'db_structure.php';
+
+/**
+ * Possible values:
+ * 'tbl_structure.php' = fields list
+ * 'tbl_sql.php' = sql form
+ * 'tbl_select.php' = select page
+ * 'tbl_change.php' = insert row page
+ * 'sql.php' = browse page
+ *
+ * @global string $cfg['DefaultTabTable']
+ */
+$cfg['DefaultTabTable'] = 'tbl_structure.php';
+
+
+/*******************************************************************************
* Export defaults
*/
+$cfg['Export'] = array();
+
+/**
+ * sql/latex/excel/csv/xml/xls/htmlexcel/htmlword/ods/odt
+ *
+ * @global string $cfg['Export']['format']
+ */
+$cfg['Export']['format'] = 'sql';
+
+/**
+ * none/zip/gzip/bzip2
+ *
+ * @global string $cfg['Export']['compression']
+ */
+$cfg['Export']['compression'] = 'none';
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['asfile']
+ */
+$cfg['Export']['asfile'] = false;
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['charset']
+ */
+$cfg['Export']['charset'] = '';
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['onserver']
+ */
+$cfg['Export']['onserver'] = false;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['onserver_overwrite']
+ */
+$cfg['Export']['onserver_overwrite'] = false;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['remember_file_template']
+ */
+$cfg['Export']['remember_file_template'] = true;
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['file_template_table']
+ */
+$cfg['Export']['file_template_table'] = '__TABLE__';
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['file_template_database']
+ */
+$cfg['Export']['file_template_database'] = '__DB__';
-$cfg['Export']['format'] = 'sql'; // sql/latex/excel/csv/xml/xls/htmlexcel/htmlword/ods/odt
-$cfg['Export']['compression'] = 'none'; // none/zip/gzip/bzip2
-
-$cfg['Export']['asfile'] = FALSE;
-$cfg['Export']['charset'] = '';
-$cfg['Export']['onserver'] = FALSE;
-$cfg['Export']['onserver_overwrite'] = FALSE;
-$cfg['Export']['remember_file_template'] = TRUE;
-$cfg['Export']['file_template_table'] = '__TABLE__';
-$cfg['Export']['file_template_database'] = '__DB__';
-$cfg['Export']['file_template_server'] = '__SERVER__';
-
-$cfg['Export']['ods_columns'] = FALSE;
-$cfg['Export']['ods_null'] = 'NULL';
-
-$cfg['Export']['odt_structure'] = TRUE;
-$cfg['Export']['odt_data'] = TRUE;
-$cfg['Export']['odt_columns'] = TRUE;
-$cfg['Export']['odt_relation'] = TRUE;
-$cfg['Export']['odt_comments'] = TRUE;
-$cfg['Export']['odt_mime'] = TRUE;
-$cfg['Export']['odt_null'] = 'NULL';
-
-$cfg['Export']['htmlexcel_columns'] = FALSE;
-$cfg['Export']['htmlexcel_null'] = 'NULL';
-
-$cfg['Export']['htmlword_structure'] = TRUE;
-$cfg['Export']['htmlword_data'] = TRUE;
-$cfg['Export']['htmlword_columns'] = FALSE;
-$cfg['Export']['htmlword_null'] = 'NULL';
-
-$cfg['Export']['xls_columns'] = FALSE;
-$cfg['Export']['xls_null'] = 'NULL';
-
-$cfg['Export']['csv_columns'] = FALSE;
-$cfg['Export']['csv_null'] = 'NULL';
-$cfg['Export']['csv_separator'] = ';';
-$cfg['Export']['csv_enclosed'] = '"';
-$cfg['Export']['csv_escaped'] = '\\';
-$cfg['Export']['csv_terminated'] = 'AUTO';
-$cfg['Export']['excel_columns'] = FALSE;
-$cfg['Export']['excel_null'] = 'NULL';
-$cfg['Export']['excel_edition'] = 'win'; // win/mac
-
-$cfg['Export']['latex_structure'] = TRUE;
-$cfg['Export']['latex_data'] = TRUE;
-$cfg['Export']['latex_columns'] = TRUE;
-$cfg['Export']['latex_relation'] = TRUE;
-$cfg['Export']['latex_comments'] = TRUE;
-$cfg['Export']['latex_mime'] = TRUE;
-$cfg['Export']['latex_null'] = '\textit{NULL}';
-$cfg['Export']['latex_caption'] = TRUE;
-$cfg['Export']['latex_structure_caption'] = 'strLatexStructure';
+/**
+ *
+ *
+ * @global string $cfg['Export']['file_template_server']
+ */
+$cfg['Export']['file_template_server'] = '__SERVER__';
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['ods_columns']
+ */
+$cfg['Export']['ods_columns'] = false;
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['ods_null']
+ */
+$cfg['Export']['ods_null'] = 'NULL';
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['odt_structure']
+ */
+$cfg['Export']['odt_structure'] = true;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['odt_data']
+ */
+$cfg['Export']['odt_data'] = true;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['odt_columns']
+ */
+$cfg['Export']['odt_columns'] = true;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['odt_relation']
+ */
+$cfg['Export']['odt_relation'] = true;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['odt_comments']
+ */
+$cfg['Export']['odt_comments'] = true;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['odt_mime']
+ */
+$cfg['Export']['odt_mime'] = true;
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['odt_null']
+ */
+$cfg['Export']['odt_null'] = 'NULL';
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['htmlexcel_columns']
+ */
+$cfg['Export']['htmlexcel_columns'] = false;
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['htmlexcel_null']
+ */
+$cfg['Export']['htmlexcel_null'] = 'NULL';
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['htmlword_structure']
+ */
+$cfg['Export']['htmlword_structure'] = true;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['htmlword_data']
+ */
+$cfg['Export']['htmlword_data'] = true;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['htmlword_columns']
+ */
+$cfg['Export']['htmlword_columns'] = false;
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['htmlword_null']
+ */
+$cfg['Export']['htmlword_null'] = 'NULL';
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['xls_columns']
+ */
+$cfg['Export']['xls_columns'] = false;
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['xls_null']
+ */
+$cfg['Export']['xls_null'] = 'NULL';
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['csv_columns']
+ */
+$cfg['Export']['csv_columns'] = false;
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['csv_null']
+ */
+$cfg['Export']['csv_null'] = 'NULL';
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['csv_separator']
+ */
+$cfg['Export']['csv_separator'] = ';';
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['csv_enclosed']
+ */
+$cfg['Export']['csv_enclosed'] = '"';
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['csv_escaped']
+ */
+$cfg['Export']['csv_escaped'] = '\\';
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['csv_terminated']
+ */
+$cfg['Export']['csv_terminated'] = 'AUTO';
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['excel_columns']
+ */
+$cfg['Export']['excel_columns'] = false;
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['excel_null']
+ */
+$cfg['Export']['excel_null'] = 'NULL';
+
+/**
+ * win/mac
+ *
+ * @global string $cfg['Export']['excel_edition']
+ */
+$cfg['Export']['excel_edition'] = 'win';
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['latex_structure']
+ */
+$cfg['Export']['latex_structure'] = true;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['latex_data']
+ */
+$cfg['Export']['latex_data'] = true;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['latex_columns']
+ */
+$cfg['Export']['latex_columns'] = true;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['latex_relation']
+ */
+$cfg['Export']['latex_relation'] = true;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['latex_comments']
+ */
+$cfg['Export']['latex_comments'] = true;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['latex_mime']
+ */
+$cfg['Export']['latex_mime'] = true;
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['latex_null']
+ */
+$cfg['Export']['latex_null'] = '\textit{NULL}';
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['latex_caption']
+ */
+$cfg['Export']['latex_caption'] = true;
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['latex_structure_caption']
+ */
+$cfg['Export']['latex_structure_caption'] = 'strLatexStructure';
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['latex_structure_continued_caption']
+ */
$cfg['Export']['latex_structure_continued_caption'] = 'strLatexStructure strLatexContinued';
-$cfg['Export']['latex_data_caption'] = 'strLatexContent';
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['latex_data_caption']
+ */
+$cfg['Export']['latex_data_caption'] = 'strLatexContent';
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['latex_data_continued_caption']
+ */
$cfg['Export']['latex_data_continued_caption'] = 'strLatexContent strLatexContinued';
-$cfg['Export']['latex_data_label'] = 'tab:__TABLE__-data';
-$cfg['Export']['latex_structure_label'] = 'tab:__TABLE__-structure';
-
-$cfg['Export']['sql_structure'] = TRUE;
-$cfg['Export']['sql_data'] = TRUE;
-$cfg['Export']['sql_compatibility'] = 'NONE';
-$cfg['Export']['sql_disable_fk'] = FALSE;
-$cfg['Export']['sql_use_transaction'] = FALSE;
-$cfg['Export']['sql_drop_database'] = FALSE;
-$cfg['Export']['sql_drop_table'] = FALSE;
-$cfg['Export']['sql_if_not_exists'] = FALSE;
-$cfg['Export']['sql_auto_increment'] = TRUE;
-$cfg['Export']['sql_backquotes'] = TRUE;
-$cfg['Export']['sql_dates'] = FALSE;
-$cfg['Export']['sql_relation'] = FALSE;
-$cfg['Export']['sql_columns'] = TRUE;
-$cfg['Export']['sql_delayed'] = FALSE;
-$cfg['Export']['sql_ignore'] = FALSE;
-$cfg['Export']['sql_hex_for_binary'] = TRUE;
-$cfg['Export']['sql_type'] = 'insert'; // insert/update/replace
-$cfg['Export']['sql_extended'] = TRUE;
-$cfg['Export']['sql_max_query_size'] = 50000;
-$cfg['Export']['sql_comments'] = FALSE;
-$cfg['Export']['sql_mime'] = FALSE;
-$cfg['Export']['sql_header_comment'] = ''; // \n is replaced by new line
-
-$cfg['Export']['pdf_structure'] = FALSE;
-$cfg['Export']['pdf_data'] = TRUE;
-$cfg['Export']['pdf_report_title'] = '';
/**
+ *
+ *
+ * @global string $cfg['Export']['latex_data_label']
+ */
+$cfg['Export']['latex_data_label'] = 'tab:__TABLE__-data';
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['latex_structure_label']
+ */
+$cfg['Export']['latex_structure_label'] = 'tab:__TABLE__-structure';
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_structure']
+ */
+$cfg['Export']['sql_structure'] = true;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_data']
+ */
+$cfg['Export']['sql_data'] = true;
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['sql_compatibility']
+ */
+$cfg['Export']['sql_compatibility'] = 'NONE';
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_disable_fk']
+ */
+$cfg['Export']['sql_disable_fk'] = false;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_use_transaction']
+ */
+$cfg['Export']['sql_use_transaction'] = false;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_drop_database']
+ */
+$cfg['Export']['sql_drop_database'] = false;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_drop_table']
+ */
+$cfg['Export']['sql_drop_table'] = false;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_if_not_exists']
+ */
+$cfg['Export']['sql_if_not_exists'] = false;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_auto_increment']
+ */
+$cfg['Export']['sql_auto_increment'] = true;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_backquotes']
+ */
+$cfg['Export']['sql_backquotes'] = true;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_dates']
+ */
+$cfg['Export']['sql_dates'] = false;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_relation']
+ */
+$cfg['Export']['sql_relation'] = false;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_columns']
+ */
+$cfg['Export']['sql_columns'] = true;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_delayed']
+ */
+$cfg['Export']['sql_delayed'] = false;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_ignore']
+ */
+$cfg['Export']['sql_ignore'] = false;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_hex_for_binary']
+ */
+$cfg['Export']['sql_hex_for_binary'] = true;
+
+/**
+ * insert/update/replace
+ *
+ * @global string $cfg['Export']['sql_type']
+ */
+$cfg['Export']['sql_type'] = 'insert';
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_extended']
+ */
+$cfg['Export']['sql_extended'] = true;
+
+/**
+ *
+ *
+ * @global integer $cfg['Export']['sql_max_query_size']
+ */
+$cfg['Export']['sql_max_query_size'] = 50000;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_comments']
+ */
+$cfg['Export']['sql_comments'] = false;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_mime']
+ */
+$cfg['Export']['sql_mime'] = false;
+
+/**
+ * \n is replaced by new line
+ *
+ * @global string $cfg['Export']['sql_header_comment']
+ */
+$cfg['Export']['sql_header_comment'] = '';
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['pdf_structure']
+ */
+$cfg['Export']['pdf_structure'] = false;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['pdf_data']
+ */
+$cfg['Export']['pdf_data'] = true;
+
+/**
+ *
+ *
+ * @global string $cfg['Export']['pdf_report_title']
+ */
+$cfg['Export']['pdf_report_title'] = '';
+
+
+/*******************************************************************************
* Import defaults
*/
+$cfg['Import'] = array();
+
+/**
+ *
+ *
+ * @global string $cfg['Import']['format']
+ */
$cfg['Import']['format'] = 'sql';
-$cfg['Import']['allow_interrupt'] = TRUE;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Import']['allow_interrupt']
+ */
+$cfg['Import']['allow_interrupt'] = true;
+
+/**
+ *
+ *
+ * @global integer $cfg['Import']['skip_queries']
+ */
$cfg['Import']['skip_queries'] = '0';
+
+/**
+ *
+ *
+ * @global string $cfg['Import']['sql_compatibility']
+ */
$cfg['Import']['sql_compatibility'] = 'NONE';
-$cfg['Import']['csv_replace'] = FALSE;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Import']['csv_replace']
+ */
+$cfg['Import']['csv_replace'] = false;
+
+/**
+ *
+ *
+ * @global string $cfg['Import']['csv_terminated']
+ */
$cfg['Import']['csv_terminated'] = ';';
+
+/**
+ *
+ *
+ * @global string $cfg['Import']['csv_enclosed']
+ */
$cfg['Import']['csv_enclosed'] = '"';
+
+/**
+ *
+ *
+ * @global string $cfg['Import']['csv_escaped']
+ */
$cfg['Import']['csv_escaped'] = '\\';
+
+/**
+ *
+ *
+ * @global string $cfg['Import']['csv_new_line']
+ */
$cfg['Import']['csv_new_line'] = 'auto';
+
+/**
+ *
+ *
+ * @global string $cfg['Import']['csv_columns']
+ */
$cfg['Import']['csv_columns'] = '';
-$cfg['Import']['ldi_replace'] = FALSE;
+
+/**
+ *
+ *
+ * @global boolean $cfg['Import']['ldi_replace']
+ */
+$cfg['Import']['ldi_replace'] = false;
+
+/**
+ *
+ *
+ * @global string $cfg['Import']['ldi_terminated']
+ */
$cfg['Import']['ldi_terminated'] = ';';
+
+/**
+ *
+ *
+ * @global string $cfg['Import']['ldi_enclosed']
+ */
$cfg['Import']['ldi_enclosed'] = '"';
+
+/**
+ *
+ *
+ * @global string $cfg['Import']['ldi_escaped']
+ */
$cfg['Import']['ldi_escaped'] = '\\';
+
+/**
+ *
+ *
+ * @global string $cfg['Import']['ldi_new_line']
+ */
$cfg['Import']['ldi_new_line'] = 'auto';
+
+/**
+ *
+ *
+ * @global string $cfg['Import']['ldi_columns']
+ */
$cfg['Import']['ldi_columns'] = '';
-$cfg['Import']['ldi_local_option'] = 'auto'; // 'auto' for autodetection, TRUE or FALSE for forcing
+/**
+ * 'auto' for autodetection, true or false for forcing
+ *
+ * @global string $cfg['Import']['ldi_local_option']
+ */
+$cfg['Import']['ldi_local_option'] = 'auto';
/**
* Link to the official MySQL documentation.
* Be sure to include no trailing slash on the path.
* See http://dev.mysql.com/doc/ for more information
* about MySQL manuals and their types.
+ *
+ * @global string $cfg['MySQLManualBase']
*/
$cfg['MySQLManualBase'] = 'http://dev.mysql.com/doc/refman';
@@ -383,63 +1486,110 @@ $cfg['MySQLManualBase'] = 'http://dev.mysql.com/doc/refman';
* big - "HTML, all on one page"
* old - old style used in phpMyAdmin 2.3.0 and sooner
* none - do not show documentation links
+ *
+ * @global string $cfg['MySQLManualType']
*/
$cfg['MySQLManualType'] = 'viewable';
-/**
+/*******************************************************************************
* PDF options
*/
-$cfg['PDFPageSizes'] = array('A3', 'A4', 'A5', 'letter', 'legal');
-$cfg['PDFDefaultPageSize'] = 'A4';
+/**
+ *
+ *
+ * @global array $cfg['PDFPageSizes']
+ */
+$cfg['PDFPageSizes'] = array('A3', 'A4', 'A5', 'letter', 'legal');
/**
+ *
+ *
+ * @global string $cfg['PDFDefaultPageSize']
+ */
+$cfg['PDFDefaultPageSize'] = 'A4';
+
+
+/*******************************************************************************
* Language and charset conversion settings
*/
-// Default language to use, if not browser-defined or user-defined
+
+/**
+ * Default language to use, if not browser-defined or user-defined
+ *
+ * @global string $cfg['DefaultLang']
+ */
$cfg['DefaultLang'] = 'en-iso-8859-1';
-// Default connection collation (used for MySQL >= 4.1)
+/**
+ * Default connection collation (used for MySQL >= 4.1)
+ *
+ * @global string $cfg['DefaultConnectionCollation']
+ */
$cfg['DefaultConnectionCollation'] = 'utf8_unicode_ci';
-// Force: always use this language - must be defined in
-// libraries/select_lang.lib.php
-// $cfg['Lang'] = 'en-iso-8859-1';
-
-// Regullar expression to limit listed languages, eg. '^(cs|en)' for Czech and
-// English only
+/**
+ * Force: always use this language - must be defined in
+ * libraries/select_lang.lib.php
+ * $cfg['Lang'] = 'en-iso-8859-1';
+ *
+ * Regullar expression to limit listed languages, eg. '^(cs|en)' for Czech and
+ * English only
+ *
+ * @global string $cfg['FilterLanguages']
+ */
$cfg['FilterLanguages'] = '';
-// Default charset to use for recoding of MySQL queries, does not take
-// any effect when charsets recoding is switched off by
-// $cfg['AllowAnywhereRecoding'] or in language file
-// (see $cfg['AvailableCharsets'] to possible choices, you can add your own)
+/**
+ * Default charset to use for recoding of MySQL queries, does not take
+ * any effect when charsets recoding is switched off by
+ * $cfg['AllowAnywhereRecoding'] or in language file
+ * (see $cfg['AvailableCharsets'] to possible choices, you can add your own)
+ *
+ * @global string $cfg['DefaultCharset']
+ */
$cfg['DefaultCharset'] = 'iso-8859-1';
-// Allow charset recoding of MySQL queries, must be also enabled in language
-// file to make harder using other language files than unicode.
-// Default value is FALSE to avoid problems on servers without the iconv
-// extension and where dl() is not supported
-$cfg['AllowAnywhereRecoding'] = FALSE;
-
-// You can select here which functions will be used for charset conversion.
-// Possible values are:
-// auto - automatically use available one (first is tested iconv, then
-// recode)
-// iconv - use iconv or libiconv functions
-// recode - use recode_string function
+/**
+ * Allow charset recoding of MySQL queries, must be also enabled in language
+ * file to make harder using other language files than unicode.
+ * Default value is false to avoid problems on servers without the iconv
+ * extension and where dl() is not supported
+ *
+ * @global boolean $cfg['AllowAnywhereRecoding']
+ */
+$cfg['AllowAnywhereRecoding'] = false;
+
+/**
+ * You can select here which functions will be used for charset conversion.
+ * Possible values are:
+ * auto - automatically use available one (first is tested iconv, then
+ * recode)
+ * iconv - use iconv or libiconv functions
+ * recode - use recode_string function
+ *
+ * @global string $cfg['RecodingEngine']
+ */
$cfg['RecodingEngine'] = 'auto';
-// Specify some parameters for iconv used in charset conversion. See iconv
-// documentation for details:
-// http://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html
+/**
+ * Specify some parameters for iconv used in charset conversion. See iconv
+ * documentation for details:
+ * http://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html
+ *
+ * @global string $cfg['IconvExtraParams']
+ */
$cfg['IconvExtraParams'] = '//TRANSLIT';
-// Available charsets for MySQL conversion. currently contains all which could
-// be found in lang/* files and few more.
-// Charsets will be shown in same order as here listed, so if you frequently
-// use some of these move them to the top.
+/**
+ * Available charsets for MySQL conversion. currently contains all which could
+ * be found in lang/* files and few more.
+ * Charsets will be shown in same order as here listed, so if you frequently
+ * use some of these move them to the top.
+ *
+ * @global array $cfg['AvailableCharsets']
+ */
$cfg['AvailableCharsets'] = array(
'iso-8859-1',
'iso-8859-2',
@@ -474,69 +1624,240 @@ $cfg['AvailableCharsets'] = array(
'SHIFT_JIS'
);
-/**
+
+/*******************************************************************************
* Customization & design
*
* The graphical settings are now located in themes/themename/layout.inc.php
*/
-$cfg['LeftPointerEnable'] = TRUE; // enable the left panel pointer
- // (used when LeftFrameLight is FALSE)
- // see also LeftPointerColor
- // in layout.inc.php
-
-$cfg['BrowsePointerEnable'] = TRUE; // enable the browse pointer
- // see also BrowsePointerColor
- // in layout.inc.php
-
-$cfg['BrowseMarkerEnable'] = TRUE; // enable the browse marker
- // see also BrowseMarkerColor
- // in layout.inc.php
-
-$cfg['TextareaCols'] = 40; // textarea size (columns) in edit mode
- // (this value will be emphasized (*2) for sql
- // query textareas and (*1.25) for query window)
-$cfg['TextareaRows'] = 7; // textarea size (rows) in edit mode
-$cfg['LongtextDoubleTextarea'] = TRUE; // double size of textarea size for longtext fields
-$cfg['TextareaAutoSelect'] = TRUE; // autoselect when clicking in the textarea of the querybox
-$cfg['CharTextareaCols'] = 40; // textarea size (columns) for CHAR/VARCHAR
-$cfg['CharTextareaRows'] = 2; // textarea size (rows) for CHAR/VARCHAR
-$cfg['CtrlArrowsMoving'] = TRUE; // Enable Ctrl+Arrows moving between fields when editing?
-$cfg['LimitChars'] = 50; // Max field data length in browse mode for all non-numeric fields
-$cfg['ModifyDeleteAtLeft'] = TRUE; // show edit/delete links on left side of browse
- // (or at the top with vertical browse)
-$cfg['ModifyDeleteAtRight'] = FALSE; // show edit/delete links on right side of browse
- // (or at the bottom with vertical browse)
-$cfg['DefaultDisplay'] = 'horizontal'; // default display direction
- // (horizontal|vertical|horizontalflipped)
-$cfg['DefaultPropDisplay'] = 3; // default display direction for altering/
- // creating columns (tbl_properties)
- // (horizontal|vertical|<number>)
- // number indicates maximal number for which vertical model is used
-
-$cfg['HeaderFlipType'] = 'css'; // table-header rotation via faking or css? (css|fake)
- // NOTE: CSS only works in IE browsers!
-$cfg['ShowBrowseComments'] = TRUE; // shows stored relation-comments in 'browse' mode.
-$cfg['ShowPropertyComments']= TRUE; // shows stored relation-comments in 'table property' mode.
-$cfg['RepeatCells'] = 100; // repeat header names every X cells? (0 = deactivate)
-
-$cfg['EditInWindow'] = TRUE; // Set to TRUE if Edit link should open the query to edit in the query window (assuming Javascript is enabled), and to FALSE if we should edit in the right panel
-$cfg['QueryWindowWidth'] = 550; // Width of Query window
-$cfg['QueryWindowHeight'] = 310; // Height of Query window
-$cfg['QueryHistoryDB'] = FALSE; // Set to TRUE if you want DB-based query history.
- // If FALSE, this utilizes JS-routines to display
- // query history (lost by window close)
-$cfg['QueryWindowDefTab'] = 'sql'; // which tab to display in the querywindow on startup
- // (sql|files|history|full)
-$cfg['QueryHistoryMax'] = 25; // When using DB-based query history, how many entries
- // should be kept?
-$cfg['BrowseMIME'] = TRUE; // Use MIME-Types (stored in column comments table) for
-$cfg['MaxExactCount'] = 20000; // When approximate count < this, PMA will get exact count for table rows.
-$cfg['MaxExactCountViews'] = 0; // Zero means that no row count is done for views; see the doc
-$cfg['WYSIWYG-PDF'] = TRUE; // Utilize DHTML/JS capabilities to allow WYSIWYG editing of
- // the PDF page editor. Requires an IE6/Mozilla based browser.
-
-$cfg['NaturalOrder'] = TRUE; // Sort table and database in natural order
+/**
+ * enable the left panel pointer
+ * (used when LeftFrameLight is false)
+ * see also LeftPointerColor
+ * in layout.inc.php
+ *
+ * @global boolean $cfg['LeftPointerEnable']
+ */
+$cfg['LeftPointerEnable'] = true;
+
+/**
+ * enable the browse pointer
+ * see also BrowsePointerColor
+ * in layout.inc.php
+ *
+ * @global boolean $cfg['BrowsePointerEnable']
+ */
+$cfg['BrowsePointerEnable'] = true;
+
+/**
+ * enable the browse marker
+ * see also BrowseMarkerColor
+ * in layout.inc.php
+ *
+ * @global boolean $cfg['BrowseMarkerEnable']
+ */
+$cfg['BrowseMarkerEnable'] = true;
+
+/**
+ * textarea size (columns) in edit mode
+ * (this value will be emphasized (*2) for sql
+ * query textareas and (*1.25) for query window)
+ *
+ * @global integer $cfg['TextareaCols']
+ */
+$cfg['TextareaCols'] = 40;
+
+/**
+ * textarea size (rows) in edit mode
+ *
+ * @global integer $cfg['TextareaRows']
+ */
+$cfg['TextareaRows'] = 7;
+
+/**
+ * double size of textarea size for longtext fields
+ *
+ * @global boolean $cfg['LongtextDoubleTextarea']
+ */
+$cfg['LongtextDoubleTextarea'] = true;
+
+/**
+ * autoselect when clicking in the textarea of the querybox
+ *
+ * @global boolean $cfg['TextareaAutoSelect']
+ */
+$cfg['TextareaAutoSelect'] = true;
+
+/**
+ * textarea size (columns) for CHAR/VARCHAR
+ *
+ * @global integer $cfg['CharTextareaCols']
+ */
+$cfg['CharTextareaCols'] = 40;
+
+/**
+ * textarea size (rows) for CHAR/VARCHAR
+ *
+ * @global integer $cfg['CharTextareaRows']
+ */
+$cfg['CharTextareaRows'] = 2;
+
+/**
+ * Enable Ctrl+Arrows moving between fields when editing?
+ *
+ * @global boolean $cfg['CtrlArrowsMoving']
+ */
+$cfg['CtrlArrowsMoving'] = true;
+
+/**
+ * Max field data length in browse mode for all non-numeric fields
+ *
+ * @global integer $cfg['LimitChars']
+ */
+$cfg['LimitChars'] = 50;
+
+/**
+ * show edit/delete links on left side of browse
+ * (or at the top with vertical browse)
+ *
+ * @global boolean $cfg['ModifyDeleteAtLeft']
+ */
+$cfg['ModifyDeleteAtLeft'] = true;
+
+/**
+ * show edit/delete links on right side of browse
+ * (or at the bottom with vertical browse)
+ *
+ * @global boolean $cfg['ModifyDeleteAtRight']
+ */
+$cfg['ModifyDeleteAtRight'] = false;
+
+/**
+ * default display direction (horizontal|vertical|horizontalflipped)
+ *
+ * @global string $cfg['DefaultDisplay']
+ */
+$cfg['DefaultDisplay'] = 'horizontal';
+
+/**
+ * default display direction for altering/creating columns (tbl_properties)
+ * (horizontal|vertical|<number>)
+ * number indicates maximal number for which vertical model is used
+ *
+ * @global integer $cfg['DefaultPropDisplay']
+ */
+$cfg['DefaultPropDisplay'] = 3;
+
+/**
+ * table-header rotation via faking or css? (css|fake)
+ * NOTE: CSS only works in IE browsers!
+ *
+ * @global string $cfg['HeaderFlipType']
+ */
+$cfg['HeaderFlipType'] = 'css';
+
+/**
+ * shows stored relation-comments in 'browse' mode.
+ *
+ * @global boolean $cfg['ShowBrowseComments']
+ */
+$cfg['ShowBrowseComments'] = true;
+
+/**
+ * shows stored relation-comments in 'table property' mode.
+ *
+ * @global boolean $cfg['ShowPropertyComments']
+ */
+$cfg['ShowPropertyComments']= true;
+
+/**
+ * repeat header names every X cells? (0 = deactivate)
+ *
+ * @global integer $cfg['RepeatCells']
+ */
+$cfg['RepeatCells'] = 100;
+
+/**
+ * Set to true if Edit link should open the query to edit in the query window
+ * (assuming Javascript is enabled), and to false if we should edit in the right panel
+ *
+ * @global boolean $cfg['EditInWindow']
+ */
+$cfg['EditInWindow'] = true;
+
+/**
+ * Width of Query window
+ *
+ * @global integer $cfg['QueryWindowWidth']
+ */
+$cfg['QueryWindowWidth'] = 550;
+
+/**
+ * Height of Query window
+ *
+ * @global integer $cfg['QueryWindowHeight']
+ */
+$cfg['QueryWindowHeight'] = 310;
+
+/**
+ * Set to true if you want DB-based query history.If false, this utilizes
+ * JS-routines to display query history (lost by window close)
+ *
+ * @global boolean $cfg['QueryHistoryDB']
+ */
+$cfg['QueryHistoryDB'] = false;
+
+/**
+ * which tab to display in the querywindow on startup
+ * (sql|files|history|full)
+ *
+ * @global string $cfg['QueryWindowDefTab']
+ */
+$cfg['QueryWindowDefTab'] = 'sql';
+
+/**
+ * When using DB-based query history, how many entries should be kept?
+ *
+ * @global integer $cfg['QueryHistoryMax']
+ */
+$cfg['QueryHistoryMax'] = 25;
+
+/**
+ * Use MIME-Types (stored in column comments table) for
+ *
+ * @global boolean $cfg['BrowseMIME']
+ */
+$cfg['BrowseMIME'] = true;
+
+/**
+ * When approximate count < this, PMA will get exact count for table rows.
+ *
+ * @global integer $cfg['MaxExactCount']
+ */
+$cfg['MaxExactCount'] = 20000;
+
+/**
+ * Zero means that no row count is done for views; see the doc
+ *
+ * @global integer $cfg['MaxExactCountViews']
+ */
+$cfg['MaxExactCountViews'] = 0;
+
+/**
+ * Utilize DHTML/JS capabilities to allow WYSIWYG editing of
+ * the PDF page editor. Requires an IE6/Mozilla based browser.
+ *
+ * @global boolean $cfg['WYSIWYG-PDF']
+ */
+$cfg['WYSIWYG-PDF'] = true;
+
+/**
+ * Sort table and database in natural order
+ *
+ * @global boolean $cfg['NaturalOrder']
+ */
+$cfg['NaturalOrder'] = true;
//-----------------------------------------------------------------------------
@@ -546,28 +1867,98 @@ $cfg['NaturalOrder'] = TRUE; // Sort table and database in natura
* @todo 2004-05-08 rabus: We need to rearrange these variables.
*/
-// Window title settings
-$cfg['TitleTable'] = '@HTTP_HOST@ / @VSERVER@ / @DATABASE@ / @TABLE@ | @PHPMYADMIN@';
-$cfg['TitleDatabase'] = '@HTTP_HOST@ / @VSERVER@ / @DATABASE@ | @PHPMYADMIN@';
-$cfg['TitleServer'] = '@HTTP_HOST@ / @VSERVER@ | @PHPMYADMIN@';
-$cfg['TitleDefault'] = '@HTTP_HOST@ | @PHPMYADMIN@';
-$cfg['ErrorIconic'] = TRUE; // show some icons for warning, error and information messages (true|false)?
-$cfg['MainPageIconic'] = TRUE; // show icons in list on main page and on menu tabs (true|false)?
-$cfg['ReplaceHelpImg'] = TRUE; // show help button instead of strDocu (true|false)?
+/*******************************************************************************
+ * Window title settings
+ */
+
+/**
+ * title of browser window when a table is selected
+ *
+ * @global string $cfg['TitleTable']
+ */
+$cfg['TitleTable'] = '@HTTP_HOST@ / @VSERVER@ / @DATABASE@ / @TABLE@ | @PHPMYADMIN@';
+
+/**
+ * title of browser window when a database is selected
+ *
+ * @global string $cfg['TitleDatabase']
+ */
+$cfg['TitleDatabase'] = '@HTTP_HOST@ / @VSERVER@ / @DATABASE@ | @PHPMYADMIN@';
+
+/**
+ * title of browser window when a server is selected
+ *
+ * @global string $cfg['TitleServer']
+ */
+$cfg['TitleServer'] = '@HTTP_HOST@ / @VSERVER@ | @PHPMYADMIN@';
-// theme manager
-$cfg['ThemePath'] = './themes'; // using themes manager please set up here the path to 'themes'
- // else leave empty
-$cfg['ThemeManager'] = TRUE; // if you want to use selectable themes and if ThemesPath not empty
- // set it to true, else set it to false (default is false);
-$cfg['ThemeDefault'] = 'original'; // set up default theme, if ThemePath not empty
- // you can set up here an valid path to themes or 'original' for
- // the original pma-theme
-$cfg['ThemePerServer'] = FALSE; // allow different theme for each configured server
+/**
+ * title of browser window when nothing is selected
+ * @global string $cfg['TitleDefault']
+ */
+$cfg['TitleDefault'] = '@HTTP_HOST@ | @PHPMYADMIN@';
-//-----------------------------------------------------------------------------
+/**
+ * show some icons for warning, error and information messages (true|false)?
+ *
+ * @global boolean $cfg['ErrorIconic']
+ */
+$cfg['ErrorIconic'] = true;
+/**
+ * show icons in list on main page and on menu tabs (true|false)?
+ *
+ * @global boolean $cfg['MainPageIconic']
+ */
+$cfg['MainPageIconic'] = true;
+
+/**
+ * show help button instead of strDocu (true|false)?
+ *
+ * @global boolean $cfg['ReplaceHelpImg']
+ */
+$cfg['ReplaceHelpImg'] = true;
+
+
+/*******************************************************************************
+ * theme manager
+ */
+
+/**
+ * using themes manager please set up here the path to 'themes' else leave empty
+ *
+ * @global string $cfg['ThemePath']
+ */
+$cfg['ThemePath'] = './themes';
+
+/**
+ * if you want to use selectable themes and if ThemesPath not empty
+ * set it to true, else set it to false (default is false);
+ *
+ * @global boolean $cfg['ThemeManager']
+ */
+$cfg['ThemeManager'] = true;
+
+/**
+ * set up default theme, if ThemePath not empty you can set up here an valid
+ * path to themes or 'original' for the original pma-theme
+ *
+ * @global string $cfg['ThemeDefault']
+ */
+$cfg['ThemeDefault'] = 'original';
+
+/**
+ * allow different theme for each configured server
+ *
+ * @global boolean $cfg['ThemePerServer']
+ */
+$cfg['ThemePerServer'] = false;
+
+
+/*******************************************************************************
+ *
+ */
/**
* Default queries
@@ -575,79 +1966,222 @@ $cfg['ThemePerServer'] = FALSE; // allow different theme for each c
* %t will be replaced by the table name.
* %f will be replaced by a list of field names.
* (%t and %f only applies to DefaultQueryTable)
+ *
+ * @global string $cfg['DefaultQueryTable']
*/
-$cfg['DefaultQueryTable'] = 'SELECT * FROM %t WHERE 1';
-$cfg['DefaultQueryDatabase'] = '';
+$cfg['DefaultQueryTable'] = 'SELECT * FROM %t WHERE 1';
/**
+ * Default queries
+ * %d will be replaced by the database name.
+ * %t will be replaced by the table name.
+ * %f will be replaced by a list of field names.
+ * (%t and %f only applies to DefaultQueryTable)
+ *
+ * @global string $cfg['DefaultQueryDatabase']
+ */
+$cfg['DefaultQueryDatabase'] = '';
+
+
+/*******************************************************************************
* SQL Query box settings
* These are the links display in all of the SQL Query boxes
+ *
+ * @global array $cfg['SQLQuery']
*/
-$cfg['SQLQuery']['Edit'] = TRUE; // Edit link to change a query
-$cfg['SQLQuery']['Explain'] = TRUE; // EXPLAIN on SELECT queries
-$cfg['SQLQuery']['ShowAsPHP'] = TRUE; // Wrap a query in PHP
-$cfg['SQLQuery']['Validate'] = FALSE; // Validate a query (see $cfg['SQLValidator'] as well)
-$cfg['SQLQuery']['Refresh'] = TRUE; // Refresh the results page
+$cfg['SQLQuery'] = array();
+/**
+ * Edit link to change a query
+ *
+ * @global boolean $cfg['SQLQuery']['Edit']
+ */
+$cfg['SQLQuery']['Edit'] = true;
/**
+ * EXPLAIN on SELECT queries
+ *
+ * @global boolean $cfg['SQLQuery']['Explain']
+ */
+$cfg['SQLQuery']['Explain'] = true;
+
+/**
+ * Wrap a query in PHP
+ *
+ * @global boolean $cfg['SQLQuery']['ShowAsPHP']
+ */
+$cfg['SQLQuery']['ShowAsPHP'] = true;
+
+/**
+ * Validate a query (see $cfg['SQLValidator'] as well)
+ *
+ * @global boolean $cfg['SQLQuery']['Validate']
+ */
+$cfg['SQLQuery']['Validate'] = false;
+
+/**
+ * Refresh the results page
+ *
+ * @global boolean $cfg['SQLQuery']['Refresh']
+ */
+$cfg['SQLQuery']['Refresh'] = true;
+
+
+/*******************************************************************************
* Webserver upload/save/import directories
*/
-$cfg['UploadDir'] = ''; // Directory for uploaded files that can be executed by
- // phpMyAdmin. For example './upload'. Leave empty for
- // no upload directory support. Use %u for username
- // inclusion.
-$cfg['SaveDir'] = ''; // Directory where phpMyAdmin can save exported data on
- // server. For example './save'. Leave empty for no save
- // directory support. Use %u for username inclusion.
-$cfg['TempDir'] = ''; // Directory where phpMyAdmin can save temporary files.
- // This is needed for MS Excel export, see documentation
- // how to enable that.
+
+/**
+ * Directory for uploaded files that can be executed by phpMyAdmin.
+ * For example './upload'. Leave empty for no upload directory support.
+ * Use %u for username inclusion.
+ *
+ * @global string $cfg['UploadDir']
+ */
+$cfg['UploadDir'] = '';
+
+/**
+ * Directory where phpMyAdmin can save exported data on server.
+ * For example './save'. Leave empty for no save directory support.
+ * Use %u for username inclusion.
+ *
+ * @global string $cfg['SaveDir']
+ */
+$cfg['SaveDir'] = '';
+
+/**
+ * Directory where phpMyAdmin can save temporary files.
+ * This is needed for MS Excel export, see documentation how to enable that.
+ *
+ * @global string $cfg['TempDir']
+ */
+$cfg['TempDir'] = '';
/**
* Misc. settings
*/
-$cfg['GD2Available'] = 'auto'; // Is GD >= 2 available? Set to yes/no/auto. 'auto'
- // does autodetection, which is a bit expensive for
- // php < 4.3.0, but it is the only safe vay how to
- // determine GD version.
-$cfg['TrustedProxies'] = array(); // List of trusted proxies for IP allow/deny
/**
+ * Is GD >= 2 available? Set to yes/no/auto. 'auto' does autodetection,
+ * which is a bit expensive for php < 4.3.0, but it is the only safe vay how to
+ * determine GD version.
+ *
+ * @global string $cfg['GD2Available']
+ */
+$cfg['GD2Available'] = 'auto';
+
+/**
+ * List of trusted proxies for IP allow/deny
+ *
+ * @global array $cfg['TrustedProxies']
+ */
+$cfg['TrustedProxies'] = array();
+
+
+/*******************************************************************************
* SQL Parser Settings
+ *
+ * @global array $cfg['SQP']
*/
-$cfg['SQP']['fmtType'] = 'html'; // Pretty-printing style to use on queries (html, text, none)
-$cfg['SQP']['fmtInd'] = '1'; // Amount to indent each level (floats ok)
-$cfg['SQP']['fmtIndUnit'] = 'em'; // Units for indenting each level (CSS Types - {em,px,pt})
-// The graphical settings are now located in themes/themename/layout.inc.php
+$cfg['SQP'] = array();
/**
- * If you wish to use the SQL Validator service, you should be
- * aware of the following:
+ * Pretty-printing style to use on queries (html, text, none)
+ *
+ * @global string $cfg['SQP']['fmtType']
+ */
+$cfg['SQP']['fmtType'] = 'html';
+
+/**
+ * Amount to indent each level (floats ok)
+ *
+ * @global integer $cfg['SQP']['fmtInd']
+ */
+$cfg['SQP']['fmtInd'] = '1';
+
+/**
+ * Units for indenting each level (CSS Types - {em,px,pt})
+ *
+ * @global string $cfg['SQP']['fmtIndUnit']
+ */
+$cfg['SQP']['fmtIndUnit'] = 'em';
+
+
+/*******************************************************************************
+ * If you wish to use the SQL Validator service, you should be aware of the
+ * following:
* All SQL statements are stored anonymously for statistical purposes.
* Mimer SQL Validator, Copyright 2002 Upright Database Technology.
* All rights reserved.
+ *
+ * @global array $cfg['SQLValidator']
+ */
+$cfg['SQLValidator'] = array();
+
+/**
+ * Make the SQL Validator available
+ *
+ * @global boolean $cfg['SQLValidator']['use']
+ */
+$cfg['SQLValidator']['use'] = false;
+
+/**
+ * If you have a custom username, specify it here (defaults to anonymous)
+ *
+ * @global string $cfg['SQLValidator']['username']
*/
-$cfg['SQLValidator']['use'] = FALSE; // Make the SQL Validator available
-$cfg['SQLValidator']['username'] = ''; // If you have a custom username, specify it here (defaults to anonymous)
-$cfg['SQLValidator']['password'] = ''; // Password for username
+$cfg['SQLValidator']['username'] = '';
/**
+ * Password for username
+ *
+ * @global string $cfg['SQLValidator']['password']
+ */
+$cfg['SQLValidator']['password'] = '';
+
+
+/*******************************************************************************
* Developers ONLY!
* To use the following, please install the DBG extension from http://dd.cron.ru/dbg/
+ *
+ * @global array $cfg['DBG']
*/
-$cfg['DBG']['enable'] = FALSE; // Make the DBG stuff available
-$cfg['DBG']['profile']['enable'] = FALSE; // Produce profiling results of PHP
-$cfg['DBG']['profile']['threshold'] = 0.5; // Threshold of long running code to display
- // Anything below the threshold is not displayed
+$cfg['DBG'] = array();
+/**
+ * Make the DBG stuff available
+ *
+ * @global boolean $cfg['DBG']['enable']
+ */
+$cfg['DBG']['enable'] = false;
+
+/**
+ * Produce profiling results of PHP
+ *
+ * @global boolean $cfg['DBG']['profile']['enable']
+ */
+$cfg['DBG']['profile']['enable'] = false;
/**
+ * Threshold of long running code to display
+ * Anything below the threshold is not displayed
+ *
+ * @global float $cfg['DBG']['profile']['threshold']
+ */
+$cfg['DBG']['profile']['threshold'] = 0.5;
+
+
+/*******************************************************************************
* MySQL settings
*/
-// Column types;
-// varchar, tinyint, text and date are listed first, based on estimated popularity
+
+/**
+ * Column types;
+ * varchar, tinyint, text and date are listed first, based on estimated popularity
+ *
+ * @global array $cfg['ColumnTypes']
+ */
$cfg['ColumnTypes'] = array(
'VARCHAR',
'TINYINT',
@@ -677,10 +2211,13 @@ $cfg['ColumnTypes'] = array(
'BOOL'
);
-// Attributes
-// Note: the "ON UPDATE CURRENT_TIMESTAMP" attribute is added dynamically
-// for MySQL >= 4.1.2, in libraries/tbl_properties.inc.php
-
+/**
+ * Attributes
+ * Note: the "ON UPDATE CURRENT_TIMESTAMP" attribute is added dynamically
+ * for MySQL >= 4.1.2, in libraries/tbl_properties.inc.php
+ *
+ * @global array $cfg['AttributeTypes']
+ */
$cfg['AttributeTypes'] = array(
'',
'BINARY',
@@ -688,8 +2225,13 @@ $cfg['AttributeTypes'] = array(
'UNSIGNED ZEROFILL'
);
-// Available functions
+
if ($cfg['ShowFunctionFields']) {
+ /**
+ * Available functions
+ *
+ * @global array $cfg['Functions']
+ */
$cfg['Functions'] = array(
'ASCII',
'CHAR',
@@ -725,38 +2267,46 @@ if ($cfg['ShowFunctionFields']) {
'CONCAT'
);
- // Which column types will be mapped to which Group?
+ /**
+ * Which column types will be mapped to which Group?
+ *
+ * @global array $cfg['RestrictColumnTypes']
+ */
$cfg['RestrictColumnTypes'] = array(
- 'VARCHAR' => 'FUNC_CHAR',
- 'TINYINT' => 'FUNC_NUMBER',
- 'TEXT' => 'FUNC_CHAR',
- 'DATE' => 'FUNC_DATE',
- 'SMALLINT' => 'FUNC_NUMBER',
- 'MEDIUMINT' => 'FUNC_NUMBER',
- 'INT' => 'FUNC_NUMBER',
- 'BIGINT' => 'FUNC_NUMBER',
- 'FLOAT' => 'FUNC_NUMBER',
- 'DOUBLE' => 'FUNC_NUMBER',
- 'DECIMAL' => 'FUNC_NUMBER',
- 'DATETIME' => 'FUNC_DATE',
- 'TIMESTAMP' => 'FUNC_DATE',
- 'TIME' => 'FUNC_DATE',
- 'YEAR' => 'FUNC_DATE',
- 'CHAR' => 'FUNC_CHAR',
- 'TINYBLOB' => 'FUNC_CHAR',
- 'TINYTEXT' => 'FUNC_CHAR',
- 'BLOB' => 'FUNC_CHAR',
- 'MEDIUMBLOB' => 'FUNC_CHAR',
- 'MEDIUMTEXT' => 'FUNC_CHAR',
- 'LONGBLOB' => 'FUNC_CHAR',
- 'LONGTEXT' => 'FUNC_CHAR',
- 'ENUM' => '',
- 'SET' => ''
+ 'VARCHAR' => 'FUNC_CHAR',
+ 'TINYINT' => 'FUNC_NUMBER',
+ 'TEXT' => 'FUNC_CHAR',
+ 'DATE' => 'FUNC_DATE',
+ 'SMALLINT' => 'FUNC_NUMBER',
+ 'MEDIUMINT' => 'FUNC_NUMBER',
+ 'INT' => 'FUNC_NUMBER',
+ 'BIGINT' => 'FUNC_NUMBER',
+ 'FLOAT' => 'FUNC_NUMBER',
+ 'DOUBLE' => 'FUNC_NUMBER',
+ 'DECIMAL' => 'FUNC_NUMBER',
+ 'DATETIME' => 'FUNC_DATE',
+ 'TIMESTAMP' => 'FUNC_DATE',
+ 'TIME' => 'FUNC_DATE',
+ 'YEAR' => 'FUNC_DATE',
+ 'CHAR' => 'FUNC_CHAR',
+ 'TINYBLOB' => 'FUNC_CHAR',
+ 'TINYTEXT' => 'FUNC_CHAR',
+ 'BLOB' => 'FUNC_CHAR',
+ 'MEDIUMBLOB' => 'FUNC_CHAR',
+ 'MEDIUMTEXT' => 'FUNC_CHAR',
+ 'LONGBLOB' => 'FUNC_CHAR',
+ 'LONGTEXT' => 'FUNC_CHAR',
+ 'ENUM' => '',
+ 'SET' => ''
);
- // Map above defined groups to any function
+ /**
+ * Map above defined groups to any function
+ *
+ * @global array $cfg['RestrictFunctions']
+ */
$cfg['RestrictFunctions'] = array(
- 'FUNC_CHAR' => array(
+ 'FUNC_CHAR' => array(
'ASCII',
'CHAR',
'SOUNDEX',
@@ -772,11 +2322,11 @@ if ($cfg['ShowFunctionFields']) {
'LAST_INSERT_ID',
'USER',
'CONCAT',
- 'HEX',
- 'UNHEX'
+ 'HEX',
+ 'UNHEX'
),
- 'FUNC_DATE' => array(
+ 'FUNC_DATE' => array(
'NOW',
'CURDATE',
'CURTIME',
@@ -807,18 +2357,26 @@ if ($cfg['ShowFunctionFields']) {
)
);
- // Default functions for above defined groups
+ /**
+ * Default functions for above defined groups
+ *
+ * @global array $cfg['DefaultFunctions']
+ */
$cfg['DefaultFunctions'] = array(
- 'FUNC_CHAR' => '',
- 'FUNC_DATE' => '',
- 'FUNC_NUMBER' => '',
- 'first_timestamp' => 'NOW'
+ 'FUNC_CHAR' => '',
+ 'FUNC_DATE' => '',
+ 'FUNC_NUMBER' => '',
+ 'first_timestamp' => 'NOW'
);
} // end if
-// Search operators
+/**
+ * Search operators
+ *
+ * @global array $cfg['NumOperators']
+ */
$cfg['NumOperators'] = array(
'=',
'>',
@@ -830,6 +2388,11 @@ $cfg['NumOperators'] = array(
'NOT LIKE'
);
+/**
+ * Search operators
+ *
+ * @global array $cfg['TextOperators']
+ */
$cfg['TextOperators'] = array(
'LIKE',
'LIKE %...%',
@@ -840,23 +2403,43 @@ $cfg['TextOperators'] = array(
'NOT REGEXP'
);
+/**
+ * Search operators
+ *
+ * @global array $cfg['EnumOperators']
+ */
$cfg['EnumOperators'] = array(
'=',
'!='
);
+/**
+ * Search operators
+ *
+ * @global array $cfg['SetOperators']
+ */
$cfg['SetOperators'] = array(
'IN',
'NOT IN'
);
+/**
+ * Search operators
+ *
+ * @global array $cfg['NullOperators']
+ */
$cfg['NullOperators'] = array(
'IS NULL',
'IS NOT NULL'
);
+/**
+ * Search operators
+ *
+ * @global array $cfg['UnaryOperators']
+ */
$cfg['UnaryOperators'] = array(
- 'IS NULL' => 1,
+ 'IS NULL' => 1,
'IS NOT NULL' => 1
);
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 04c46c28cd..c3f9097ed4 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -56,18 +56,11 @@ if ( ! PMA_DBI_checkAndLoadMysqlExtension( $GLOBALS['cfg']['Server']['extension'
if ( ! PMA_DBI_checkAndLoadMysqlExtension( $alternativ_extension ) ) {
// if alternativ fails too ...
- header( 'Location: error.php'
- . '?lang=' . urlencode( $available_languages[$lang][2] )
- . '&dir=' . urlencode( $text_dir )
- . '&type=' . urlencode( $strError )
- . '&error=' . urlencode(
- sprintf( $GLOBALS['strCantLoad'],
- $GLOBALS['cfg']['Server']['extension'] )
- .' - [a@./Documentation.html#faqmysql@documentation]'
- .$GLOBALS['strDocu'] . '[/a]' )
- . '&' . SID
- );
- exit();
+ PMA_fatalError(
+ sprintf($GLOBALS['strCantLoad'],
+ $GLOBALS['cfg']['Server']['extension'])
+ . ' - [a@./Documentation.html#faqmysql@documentation]'
+ . $GLOBALS['strDocu'] . '[/a]');
}
$GLOBALS['cfg']['Server']['extension'] = $alternativ_extension;
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index cda621e050..1e4a86d63d 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -793,17 +793,15 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
}
// 2.1.4 Do define the sorting url
- if (!$is_in_sort) {
+ if (! $is_in_sort) {
// loic1: patch #455484 ("Smart" order)
- $GLOBALS['cfg']['Order'] = strtoupper($GLOBALS['cfg']['Order']);
- if ($GLOBALS['cfg']['Order'] == 'SMART') {
- $GLOBALS['cfg']['Order'] = (preg_match('@time|date@i', $fields_meta[$i]->type)) ? 'DESC' : 'ASC';
+ $GLOBALS['cfg']['Order'] = strtoupper($GLOBALS['cfg']['Order']);
+ if ($GLOBALS['cfg']['Order'] === 'SMART') {
+ $sort_order .= (preg_match('@time|date@i', $fields_meta[$i]->type)) ? 'DESC' : 'ASC';
+ } else {
+ $sort_order .= $GLOBALS['cfg']['Order'];
}
- $sort_order .= $GLOBALS['cfg']['Order'];
$order_img = '';
- } elseif (preg_match('@[[:space:]]ASC$@i', $sort_expression)) {
- $sort_order .= ' DESC';
- $order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_asc.png" width="11" height="9" alt="'. $GLOBALS['strAscending'] . '" title="'. $GLOBALS['strAscending'] . '" id="soimg' . $i . '" />';
} elseif (preg_match('@[[:space:]]DESC$@i', $sort_expression)) {
$sort_order .= ' ASC';
$order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_desc.png" width="11" height="9" alt="'. $GLOBALS['strDescending'] . '" title="'. $GLOBALS['strDescending'] . '" id="soimg' . $i . '" />';
@@ -1720,9 +1718,11 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
// displayed
$total = '';
$is_display = PMA_setDisplayMode($the_disp_mode, $total);
- if ($total == '') {
- unset($total);
- }
+ // what was this for?
+ // $total can be 0 if $cfg['MaxExactCountViews'] = 0
+ //if ($total == '') {
+ // unset($total);
+ //}
// 1.2 Defines offsets for the next and previous pages
if ($is_display['nav_bar'] == '1') {
@@ -2015,6 +2015,27 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) {
($GLOBALS['cfg']['PropertiesIconic'] ? '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_tblexport.png" height="16" width="16" alt="' . $GLOBALS['strExport'] . '" />' : '') . $GLOBALS['strExport'],
'', true, true, '') . "\n";
}
+
+ // CREATE VIEW
+ /**
+ *
+ * @todo detect privileges to create a view
+ * (but see 2006-01-19 note in display_create_table.lib.php,
+ * I think we cannot detect db-specific privileges reliably)
+ */
+ if (PMA_MYSQL_INT_VERSION >= 50000) {
+ if (!$header_shown) {
+ echo $header;
+ $header_shown = TRUE;
+ }
+ echo ' <!-- Create View -->' . "\n";
+ echo ' &nbsp;&nbsp;' . "\n";
+ echo PMA_linkOrButton(
+ 'view_create.php' . $url_query,
+ ($GLOBALS['cfg']['PropertiesIconic'] ? '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_views.png" height="16" width="16" alt="CREATE VIEW" />' : '') . 'CREATE VIEW',
+ '', true, true, '') . "\n";
+ }
+
if ($header_shown) {
echo '</fieldset><br />';
}
diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php
index f17194fa4f..778fdfd429 100644
--- a/libraries/header_meta_style.inc.php
+++ b/libraries/header_meta_style.inc.php
@@ -36,5 +36,5 @@ if ($GLOBALS['text_dir'] == 'ltr') {
}
?></title>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
- <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : './'; ?>css/phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&amp;nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" />
- <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : './'; ?>css/print.css?<?php echo PMA_generate_common_url(); ?>" media="print" />
+ <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&amp;nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" />
+ <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>print.css" media="print" />
diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php
index 915c2b76d6..a74135f729 100644
--- a/libraries/header_printview.inc.php
+++ b/libraries/header_printview.inc.php
@@ -46,7 +46,7 @@ if ($text_dir == 'ltr') {
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<title><?php echo $strSQLResult; ?> - phpMyAdmin <?php echo PMA_VERSION ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
-<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?<?php echo PMA_generate_common_url( '', '' ); ?>&amp;js_frame=print&amp;nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" />
+<link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url( '', '' ); ?>&amp;js_frame=print&amp;nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" />
</style>
</head>
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index 6e5a89ecef..32a2056b79 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -176,9 +176,6 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false)
$sql_query_disabled = TRUE;
}
}
- if (! empty($sql_query)) {
- $sql_query = htmlspecialchars($sql_query);
- }
}
} // end do query (no skip)
} // end buffer exists
diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php
new file mode 100644
index 0000000000..19170ee20c
--- /dev/null
+++ b/libraries/js_escape.lib.php
@@ -0,0 +1,64 @@
+<?php
+/* $Id: common.lib.php 9832 2007-01-09 09:50:49Z nijel $ */
+// vim: expandtab sw=4 ts=4 sts=4:
+
+/**
+ * Javascript escaping functions.
+ *
+ * @author Michal Čihař <michal@cihar.com>
+ * @package phpMyAdmin
+ */
+
+/**
+ * Format a string so it can be a string inside JavaScript code inside an
+ * eventhandler (onclick, onchange, on..., ).
+ * This function is used to displays a javascript confirmation box for
+ * "DROP/DELETE/ALTER" queries.
+ *
+ * @uses PMA_escapeJsString()
+ * @uses PMA_backquote()
+ * @uses is_string()
+ * @uses htmlspecialchars()
+ * @uses str_replace()
+ * @param string $a_string the string to format
+ * @param boolean $add_backquotes whether to add backquotes to the string or not
+ *
+ * @return string the formatted string
+ *
+ * @access public
+ */
+function PMA_jsFormat($a_string = '', $add_backquotes = true)
+{
+ if (is_string($a_string)) {
+ $a_string = htmlspecialchars($a_string);
+ $a_string = PMA_escapeJsString($a_string);
+ /**
+ * @todo what is this good for?
+ */
+ $a_string = str_replace('#', '\\#', $a_string);
+ }
+
+ return (($add_backquotes) ? PMA_backquote($a_string) : $a_string);
+} // end of the 'PMA_jsFormat()' function
+
+/**
+ * escapes a string to be inserted as string a JavaScript block
+ * enclosed by <![CDATA[ ... ]]>
+ * this requires only to escape ' with \' and end of script block
+ *
+ * @uses strtr()
+ * @uses preg_replace()
+ * @param string $string the string to be escaped
+ * @return string the escaped string
+ */
+function PMA_escapeJsString($string)
+{
+ return preg_replace('@</script@i', '</\' + \'script',
+ strtr($string, array(
+ '\\' => '\\\\',
+ '\'' => '\\\'',
+ "\n" => '\n',
+ "\r" => '\r')));
+}
+
+?>
diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php
index 4499adb06e..99c8383199 100644
--- a/libraries/navigation_header.inc.php
+++ b/libraries/navigation_header.inc.php
@@ -25,8 +25,15 @@ if ( $GLOBALS['cfg']['LeftDisplayLogo'] ) {
}
echo '<div id="pmalogo">' . "\n"
- .'<a href="' . $GLOBALS['cfg']['LeftLogoLink'] . '" target="_blank">'
- .$logo . '</a>' . "\n"
+ .'<a href="' . $GLOBALS['cfg']['LeftLogoLink'];
+ switch ($GLOBALS['cfg']['LeftLogoLinkWindow']) {
+ case 'new':
+ echo '" target="_blank"';
+ break;
+ case 'main':
+ echo '?' . $query_url . '" target="frame_content"';
+ }
+ echo '>' . $logo . '</a>' . "\n"
.'</div>' . "\n";
} // end of display logo
?>
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index d2cee41bd0..b6f28eb273 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -1,9 +1,9 @@
<?php
-/* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4:
-
/**
* phpMyAdmin Language Loading File
+ *
+ * @version $Id$
*/
/**
@@ -152,42 +152,30 @@ function PMA_langDetect(&$str, $envType)
} // end of the 'PMA_langDetect()' function
/**
- * @var string path to the translations directory
+ * @global string path to the translations directory
*/
-$lang_path = './lang/';
+$GLOBALS['lang_path'] = './lang/';
/**
- * first check for lang dir exists
+ * @global string interface language
*/
-if (! is_dir($lang_path)) {
- // language directory not found
- trigger_error('phpMyAdmin-ERROR: path not found: '
- . $lang_path . ', check your language directory.',
- E_USER_WARNING);
- // and tell the user
- PMA_sendHeaderLocation('error.php?error='
- . urlencode( 'path to languages is invalid: ' . $lang_path));
- // stop execution
- exit;
-}
-
+$GLOBALS['lang'] = 'en-iso-8859-1';
/**
- * @var string interface language
+ * @global boolean wether loading lang from cfg failed
*/
-$GLOBALS['lang'] = '';
+$GLOBALS['lang_failed_cfg'] = false;
/**
- * @var boolean wether loading lang from cfg failed
+ * @global boolean wether loading lang from cookie failed
*/
-$lang_failed_cfg = false;
+$GLOBALS['lang_failed_cookie'] = false;
/**
- * @var boolean wether loading lang from cookie failed
+ * @global boolean wether loading lang from user request failed
*/
-$lang_failed_cookie = false;
+$GLOBALS['lang_failed_request'] = false;
/**
- * @var boolean wether loading lang from user request failed
+ * @global string text direction ltr or rtl
*/
-$lang_failed_request = false;
-
+$GLOBALS['text_dir'] = 'ltr';
/**
* All the supported languages have to be listed in the array below.
@@ -222,7 +210,10 @@ $lang_failed_request = false;
* For Russian, we put 1251 first, because MSIE does not accept 866
* and users would not see anything.
*/
-$available_languages = array(
+/**
+ * @global array supported languages
+ */
+$GLOBALS['available_languages'] = array(
'af-iso-8859-1' => array('af|afrikaans', 'afrikaans-iso-8859-1', 'af', ''),
'af-utf-8' => array('af|afrikaans', 'afrikaans-utf-8', 'af', ''),
'ar-win1256' => array('ar|arabic', 'arabic-windows-1256', 'ar', '&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;'),
@@ -346,29 +337,43 @@ $available_languages = array(
// Language filtering support
if (! empty($GLOBALS['cfg']['FilterLanguages'])) {
$new_lang = array();
- foreach ($available_languages as $key => $val) {
+ foreach ($GLOBALS['available_languages'] as $key => $val) {
if (preg_match('@' . $GLOBALS['cfg']['FilterLanguages'] . '@', $key)) {
$new_lang[$key] = $val;
}
}
if (count($new_lang) > 0) {
- $available_languages = $new_lang;
+ $GLOBALS['available_languages'] = $new_lang;
}
unset($key, $val, $new_lang);
}
/**
+ * first check for lang dir exists
+ */
+if (! is_dir($GLOBALS['lang_path'])) {
+ // language directory not found
+ trigger_error('phpMyAdmin-ERROR: path not found: '
+ . $GLOBALS['lang_path'] . ', check your language directory.',
+ E_USER_WARNING);
+ // and tell the user
+ PMA_fatalError('path to languages is invalid: ' . $GLOBALS['lang_path']);
+}
+
+/**
* check for language files
*/
-foreach ($available_languages as $each_lang_key => $each_lang) {
- if (! file_exists($lang_path . $each_lang[1] . '.inc.php')) {
- unset($available_languages[$each_lang_key]);
+foreach ($GLOBALS['available_languages'] as $each_lang_key => $each_lang) {
+ if (! file_exists($GLOBALS['lang_path'] . $each_lang[1] . '.inc.php')) {
+ unset($GLOBALS['available_languages'][$each_lang_key]);
}
}
unset($each_lang_key, $each_lang);
-// MySQL charsets map
-$mysql_charset_map = array(
+/**
+ * @global array MySQL charsets map
+ */
+$GLOBALS['mysql_charset_map'] = array(
'big5' => 'big5',
'cp-866' => 'cp866',
'euc-jp' => 'ujis',
@@ -394,49 +399,51 @@ $mysql_charset_map = array(
'windows-1257' => 'cp1257',
);
-/**
+/*
* Do the work!
*/
-// Checks whether charset recoding should be allowed or not
-$allow_recoding = FALSE; // Default fallback value
-if (empty($convcharset)) {
+
+/**
+ * @global boolean whether charset recoding should be allowed or not
+ */
+$GLOBALS['allow_recoding'] = false;
+if (empty($GLOBALS['convcharset'])) {
if (isset($_COOKIE['pma_charset'])) {
- $convcharset = $_COOKIE['pma_charset'];
+ $GLOBALS['convcharset'] = $_COOKIE['pma_charset'];
} else {
- $convcharset = $GLOBALS['cfg']['DefaultCharset'];
+ $GLOBALS['convcharset'] = $GLOBALS['cfg']['DefaultCharset'];
}
}
if (! PMA_langCheck()) {
// fallback language
- $fall_back_lang = 'en-utf-8'; $line = __LINE__;
+ $fall_back_lang = 'en-utf-8';
+ $line = __LINE__;
if (! PMA_langSet($fall_back_lang)) {
trigger_error('phpMyAdmin-ERROR: invalid lang code: '
. __FILE__ . '#' . $line . ', check hard coded fall back language.',
E_USER_WARNING);
// stop execution
// and tell the user that his choosen language is invalid
- PMA_sendHeaderLocation('error.php?error='
- . urlencode('Could not load any language, please check your language settings and folder'));
- exit;
+ PMA_fatalError('Could not load any language, please check your language settings and folder.');
}
}
// Defines the associated filename and load the translation
-$lang_file = $lang_path . $available_languages[$GLOBALS['lang']][1] . '.inc.php';
+$lang_file = $GLOBALS['lang_path'] . $GLOBALS['available_languages'][$GLOBALS['lang']][1] . '.inc.php';
require_once $lang_file;
// now, that we have loaded the language strings we can send the errors
-if ($lang_failed_cfg) {
- $GLOBALS['PMA_errors'][] = sprintf($strLanguageUnknown, htmlspecialchars($lang_failed_cfg));
+if ($GLOBALS['lang_failed_cfg']) {
+ $GLOBALS['PMA_errors'][] = sprintf($GLOBALS['strLanguageUnknown'], htmlspecialchars($GLOBALS['lang_failed_cfg']));
}
-if ($lang_failed_cookie) {
- $GLOBALS['PMA_errors'][] = sprintf($strLanguageUnknown, htmlspecialchars($lang_failed_cookie));
+if ($GLOBALS['lang_failed_cookie']) {
+ $GLOBALS['PMA_errors'][] = sprintf($GLOBALS['strLanguageUnknown'], htmlspecialchars($GLOBALS['lang_failed_cookie']));
}
-if ($lang_failed_request) {
- $GLOBALS['PMA_errors'][] = sprintf($strLanguageUnknown, htmlspecialchars($lang_failed_request));
+if ($GLOBALS['lang_failed_request']) {
+ $GLOBALS['PMA_errors'][] = sprintf($GLOBALS['strLanguageUnknown'], htmlspecialchars($GLOBALS['lang_failed_request']));
}
unset($strLanguageFileNotFound, $line, $fall_back_lang,
- $lang_failed_cfg, $lang_failed_cookie, $lang_failed_request, $strLanguageUnknown);
+ $GLOBALS['lang_failed_cfg'], $GLOBALS['lang_failed_cookie'], $GLOBALS['ang_failed_request'], $GLOBALS['strLanguageUnknown']);
?>
diff --git a/libraries/session.inc.php b/libraries/session.inc.php
index 7410d48565..9d4e252d27 100644
--- a/libraries/session.inc.php
+++ b/libraries/session.inc.php
@@ -17,18 +17,7 @@
// verify if PHP supports session, die if it does not
if (!@function_exists('session_name')) {
- $cfg = array('DefaultLang' => 'en-iso-8859-1',
- 'AllowAnywhereRecoding' => false);
- // Loads the language file
- require_once('./libraries/select_lang.lib.php');
- // Displays the error message
- // (do not use &amp; for parameters sent by header)
- header('Location: error.php'
- . '?lang=' . urlencode($available_languages[$lang][2])
- . '&dir=' . urlencode($text_dir)
- . '&type=' . urlencode($strError)
- . '&error=' . urlencode(sprintf($strCantLoad, 'session')));
- exit();
+ PMA_fatalError('strCantLoad', 'session');
} elseif (ini_get('session.auto_start') == true && session_name() != 'phpMyAdmin') {
$_SESSION = array();
if (isset($_COOKIE[session_name()])) {
@@ -83,13 +72,32 @@ session_cache_limiter('private');
$session_name = 'phpMyAdmin';
@session_name($session_name);
-// strictly, PHP 4 since 4.4.2 would not need a verification
-if (version_compare(PHP_VERSION, '5.1.2', 'lt')
- && isset($_COOKIE[$session_name])
+// strictly, PHP 4 since 4.4.2 would not need a verification
+if (version_compare(PHP_VERSION, '5.1.2', 'lt')
+ && isset($_COOKIE[$session_name])
&& eregi("\r|\n", $_COOKIE[$session_name])) {
- die('attacked');
+ die('attacked');
+}
+
+if (! isset($_COOKIE[$session_name])) {
+ // on first start of session we will check for errors
+ // f.e. session dir cannot be accessed - session file not created
+ ob_start();
+ $old_display_errors = ini_get('display_errors');
+ $old_error_reporting = error_reporting(E_ALL);
+ ini_set('display_errors', 1);
+ $r = session_start();
+ ini_set('display_errors', $old_display_errors);
+ error_reporting($old_error_reporting);
+ unset($old_display_errors, $old_error_reporting);
+ $session_error = ob_get_contents();
+ ob_end_clean();
+ if ($r !== true || ! empty($session_error)) {
+ PMA_fatalError('strSessionStartupErrorGeneral');
+ }
+} else {
+ @session_start();
}
-@session_start();
/**
* Token which is used for authenticating access queries.
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index f4f0337bc6..5bf99e0ac1 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -719,7 +719,7 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
*
* @access public
*/
- function PMA_SQP_analyze(&$arr)
+ function PMA_SQP_analyze($arr)
{
if ($arr == array()) {
return array();
diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php
index ec3c05378e..d8b882c285 100644
--- a/libraries/tbl_replace_fields.inc.php
+++ b/libraries/tbl_replace_fields.inc.php
@@ -1,4 +1,5 @@
<?php
+// vim: expandtab sw=4 ts=4 sts=4:
/**
* f i e l d u p l o a d e d f r o m a f i l e
*
@@ -47,6 +48,7 @@
* @uses PMA_checkParameters()
* @uses PMA_sqlAddslashes()
* @uses PMA_userDir()
+ * @todo there are also file uploads in the import dialog - possible we can merge this
*/
/**
@@ -63,7 +65,6 @@ require_once './libraries/common.lib.php';
$valid_file_was_uploaded = false;
// Check if a multi-edit row was found
-
$me_fields_upload =
(isset($_FILES['fields_upload_' . $key]['tmp_name']['multi_edit'][$primary_key])
? $_FILES['fields_upload_' . $key]['tmp_name']['multi_edit'][$primary_key]
@@ -93,16 +94,18 @@ if ($me_fields_upload != 'none') {
// before opening it. The FAQ 1.11 explains how to create the "./tmp"
// directory - if needed
if ('' != ini_get('open_basedir')) {
- $tmp_subdir = (PMA_IS_WINDOWS ? '.\\tmp\\' : './tmp/');
+ $tmp_subdir = (PMA_IS_WINDOWS ? 'tmp' : 'tmp');
if (! is_dir($tmp_subdir)) {
// try to create the tmp directory if not exists
- if (mkdir($tmp_subdir, 0777)) {
+ if (@mkdir($tmp_subdir, 0777)) {
chmod($tmp_subdir, 0777);
}
}
if (! is_writable($tmp_subdir)) {
+ // cannot create directory or access, point user to FAQ 1.11
+ $message .= $GLOBALS['strFieldInsertFromFileTempDirNotExists'] . '<br />';
// if we cannot move the file don't change blob fields
$file_to_insert = false;
} else {
@@ -148,7 +151,37 @@ if ($me_fields_upload != 'none') {
}
unset($file_to_insert, $file_to_insert_size, $unlink);
-}
+} elseif (isset($_FILES['fields_upload_' . $key]['error']['multi_edit'][$primary_key])) {
+ // check for file upload errors
+ switch ($_FILES['fields_upload_' . $key]['error']['multi_edit'][$primary_key]) {
+ // cybot_tm: we do not use the PHP constants here cause not all constants
+ // are defined in all versions of PHP - but the correct constants names
+ // are given as comment
+ case 0: //UPLOAD_ERR_OK:
+ case 4: //UPLOAD_ERR_NO_FILE:
+ break;
+ case 1: //UPLOAD_ERR_INI_SIZE:
+ $message .= $GLOBALS['strUploadErrorIniSize'] . '<br />';
+ break;
+ case 2: //UPLOAD_ERR_FORM_SIZE:
+ $message .= $GLOBALS['strUploadErrorFormSize'] . '<br />';
+ break;
+ case 3: //UPLOAD_ERR_PARTIAL:
+ $message .= $GLOBALS['strUploadErrorPartial'] . '<br />';
+ break;
+ case 6: //UPLOAD_ERR_NO_TMP_DIR:
+ $message .= $GLOBALS['strUploadErrorNoTempDir'] . '<br />';
+ break;
+ case 7: //UPLOAD_ERR_CANT_WRITE:
+ $message .= $GLOBALS['strUploadErrorCantWrite'] . '<br />';
+ break;
+ case 8: //UPLOAD_ERR_EXTENSION:
+ $message .= $GLOBALS['strUploadErrorExtension'] . '<br />';
+ break;
+ default:
+ $message .= $GLOBALS['strUploadErrorUnknown'] . '<br />';
+ } // end switch
+} // end else
if (false === $valid_file_was_uploaded) {
diff --git a/main.php b/main.php
index 240b4dc3ce..bd2f6c8803 100644
--- a/main.php
+++ b/main.php
@@ -298,8 +298,8 @@ if ($GLOBALS['cfg']['ThemeManager']) {
echo '<li id="li_select_fontsize">';
echo PMA_Config::getFontsizeForm();
echo '</li>';
-PMA_printListItem($strPmaDocumentation, 'li_pma_docs', 'Documentation.html');
-PMA_printListItem($strPmaWiki, 'li_pma_docs', 'http://wiki.cihar.com');
+PMA_printListItem($strPmaDocumentation, 'li_pma_docs', 'Documentation.html', null, '_blank');
+PMA_printListItem($strPmaWiki, 'li_pma_docs', 'http://wiki.cihar.com', null, '_blank');
if ($cfg['ShowPhpInfo']) {
PMA_printListItem($strShowPHPInfo, 'li_phpinfo', './phpinfo.php?' . $common_url_query);
diff --git a/navigation.php b/navigation.php
index bf9a1b46bc..bae5a82ab2 100644
--- a/navigation.php
+++ b/navigation.php
@@ -130,7 +130,7 @@ require_once './libraries/header_http.inc.php';
content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
<base target="frame_content" />
<link rel="stylesheet" type="text/css"
- href="./css/phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=left&amp;nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" />
+ href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=left&amp;nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" />
<script type="text/javascript" src="js/navigation.js"></script>
<script type="text/javascript">
// <![CDATA[
diff --git a/css/phpmyadmin.css.php b/phpmyadmin.css.php
index 55d19da898..17964c7569 100644
--- a/css/phpmyadmin.css.php
+++ b/phpmyadmin.css.php
@@ -2,12 +2,11 @@
/* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4:
-chdir('..');
define('PMA_MINIMUM_COMMON', true);
require_once './libraries/common.lib.php';
require_once './libraries/sqlparser.lib.php';
-// MSIE 6 (at least some unpatched versions) has problems loading CSS
+// MSIE 6 (at least some unpatched versions) has problems loading CSS
// when zlib_compression is on
if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER == '6'
&& (ini_get('zlib.output_compression')) ) {
@@ -371,7 +370,7 @@ a.tab:hover, .tabactive {
/* disabled drop/empty tabs */
span.tab, span.tabcaution {
- cursor: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/error.ico), url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/error.ico), default;
+ cursor: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/error.ico), default;
}
<?php } ?>
/* end topmenu */
@@ -510,7 +509,7 @@ form.login label {
/* main page */
#maincontainer {
- background-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/logo_right.png);
+ background-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/logo_right.png);
background-position: <?php echo $right; ?> bottom;
background-repeat: no-repeat;
border-bottom: 1px solid silver;
@@ -523,7 +522,7 @@ form.login label {
}
#maincontainer ul {
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/item_<?php echo $GLOBALS['text_dir']; ?>.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/item_<?php echo $GLOBALS['text_dir']; ?>.png);
vertical-align: middle;
}
@@ -536,96 +535,96 @@ form.login label {
<?php if ($GLOBALS['cfg']['MainPageIconic']) { ?>
/* iconic view for ul items */
li#li_create_database {
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_newdb.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_newdb.png);
}
li#li_select_lang {
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_lang.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_lang.png);
}
li#li_select_mysql_collation,
li#li_select_mysql_charset {
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_asci.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_asci.png);
}
li#li_select_theme{
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_theme.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_theme.png);
}
li#li_server_info{
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_host.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_host.png);
}
li#li_user_info{
- /* list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_rights.png); */
+ /* list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_rights.png); */
}
li#li_mysql_status{
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_status.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_status.png);
}
li#li_mysql_variables{
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_vars.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_vars.png);
}
li#li_mysql_processes{
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_process.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_process.png);
}
li#li_mysql_collations{
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_asci.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_asci.png);
}
li#li_mysql_engines{
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_engine.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_engine.png);
}
li#li_mysql_binlogs {
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_tbl.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_tbl.png);
}
li#li_mysql_databases {
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_db.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_db.png);
}
li#li_export {
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_export.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_export.png);
}
li#li_import {
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_import.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_import.png);
}
li#li_change_password {
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_passwd.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_passwd.png);
}
li#li_log_out {
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_loggoff.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_loggoff.png);
}
li#li_pma_docs {
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_docs.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_docs.png);
}
li#li_phpinfo {
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/php_sym.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/php_sym.png);
}
li#li_pma_homepage {
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_home.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_home.png);
}
li#li_mysql_privilegs{
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_rights.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_rights.png);
}
li#li_switch_dbstats {
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_dbstatistics.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_dbstatistics.png);
}
li#li_flush_privileges {
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_reload.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_reload.png);
}
/* END iconic view for ul items */
<?php } /* end if $GLOBALS['cfg']['MainPageIconic'] */ ?>
@@ -770,7 +769,7 @@ body.loginform div.container {
}
#body_leftFrame #list_server {
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_host.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_host.png);
list-style-position: inside;
list-style-type: none;
margin: 0;
diff --git a/pmd/scripts/move.js b/pmd/scripts/move.js
index f22d29fee9..6b6500155b 100644
--- a/pmd/scripts/move.js
+++ b/pmd/scripts/move.js
@@ -321,6 +321,7 @@ function Circle(x,y,r,w,color)
{
var ctx = document.getElementById('canvas').getContext('2d');
ctx.beginPath();
+ ctx.moveTo(x, y);
ctx.lineWidth = w;
ctx.strokeStyle = color;
ctx.arc(x, y, r, 0, 2*Math.PI, true);
diff --git a/pmd_general.php b/pmd_general.php
index 342a7fbc99..c709bdb7a1 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -29,27 +29,27 @@ $hidden = "hidden";
<title>Designer</title>
</head>
-<?php
-echo "
+<?php
+echo '
<script>
-var db = '".$db."';
-var token = '".$token."';
-var LangSelectReferencedKey = '$strSelectReferencedKey';
-var LangSelectForeignKey = '$strSelectForeignKey';
-var LangPleaseSelectPrimaryOrUniqueKey = '$strPleaseSelectPrimaryOrUniqueKey';
-var LangIEnotSupport = '$strIEUnsupported';
-var LangChangeDisplay = '$strChangeDisplay';
-//---
+var db = "' . $db . '";
+var token = "' . $token . '";
+var LangSelectReferencedKey = "' . $strSelectReferencedKey . '";
+var LangSelectForeignKey = "' . $strSelectForeignKey . '";
+var LangPleaseSelectPrimaryOrUniqueKey = "' . $strPleaseSelectPrimaryOrUniqueKey . '";
+var LangIEnotSupport = "' . $strIEUnsupported . '";
+var LangChangeDisplay = "' . $strChangeDisplay . '";
+
var strLang = Array();
-strLang['strModifications'] = '$strModifications';
-strLang['strRelationDeleted'] = '$strRelationDeleted';
-strLang['strInnoDBRelationAdded'] = '$strInnoDBRelationAdded';
-strLang['strGeneralRelationFeat:strDisabled'] = '$strGeneralRelationFeat : $strDisabled';
-strLang['strInternalRelationAdded'] = '$strInternalRelationAdded';
-strLang['strErrorRelationAdded'] = '$strErrorRelationAdded';
-strLang['strErrorRelationExists'] = '$strErrorRelationExists';
-strLang['strErrorSaveTable'] = '$strErrorSaveTable';
-</script>";
+strLang["strModifications"] = "' . $strModifications . '";
+strLang["strRelationDeleted"] = "' . $strRelationDeleted . '";
+strLang["strInnoDBRelationAdded"] = "' . $strInnoDBRelationAdded . '";
+strLang["strGeneralRelationFeat:strDisabled"] = "' . $strGeneralRelationFeat . ' : ' . $strDisabled . '";
+strLang["strInternalRelationAdded"] = "' . $strInternalRelationAdded . '";
+strLang["strErrorRelationAdded"] = "' . $strErrorRelationAdded . '";
+strLang["strErrorRelationExists"] = "' . $strErrorRelationExists . '";
+strLang["strErrorSaveTable"] = "' . $strErrorSaveTable . '";
+</script>';
?>
<script language=javascript src="pmd/scripts/ajax.js" type=text/javascript></script>
<script language=javascript src="pmd/scripts/move.js" type=text/javascript></script>
@@ -61,27 +61,27 @@ echo $script_tabs . $script_contr . $script_display_field;
<body onLoad="Main()" class="general_body" marginheight="0" marginwidth="0">
<ul class="header" id="top_menu"><table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
- <td width="10%" align="left"><a
+ <td width="10%" align="left"><a
href="javascript:Show_left_menu(document.getElementById('key_Show_left_menu'));" onMouseDown="return false;" class="M_butt" target="_self"><img id='key_Show_left_menu' title="<?php echo $strShowHideLeftMenu; ?>" alt="v" src="pmd/images/downarrow2_m.png" ></a></td>
<td width="80%" align="center" nowrap><a
- href="javascript:Save2();" onMouseDown="return false;" class="M_butt" target="_self"><img title="<?php echo $strSavePosition ?>" src="pmd/images/save.png"></a><a
- href="javascript:Start_table_new();" onMouseDown="return false;" class="M_butt" target="_self"><img title="<?php echo $strCreateTable ?>" src="pmd/images/table.png"></a><a
- href="javascript:Start_relation();" onMouseDown="return false;" class="M_butt" id="rel_button" target="_self"><img title="<?php echo $strCreateRelation ?>" src="pmd/images/relation.png"></a><a
- href="javascript:Start_display_field();" onMouseDown="return false;" class="M_butt" id="display_field_button" target="_self"><img title="<?php echo $strChangeDisplay ?>" src="pmd/images/display_field.png"></a><a
- href="javascript:location.reload();" onMouseDown="return false;" class="M_butt" target="_self"><img title="<?php echo $strReload; ?>" src="pmd/images/reload.png"></a><a
- href="javascript:Help();" onMouseDown="return false;" class="M_butt" target="_self"><img title="<?php echo $strHelp; ?>" src="pmd/images/help.png"></a><img class="M_bord" src="pmd/images/bord.png"><a
- href="javascript:Angular_direct();" onMouseDown="return false;" class="M_butt" id="angular_direct_button" target="_self"><img title="<?php echo $strAngularLinks.' / '.$strDirectLinks; ?>" src="pmd/images/ang_direct.png"></a><a
- href="javascript:Grid();" onMouseDown="return false;" class="M_butt" id="grid_button" target="_self"><img title="<?php echo $strSnapToGrid ?>" src="pmd/images/grid.png"></a><img class="M_bord" src="pmd/images/bord.png"><a
- href="javascript:Small_tab_all(document.getElementById('key_SB_all'));" onMouseDown="return false;" class="M_butt" target="_self"><img id='key_SB_all' title="<?php echo $strSmallBigAll; ?>" alt="v" src="pmd/images/downarrow1.png" ></a><a
+ href="javascript:Save2();" onMouseDown="return false;" class="M_butt" target="_self"><img title="<?php echo $strSavePosition ?>" src="pmd/images/save.png"></a><a
+ href="javascript:Start_table_new();" onMouseDown="return false;" class="M_butt" target="_self"><img title="<?php echo $strCreateTable ?>" src="pmd/images/table.png"></a><a
+ href="javascript:Start_relation();" onMouseDown="return false;" class="M_butt" id="rel_button" target="_self"><img title="<?php echo $strCreateRelation ?>" src="pmd/images/relation.png"></a><a
+ href="javascript:Start_display_field();" onMouseDown="return false;" class="M_butt" id="display_field_button" target="_self"><img title="<?php echo $strChangeDisplay ?>" src="pmd/images/display_field.png"></a><a
+ href="javascript:location.reload();" onMouseDown="return false;" class="M_butt" target="_self"><img title="<?php echo $strReload; ?>" src="pmd/images/reload.png"></a><a
+ href="javascript:Help();" onMouseDown="return false;" class="M_butt" target="_self"><img title="<?php echo $strHelp; ?>" src="pmd/images/help.png"></a><img class="M_bord" src="pmd/images/bord.png"><a
+ href="javascript:Angular_direct();" onMouseDown="return false;" class="M_butt" id="angular_direct_button" target="_self"><img title="<?php echo $strAngularLinks.' / '.$strDirectLinks; ?>" src="pmd/images/ang_direct.png"></a><a
+ href="javascript:Grid();" onMouseDown="return false;" class="M_butt" id="grid_button" target="_self"><img title="<?php echo $strSnapToGrid ?>" src="pmd/images/grid.png"></a><img class="M_bord" src="pmd/images/bord.png"><a
+ href="javascript:Small_tab_all(document.getElementById('key_SB_all'));" onMouseDown="return false;" class="M_butt" target="_self"><img id='key_SB_all' title="<?php echo $strSmallBigAll; ?>" alt="v" src="pmd/images/downarrow1.png" ></a><a
href="javascript:Small_tab_invert();" onMouseDown="return false;" class="M_butt" target="_self"><img title="<?php echo $strToggleSmallBig; ?>" alt="key" src="pmd/images/bottom.png" ></a><img class="M_bord" src="pmd/images/bord.png"><a
href="javascript:PDF_save();" onMouseDown="return false;" class="M_butt" target="_self"><img src="pmd/images/pdf.png" alt="key" width="20" height="20" title="<?php echo $strImportExportCoords; ?>"></a></td>
<td width="10%" align="right"><a
href="javascript:Top_menu_right(document.getElementById('key_Left_Right'));" onMouseDown="return false;" class="M_butt" target="_self"><img src="pmd/images/2rightarrow_m.png" id="key_Left_Right" alt=">" title="<?php echo $strMoveMenu; ?>"></a></td>
</tr>
</table></ul>
-
+
<div id="osn_tab">
- <CANVAS id="canvas" width="100" height="100" onClick="Canvas_click(this)"></CANVAS>
+ <CANVAS id="canvas" width="100" height="100" onClick="Canvas_click(this)"></CANVAS>
</div>
<form action="" method="post" name="form1">
@@ -91,9 +91,9 @@ echo $script_tabs . $script_contr . $script_display_field;
<td height="1px">
<div align="center" style="padding-top:5px">
- <a
- href="javascript:Hide_tab_all(document.getElementById('key_HS_all'));" onMouseDown="return false;" class="M_butt" target="_self"><img title="<?php echo $strHideShowAll; ?>" alt="v" src="pmd/images/downarrow1.png" id='key_HS_all' ></a><a
- href="javascript:No_have_constr(document.getElementById('key_HS'));" onMouseDown="return false;" class="M_butt" target="_self"><img title="<?php echo $strHideShowNoRelation; ?>" alt="v" src="pmd/images/downarrow2.png" id='key_HS'></a>
+ <a
+ href="javascript:Hide_tab_all(document.getElementById('key_HS_all'));" onMouseDown="return false;" class="M_butt" target="_self"><img title="<?php echo $strHideShowAll; ?>" alt="v" src="pmd/images/downarrow1.png" id='key_HS_all' ></a><a
+ href="javascript:No_have_constr(document.getElementById('key_HS'));" onMouseDown="return false;" class="M_butt" target="_self"><img title="<?php echo $strHideShowNoRelation; ?>" alt="v" src="pmd/images/downarrow2.png" id='key_HS'></a>
</div>
</td>
</tr>
@@ -102,7 +102,7 @@ echo $script_tabs . $script_contr . $script_display_field;
<div id="id_scroll_tab" class="scroll_tab">
<table width="100%" style="padding-left:3px;">
<?php
- for ( $i=0; $i < sizeof( $GLOBALS['PMD']['TABLE_NAME'] ); $i++ )
+ for ( $i=0; $i < sizeof( $GLOBALS['PMD']['TABLE_NAME'] ); $i++ )
{
?>
<tr>
@@ -110,12 +110,12 @@ echo $script_tabs . $script_contr . $script_display_field;
<td width="1px"><input onClick="VisibleTab(this,'<?php echo $GLOBALS['PMD_URL']["TABLE_NAME"][$i]; ?>')" title="<?php echo $strHide ?>" id="check_vis_<?php echo $GLOBALS['PMD_URL']["TABLE_NAME"][$i]; ?>" style="margin:0px;" type="checkbox" value="<?php echo $GLOBALS['PMD_URL']["TABLE_NAME"][$i]; ?>" <?php if( isset($tab_pos[$GLOBALS['PMD']["TABLE_NAME"][$i]]) ) echo $tab_pos[$GLOBALS['PMD']["TABLE_NAME"][$i]]["H"]?"checked":""; else echo "checked"; ?>></td>
<td class="Tabs" onMouseOver="this.className='Tabs2'" onMouseOut="this.className='Tabs'" onClick="Select_tab('<?php echo $GLOBALS['PMD_URL']["TABLE_NAME"][$i]; ?>');"><?php echo $GLOBALS['PMD_OUT']["TABLE_NAME"][$i]; ?></td>
</tr>
- <?php
+ <?php
}
?>
</table>
</div>
- </td>
+ </td>
</tr>
<tr>
<td height="1px">
@@ -126,7 +126,7 @@ echo $script_tabs . $script_contr . $script_display_field;
</table>
</div>
<?php
-for ( $i=0; $i < sizeof( $GLOBALS['PMD']["TABLE_NAME"] ); $i++ )
+for ( $i=0; $i < sizeof( $GLOBALS['PMD']["TABLE_NAME"] ); $i++ )
{
$t_n = $GLOBALS['PMD']["TABLE_NAME"][$i];
$t_n_url = $GLOBALS['PMD_URL']["TABLE_NAME"][$i];
@@ -136,9 +136,9 @@ for ( $i=0; $i < sizeof( $GLOBALS['PMD']["TABLE_NAME"] ); $i++ )
<input name="t_v[<?php echo $t_n_url ?>]" type="hidden" id="t_v[<?php echo $t_n_url ?>]">
<input name="t_h[<?php echo $t_n_url ?>]" type="hidden" id="t_h[<?php echo $t_n_url ?>]">
-<table id="<?php echo $t_n_url ?>" cellpadding="0" cellspacing="0" class="tab"
- style="position:absolute;
- left: <?php if( isset($tab_pos[$t_n]) ) echo $tab_pos[$t_n]["X"]; else echo rand(180,800); ?>;
+<table id="<?php echo $t_n_url ?>" cellpadding="0" cellspacing="0" class="tab"
+ style="position:absolute;
+ left: <?php if( isset($tab_pos[$t_n]) ) echo $tab_pos[$t_n]["X"]; else echo rand(180,800); ?>;
top: <?php if( isset($tab_pos[$t_n]) ) echo $tab_pos[$t_n]["Y"]; else echo rand(30,500); ?>;
visibility: <?php if( isset($tab_pos[$t_n]) ) echo $tab_pos[$t_n]["H"]?"visible":"hidden"; ?>;
">
@@ -149,16 +149,16 @@ for ( $i=0; $i < sizeof( $GLOBALS['PMD']["TABLE_NAME"] ); $i++ )
onMouseOver="this.className = 'tab_zag_2'" onMouseOut="this.className = 'tab_zag'"
><?php echo "<span class='owner'>".strtolower($GLOBALS['PMD_OUT']["OWNER"][$i]).".</span>".$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]; ?></td>
</tr>
- <tbody id="_|_tbody_<?php echo $t_n_url ?>"
+ <tbody id="_|_tbody_<?php echo $t_n_url ?>"
style="display:<?php if( isset($tab_pos[$t_n]) ) echo $tab_pos[$t_n]["V"]?"":"none"; ?>;">
<?php
$display_field = PMA_getDisplayField($db, $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i]);
- for ( $j=0; $j < sizeof( $tab_column[$t_n]["COLUMN_ID"] ); $j++ )
+ for ( $j=0; $j < sizeof( $tab_column[$t_n]["COLUMN_ID"] ); $j++ )
{
?>
<tr id = "_|_tr_<?php echo $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i].'.'.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) ?>"
- <? if($display_field == $tab_column[$t_n]["COLUMN_NAME"][$j]) echo ' class="tab_field_3" '; else echo ' class="tab_field" '; ?>
- onMouseOver="old_class = this.className; this.className = 'tab_field_2';" onMouseOut="this.className = old_class;"
+ <?php if($display_field == $tab_column[$t_n]["COLUMN_NAME"][$j]) echo ' class="tab_field_3" '; else echo ' class="tab_field" '; ?>
+ onMouseOver="old_class = this.className; this.className = 'tab_field_2';" onMouseOut="this.className = old_class;"
onMouseDown="Click_field('<?php
echo $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]."','".urlencode($tab_column[$t_n]["COLUMN_NAME"][$j])."',";
if ($GLOBALS['PMD']['TABLE_TYPE'][$i] != 'INNODB') {
@@ -171,13 +171,13 @@ for ( $i=0; $i < sizeof( $GLOBALS['PMD']["TABLE_NAME"] ); $i++ )
?>)">
<td width="10px" colspan="3" id="<?php echo $t_n_url.".".urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) ?>"
><div style="white-space:nowrap">
- <?php
+ <?php
if(isset($tables_pk_or_unique_keys[$t_n.".".$tab_column[$t_n]["COLUMN_NAME"][$j]])) {
?>
<img src="pmd/styles/<?php echo $GLOBALS['PMD']['STYLE']
- ?>/images/FieldKey_small.png" alt="*"><?php
+ ?>/images/FieldKey_small.png" alt="*"><?php
} else {
- ?><img src="pmd/styles/<?php echo $GLOBALS['PMD']['STYLE']?>/images/Field_small<?
+ ?><img src="pmd/styles/<?php echo $GLOBALS['PMD']['STYLE']?>/images/Field_small<?php
if(strstr($tab_column[$t_n]["TYPE"][$j],'char')
|| strstr($tab_column[$t_n]["TYPE"][$j],'text') ) echo '_char';
elseif(strstr($tab_column[$t_n]["TYPE"][$j],'int')
@@ -187,7 +187,7 @@ for ( $i=0; $i < sizeof( $GLOBALS['PMD']["TABLE_NAME"] ); $i++ )
elseif(strstr($tab_column[$t_n]["TYPE"][$j],'date')
|| strstr($tab_column[$t_n]["TYPE"][$j],'time')
|| strstr($tab_column[$t_n]["TYPE"][$j],'year') ) echo '_date';
- ?>.png" alt="*"><?php } ?>
+ ?>.png" alt="*"><?php } ?>
<?php echo htmlspecialchars($tab_column[$t_n]["COLUMN_NAME"][$j]." : ".$tab_column[$t_n]["TYPE"][$j], ENT_QUOTES); ?>
</div>
</td>
@@ -202,7 +202,7 @@ for ( $i=0; $i < sizeof( $GLOBALS['PMD']["TABLE_NAME"] ); $i++ )
?>
</form>
<div id="hint"></div>
-<div id='layer_action' style="position:absolute; left:638px; top:52px; z-index:1000;
+<div id='layer_action' style="position:absolute; left:638px; top:52px; z-index:1000;
visibility:<?PHP echo $hidden ?>; background-color:#CCFF99; padding:3px; border:#009933 solid 1px; white-space:nowrap; font-weight:bold">Load...</div>
<table id="layer_new_relation" style="visibility:<?PHP echo $hidden ?>; position:absolute; left:636px; top:85px; z-index:1000; width: 153px;" width="5%" border="0" cellpadding="0" cellspacing="0">
@@ -244,7 +244,7 @@ for ( $i=0; $i < sizeof( $GLOBALS['PMD']["TABLE_NAME"] ); $i++ )
</tbody>
<tr>
<td colspan="2" align="center" nowrap>
- <input type="button" id="butt" name="Button" value="<?php echo $strOK; ?>" onClick="New_relation()" >
+ <input type="button" id="butt" name="Button" value="<?php echo $strOK; ?>" onClick="New_relation()" >
<input type="button" id="butt" name="Button" value="<?php echo $strCancel; ?>" onClick="document.getElementById('layer_new_relation').style.visibility = 'hidden';">
</td>
</tr>
diff --git a/pmd_pdf.php b/pmd_pdf.php
index 7930667651..841a7c4427 100644
--- a/pmd_pdf.php
+++ b/pmd_pdf.php
@@ -13,7 +13,7 @@ if (isset($scale)) {
if (empty($pdf_page_number)) {
die("<script>alert('Pages not found!');history.go(-2);</script>");
}
-
+
$pmd_table = PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['designer_coords']);
$pma_table = PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']);
@@ -23,14 +23,14 @@ if (isset($scale)) {
PMA_query_as_cu($sql,TRUE,PMA_DBI_QUERY_STORE);
}
-
+
if (isset($imp)) {
PMA_query_as_cu(
- 'UPDATE ' . $pma_table . ',' . $pmd_table .
+ 'UPDATE ' . $pma_table . ',' . $pmd_table .
' SET ' . $pmd_table . '.`x`= ' . $pma_table . '.`x` * '. $scale . ',
' . $pmd_table . '.`y`= ' . $pma_table . '.`y` * '.$scale.'
WHERE
- ' . $pmd_table . '.`db_name`=' . $pma_table . '.`db_name`
+ ' . $pmd_table . '.`db_name`=' . $pma_table . '.`db_name`
AND
' . $pmd_table . '.`table_name` = ' . $pma_table . '.`table_name`
AND
@@ -53,7 +53,7 @@ if (isset($scale)) {
<body>
<br>
<div style="text-align:center; font-weight:bold;">
- <form name="form1" method="post" action="pmd_pdf.php?db=<? echo $db ?>&token=<? echo $token ?>">
+ <form name="form1" method="post" action="pmd_pdf.php?db=<?php echo $db ?>&token=<?php echo $token ?>">
<p><?php echo $strExportImportToScale; ?>:
<select name="scale">
<option value="1">1:1</option>
@@ -66,14 +66,14 @@ if (isset($scale)) {
<p><?php echo $strToFromPage; ?>:
<select name="pdf_page_number">
- <?
+ <?php
$table_info_result = PMA_query_as_cu('SELECT * FROM '.PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']).'
WHERE db_name = \''.$db.'\'');
while($page = PMA_DBI_fetch_assoc($table_info_result))
{
?>
- <option value="<? echo $page['page_nr'] ?>"><? echo $page['page_descr'] ?></option>
- <?
+ <option value="<?php echo $page['page_nr'] ?>"><?php echo $page['page_descr'] ?></option>
+ <?php
}
?>
</select>
diff --git a/pmd_save_pos.php b/pmd_save_pos.php
index 4f41a43971..b6f7ec81dc 100644
--- a/pmd_save_pos.php
+++ b/pmd_save_pos.php
@@ -4,29 +4,29 @@
include_once 'pmd_common.php';
require_once './libraries/relation.lib.php';
-
-$alltab_rs = PMA_query_as_cu('SHOW TABLES FROM '.PMA_backquote($cfg['Server']['pmadb']),FALSE,PMA_DBI_QUERY_STORE) or PMD_err_sav();
+
+$alltab_rs = PMA_query_as_cu('SHOW TABLES FROM '.PMA_backquote($cfg['Server']['pmadb']),FALSE,PMA_DBI_QUERY_STORE) or PMD_err_sav();
$seen_pmd_table = false;
while ($tab_name = @PMA_DBI_fetch_row($alltab_rs)) {
if (stristr($tab_name[0],$GLOBALS['cfgRelation']['designer_coords'])) {
$seen_pmd_table = true;
- break;
+ break;
}
}
if ( ! $seen_pmd_table) {
- PMD_err_sav();
+ PMD_err_sav();
}
foreach ($t_x as $key => $value) {
$KEY = empty($IS_AJAX) ? urldecode($key) : $key; // table name decode (post PDF exp/imp)
list($DB,$TAB) = explode(".", $KEY);
- PMA_query_as_cu('DELETE FROM '.$GLOBALS['cfgRelation']['designer_coords'].'
+ PMA_query_as_cu('DELETE FROM '.$GLOBALS['cfgRelation']['designer_coords'].'
WHERE `db_name` = \'' . PMA_sqlAddslashes($DB) . '\'
AND `table_name` = \'' . PMA_sqlAddslashes($TAB) . '\'', 1, PMA_DBI_QUERY_STORE);
- PMA_query_as_cu('INSERT INTO '.$GLOBALS['cfgRelation']['designer_coords'].'
+ PMA_query_as_cu('INSERT INTO '.$GLOBALS['cfgRelation']['designer_coords'].'
(db_name, table_name, x, y, v, h)
VALUES ('
. '\'' . PMA_sqlAddslashes($DB) . '\', '
@@ -53,6 +53,6 @@ if(! empty($die_save_pos)) {
header("Cache-Control: no-cache");
?>
<root act='save_pos' return='<?php echo 'strModifications'; ?>'></root>
-<?
+<?php
}
?>
diff --git a/css/print.css b/print.css
index 54543dce2f..54543dce2f 100644
--- a/css/print.css
+++ b/print.css
diff --git a/tbl_change.php b/tbl_change.php
index 9550b64239..a9bef7386e 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -138,7 +138,7 @@ if (isset($primary_key)) {
$local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . ' WHERE ' . $primary_key . ';';
$result[$rowcount] = PMA_DBI_query($local_query, null, PMA_DBI_QUERY_STORE);
$row[$rowcount] = PMA_DBI_fetch_assoc($result[$rowcount]);
- $primary_keys[$rowcount] = $primary_key;
+ $primary_keys[$rowcount] = str_replace('\\', '\\\\', $primary_key);
// No row returned
if (!$row[$rowcount]) {
@@ -203,11 +203,8 @@ if (isset($primary_key_array)) {
}
echo "\n";
-if ($cfg['PropertiesIconic'] == true) {
- // We need to copy the value or else the == 'both' check will always return true
- $propicon = (string)$cfg['PropertiesIconic'];
-
- if ($propicon == 'both') {
+if ($cfg['PropertiesIconic'] === true || $cfg['PropertiesIconic'] === 'both') {
+ if ($cfg['PropertiesIconic'] === 'both') {
$iconic_spacer = '<div class="nowrap">';
} else {
$iconic_spacer = '';
@@ -215,7 +212,7 @@ if ($cfg['PropertiesIconic'] == true) {
$titles['Browse'] = $iconic_spacer . '<img width="16" height="16" src="' . $pmaThemeImage . 'b_browse.png" alt="' . $strBrowseForeignValues . '" title="' . $strBrowseForeignValues . '" border="0" />';
- if ($propicon == 'both') {
+ if ($cfg['PropertiesIconic'] === 'both') {
$titles['Browse'] .= '&nbsp;' . $strBrowseForeignValues . '</div>';
}
} else {
@@ -330,11 +327,17 @@ foreach ($loop_array as $vrowcount => $vrow) {
$row_table_def['True_Type'] = preg_replace('@\(.*@s', '', $row_table_def['Type']);
$field = $row_table_def['Field'];
- $field_html = $field;
+ $field_html = htmlspecialchars($field);
+ $field_md5 = md5($field);
+
+ $unnillify_trigger = $chg_evt_handler . "=\"return unNullify('" . PMA_escapeJsString($field_html) . "', '" . PMA_escapeJsString($jsvkey) . "')\"";
+ $field_name_appendix = $vkey . '[' . $field_html . ']';
+ $field_name_appendix_md5 = $field_md5 . $vkey . '[]';
+
// removed previous PHP3-workaround that caused a problem with
// field names like '000'
- $rowfield = $field;
+ //$rowfield = $field;
// d a t e t i m e
//
@@ -365,14 +368,14 @@ foreach ($loop_array as $vrowcount => $vrow) {
// INSERT case
if ($insert_mode) {
if (isset($vrow)) {
- $vrow[$rowfield] = date('Y-m-d H:i:s', time());
+ $vrow[$field] = date('Y-m-d H:i:s', time());
} else {
- $vrow = array($rowfield => date('Y-m-d H:i:s', time()));
+ $vrow = array($field => date('Y-m-d H:i:s', time()));
}
}
// UPDATE case with an empty and not NULL value under PHP4
- elseif (empty($vrow[$rowfield]) && is_null($vrow[$rowfield])) {
- $vrow[$rowfield] = date('Y-m-d H:i:s', time());
+ elseif (empty($vrow[$field]) && is_null($vrow[$field])) {
+ $vrow[$field] = date('Y-m-d H:i:s', time());
} // end if... elseif...
}
$len = (preg_match('@float|double@', $row_table_def['Type']))
@@ -382,7 +385,8 @@ foreach ($loop_array as $vrowcount => $vrow) {
$field_name = $field_html;
if (isset($comments_map[$field])) {
- $field_name = '<span style="border-bottom: 1px dashed black;" title="' . htmlspecialchars($comments_map[$field]) . '">' . $field_name . '</span>';
+ $field_name = '<span style="border-bottom: 1px dashed black;" title="'
+ . htmlspecialchars($comments_map[$field]) . '">' . $field_name . '</span>';
}
?>
@@ -427,23 +431,23 @@ foreach ($loop_array as $vrowcount => $vrow) {
// Prepares the field value
$real_null_value = FALSE;
if (isset($vrow)) {
- if (!isset($vrow[$rowfield])
- || (function_exists('is_null') && is_null($vrow[$rowfield]))) {
+ if (!isset($vrow[$field])
+ || (function_exists('is_null') && is_null($vrow[$field]))) {
$real_null_value = TRUE;
- $vrow[$rowfield] = '';
+ $vrow[$field] = '';
$special_chars = '';
- $data = $vrow[$rowfield];
+ $data = $vrow[$field];
} else {
// loic1: special binary "characters"
if ($is_binary || $is_blob) {
- $vrow[$rowfield] = str_replace("\x00", '\0', $vrow[$rowfield]);
- $vrow[$rowfield] = str_replace("\x08", '\b', $vrow[$rowfield]);
- $vrow[$rowfield] = str_replace("\x0a", '\n', $vrow[$rowfield]);
- $vrow[$rowfield] = str_replace("\x0d", '\r', $vrow[$rowfield]);
- $vrow[$rowfield] = str_replace("\x1a", '\Z', $vrow[$rowfield]);
+ $vrow[$field] = str_replace("\x00", '\0', $vrow[$field]);
+ $vrow[$field] = str_replace("\x08", '\b', $vrow[$field]);
+ $vrow[$field] = str_replace("\x0a", '\n', $vrow[$field]);
+ $vrow[$field] = str_replace("\x0d", '\r', $vrow[$field]);
+ $vrow[$field] = str_replace("\x1a", '\Z', $vrow[$field]);
} // end if
- $special_chars = htmlspecialchars($vrow[$rowfield]);
- $data = $vrow[$rowfield];
+ $special_chars = htmlspecialchars($vrow[$field]);
+ $data = $vrow[$field];
} // end if... else...
// loic1: if a timestamp field value is not included in an update
// statement MySQL auto-update it to the current timestamp
@@ -451,7 +455,7 @@ foreach ($loop_array as $vrowcount => $vrow) {
// it's better to set a fields_prev in this situation
$backup_field = (PMA_MYSQL_INT_VERSION < 40100 && $row_table_def['True_Type'] == 'timestamp')
? ''
- : '<input type="hidden" name="fields_prev' . $vkey . '[' . $field_html . ']" value="' . htmlspecialchars($vrow[$rowfield]) . '" />';
+ : '<input type="hidden" name="fields_prev' . $field_name_appendix . '" value="' . htmlspecialchars($vrow[$field]) . '" />';
} else {
// loic1: display default values
if (!isset($row_table_def['Default'])) {
@@ -484,7 +488,7 @@ foreach ($loop_array as $vrowcount => $vrow) {
} else {
?>
<td>
- <select name="funcs<?php echo $vkey; ?>[<?php echo $field_html; ?>]" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo $field_html; ?>', '<?php echo $jsvkey; ?>')" tabindex="<?php echo ($tabindex + $tabindex_for_function); ?>" id="field_<?php echo $idindex; ?>_1">
+ <select name="funcs<?php echo $field_name_appendix; ?>" <?php echo $unnillify_trigger; ?> tabindex="<?php echo ($tabindex + $tabindex_for_function); ?>" id="field_<?php echo $idindex; ?>_1">
<option></option>
<?php
$selected = '';
@@ -492,7 +496,10 @@ foreach ($loop_array as $vrowcount => $vrow) {
// garvin: Find the current type in the RestrictColumnTypes. Will result in 'FUNC_CHAR'
// or something similar. Then directly look up the entry in the RestrictFunctions array,
// which will then reveal the available dropdown options
- if (isset($cfg['RestrictFunctions']) && isset($cfg['RestrictColumnTypes']) && isset($cfg['RestrictColumnTypes'][strtoupper($row_table_def['True_Type'])]) && isset($cfg['RestrictFunctions'][$cfg['RestrictColumnTypes'][strtoupper($row_table_def['True_Type'])]])) {
+ if (isset($cfg['RestrictFunctions'])
+ && isset($cfg['RestrictColumnTypes'])
+ && isset($cfg['RestrictColumnTypes'][strtoupper($row_table_def['True_Type'])])
+ && isset($cfg['RestrictFunctions'][$cfg['RestrictColumnTypes'][strtoupper($row_table_def['True_Type'])]])) {
$current_func_type = $cfg['RestrictColumnTypes'][strtoupper($row_table_def['True_Type'])];
$dropdown = $cfg['RestrictFunctions'][$current_func_type];
$default_function = $cfg['DefaultFunctions'][$current_func_type];
@@ -517,8 +524,10 @@ foreach ($loop_array as $vrowcount => $vrow) {
// ON UPDATE DEFAULT TIMESTAMP attribute.
if (PMA_MYSQL_INT_VERSION < 40102
- || (PMA_MYSQL_INT_VERSION >= 40102
- && !($row_table_def['True_Type'] == 'timestamp' && !empty($row_table_def['Default']) && !isset($analyzed_sql[0]['create_table_fields'][$field]['on_update_current_timestamp'])))) {
+ || (PMA_MYSQL_INT_VERSION >= 40102
+ && !($row_table_def['True_Type'] == 'timestamp'
+ && !empty($row_table_def['Default'])
+ && !isset($analyzed_sql[0]['create_table_fields'][$field]['on_update_current_timestamp'])))) {
$selected = ($first_timestamp && $dropdown[$j] == $cfg['DefaultFunctions']['first_timestamp'])
|| (!$first_timestamp && $dropdown[$j] == $default_function)
? ' selected="selected"'
@@ -564,7 +573,7 @@ foreach ($loop_array as $vrowcount => $vrow) {
// ---------------
echo ' <td>' . "\n";
if ($row_table_def['Null'] == 'YES') {
- echo ' <input type="hidden" name="fields_null_prev' . $vkey . '[' . $field_html . ']"';
+ echo ' <input type="hidden" name="fields_null_prev' . $field_name_appendix . '"';
if ($real_null_value && !$first_timestamp) {
echo ' value="on"';
}
@@ -573,7 +582,7 @@ foreach ($loop_array as $vrowcount => $vrow) {
if (!(($cfg['ProtectBinary'] && $is_blob) || ($cfg['ProtectBinary'] == 'all' && $is_binary)) ) {
echo ' <input type="checkbox" tabindex="' . ($tabindex + $tabindex_for_null) . '"'
- . ' name="fields_null' . $vkey . '[' . $field_html . ']"';
+ . ' name="fields_null' . $field_name_appendix . '"';
if ($real_null_value && !$first_timestamp) {
echo ' checked="checked"';
}
@@ -592,10 +601,10 @@ foreach ($loop_array as $vrowcount => $vrow) {
} else {
$onclick .= '5, ';
}
- $onclick .= '\'' . $field_html . '\', \'' . md5($field) . '\', \'' . $vkey . '\'); this.checked = true}; return true" />' . "\n";
+ $onclick .= '\'' . PMA_escapeJsString($field_html) . '\', \'' . $field_md5 . '\', \'' . PMA_escapeJsString($vkey) . '\'); this.checked = true}; return true" />' . "\n";
echo $onclick;
} else {
- echo ' <input type="hidden" name="fields_null' . $vkey . '[' . $field_html . ']"';
+ echo ' <input type="hidden" name="fields_null' . $field_name_appendix . '"';
if ($real_null_value && !$first_timestamp) {
echo ' value="on"';
}
@@ -613,15 +622,21 @@ foreach ($loop_array as $vrowcount => $vrow) {
?>
<td>
<?php echo $backup_field . "\n"; ?>
- <input type="hidden" name="fields_type<?php echo $vkey; ?>[<?php echo $field_html; ?>]" value="foreign" />
- <input type="hidden" name="fields<?php echo $vkey; ?>[<?php echo $field_html; ?>]" value="" id="field_<?php echo ($idindex); ?>_1" />
- <input type="text" name="field_<?php echo md5($field); ?><?php echo $vkey; ?>[]" class="textfield" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo $field_html; ?>', '<?php echo $jsvkey; ?>')" tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3" value="<?php echo htmlspecialchars($data); ?>" />
+ <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>"
+ value="foreign" />
+ <input type="hidden" name="fields<?php echo $field_name_appendix; ?>"
+ value="" id="field_<?php echo ($idindex); ?>_1" />
+ <input type="text" name="field_<?php echo $field_name_appendix_md5; ?>"
+ class="textfield" <?php echo $unnillify_trigger; ?>
+ tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>"
+ id="field_<?php echo ($idindex); ?>_3"
+ value="<?php echo htmlspecialchars($data); ?>" />
<script type="text/javascript" language="javascript">
//<![CDATA[
document.writeln('<a target="_blank" onclick="window.open(this.href, \'foreigners\', \'width=640,height=240,scrollbars=yes,resizable=yes\'); return false"');
document.writeln(' href="browse_foreigners.php?');
document.writeln('<?php echo PMA_generate_common_url($db, $table); ?>');
- document.writeln('&amp;field=<?php echo urlencode($field) . $browse_foreigners_uri; ?>">');
+ document.writeln('&amp;field=<?php echo PMA_escapeJsString(urlencode($field) . $browse_foreigners_uri); ?>">');
document.writeln('<?php echo str_replace("'", "\'", $titles['Browse']); ?></a>');
//]]>
</script>
@@ -631,9 +646,14 @@ foreach ($loop_array as $vrowcount => $vrow) {
?>
<td>
<?php echo $backup_field . "\n"; ?>
- <input type="hidden" name="fields_type<?php echo $vkey; ?>[<?php echo $field_html; ?>]" value="foreign" />
- <input type="hidden" name="fields<?php echo $vkey; ?>[<?php echo $field_html; ?>]" value="" id="field_<?php echo $idindex; ?>_1" />
- <select name="field_<?php echo md5($field); ?><?php echo $vkey; ?>[]" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo $field_html; ?>', '<?php echo $jsvkey; ?>')" tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3">
+ <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>"
+ value="foreign" />
+ <input type="hidden" name="fields<?php echo $field_name_appendix; ?>"
+ value="" id="field_<?php echo $idindex; ?>_1" />
+ <select name="field_<?php echo $field_name_appendix_md5; ?>"
+ <?php echo $unnillify_trigger; ?>
+ tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>"
+ id="field_<?php echo ($idindex); ?>_3">
<?php echo PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display, $data, $cfg['ForeignKeyMaxLimit']); ?>
</select>
</td>
@@ -646,16 +666,28 @@ foreach ($loop_array as $vrowcount => $vrow) {
<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>">
<td colspan="5" align="right">
<?php echo $backup_field . "\n"; ?>
- <textarea name="fields<?php echo $vkey; ?>[<?php echo $field_html; ?>]" rows="<?php echo ($cfg['TextareaRows']*2); ?>" cols="<?php echo ($cfg['TextareaCols']*2); ?>" dir="<?php echo $text_dir; ?>" id="field_<?php echo ($idindex); ?>_3"
- <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo $field_html; ?>', '<?php echo $jsvkey; ?>')" tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>"><?php echo $special_chars; ?></textarea>
+ <textarea name="fields<?php echo $field_name_appendix; ?>"
+ rows="<?php echo ($cfg['TextareaRows']*2); ?>"
+ cols="<?php echo ($cfg['TextareaCols']*2); ?>"
+ dir="<?php echo $text_dir; ?>"
+ id="field_<?php echo ($idindex); ?>_3"
+ <?php echo $unnillify_trigger; ?>
+ tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>"
+ ><?php echo $special_chars; ?></textarea>
</td>
<?php
} elseif (strstr($type, 'text')) {
?>
<td>
<?php echo $backup_field . "\n"; ?>
- <textarea name="fields<?php echo $vkey; ?>[<?php echo $field_html; ?>]" rows="<?php echo $cfg['TextareaRows']; ?>" cols="<?php echo $cfg['TextareaCols']; ?>" dir="<?php echo $text_dir; ?>" id="field_<?php echo ($idindex); ?>_3"
- <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo $field_html; ?>', '<?php echo $jsvkey; ?>')" tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>"><?php echo $special_chars; ?></textarea>
+ <textarea name="fields<?php echo $field_name_appendix; ?>"
+ rows="<?php echo $cfg['TextareaRows']; ?>"
+ cols="<?php echo $cfg['TextareaCols']; ?>"
+ dir="<?php echo $text_dir; ?>"
+ id="field_<?php echo ($idindex); ?>_3"
+ <?php echo $unnillify_trigger; ?>
+ tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>"
+ ><?php echo $special_chars; ?></textarea>
</td>
<?php
echo "\n";
@@ -667,8 +699,8 @@ foreach ($loop_array as $vrowcount => $vrow) {
$enum_cnt = count($enum);
?>
<td>
- <input type="hidden" name="fields_type<?php echo $vkey; ?>[<?php echo $field_html; ?>]" value="enum" />
- <input type="hidden" name="fields<?php echo $vkey; ?>[<?php echo $field_html; ?>]" value="" />
+ <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="enum" />
+ <input type="hidden" name="fields<?php echo $field_name_appendix; ?>" value="" />
<?php
echo "\n" . ' ' . $backup_field;
@@ -676,7 +708,10 @@ foreach ($loop_array as $vrowcount => $vrow) {
if (strlen($row_table_def['Type']) > 20) {
echo "\n";
?>
- <select name="field_<?php echo md5($field); ?><?php echo $vkey; ?>[]" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo $field_html; ?>', '<?php echo $jsvkey; ?>')" tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3">
+ <select name="field_<?php echo $field_name_appendix_md5; ?>"
+ <?php echo $unnillify_trigger; ?>
+ tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>"
+ id="field_<?php echo ($idindex); ?>_3">
<option value=""></option>
<?php
echo "\n";
@@ -704,14 +739,22 @@ foreach ($loop_array as $vrowcount => $vrow) {
// Removes automatic MySQL escape format
$enum_atom = str_replace('\'\'', '\'', str_replace('\\\\', '\\', $enum[$j]));
echo ' ';
- echo '<input type="radio" name="field_' . md5($field) . $vkey . '[]" value="' . htmlspecialchars($enum_atom) . '" id="field_' . ($idindex) . '_3_' . $j . '" onclick="if (typeof(document.forms[\'insertForm\'].elements[\'fields_null' . str_replace('"', '\"', $vkey) . '[' . $field_html . ']\']) != \'undefined\') {document.forms[\'insertForm\'].elements[\'fields_null' . str_replace('"', '\"', $vkey) . '[' . $field_html .']\'].checked = false}"';
+ echo '<input type="radio" name="field_' . $field_name_appendix_md5 . '"';
+ echo ' value="' . htmlspecialchars($enum_atom) . '"';
+ echo ' id="field_' . ($idindex) . '_3_' . $j . '"';
+ echo ' onclick="';
+ echo "if (typeof(document.forms['insertForm'].elements['fields_null"
+ . $field_name_appendix . "']) != 'undefined') {document.forms['insertForm'].elements['fields_null"
+ . $field_name_appendix . "'].checked = false}";
+ echo '"';
if ($data == $enum_atom
|| ($data == '' && (!isset($primary_key) || $row_table_def['Null'] != 'YES')
&& isset($row_table_def['Default']) && $enum_atom == $row_table_def['Default'])) {
echo ' checked="checked"';
}
echo 'tabindex="' . ($tabindex + $tabindex_for_value) . '" />';
- echo '<label for="field_' . $idindex . '_3_' . $j . '">' . htmlspecialchars($enum_atom) . '</label>' . "\n";
+ echo '<label for="field_' . $idindex . '_3_' . $j . '">'
+ . htmlspecialchars($enum_atom) . '</label>' . "\n";
} // end for
} // end else
@@ -734,9 +777,13 @@ foreach ($loop_array as $vrowcount => $vrow) {
?>
<td>
<?php echo $backup_field . "\n"; ?>
- <input type="hidden" name="fields_type<?php echo $vkey; ?>[<?php echo $field_html; ?>]" value="set" />
- <input type="hidden" name="fields<?php echo $vkey; ?>[<?php echo $field_html; ?>]" value="" />
- <select name="field_<?php echo md5($field); ?><?php echo $vkey; ?>[]" size="<?php echo $size; ?>" multiple="multiple" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo $field_html; ?>', '<?php echo $jsvkey; ?>')" tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3">
+ <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="set" />
+ <input type="hidden" name="fields<?php echo $field_name_appendix; ?>" value="" />
+ <select name="field_<?php echo $field_name_appendix_md5; ?>"
+ size="<?php echo $size; ?>"
+ multiple="multiple" <?php echo $unnillify_trigger; ?>
+ tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>"
+ id="field_<?php echo ($idindex); ?>_3">
<?php
echo "\n";
for ($j = 0; $j < $countset; $j++) {
@@ -770,16 +817,22 @@ foreach ($loop_array as $vrowcount => $vrow) {
}
echo "\n";
?>
- <input type="hidden" name="fields_type<?php echo $vkey; ?>[<?php echo $field_html; ?>]" value="protected" />
- <input type="hidden" name="fields<?php echo $vkey; ?>[<?php echo $field_html; ?>]" value="" />
+ <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="protected" />
+ <input type="hidden" name="fields<?php echo $field_name_appendix; ?>" value="" />
<?php
} elseif ($is_blob) {
echo "\n";
?>
<td>
<?php echo $backup_field . "\n"; ?>
- <textarea name="fields<?php echo $vkey; ?>[<?php echo $field_html; ?>]" rows="<?php echo $cfg['TextareaRows']; ?>" cols="<?php echo $cfg['TextareaCols']; ?>" dir="<?php echo $text_dir; ?>" id="field_<?php echo ($idindex); ?>_3"
- <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo $field_html; ?>', '<?php echo $jsvkey; ?>')" tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" ><?php echo $special_chars; ?></textarea>
+ <textarea name="fields<?php echo $field_name_appendix; ?>"
+ rows="<?php echo $cfg['TextareaRows']; ?>"
+ cols="<?php echo $cfg['TextareaCols']; ?>"
+ dir="<?php echo $text_dir; ?>"
+ id="field_<?php echo ($idindex); ?>_3"
+ <?php echo $unnillify_trigger; ?>
+ tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>"
+ ><?php echo $special_chars; ?></textarea>
<?php
} else {
@@ -793,7 +846,12 @@ foreach ($loop_array as $vrowcount => $vrow) {
?>
<td>
<?php echo $backup_field . "\n"; ?>
- <input type="text" name="fields<?php echo $vkey; ?>[<?php echo $field_html; ?>]" value="<?php echo $special_chars; ?>" size="<?php echo $fieldsize; ?>" maxlength="<?php echo $maxlength; ?>" class="textfield" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo $field_html; ?>', '<?php echo $jsvkey; ?>')" tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3" />
+ <input type="text" name="fields<?php echo $field_name_appendix; ?>"
+ value="<?php echo $special_chars; ?>" size="<?php echo $fieldsize; ?>"
+ maxlength="<?php echo $maxlength; ?>"
+ class="textfield" <?php echo $unnillify_trigger; ?>
+ tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>"
+ id="field_<?php echo ($idindex); ?>_3" />
<?php
} // end if...elseif...else
@@ -803,7 +861,7 @@ foreach ($loop_array as $vrowcount => $vrow) {
if ($is_upload && $is_blob) {
echo '<br />';
- echo '<input type="file" name="fields_upload_' . $field_html . $vkey . '" class="textfield" id="field_' . ($idindex) . '_3" size="10" />&nbsp;';
+ echo '<input type="file" name="fields_upload_' . $field_html . $vkey . '" class="textfield" id="field_' . $idindex . '_3" size="10" />&nbsp;';
// find maximum upload size, based on field type
/**
@@ -867,28 +925,43 @@ foreach ($loop_array as $vrowcount => $vrow) {
if ($is_char && ($cfg['CharEditing'] == 'textarea' || strpos($data, "\n") !== FALSE)) {
echo "\n";
?>
- <textarea name="fields<?php echo $vkey; ?>[<?php echo $field_html; ?>]" rows="<?php echo $cfg['CharTextareaRows']; ?>" cols="<?php echo $cfg['CharTextareaCols']; ?>" dir="<?php echo $text_dir; ?>" id="field_<?php echo ($idindex); ?>_3"
- <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo $field_html; ?>', '<?php echo $jsvkey; ?>')" tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" ><?php echo $special_chars; ?></textarea>
+ <textarea name="fields<?php echo $field_name_appendix; ?>"
+ rows="<?php echo $cfg['CharTextareaRows']; ?>"
+ cols="<?php echo $cfg['CharTextareaCols']; ?>"
+ dir="<?php echo $text_dir; ?>"
+ id="field_<?php echo ($idindex); ?>_3"
+ <?php echo $unnillify_trigger; ?>
+ tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>"
+ ><?php echo $special_chars; ?></textarea>
<?php
} else {
?>
- <input type="text" name="fields<?php echo $vkey; ?>[<?php echo $field_html; ?>]" value="<?php echo $special_chars; ?>" size="<?php echo $fieldsize; ?>" maxlength="<?php echo $maxlength; ?>" class="textfield" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo $field_html; ?>', '<?php echo $jsvkey; ?>')" tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3" />
+ <input type="text" name="fields<?php echo $field_name_appendix; ?>"
+ value="<?php echo $special_chars; ?>" size="<?php echo $fieldsize; ?>"
+ maxlength="<?php echo $maxlength; ?>"
+ class="textfield" <?php echo $unnillify_trigger; ?>
+ tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>"
+ id="field_<?php echo ($idindex); ?>_3" />
<?php
if ($row_table_def['Extra'] == 'auto_increment') {
?>
- <input type="hidden" name="auto_increment<?php echo $vkey; ?>[<?php echo $field_html; ?>]" value="1" />
+ <input type="hidden" name="auto_increment<?php echo $field_name_appendix; ?>" value="1" />
<?php
} // end if
if (substr($type, 0, 9) == 'timestamp') {
?>
- <input type="hidden" name="fields_type<?php echo $vkey; ?>[<?php echo $field_html; ?>]" value="timestamp" />
+ <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="timestamp" />
<?php
}
if ($type == 'date' || $type == 'datetime' || substr($type, 0, 9) == 'timestamp') {
?>
<script type="text/javascript" language="javascript">
//<![CDATA[
- document.write('<a title="<?php echo $strCalendar;?>" href="javascript:openCalendar(\'<?php echo PMA_generate_common_url();?>\', \'insertForm\', \'field_<?php echo ($idindex); ?>_3\', \'<?php echo (PMA_MYSQL_INT_VERSION >= 40100 && substr($type, 0, 9) == 'timestamp') ? 'datetime' : substr($type, 0, 9); ?>\')"><img class="calendar" src="<?php echo $pmaThemeImage; ?>b_calendar.png" alt="<?php echo $strCalendar; ?>"/></a>');
+ document.write('<a title="<?php echo $strCalendar;?>"');
+ document.write(' href="javascript:openCalendar(\'<?php echo PMA_generate_common_url();?>\', \'insertForm\', \'field_<?php echo ($idindex); ?>_3\', \'<?php echo (PMA_MYSQL_INT_VERSION >= 40100 && substr($type, 0, 9) == 'timestamp') ? 'datetime' : substr($type, 0, 9); ?>\')">');
+ document.write('<img class="calendar"');
+ document.write(' src="<?php echo $pmaThemeImage; ?>b_calendar.png"');
+ document.write(' alt="<?php echo $strCalendar; ?>"/></a>');
//]]>
</script>
<?php
diff --git a/tbl_indexes.php b/tbl_indexes.php
index be9667c57f..810e170c18 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -416,11 +416,7 @@ elseif (!defined('PMA_IDX_INCLUDED')
$edit_link_text = '';
$drop_link_text = '';
- // We need to copy the value or else the == 'both' check will always
- // return true
- $propicon = (string) $cfg['PropertiesIconic'];
-
- if ($cfg['PropertiesIconic'] === true || $propicon == 'both') {
+ if ($cfg['PropertiesIconic'] === true || $cfg['PropertiesIconic'] === 'both') {
$edit_link_text = '<img class="icon" src="' . $pmaThemeImage
. 'b_edit.png" width="16" height="16" title="' . $strEdit
. '" alt="' . $strEdit . '" />';
@@ -428,11 +424,11 @@ elseif (!defined('PMA_IDX_INCLUDED')
. 'b_drop.png" width="16" height="16" title="' . $strDrop
. '" alt="' . $strDrop . '" />';
}
- if ($cfg['PropertiesIconic'] === false || $propicon == 'both') {
+ if ($cfg['PropertiesIconic'] === false || $cfg['PropertiesIconic'] === 'both') {
$edit_link_text .= $strEdit;
$drop_link_text .= $strDrop;
}
- if ($propicon == 'both') {
+ if ($cfg['PropertiesIconic'] === 'both') {
$edit_link_text = '<nobr>' . $edit_link_text . '</nobr>';
$drop_link_text = '<nobr>' . $drop_link_text . '</nobr>';
}
diff --git a/tbl_replace.php b/tbl_replace.php
index 4e2554f16a..318f76c580 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -1,11 +1,10 @@
<?php
/**
* manipulation of table data like inserting, replacing and updating
+ * vim: expandtab sw=4 ts=4 sts=4:
*
* usally called as form action from tbl_change.php to insert or update table rows
*
- * vim: expandtab sw=4 ts=4 sts=4:
- *
* @version $Id$
*
* @todo 'edit_next' tends to not work as expected if used ... at least there is no order by
@@ -275,12 +274,12 @@ if ($is_insert && count($value_sets) > 0) {
unset($query_fields, $value_sets);
- $message = $GLOBALS['strInsertedRows'] . '&nbsp;';
+ $message .= $GLOBALS['strInsertedRows'] . '&nbsp;';
} elseif (! empty($query)) {
- $message = $GLOBALS['strAffectedRows'] . '&nbsp;';
+ $message .= $GLOBALS['strAffectedRows'] . '&nbsp;';
} else {
// No change -> move back to the calling script
- $message = $GLOBALS['strNoModification'];
+ $message .= $GLOBALS['strNoModification'];
$js_to_run = 'functions.js';
$active_page = $goto_include;
require_once './libraries/header.inc.php';
@@ -352,7 +351,18 @@ if (isset($return_to_sql_query)) {
$GLOBALS['sql_query'] = $return_to_sql_query;
}
-$js_to_run = 'functions.js';
+// if user asked to "Insert another new row", we need tbl_change.js
+// otherwise the calendar icon does not work
+if ($goto_include == 'tbl_change.php') {
+ /**
+ * @todo if we really need to run many different js at header time,
+ * $js_to_run would become an array and header.inc.php would iterate
+ * thru it, instead of the bunch of if/elseif it does now
+ */
+ $js_to_run = 'tbl_change.js';
+} else {
+ $js_to_run = 'functions.js';
+}
$active_page = $goto_include;
require_once './libraries/header.inc.php';
require './' . PMA_securePath($goto_include);
diff --git a/test/core.lib.php b/test/core.lib.php
new file mode 100644
index 0000000000..6ebfe164c1
--- /dev/null
+++ b/test/core.lib.php
@@ -0,0 +1,67 @@
+<?php
+/* $Id: common.lib.php 9832 2007-01-09 09:50:49Z nijel $ */
+// vim: expandtab sw=4 ts=4 sts=4:
+
+/**
+ * Core testing library to wrap phpMyAdmin and add some useful functions.
+ *
+ * @author Michal Čihař <michal@cihar.com>
+ * @package phpMyAdmin-test
+ */
+
+/**
+ * Go to root directory.
+ */
+chdir('..');
+
+
+/**
+ * Report failed test.
+ *
+ * @param string function to test
+ * @param string test description
+ * @param string failure description
+ */
+function PMA_test_fail($function, $test, $message) {
+ $function = htmlspecialchars($function);
+ $test = htmlspecialchars($test);
+ $message = htmlspecialchars($message);
+ echo <<<EOT
+<dt>$function ($test)</dt>
+<dd><strong>Failed:</strong> $message</dd>
+EOT;
+}
+
+/**
+ * Report ok test.
+ *
+ * @param string function to test
+ * @param string test description
+ */
+function PMA_test_okay($function, $test) {
+ $function = htmlspecialchars($function);
+ $test = htmlspecialchars($test);
+ echo <<<EOT
+<dt>$function ($test)</dt>
+<dd><strong>OK</strong></dd>
+EOT;
+}
+
+/**
+ * Function for testing strings.
+ *
+ * @uses PMA_test_okay()
+ * @uses PMA_test_fail()
+ * @param string function to test
+ * @param string test description
+ * @param string actual result
+ * @param string expected result
+ */
+function PMA_test_string($function, $test, $received, $expected) {
+ if ($received != $expected) {
+ PMA_test_fail($function, $test, "Strings >$received< and >$expected< do not match");
+ } else {
+ PMA_test_okay($function, $test);
+ }
+}
+?>
diff --git a/test/escape_js_string.php b/test/escape_js_string.php
new file mode 100644
index 0000000000..6632bf9438
--- /dev/null
+++ b/test/escape_js_string.php
@@ -0,0 +1,39 @@
+<?php
+/* $Id: common.lib.php 9832 2007-01-09 09:50:49Z nijel $ */
+// vim: expandtab sw=4 ts=4 sts=4:
+
+/**
+ * Test for javascript escaping.
+ *
+ * @author Michal Čihař <michal@cihar.com>
+ * @package phpMyAdmin-test
+ */
+
+/**
+ * Tests core.
+ */
+include('./core.lib.php');
+/**
+ * Include to test.
+ */
+include('./libraries/js_escape.lib.php');
+
+/**
+ * Test java script escaping.
+ *
+ * @uses PMA_escapeJsString()
+ * @uses PMA_test_string()
+ * @param string string to escape
+ * @param string expected result
+ */
+function PMA_test_escape($test, $expected) {
+ PMA_test_string('PMA_escapeJsString', $test, PMA_escapeJsString($test), $expected);
+}
+
+PMA_test_escape('\';', '\\\';');
+PMA_test_escape("\r\n'<scrIpt></sCRIPT>", '\r\n\\\'<scrIpt></\' + \'script>');
+PMA_test_escape('\';[XSS]', '\\\';[XSS]');
+PMA_test_escape('</SCRIPT></head><body>[HTML]', '</\' + \'script></head><body>[HTML]');
+PMA_test_escape('"\'\\\'"', '"\\\'\\\\\\\'"');
+PMA_test_escape("\\''''''''''''\\", "\\\\\'\'\'\'\'\'\'\'\'\'\'\'\\\\");
+?>
diff --git a/test/theme.php b/test/theme.php
index 4cc85a3dc5..37346c380a 100644
--- a/test/theme.php
+++ b/test/theme.php
@@ -5,6 +5,7 @@
* theme test
*
* @uses libraries/common.lib.php global fnctions
+ * @package phpMyAdmin-test
*/
chdir( '..' );
@@ -31,9 +32,9 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
<meta http-equiv="Content-Type"
content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
<link rel="stylesheet" type="text/css"
- href="../css/phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;js_frame=right&amp;nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" />
+ href="../phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;js_frame=right&amp;nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" />
<link rel="stylesheet" type="text/css" media="print"
- href="../css/print.css?<?php echo PMA_generate_common_url(); ?>" />
+ href="../print.css" />
<script src="../js/functions.js" type="text/javascript"
language="javascript"></script>
</head>
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index 2c1ed58af6..ce9abb4a4b 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -194,13 +194,16 @@ table tr.even {
text-align: <?php echo $left; ?>;
}
+<?php if ($GLOBALS['cfg']['BrowseMarkerEnable']) { ?>
/* marked table rows */
table tr.marked th,
table tr.marked {
background: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
}
+<?php } ?>
+<?php if ($GLOBALS['cfg']['BrowsePointerEnable']) { ?>
/* hovered items */
.odd:hover,
.even:hover,
@@ -216,6 +219,7 @@ table tr.hover th {
background: <?php echo $GLOBALS['cfg']['BrowsePointerBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
}
+<?php } ?>
/**
* marks table rows/cells if the db field is in a where condition
@@ -365,7 +369,7 @@ div.notice {
border: 0.1em solid #FFD700;
width: 90%;
<?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
- background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
+ background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
background-repeat: no-repeat;
<?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
background-position: 10px 50%;
@@ -396,7 +400,7 @@ div.warning {
border: 0.1em solid #CC0000;
width: 90%;
<?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
- background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png);
+ background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png);
background-repeat: no-repeat;
<?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
background-position: 10px 50%;
@@ -427,7 +431,7 @@ div.error {
border: 0.1em solid #ff0000;
width: 90%;
<?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
- background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
+ background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
background-repeat: no-repeat;
<?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
background-position: 10px 50%;
@@ -458,7 +462,7 @@ fieldset.confirmation legend {
border-right: 0.1em solid #FF0000;
font-weight: bold;
<?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
- background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_really.png);
+ background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_really.png);
background-repeat: no-repeat;
<?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
background-position: 5px 50%;
@@ -649,7 +653,7 @@ a.tab:hover,
span.tab,
a.warning,
span.tabcaution {
- cursor: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>error.ico), default;
+ cursor: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>error.ico), default;
}
<?php } ?>
/* end topmenu */
@@ -943,7 +947,7 @@ div#queryboxcontainer div#bookmarkoptions {
/* main page */
#maincontainer {
- background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>logo_right.png);
+ background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>logo_right.png);
background-position: <?php echo $right; ?> bottom;
background-repeat: no-repeat;
border-bottom: 1px solid silver;
@@ -956,7 +960,7 @@ div#queryboxcontainer div#bookmarkoptions {
}
#maincontainer ul {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_<?php echo $GLOBALS['text_dir']; ?>.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_<?php echo $GLOBALS['text_dir']; ?>.png);
vertical-align: middle;
}
@@ -969,96 +973,96 @@ div#queryboxcontainer div#bookmarkoptions {
<?php if ($GLOBALS['cfg']['MainPageIconic']) { ?>
/* iconic view for ul items */
li#li_create_database {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_newdb.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_newdb.png);
}
li#li_select_lang {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_lang.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_lang.png);
}
li#li_select_mysql_collation,
li#li_select_mysql_charset {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
}
li#li_select_theme{
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_theme.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_theme.png);
}
li#li_server_info{
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_host.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_host.png);
}
li#li_user_info{
- /* list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png); */
+ /* list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png); */
}
li#li_mysql_status{
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_status.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_status.png);
}
li#li_mysql_variables{
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_vars.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_vars.png);
}
li#li_mysql_processes{
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_process.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_process.png);
}
li#li_mysql_collations{
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
}
li#li_mysql_engines{
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_engine.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_engine.png);
}
li#li_mysql_binlogs {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_tbl.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_tbl.png);
}
li#li_mysql_databases {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_db.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_db.png);
}
li#li_export {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_export.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_export.png);
}
li#li_import {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_import.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_import.png);
}
li#li_change_password {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_passwd.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_passwd.png);
}
li#li_log_out {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_loggoff.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_loggoff.png);
}
li#li_pma_docs {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_docs.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_docs.png);
}
li#li_phpinfo {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>php_sym.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>php_sym.png);
}
li#li_pma_homepage {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_home.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_home.png);
}
li#li_mysql_privilegs{
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png);
}
li#li_switch_dbstats {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_dbstatistics.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_dbstatistics.png);
}
li#li_flush_privileges {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_reload.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_reload.png);
}
/* END iconic view for ul items */
<?php } /* end if $GLOBALS['cfg']['MainPageIconic'] */ ?>
diff --git a/themes/darkblue_orange/img/logo_left.png b/themes/darkblue_orange/img/logo_left.png
index d75bdee0cb..26acf2e3bf 100644
--- a/themes/darkblue_orange/img/logo_left.png
+++ b/themes/darkblue_orange/img/logo_left.png
Binary files differ
diff --git a/themes/darkblue_orange/layout.inc.php b/themes/darkblue_orange/layout.inc.php
index 10cfe0d66e..21a7f41356 100644
--- a/themes/darkblue_orange/layout.inc.php
+++ b/themes/darkblue_orange/layout.inc.php
@@ -30,7 +30,7 @@ $GLOBALS['cfg']['MainColor'] = '#000000';
// background for the main frame
$GLOBALS['cfg']['MainBackground'] = '#ffffff';
-//$GLOBALS['cfg']['MainBackground'] = '#ffffff url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y';
+//$GLOBALS['cfg']['MainBackground'] = '#ffffff url(' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y';
// foreground (text) color of the pointer in browse mode
$GLOBALS['cfg']['BrowsePointerColor'] = '#000000';
@@ -64,7 +64,7 @@ $GLOBALS['cfg']['FontFamilyFixed'] = 'monospace';
// border
$GLOBALS['cfg']['Border'] = 0;
// table header and footer color
-$GLOBALS['cfg']['ThBackground'] = '#ff9900 url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'tbl_th.png) repeat-x top';
+$GLOBALS['cfg']['ThBackground'] = '#ff9900 url(' . $_SESSION['PMA_Theme']->getImgPath() . 'tbl_th.png) repeat-x top';
// table header and footer background
$GLOBALS['cfg']['ThColor'] = '#000000';
// table data row background
diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php
index f45d86ebb0..599d1254b6 100644
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -102,7 +102,7 @@ div#leftframelinks a:hover {
/* serverlist */
#body_leftFrame #list_server {
- list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_host.png);
+ list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_host.png);
list-style-position: inside;
list-style-type: none;
margin: 0;
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index f32cf4ad03..d40b30a507 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -169,13 +169,16 @@ table tr.even {
text-align: <?php echo $left; ?>;
}
+<?php if ($GLOBALS['cfg']['BrowseMarkerEnable']) { ?>
/* marked table rows */
table tr.marked th,
table tr.marked {
background: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
}
+<?php } ?>
+<?php if ($GLOBALS['cfg']['BrowsePointerEnable']) { ?>
/* hovered items */
.odd:hover,
.even:hover,
@@ -191,6 +194,7 @@ table tr.hover th {
background: <?php echo $GLOBALS['cfg']['BrowsePointerBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
}
+<?php } ?>
/**
* marks table rows/cells if the db field is in a where condition
@@ -340,7 +344,7 @@ div.notice {
margin: 0.5em 0 0.5em 0;
border: 0.1em solid #FFD700;
<?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
- background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
+ background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
background-repeat: no-repeat;
<?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
background-position: 10px 50%;
@@ -370,7 +374,7 @@ div.warning {
margin: 0.5em 0 0.5em 0;
border: 0.1em solid #CC0000;
<?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
- background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png);
+ background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png);
background-repeat: no-repeat;
<?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
background-position: 10px 50%;
@@ -400,7 +404,7 @@ div.error {
margin: 0.5em 0 0.5em 0;
border: 0.1em solid #ff0000;
<?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
- background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
+ background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
background-repeat: no-repeat;
<?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
background-position: 10px 50%;
@@ -431,7 +435,7 @@ fieldset.confirmation legend {
border-right: 0.1em solid #FF0000;
font-weight: bold;
<?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
- background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_really.png);
+ background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_really.png);
background-repeat: no-repeat;
<?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
background-position: 5px 50%;
@@ -621,7 +625,7 @@ a.tab:hover,
span.tab,
a.warning,
span.tabcaution {
- cursor: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>error.ico), default;
+ cursor: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>error.ico), default;
}
<?php } ?>
/* end topmenu */
@@ -889,7 +893,7 @@ div#queryboxcontainer div#bookmarkoptions {
/* main page */
#maincontainer {
- background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>logo_right.png);
+ background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>logo_right.png);
background-position: <?php echo $right; ?> bottom;
background-repeat: no-repeat;
border-bottom: 1px solid silver;
@@ -902,7 +906,7 @@ div#queryboxcontainer div#bookmarkoptions {
}
#maincontainer ul {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_<?php echo $GLOBALS['text_dir']; ?>.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_<?php echo $GLOBALS['text_dir']; ?>.png);
vertical-align: middle;
}
@@ -915,96 +919,96 @@ div#queryboxcontainer div#bookmarkoptions {
<?php if ($GLOBALS['cfg']['MainPageIconic']) { ?>
/* iconic view for ul items */
li#li_create_database {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_newdb.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_newdb.png);
}
li#li_select_lang {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_lang.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_lang.png);
}
li#li_select_mysql_collation,
li#li_select_mysql_charset {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
}
li#li_select_theme{
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_theme.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_theme.png);
}
li#li_server_info{
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_host.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_host.png);
}
li#li_user_info{
- /* list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png); */
+ /* list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png); */
}
li#li_mysql_status{
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_status.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_status.png);
}
li#li_mysql_variables{
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_vars.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_vars.png);
}
li#li_mysql_processes{
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_process.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_process.png);
}
li#li_mysql_collations{
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
}
li#li_mysql_engines{
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_engine.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_engine.png);
}
li#li_mysql_binlogs {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_tbl.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_tbl.png);
}
li#li_mysql_databases {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_db.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_db.png);
}
li#li_export {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_export.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_export.png);
}
li#li_import {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_import.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_import.png);
}
li#li_change_password {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_passwd.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_passwd.png);
}
li#li_log_out {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_loggoff.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_loggoff.png);
}
li#li_pma_docs {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_docs.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_docs.png);
}
li#li_phpinfo {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>php_sym.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>php_sym.png);
}
li#li_pma_homepage {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_home.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_home.png);
}
li#li_mysql_privilegs{
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png);
}
li#li_switch_dbstats {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_dbstatistics.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_dbstatistics.png);
}
li#li_flush_privileges {
- list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_reload.png);
+ list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_reload.png);
}
/* END iconic view for ul items */
<?php } /* end if $GLOBALS['cfg']['MainPageIconic'] */ ?>
diff --git a/themes/original/img/logo_left.png b/themes/original/img/logo_left.png
index e3c47e4657..26acf2e3bf 100644
--- a/themes/original/img/logo_left.png
+++ b/themes/original/img/logo_left.png
Binary files differ
diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php
index 549f3392b0..ab855df207 100644
--- a/themes/original/layout.inc.php
+++ b/themes/original/layout.inc.php
@@ -29,7 +29,7 @@ $GLOBALS['cfg']['MainColor'] = '#000000';
// background for the main frame
$GLOBALS['cfg']['MainBackground'] = '#F5F5F5';
-//$GLOBALS['cfg']['MainBackground'] = '#F5F5F5 url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y';
+//$GLOBALS['cfg']['MainBackground'] = '#F5F5F5 url(' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y';
// foreground (text) color of the pointer in browse mode
$GLOBALS['cfg']['BrowsePointerColor'] = '#000000';
diff --git a/translators.html b/translators.html
index b1a288d7a3..4e3c42cdb1 100644
--- a/translators.html
+++ b/translators.html
@@ -8,7 +8,7 @@
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <title>phpMyAdmin 2.10.0-dev - Official translators</title>
+ <title>phpMyAdmin 2.11.0-dev - Official translators</title>
<link rel="stylesheet" type="text/css" href="docs.css" />
</head>
@@ -31,7 +31,7 @@
<li><a href="Documentation.html#glossary">Glossary</a></li>
</ul>
-<h1>phpMyAdmin 2.10.0-dev official translators list</h1>
+<h1>phpMyAdmin 2.11.0-dev official translators list</h1>
<p> Here is the list of the &quot;official translators&quot; of
phpMyAdmin.</p>
@@ -57,7 +57,7 @@
<tr>
<td>Afrikaans</td>
<td>
- Andreas Pauley (pauley@buitegroep.org.za)
+ volunteer needed
</td>
</tr>
@@ -206,7 +206,7 @@
<tr>
<td>Georgian</td>
<td>
- --volunteer needed--
+ volunteer needed
</td>
</tr>
@@ -234,7 +234,7 @@
<tr>
<td>Hindi</td>
<td>
- Girish Nair (girish_nair@users.sourceforge.net)
+ volunteer needed
</td>
</tr>
@@ -269,7 +269,7 @@
<tr>
<td>Korean</td>
<td>
- WooSuhan (kjh@unews.co.kr)
+ volunteer needed
</td>
</tr>
@@ -290,7 +290,7 @@
<tr>
<td>Malay</td>
<td>
- Mohammad Shafiq bin Mohd Mustapa (sicksand@users.sourceforge.net)
+ volunteer needed
</td>
</tr>
@@ -311,7 +311,7 @@
<tr>
<td>Persian</td>
<td>
- Parham Ghaffarian (parham@bornisgroup.com)
+ volunteer needed
</td>
</tr>
diff --git a/view_create.php b/view_create.php
new file mode 100644
index 0000000000..cb890ce9ea
--- /dev/null
+++ b/view_create.php
@@ -0,0 +1,141 @@
+<?php
+/* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
+
+require_once './libraries/common.lib.php';
+
+/**
+ * Runs common work
+ */
+require './libraries/db_common.inc.php';
+$url_params['goto'] = $url_params['back'] = 'view_create.php';
+
+if (isset($_POST['submitoptions'])) {
+ /**
+ * Creates the view
+ */
+ $message = '';
+ $sep = "\r\n";
+ $create_query = 'CREATE' . $sep;
+ if (isset($_POST['or_replace'])) {
+ $create_query .= ' OR REPLACE' . $sep;
+ }
+ if (isset($_POST['algorithm'])) {
+ $create_query .= ' ALGORITHM = ' . $_POST['algorithm'] . $sep;
+ }
+ $create_query .= ' VIEW ' . $_POST['view_name'] . $sep;
+
+ if (!empty($_POST['column_names'])) {
+ $create_query .= ' ( ' . $_POST['column_names'] . ')' . $sep;
+ }
+
+ $create_query .= ' AS ' . $_POST['sql_statement'] . $sep;
+
+ if (isset($_POST['cascaded']) || isset($_POST['local']) || isset($_POST['check_option'])) {
+ $create_query .= ' WITH ';
+ }
+
+ if (isset($_POST['cascaded'])) {
+ $create_query .= ' CASCADED ';
+ }
+
+ if (isset($_POST['local'])) {
+ $create_query .= ' LOCAL ';
+ }
+
+ if (isset($_POST['check_option'])) {
+ $create_query .= ' CHECK OPTION ';
+ }
+
+ $message .= PMA_DBI_query($create_query) ? $strSuccess : $strError;
+
+ // to display the CREATE VIEW query
+ $sql_query = $create_query;
+
+ require './' . $cfg['DefaultTabDatabase'];
+ exit();
+
+} else {
+ /**
+ * Displays top menu links
+ * We use db links because a VIEW is not necessarily on a single table
+ */
+ $num_tables = 0;
+ require_once './libraries/db_links.inc.php';
+
+ $url_params['goto'] = 'view_create.php';
+ $url_params['back'] = 'view_create.php';
+
+ /**
+ * Displays the page
+ *
+ * @todo js error when view name is empty (strFormEmpty)
+ * @todo (also validate if js is disabled, after form submission?)
+ */
+
+?>
+<!-- CREATE VIEW options -->
+<div id="div_view_options">
+<form method="post" action="view_create.php">
+<?php echo PMA_generate_common_hidden_inputs($GLOBALS['db']); ?>
+<input type="hidden" name="reload" value="1" />
+<fieldset>
+ <legend>CREATE VIEW</legend>
+
+ <table>
+ <tr><td><label for="or_replace">OR REPLACE</label></td>
+ <td><input type="checkbox" name="or_replace" id="or_replace"
+ value="1" />
+ </td>
+ </tr>
+ <tr>
+ <td><label for="algorithm">ALGORITHM</label></td>
+ <td><select name="algorithm" id="algorithm">
+ <option value="UNDEFINED">UNDEFINED</option>
+ <option value="MERGE">MERGE</option>
+ <option value="MERGE">MERGE</option>
+ </select>
+ </td>
+ </tr>
+ <tr><td><?php echo $strViewName; ?></td>
+ <td><input type="text" size="20" name="view_name" onfocus="this.select()"
+ value="" />
+ </td>
+ </tr>
+
+ <tr><td><?php echo $strColumnNames; ?></td>
+ <td><input type="text" maxlength="100" size="50" name="column_names" onfocus="this.select()"
+ value="" />
+ </td>
+ </tr>
+
+ <tr><td><?php echo 'AS' ?></td>
+ <td><input type="text" name="sql_statement" maxlength="100" size="50"
+ value="<?php echo htmlspecialchars($sql_query); ?>" onfocus="this.select()" />
+ </td>
+ </tr>
+ <tr><td>WITH</td>
+ <td>
+ <input type="checkbox" name="cascaded" id="cascaded" value="1" />
+ <label for="cascaded">CASCADED</label>
+ <input type="checkbox" name="local" id="local" value="1" />
+ <label for="local">LOCAL</label>
+ <input type="checkbox" name="check_option" id="check_option" value="1" />
+ <label for="check_option">CHECK OPTION</label>
+ </td>
+ </tr>
+ </table>
+</fieldset>
+<fieldset class="tblFooters">
+ <input type="submit" name="submitoptions" value="<?php echo $strGo; ?>" />
+</fieldset>
+</form>
+</div>
+<?php
+/**
+ * Displays the footer
+ */
+require_once './libraries/footer.inc.php';
+
+} // end if
+?>